Merge branch 'security-aosp-rvc-release' into int/11/fp3

* security-aosp-rvc-release:
  [rvc] RESTRICT AUTOMERGE Use finalizeWorkProfileProvisioning.

Change-Id: Ic34adfd416084bdd9fb5e70ffc4fbf1be952777e
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..6f6abfc
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,41 @@
+java_library {
+    name: "managedprovisioning_protoslite",
+    srcs: ["proto/**/*.proto"],
+    proto: {
+        type: "lite",
+    },
+}
+
+android_app {
+    name: "ManagedProvisioning",
+
+    libs: ["android.car"],
+
+    static_libs: [
+        "androidx.legacy_legacy-support-v4",
+        "car-ui-lib",
+        "setupcompat",
+        "setupdesign",
+        "devicepolicyprotosnano",
+        "managedprovisioning_protoslite",
+    ],
+
+    srcs: [
+        "src/**/*.java",
+        "src/**/I*.aidl",
+    ],
+
+    resource_dirs: ["res"],
+
+    platform_apis: true,
+    certificate: "platform",
+    privileged: true,
+    optimize: {
+        proguard_flags_files: ["proguard.flags"],
+    },
+
+    // Packages to be included in code coverage runs. This does not affect production builds.
+    jacoco: {
+        include_filter: ["com.android.managedprovisioning.*"],
+    },
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index a62b52b..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := managedprovisioning_protoslite
-LOCAL_SRC_FILES := $(call all-proto-files-under, proto)
-LOCAL_PROTOC_OPTIMIZE_TYPE := lite
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_JAVA_LIBRARIES += android.car
-
-LOCAL_STATIC_ANDROID_LIBRARIES += \
-        androidx.legacy_legacy-support-v4 \
-        car-ui-lib \
-        setupcompat \
-        setupdesign
-
-LOCAL_STATIC_LIBRARIES := devicepolicyprotosnano
-LOCAL_STATIC_JAVA_LIBRARIES := managedprovisioning_protoslite
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_SRC_FILES += $(call all-Iaidl-files-under, src)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_PACKAGE_NAME := ManagedProvisioning
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-# Packages to be included in code coverage runs. This does not affect production builds.
-LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.managedprovisioning.*
-
-include $(BUILD_PACKAGE)
-
-# additionally, build tests if we build via mmm / mm
-ifeq (,$(ONE_SHOT_MAKEFILE))
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
diff --git a/CleanSpec.mk b/CleanSpec.mk
deleted file mode 100644
index 8179bd3..0000000
--- a/CleanSpec.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.
-#
-
-# If you don't need to do a full clean build but would like to touch
-# a file or delete some intermediate files, add a clean step to the end
-# of the list.  These steps will only be run once, if they haven't been
-# run before.
-#
-# E.g.:
-#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
-#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
-#
-# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
-# files that are missing or have been moved.
-#
-# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
-# Use $(OUT_DIR) to refer to the "out" directory.
-#
-# If you need to re-do something that's already mentioned, just copy
-# the command and add it to the bottom of the list.  E.g., if a change
-# that you made last week required touching a file and a change you
-# made today requires touching the same file, just copy the old
-# touch step and add it to the end of the list.
-#
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************
-
-# For example:
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
-#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
-#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
-
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ManagedProvisioningComm_intermediates)
-
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 719a46a..3a82970 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -7,22 +7,11 @@
           "exclude-annotation": "androidx.test.filters.FlakyTest"
         }
       ]
-    },
-    {
-      "name": "ManagedProvisioningRoboTests",
-      "options": [
-        {
-          "exclude-annotation": "androidx.test.filters.FlakyTest"
-        }
-      ]
     }
   ],
   "postsubmit": [
     {
       "name": "ManagedProvisioningTests"
-    },
-    {
-      "name": "ManagedProvisioningRoboTests"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 0c56e73..c345e64 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -73,7 +73,7 @@
     <string name="progress_delete_non_required_apps" msgid="7633458399262691256">"جارٍ إزالة تطبيقات النظام غير المطلوبة…"</string>
     <string name="progress_finishing_touches" msgid="9037776404089697198">"جارٍ وضع اللمسات النهائية…"</string>
     <string name="progress_set_owner" msgid="8214062820093757961">"جارٍ تعيين مالك الجهاز..."</string>
-    <string name="progress_initialize" msgid="1104643492713424939">"جارٍ تهيئة الجهاز…"</string>
+    <string name="progress_initialize" msgid="1104643492713424939">"جارٍ إعداد الجهاز…"</string>
     <string name="device_doesnt_allow_encryption_contact_admin" msgid="5124643338424539794">"لا يسمح هذا الجهاز بالتشفير، وهو أمر لازم للإعداد. يمكنك التواصل مع مشرف تكنولوجيا المعلومات للحصول على مساعدة."</string>
     <string name="stop_setup_reset_device_question" msgid="7547191251522623210">"هل تريد إيقاف الإعداد وإعادة ضبط الجهاز؟"</string>
     <string name="this_will_reset_take_back_first_screen" msgid="4623290347188404725">"سيؤدي هذا إلى إعادة ضبط جهازك ورجوعك إلى الشاشة الأولى"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 55174e3..20cd443 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -157,7 +157,7 @@
     <string name="join_many_items_last" msgid="7469666990442158802">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> və <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="8365482726853276608">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="8569294838319639963">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
-    <string name="take_a_few_minutes" msgid="6282806501305322838">"Bu, bir neçə dəqiqə çəkə bilər"</string>
+    <string name="take_a_few_minutes" msgid="6282806501305322838">"Bir az gözləyin"</string>
     <string name="work_profile_description" msgid="8524116010729569213">"İş tətbiqləriniz bu profildə saxlanılacaq və təşkilat tərəfindən idarə ediləcək"</string>
     <string name="device_owner_description" msgid="168013145812679664">"Təşkilatınız bu cihazı təhlükəsiz saxlayaraq idarə edəcək"</string>
     <string name="setup_provisioning_header" msgid="4282483198266806271">"İş cihazının quraşdırılması hazırlanır…"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index ec8b745..27884d0 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -66,7 +66,7 @@
     <string name="default_owned_device_username" msgid="3915120202811807955">"Korisnik poslovnog uređaja"</string>
     <string name="setup_work_device" msgid="6003988351437862369">"Podešava se poslovni uređaj..."</string>
     <string name="progress_data_process" msgid="1707745321954672971">"Obrađuju se podaci podešavanja..."</string>
-    <string name="progress_connect_to_wifi" msgid="472251154628863539">"Povezujete se sa Wi-Fi-jem..."</string>
+    <string name="progress_connect_to_wifi" msgid="472251154628863539">"Povezujete se sa WiFi-em..."</string>
     <string name="progress_connect_to_mobile_network" msgid="3852054186860657088">"Povezujemo se sa mobilnom mrežom…"</string>
     <string name="progress_download" msgid="3522436271691064624">"Preuzima se aplikacija za administratora..."</string>
     <string name="progress_install" msgid="2258045670385866183">"Instalira se aplikacija za administratora..."</string>
@@ -88,7 +88,7 @@
     <string name="contact_your_admin_for_help" msgid="2009904021552323731">"Potražite pomoć od IT administratora"</string>
     <string name="reset_device" msgid="5483853913241939262">"Resetujte ovaj uređaj i probajte ponovo da ga podesite"</string>
     <string name="device_already_set_up" msgid="507881934487140294">"Uređaj je već podešen"</string>
-    <string name="error_wifi" msgid="1850288843966836571">"Povezivanje na Wi-Fi mrežu nije uspelo"</string>
+    <string name="error_wifi" msgid="1850288843966836571">"Povezivanje na WiFi mrežu nije uspelo"</string>
     <string name="device_has_reset_protection_contact_admin" msgid="2662050020376475656">"Zaštita resetovanja je uključena za uređaj. Potražite pomoć od IT administratora."</string>
     <string name="frp_clear_progress_title" msgid="8628074089458234965">"Brisanje"</string>
     <string name="frp_clear_progress_text" msgid="1740164332830598827">"Sačekajte..."</string>
@@ -157,7 +157,7 @@
     <string name="join_many_items_last" msgid="7469666990442158802">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> i <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="8365482726853276608">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="8569294838319639963">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
-    <string name="take_a_few_minutes" msgid="6282806501305322838">"Ovo može da potraje nekoliko minuta"</string>
+    <string name="take_a_few_minutes" msgid="6282806501305322838">"Ovo može da potraje par minuta"</string>
     <string name="work_profile_description" msgid="8524116010729569213">"Poslovne aplikacije će se čuvati na ovom profilu i njima će upravljati organizacija"</string>
     <string name="device_owner_description" msgid="168013145812679664">"Organizacija će štititi ovaj uređaj i upravljaće njime"</string>
     <string name="setup_provisioning_header" msgid="4282483198266806271">"Priprema se podešavanje uređaja za posao…"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f91cf4b..2854d5f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -83,7 +83,7 @@
     <string name="reset" msgid="6467204151306265796">"Nulstil"</string>
     <string name="cant_set_up_profile" msgid="4341825293970158436">"Profilen kan ikke konfigureres"</string>
     <string name="cant_set_up_device" msgid="4120090138983350714">"Enheden kan ikke konfigureres"</string>
-    <string name="something_went_wrong" msgid="3593223774041784329">"Der opstod en fejl"</string>
+    <string name="something_went_wrong" msgid="3593223774041784329">"Noget gik galt"</string>
     <string name="couldnt_set_up_device" msgid="5137950404283642302">"Enheden kunne ikke konfigureres. Kontakt din it-administrator for at få hjælp."</string>
     <string name="contact_your_admin_for_help" msgid="2009904021552323731">"Kontakt din it-administrator for at få hjælp"</string>
     <string name="reset_device" msgid="5483853913241939262">"Nulstil denne enhed, og prøv at konfigurere den igen"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index d414d71..918971e 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -28,7 +28,7 @@
     <string name="the_following_is_your_mdm_for_device" msgid="6717973404364414816">"Aplikazio honek kudeatuko du zure gailua:"</string>
     <string name="next" msgid="1004321437324424398">"Hurrengoa"</string>
     <string name="setting_up_workspace" msgid="7862472373642601041">"Laneko profila konfiguratzen…"</string>
-    <string name="admin_has_ability_to_monitor_profile" msgid="7051310668406162979">"Administratzaileak gainbegiratu eta kudeatu egin ditzake ezarpenak, enpresa-sarbidea, aplikazioak, baimenak eta profilarekin erlazionatutako datuak (hala nola sareko jarduerak, gailuaren kokapena, deien historia eta kontaktuen bilaketa-historia).<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>Informazio gehiago lortzeko (esaterako, erakundearen pribatutasun-gidalerroak), jarri IKT saileko administratzailearekin harremanetan."</string>
+    <string name="admin_has_ability_to_monitor_profile" msgid="7051310668406162979">"IKT saileko dministratzaileak gainbegiratu eta kudeatu egin ditzake ezarpenak, enpresa-sarbidea, aplikazioak, baimenak eta profilarekin erlazionatutako datuak (hala nola sareko jarduerak, gailuaren kokapena, deien historia eta kontaktuen bilaketa-historia).<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>Informazio gehiago lortzeko (esaterako, erakundearen pribatutasun-gidalerroak), jarri IKT saileko administratzailearekin harremanetan."</string>
     <string name="admin_has_ability_to_monitor_device" msgid="6303112630697870695">"IKT saileko administratzaileak gainbegiratu eta kudeatu egin ditzake ezarpenak, enpresa-sarbidea, aplikazioak, baimenak eta gailuarekin erlazionatutako datuak (hala nola sareko jarduerak, gailuaren kokapena, deien historia eta kontaktuen bilaketa-historia).<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>Informazio gehiago lortzeko (esaterako, erakundearen pribatutasun-gidalerroak), jarri IKT saileko administratzailearekin harremanetan."</string>
     <string name="theft_protection_disabled_warning" msgid="3708092473574738478">"Lapurreten aurkako babesaren eginbideak erabiltzeko, pasahitzez babestutako pantaila-blokeoa izan behar duzu gailuan."</string>
     <string name="contact_your_admin_for_more_info" msgid="9209568156969966347">"Informazio gehiago lortzeko (esaterako, erakundearen pribatutasun-gidalerroak), jarri IKT saileko administratzailearekin harremanetan."</string>
@@ -89,7 +89,7 @@
     <string name="reset_device" msgid="5483853913241939262">"Berrezarri gailua eta saiatu berriro konfiguratzen"</string>
     <string name="device_already_set_up" msgid="507881934487140294">"Konfiguratuta dago gailua"</string>
     <string name="error_wifi" msgid="1850288843966836571">"Ezin izan da konektatu wifi-sarera"</string>
-    <string name="device_has_reset_protection_contact_admin" msgid="2662050020376475656">"Jatorrizko datuak berrezartzearen aurkako babesa aktibatuta du gailuak. Laguntza lortzeko, jarri IKT saileko administratzailearekin harremanetan."</string>
+    <string name="device_has_reset_protection_contact_admin" msgid="2662050020376475656">"Jatorrizko datuak berrezartzearen aurkako babesa aktibatuta dauka gailuak. Laguntza lortzeko, jarri IKT saileko administratzailearekin harremanetan."</string>
     <string name="frp_clear_progress_title" msgid="8628074089458234965">"Ezabatzen"</string>
     <string name="frp_clear_progress_text" msgid="1740164332830598827">"Itxaron, mesedez…"</string>
     <string name="error_hash_mismatch" msgid="1145488923243178454">"Ezin izan da erabili gailua administratzeko aplikazioa, errore bat gertatu delako batuketa egitean. Laguntza lortzeko, jarri IKT saileko administratzailearekin harremanetan."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index bd15c79..41eefb1 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -185,7 +185,7 @@
     <string name="cope_provisioning_step_3_header" msgid="7161795433847296201">"سرپرست فناوری اطلاعات می‌تواند این دستگاه را کنترل کند و برخی از برنامه‌ها را مسدود کند"</string>
     <string name="cope_provisioning_summary" msgid="993014104601034878">"برنامه‌های کاری در نمایه کاری نگه داشته می‌شوند و سرپرست فناوری اطلاعات می‌تواند آن‌ها را مدیریت کند. برنامه‌های شخصی مجزا هستند و از دسترس برنامه‌های کاری پنهان هستند. سرپرست فناوری اطلاعات می‌تواند این دستگاه را کنترل کند و برخی از برنامه‌ها را مسدود کند."</string>
     <string name="just_a_sec" msgid="6244676028626237220">"لحظه‌ای صبر کنید…"</string>
-    <string name="fully_managed_device_provisioning_privacy_title" msgid="4017627906103556021">"یادآوری حریم خصوصی"</string>
+    <string name="fully_managed_device_provisioning_privacy_title" msgid="4017627906103556021">"یادآوری حریم‌خصوصی"</string>
     <string name="fully_managed_device_provisioning_privacy_body" msgid="2219074604343348608">"‏ممکن است سرپرست IT بتواند داده‌ها و فعالیت شما را در این دستگاه ببیند"</string>
     <string name="device_provisioning_finished" msgid="3981783240592092906">"دستگاهتان آماده استفاده است!"</string>
     <string name="done" msgid="7755227776955952318">"تمام"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 3fbc0e0..d655703 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -150,7 +150,7 @@
     <string name="read_terms" msgid="1745011123626640728">"Lire les conditions"</string>
     <string name="close_list" msgid="9053538299788717597">"Fermer la liste"</string>
     <string name="cancel_setup_and_factory_reset_dialog_title" msgid="5416045931532004811">"Temin. la config. et réinitialiser l\'appareil?"</string>
-    <string name="cancel_setup_and_factory_reset_dialog_msg" msgid="808442439937994485">"Si vous annulez cette configuration, votre appareil sera réinitialisé à ses paramètres d\'usine et vous serez redirigé vers le premier écran."</string>
+    <string name="cancel_setup_and_factory_reset_dialog_msg" msgid="808442439937994485">"Si vous annulez cette configuration, votre appareil sera réinitialisé à ses paramètres par défaut et vous serez redirigé vers le premier écran."</string>
     <string name="cancel_setup_and_factory_reset_dialog_cancel" msgid="2810966091829264727">"Annuler"</string>
     <string name="cancel_setup_and_factory_reset_dialog_ok" msgid="7168008267496150529">"Réinitialiser l\'appareil"</string>
     <string name="join_two_items" msgid="6110273439759895837">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> et <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 2c37089..6ca7d2a 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -25,7 +25,7 @@
     <string name="company_controls_workspace" msgid="2808025277267917221">"તમારી સંસ્થા આ પ્રોફાઇલને નિયંત્રિત કરે છે અને તેને સુરક્ષિત રાખે છે. તમે તમારા ઉપકરણ પર બાકીનું બધું નિયંત્રિત કરો છો."</string>
     <string name="company_controls_device" msgid="8230957518758871390">"તમારી સંસ્થા આ ઉપકરણનું નિયંત્રણ કરશે અને તેને સુરક્ષિત રાખશે."</string>
     <string name="the_following_is_your_mdm" msgid="6613658218262376404">"નીચેની એપ્લિકેશનને આ પ્રોફાઇલ ઍક્સેસ કરવાની જરૂર પડશે:"</string>
-    <string name="the_following_is_your_mdm_for_device" msgid="6717973404364414816">"નીચેની ઍપ્લિકેશન તમારા ઉપકરણને સંચાલિત કરશે:"</string>
+    <string name="the_following_is_your_mdm_for_device" msgid="6717973404364414816">"નીચેની ઍપ તમારા ડિવાઇસને મેનેજ કરશે:"</string>
     <string name="next" msgid="1004321437324424398">"આગલું"</string>
     <string name="setting_up_workspace" msgid="7862472373642601041">"કાર્યાલયની પ્રોફાઇલ સેટ કરી રહ્યાં છીએ..."</string>
     <string name="admin_has_ability_to_monitor_profile" msgid="7051310668406162979">"તમારા IT વ્યવસ્થાપક સેટિંગ, કૉર્પોરેટ ઍક્સેસ, ઍપ, પરવાનગીઓ અને તમારી નેટવર્ક પ્રવૃત્તિ સહિતનો આ પ્રોફાઇલ સાથે સંલગ્ન ડેટા, ઉપરાંત તમારા ડિવાઇસનું સ્થાન, કૉલ ઇતિહાસ અને સંપર્ક શોધ ઇતિહાસને મૉનિટર અને મેનેજ કરવાની ક્ષમતા ધરાવે છે.<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>તમારી સંસ્થાની પ્રાઇવસી પૉલિસી સહિતની વધુ માહિતી માટે તમારા IT વ્યવસ્થાપકનો સંપર્ક કરો."</string>
@@ -39,7 +39,7 @@
     <string name="url_error" msgid="5958494012986243186">"આ લિંક પ્રદર્શિત કરી શકાશે નહીં."</string>
     <string name="terms" msgid="8295436105384703903">"શરતો"</string>
     <string name="work_profile_info" msgid="5433388376309583996">"કાર્ય પ્રોફાઇલની માહિતી"</string>
-    <string name="managed_device_info" msgid="1529447646526616811">"સંચાલિત ઉપકરણની માહિતી"</string>
+    <string name="managed_device_info" msgid="1529447646526616811">"મેનેજ કરેલ ડિવાઇસની માહિતી"</string>
     <string name="default_managed_profile_name" msgid="5370257687074907055">"ઑફિસની પ્રોફાઇલ"</string>
     <string name="default_first_meat_user_name" msgid="7540515892748490540">"પ્રાથમિક વપરાશકર્તા"</string>
     <string name="delete_profile_title" msgid="2841349358380849525">"વર્તમાન પ્રોફાઇલ કાઢી નાખીએ?"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index f124fe8..b2a279e 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -75,12 +75,12 @@
     <string name="progress_set_owner" msgid="8214062820093757961">"Menyetel pemilik perangkat..."</string>
     <string name="progress_initialize" msgid="1104643492713424939">"Memulai perangkat..."</string>
     <string name="device_doesnt_allow_encryption_contact_admin" msgid="5124643338424539794">"Perangkat ini tidak mengizinkan enkripsi yang diperlukan untuk penyiapan. Hubungi admin IT untuk meminta bantuan."</string>
-    <string name="stop_setup_reset_device_question" msgid="7547191251522623210">"Hentikan penyiapan &amp; setel ulang perangkat?"</string>
+    <string name="stop_setup_reset_device_question" msgid="7547191251522623210">"Hentikan penyiapan &amp; reset perangkat?"</string>
     <string name="this_will_reset_take_back_first_screen" msgid="4623290347188404725">"Tindakan ini akan menyetel ulang perangkat dan membawa Anda kembali ke layar pertama"</string>
     <string name="device_owner_cancel_message" msgid="2529288571742712065">"Berhenti menyiapkan dan hapus data perangkat?"</string>
     <string name="device_owner_cancel_cancel" msgid="1052951540909389275">"Batal"</string>
     <string name="device_owner_error_ok" msgid="2002250763093787051">"Oke"</string>
-    <string name="reset" msgid="6467204151306265796">"Setel ulang"</string>
+    <string name="reset" msgid="6467204151306265796">"Reset"</string>
     <string name="cant_set_up_profile" msgid="4341825293970158436">"Tidak dapat menyiapkan profil"</string>
     <string name="cant_set_up_device" msgid="4120090138983350714">"Tidak dapat menyiapkan perangkat"</string>
     <string name="something_went_wrong" msgid="3593223774041784329">"Terjadi masalah"</string>
@@ -89,7 +89,7 @@
     <string name="reset_device" msgid="5483853913241939262">"Reset perangkat ini dan coba setel kembali"</string>
     <string name="device_already_set_up" msgid="507881934487140294">"Perangkat sudah disiapkan"</string>
     <string name="error_wifi" msgid="1850288843966836571">"Tidak dapat terhubung ke Wi-Fi"</string>
-    <string name="device_has_reset_protection_contact_admin" msgid="2662050020376475656">"Perangkat telah mengaktifkan perlindungan penyetelan ulang. Hubungi admin IT untuk meminta bantuan."</string>
+    <string name="device_has_reset_protection_contact_admin" msgid="2662050020376475656">"Perangkat telah mengaktifkan perlindungan peresetan. Hubungi admin IT untuk meminta bantuan."</string>
     <string name="frp_clear_progress_title" msgid="8628074089458234965">"Menghapus"</string>
     <string name="frp_clear_progress_text" msgid="1740164332830598827">"Harap tunggu..."</string>
     <string name="error_hash_mismatch" msgid="1145488923243178454">"Tidak dapat menggunakan aplikasi admin karena terjadi error checksum. Harap hubungi admin IT Anda untuk meminta bantuan."</string>
@@ -152,7 +152,7 @@
     <string name="cancel_setup_and_factory_reset_dialog_title" msgid="5416045931532004811">"Selesaikan dan kembalikan ke setelan pabrik?"</string>
     <string name="cancel_setup_and_factory_reset_dialog_msg" msgid="808442439937994485">"Menyelesaikan penyiapan ini akan mengembalikan perangkat ke setelan pabrik dan membawa Anda kembali ke layar pertama."</string>
     <string name="cancel_setup_and_factory_reset_dialog_cancel" msgid="2810966091829264727">"Batal"</string>
-    <string name="cancel_setup_and_factory_reset_dialog_ok" msgid="7168008267496150529">"Setel ulang perangkat"</string>
+    <string name="cancel_setup_and_factory_reset_dialog_ok" msgid="7168008267496150529">"Reset perangkat"</string>
     <string name="join_two_items" msgid="6110273439759895837">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> dan <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="7469666990442158802">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g>, dan <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="8365482726853276608">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index a022c9e..5aabace 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -44,40 +44,40 @@
     <string name="default_first_meat_user_name" msgid="7540515892748490540">"משתמש ראשי"</string>
     <string name="delete_profile_title" msgid="2841349358380849525">"למחוק את הפרופיל הקיים?"</string>
     <string name="opening_paragraph_delete_profile" msgid="4913885310795775967">"כבר הגדרת פרופיל עבודה. הוא מנוהל דרך האפליקציה הבאה:"</string>
-    <string name="read_more_delete_profile" msgid="7789171620401666343"><a href="#read_this_link">"קרא את המידע שכאן"</a>" לפני שתמשיך."</string>
+    <string name="read_more_delete_profile" msgid="7789171620401666343"><a href="#read_this_link">"יש לקרוא את המידע שכאן"</a>" לפני שממשיכים."</string>
     <string name="sure_you_want_to_delete_profile" msgid="6927697984573575564">"אם תמשיך, כל האפליקציות והנתונים בפרופיל זה יימחקו."</string>
-    <string name="delete_profile" msgid="2299218578684663459">"מחק"</string>
+    <string name="delete_profile" msgid="2299218578684663459">"מחיקה"</string>
     <string name="cancel_delete_profile" msgid="5155447537894046036">"ביטול"</string>
     <string name="encrypt_device_text_for_profile_owner_setup" msgid="7828515754696057140">"כדי להגדיר את פרופיל העבודה, עליך להצפין את המכשיר. הפעולה הזו עשויה להימשך זמן מה."</string>
     <string name="encrypt_device_text_for_device_owner_setup" msgid="5194673142404735676">"כדי להגדיר את המכשיר, עליך להצפין אותו. הפעולה הזו עשויה להימשך זמן מה."</string>
     <string name="encrypt_this_device_question" msgid="8719916619866892601">"להצפין את המכשיר?"</string>
-    <string name="encrypt" msgid="1749320161747489212">"הצפן"</string>
+    <string name="encrypt" msgid="1749320161747489212">"הצפנה"</string>
     <string name="continue_provisioning_notify_title" msgid="5191449100153186648">"ההצפנה הושלמה"</string>
     <string name="continue_provisioning_notify_text" msgid="1066841819786425980">"הקש כדי להמשיך בהגדרת פרופיל העבודה שלך"</string>
-    <string name="managed_provisioning_error_text" msgid="7063621174570680890">"‏לא ניתן להגדיר את פרופיל העבודה שלך. צור קשר עם מחלקת ה-IT או נסה שוב מאוחר יותר."</string>
+    <string name="managed_provisioning_error_text" msgid="7063621174570680890">"‏לא ניתן להגדיר את פרופיל העבודה שלך. יש ליצור קשר עם מחלקת ה-IT או לנסות שוב מאוחר יותר."</string>
     <string name="cant_add_work_profile" msgid="9217268909964154934">"לא ניתן להוסיף פרופיל עבודה"</string>
     <string name="cant_replace_or_remove_work_profile" msgid="7861054306792698290">"לא ניתן להחליף או להסיר את פרופיל העבודה"</string>
     <string name="work_profile_cant_be_added_contact_admin" msgid="5393019630297157418">"‏אי אפשר להוסיף למכשיר הזה פרופיל עבודה. יש לך שאלות? כדאי ליצור קשר עם מנהל ה-IT."</string>
     <string name="change_device_launcher" msgid="4523563368433637980">"שנה את מפעיל האפליקציות במכשיר"</string>
-    <string name="launcher_app_cant_be_used_by_work_profile" msgid="3524366082000739743">"פרופיל העבודה שלך לא יכול להשתמש במפעיל האפליקציות הזה"</string>
+    <string name="launcher_app_cant_be_used_by_work_profile" msgid="3524366082000739743">"אי אפשר להשתמש באפליקציה הזו בפרופיל העבודה שלך"</string>
     <string name="cancel_provisioning" msgid="3408069559452653724">"ביטול"</string>
     <string name="pick_launcher" msgid="4257084827403983845">"אישור"</string>
     <string name="user_setup_incomplete" msgid="6494920045526591079">"הגדרת המשתמש אינה מלאה"</string>
     <string name="default_owned_device_username" msgid="3915120202811807955">"משתמש של מכשיר עבודה"</string>
     <string name="setup_work_device" msgid="6003988351437862369">"המערכת מגדירה מכשיר לעבודה…"</string>
-    <string name="progress_data_process" msgid="1707745321954672971">"מעבד נתונים להגדרה…"</string>
-    <string name="progress_connect_to_wifi" msgid="472251154628863539">"‏מתחבר ל-Wi-Fi…"</string>
-    <string name="progress_connect_to_mobile_network" msgid="3852054186860657088">"מתחבר לרשת סלולרית…"</string>
-    <string name="progress_download" msgid="3522436271691064624">"מוריד את אפליקציית הניהול…"</string>
+    <string name="progress_data_process" msgid="1707745321954672971">"מתבצע עיבוד של נתונים להגדרה…"</string>
+    <string name="progress_connect_to_wifi" msgid="472251154628863539">"‏מתבצע חיבור ל-Wi-Fi…"</string>
+    <string name="progress_connect_to_mobile_network" msgid="3852054186860657088">"מתבצע חיבור לרשת סלולרית…"</string>
+    <string name="progress_download" msgid="3522436271691064624">"מתבצעת הורדה של אפליקציית הניהול…"</string>
     <string name="progress_install" msgid="2258045670385866183">"מתקין את אפליקציית הניהול…"</string>
-    <string name="progress_delete_non_required_apps" msgid="7633458399262691256">"מסיר אפליקציות מערכת שאינן נחוצות…"</string>
+    <string name="progress_delete_non_required_apps" msgid="7633458399262691256">"מתבצעת הסרה של אפליקציות מערכת שאינן נחוצות…"</string>
     <string name="progress_finishing_touches" msgid="9037776404089697198">"מוסיף ליטושים אחרונים..."</string>
-    <string name="progress_set_owner" msgid="8214062820093757961">"מגדיר את בעל המכשיר…"</string>
-    <string name="progress_initialize" msgid="1104643492713424939">"מאתחל את המכשיר…"</string>
+    <string name="progress_set_owner" msgid="8214062820093757961">"המערכת מגדירה את הבעלים של המכשיר…"</string>
+    <string name="progress_initialize" msgid="1104643492713424939">"מתבצע אתחול של המכשיר…"</string>
     <string name="device_doesnt_allow_encryption_contact_admin" msgid="5124643338424539794">"‏המכשיר הזה לא מתיר הצפנה, והיא נחוצה להגדרה. לקבלת עזרה כדאי ליצור קשר עם מנהל ה-IT."</string>
     <string name="stop_setup_reset_device_question" msgid="7547191251522623210">"להפסיק את ההגדרה ולאפס את המכשיר?"</string>
     <string name="this_will_reset_take_back_first_screen" msgid="4623290347188404725">"פעולה זו תאפס את המכשיר להגדרות היצרן ותחזיר אותך למסך הראשון"</string>
-    <string name="device_owner_cancel_message" msgid="2529288571742712065">"האם להפסיק את ההגדרה ולמחוק את נתוני המכשיר?"</string>
+    <string name="device_owner_cancel_message" msgid="2529288571742712065">"להפסיק את תהליך ההגדרה ולמחוק את נתוני המכשיר?"</string>
     <string name="device_owner_cancel_cancel" msgid="1052951540909389275">"ביטול"</string>
     <string name="device_owner_error_ok" msgid="2002250763093787051">"אישור"</string>
     <string name="reset" msgid="6467204151306265796">"אפס את המכשיר"</string>
@@ -90,8 +90,8 @@
     <string name="device_already_set_up" msgid="507881934487140294">"המכשיר כבר הוגדר"</string>
     <string name="error_wifi" msgid="1850288843966836571">"‏לא ניתן היה להתחבר לרשת Wi-Fi"</string>
     <string name="device_has_reset_protection_contact_admin" msgid="2662050020376475656">"‏במכשיר שלך הופעלה הגנה מפני איפוס. לקבלת עזרה כדאי ליצור קשר עם מנהל ה-IT."</string>
-    <string name="frp_clear_progress_title" msgid="8628074089458234965">"מוחק"</string>
-    <string name="frp_clear_progress_text" msgid="1740164332830598827">"אנא המתן..."</string>
+    <string name="frp_clear_progress_title" msgid="8628074089458234965">"מתבצעת מחיקה"</string>
+    <string name="frp_clear_progress_text" msgid="1740164332830598827">"רק רגע..."</string>
     <string name="error_hash_mismatch" msgid="1145488923243178454">"‏לא ניתן להשתמש באפליקציית הניהול עקב שגיאה בסיכום הביקורת. לקבלת עזרה יש לפנות למנהל ה-IT."</string>
     <string name="error_download_failed" msgid="3274283629837019452">"לא ניתן להוריד את אפליקציית הניהול"</string>
     <string name="error_package_invalid" msgid="555402554502033988">"‏אי אפשר להשתמש באפליקציה למנהלי מערכת. חסרים בה רכיבים או שהיא פגומה. לקבלת עזרה כדאי ליצור קשר עם מנהל ה-IT."</string>
@@ -99,7 +99,7 @@
     <string name="profile_owner_cancel_message" msgid="6868736915633023477">"האם להפסיק את תהליך ההגדרה?"</string>
     <string name="profile_owner_cancel_cancel" msgid="4408725524311574891">"לא"</string>
     <string name="profile_owner_cancel_ok" msgid="5951679183850766029">"כן"</string>
-    <string name="profile_owner_cancelling" msgid="5679573829145112822">"מבטל…"</string>
+    <string name="profile_owner_cancelling" msgid="5679573829145112822">"מתבצע ביטול…"</string>
     <string name="work_profile_setup_later_title" msgid="9069148190226279892">"האם להפסיק את הגדרת הפרופיל?"</string>
     <string name="work_profile_setup_later_message" msgid="122069011117225292">"תוכל להגדיר את פרופיל העבודה מאוחר יותר באמצעות האפליקציה לניהול המכשיר שבה משתמש הארגון שלך."</string>
     <string name="continue_button" msgid="7177918589510964446">"המשך"</string>
@@ -117,11 +117,11 @@
     <string name="setup_isnt_finished_contact_admin" msgid="8849644190723875952">"‏ההגדרה לא הסתיימה. לקבלת עזרה כדאי ליצור קשר עם מנהל ה-IT."</string>
     <string name="for_help_contact_admin" msgid="5922538077702487859">"‏לקבלת עזרה כדאי ליצור קשר עם מנהל ה-IT"</string>
     <string name="organization_admin" msgid="5975914478148511290">"‏מנהל IT"</string>
-    <string name="your_org_app_used" msgid="5336414768293540831">"<xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g> ינהל וינטר את המכשיר הזה באמצעות האפליקציה הבאה:"</string>
+    <string name="your_org_app_used" msgid="5336414768293540831">"המכשיר הזה ינוהל וינוטר על ידי <xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g> באמצעות האפליקציה הבאה:"</string>
     <string name="your_organization_beginning" msgid="5952561489910967255">"הארגון שלך"</string>
     <string name="your_organization_middle" msgid="8288538158061644733">"הארגון שלך"</string>
     <string name="view_terms" msgid="7230493092383341605">"הצג תנאים והגבלות"</string>
-    <string name="accept_and_continue" msgid="1632679734918410653">"קבל והמשך"</string>
+    <string name="accept_and_continue" msgid="1632679734918410653">"אישור והמשך"</string>
     <string name="back" msgid="6455622465896147127">"חזרה"</string>
     <string name="set_up_your_device" msgid="1896651520959894681">"הגדרת המכשיר"</string>
     <string name="info_anim_title_0" msgid="3285414600215959704">"כך תשנה את אופן העבודה שלך"</string>
@@ -129,15 +129,15 @@
     <string name="one_place_for_work_apps" msgid="2595597562302953960">"מקום אחד לכל אפליקציות העבודה"</string>
     <string name="info_anim_title_2" msgid="4629781398620470204">"כבה את העבודה כשתסיים"</string>
     <string name="provisioning" msgid="4512493827019163451">"קובע את התצורה"</string>
-    <string name="copying_certs" msgid="5697938664953550881">"‏מגדיר אישורי CA"</string>
+    <string name="copying_certs" msgid="5697938664953550881">"‏בתהליך הגדרת אישורי CA"</string>
     <string name="setup_profile" msgid="5573950582159698549">"הגדרת הפרופיל שלך"</string>
     <string name="profile_benefits_description" msgid="758432985984252636">"פרופיל העבודה מאפשר לך להפריד בין נתוני עבודה לנתונים האישיים"</string>
     <string name="comp_profile_benefits_description" msgid="379837075456998273">"פרופיל עבודה מאפשר לך לגשת לכל אפליקציות העבודה שלך ממקום אחד"</string>
     <string name="setup_profile_encryption" msgid="5241291404536277038">"הגדר את הפרופיל. הצפנה"</string>
-    <string name="setup_profile_progress" msgid="7742718527853325656">"הגדר את הפרופיל. מציג התקדמות"</string>
+    <string name="setup_profile_progress" msgid="7742718527853325656">"הגדרת הפרופיל. מוצגת התקדמות"</string>
     <string name="setup_device" msgid="6725265673245816366">"הגדרת המכשיר שלך"</string>
-    <string name="setup_device_encryption" msgid="7852944465414197103">"הגדר את המכשיר. הצפנה"</string>
-    <string name="setup_device_progress" msgid="7035335208571175393">"הגדר את המכשיר. מציג התקדמות"</string>
+    <string name="setup_device_encryption" msgid="7852944465414197103">"הגדרת המכשיר. הצפנה"</string>
+    <string name="setup_device_progress" msgid="7035335208571175393">"הגדרת המכשיר. מוצגת התקדמות"</string>
     <string name="learn_more_label" msgid="2723716758654655009">"לחצן \'למידע נוסף\'"</string>
     <string name="mdm_icon_label" msgid="3399134595549660561">"סמל <xliff:g id="ICON_LABEL">%1$s</xliff:g>"</string>
     <string name="section_heading" msgid="3924666803774291908">"כותרת הקטע \'<xliff:g id="SECTION_HEADING">%1$s</xliff:g>\'."</string>
@@ -148,7 +148,7 @@
     <string name="access_links" msgid="7991363727326168600">"גישה לקישורים"</string>
     <string name="access_terms" msgid="1982500872249763745">"גישה למונחים"</string>
     <string name="read_terms" msgid="1745011123626640728">"לקריאת התנאים"</string>
-    <string name="close_list" msgid="9053538299788717597">"סגור את הרשימה"</string>
+    <string name="close_list" msgid="9053538299788717597">"סגירת הרשימה"</string>
     <string name="cancel_setup_and_factory_reset_dialog_title" msgid="5416045931532004811">"האם לסיים את ההגדרה ולאפס את המכשיר להגדרות היצרן?"</string>
     <string name="cancel_setup_and_factory_reset_dialog_msg" msgid="808442439937994485">"סיום ההגדרה הזאת יגרום לאיפוס המכשיר להגדרות היצרן ויעביר אותך למסך הראשון."</string>
     <string name="cancel_setup_and_factory_reset_dialog_cancel" msgid="2810966091829264727">"ביטול"</string>
@@ -158,9 +158,9 @@
     <string name="join_many_items_first" msgid="8365482726853276608">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="8569294838319639963">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
     <string name="take_a_few_minutes" msgid="6282806501305322838">"הפעולה עשויה להימשך מספר דקות"</string>
-    <string name="work_profile_description" msgid="8524116010729569213">"אפליקציות העבודה יישמרו בפרופיל זה וינוהלו על ידי הארגון שלך"</string>
+    <string name="work_profile_description" msgid="8524116010729569213">"אפליקציות לעבודה יישמרו בפרופיל הזה וינוהלו על ידי הארגון שלך"</string>
     <string name="device_owner_description" msgid="168013145812679664">"מכשיר זה יישאר מאובטח בידי הארגון שלך"</string>
-    <string name="setup_provisioning_header" msgid="4282483198266806271">"מתכונן להגדרת מכשיר העבודה…"</string>
+    <string name="setup_provisioning_header" msgid="4282483198266806271">"בתהליך להגדרת מכשיר העבודה…"</string>
     <string name="setup_provisioning_header_description" msgid="2567041263563823566">"ההגדרה של אפליקציית הניהול מתבצעת"</string>
     <string name="set_up_everything_else" msgid="4407706086957916501">"הגדרת כל השאר"</string>
     <string name="now_lets_set_up_everything_else" msgid="5829716209795747105">"כדאי להוסיף חשבון פרטי כדי להפיק יותר מהמכשיר"</string>
@@ -172,7 +172,7 @@
     <string name="work_profile_provisioning_step_1_header" msgid="7914961694921466366">"אפליקציות לעבודה נשמרות בפרופיל העבודה"</string>
     <string name="work_profile_provisioning_step_2_header" msgid="6001172190404670248">"השהיית אפליקציות עבודה בסוף היום"</string>
     <string name="work_profile_provisioning_step_3_header" msgid="4316106639726774330">"‏הנתונים בפרופיל העבודה שלך גלויים למנהל ה-IT"</string>
-    <string name="work_profile_provisioning_progress_label" msgid="2627905308998389193">"מגדיר את פרופיל העבודה שלך…"</string>
+    <string name="work_profile_provisioning_progress_label" msgid="2627905308998389193">"המערכת מגדירה את פרופיל העבודה שלך…"</string>
     <string name="work_profile_provisioning_summary" msgid="3436190271657388747">"‏אפליקציות לעבודה נשמרות בפרופיל העבודה שלך. אפשר להשהות את האפליקציות לעבודה בסוף היום. הנתונים בפרופיל העבודה שלך גלויים למנהל ה-IT."</string>
     <string name="fully_managed_device_provisioning_accept_header" msgid="2944032660440403130">"נתחיל להגדיר את מכשיר העבודה שלך"</string>
     <string name="fully_managed_device_provisioning_step_1_header" msgid="6396274703116708592">"אפשר לשמור את אפליקציות העבודה במקום נגיש"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index c4716d4..98a351e 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -70,7 +70,7 @@
     <string name="progress_connect_to_mobile_network" msgid="3852054186860657088">"ಮೊಬೈಲ್‌ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ..."</string>
     <string name="progress_download" msgid="3522436271691064624">"ನಿರ್ವಾಹಕ ಅಪ್ಲಿಕೇಶನ್‌ ಡೌನ್‌ಲೋಡ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="progress_install" msgid="2258045670385866183">"ನಿರ್ವಾಹಕ ಅಪ್ಲಿಕೇಶನ್‌ ಸ್ಥಾಪಿಸಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="progress_delete_non_required_apps" msgid="7633458399262691256">"ಸಿಸ್ಟಂ ಅಗತ್ಯವಿಲ್ಲದ ಆಪ್‌ ತೆಗೆದುಹಾಕಲಾಗುತ್ತಿದೆ"</string>
+    <string name="progress_delete_non_required_apps" msgid="7633458399262691256">"ಸಿಸ್ಟಂ ಅಗತ್ಯವಿಲ್ಲದ ಆ್ಯಪ್‌ ತೆಗೆದುಹಾಕಲಾಗುತ್ತಿದೆ"</string>
     <string name="progress_finishing_touches" msgid="9037776404089697198">"ಅಂತಿಮ ಸ್ಪರ್ಶಗಳನ್ನು ನೀಡಲಾಗುತ್ತಿದೆ..."</string>
     <string name="progress_set_owner" msgid="8214062820093757961">"ಸಾಧನದ ಮಾಲೀಕರನ್ನು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ…"</string>
     <string name="progress_initialize" msgid="1104643492713424939">"ಸಾಧನವನ್ನು ಆರಂಭಿಸಲಾಗುತ್ತಿದೆ..."</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 943ac0c..bbf1561 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -45,7 +45,7 @@
     <string name="delete_profile_title" msgid="2841349358380849525">"Учурдагы профиль жок кылынсынбы?"</string>
     <string name="opening_paragraph_delete_profile" msgid="4913885310795775967">"Жумуш профилиңиз мурунтан эле бар. Ал төмөнкү колдонмо аркылуу башкарылат:"</string>
     <string name="read_more_delete_profile" msgid="7789171620401666343">"Улантуудан мурун "<a href="#read_this_link">"муну окуп чыгыңыз"</a>"."</string>
-    <string name="sure_you_want_to_delete_profile" msgid="6927697984573575564">"Эгер улантсаңыз, бул профилдеги бардык колдонмолор жана дайындар өчүрүлөт."</string>
+    <string name="sure_you_want_to_delete_profile" msgid="6927697984573575564">"Эгер улантсаңыз, бул профилдеги бардык колдонмолор жана маалыматтар өчүрүлөт."</string>
     <string name="delete_profile" msgid="2299218578684663459">"Жок кылуу"</string>
     <string name="cancel_delete_profile" msgid="5155447537894046036">"Жок"</string>
     <string name="encrypt_device_text_for_profile_owner_setup" msgid="7828515754696057140">"Жумуш профилиңизди жөндөө үчүн түзмөгүңүздү шифрлеп алыш керек. Буга бир аз убакыт кетиши мүмкүн."</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index f4b74eb..d5749ce 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -84,18 +84,18 @@
     <string name="cant_set_up_profile" msgid="4341825293970158436">"Не може да се постави профил"</string>
     <string name="cant_set_up_device" msgid="4120090138983350714">"Не може да се постави уредот"</string>
     <string name="something_went_wrong" msgid="3593223774041784329">"Нешто тргна наопаку"</string>
-    <string name="couldnt_set_up_device" msgid="5137950404283642302">"Уредот не можеше да се постави. За помош, контактирајте со вашиот IT-администратор."</string>
+    <string name="couldnt_set_up_device" msgid="5137950404283642302">"Уредот не може да се постави. За помош, контактирајте со вашиот IT-администратор."</string>
     <string name="contact_your_admin_for_help" msgid="2009904021552323731">"Контактирајте со вашиот IT-администратор за помош"</string>
     <string name="reset_device" msgid="5483853913241939262">"Ресетирајте го уредов и поставете го повторно"</string>
     <string name="device_already_set_up" msgid="507881934487140294">"Уредот е веќе поставен"</string>
-    <string name="error_wifi" msgid="1850288843966836571">"Не можеше да се поврзе на Wi-Fi"</string>
+    <string name="error_wifi" msgid="1850288843966836571">"Не може да се поврзе на Wi-Fi"</string>
     <string name="device_has_reset_protection_contact_admin" msgid="2662050020376475656">"На вашиот уред е вклучена заштита од ресетирање. За помош, контактирајте со вашиот IT-администратор."</string>
     <string name="frp_clear_progress_title" msgid="8628074089458234965">"Се брише"</string>
     <string name="frp_clear_progress_text" msgid="1740164332830598827">"Почекајте..."</string>
-    <string name="error_hash_mismatch" msgid="1145488923243178454">"Не можеше да се користи апликацијата за администратор поради грешка со контролна сума. За помош, контактирајте со вашиот IT-администратор."</string>
-    <string name="error_download_failed" msgid="3274283629837019452">"Не можеше да се преземе апликацијата за администратор"</string>
+    <string name="error_hash_mismatch" msgid="1145488923243178454">"Не може да се користи апликацијата за администратор поради грешка со контролна сума. За помош, контактирајте со вашиот IT-администратор."</string>
+    <string name="error_download_failed" msgid="3274283629837019452">"Не може да се преземе апликацијата за администратор"</string>
     <string name="error_package_invalid" msgid="555402554502033988">"Не може да се користи апликацијата за администратор. Или ѝ недостасуваат компоненти или е оштетена. За помош, контактирајте со вашиот IT-администратор."</string>
-    <string name="error_installation_failed" msgid="2282903750318407285">"Не можеше да се инсталира апликацијата за администратор"</string>
+    <string name="error_installation_failed" msgid="2282903750318407285">"Не може да се инсталира апликацијата за администратор"</string>
     <string name="profile_owner_cancel_message" msgid="6868736915633023477">"Дали да се запре поставувањето?"</string>
     <string name="profile_owner_cancel_cancel" msgid="4408725524311574891">"Не"</string>
     <string name="profile_owner_cancel_ok" msgid="5951679183850766029">"Да"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index df6b0e4..c883c44 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -67,7 +67,7 @@
     <string name="setup_work_device" msgid="6003988351437862369">"कार्य डिव्हाइस सेट अप करत आहे..."</string>
     <string name="progress_data_process" msgid="1707745321954672971">"सेटअप डेटावर प्रक्रिया करत आहे..."</string>
     <string name="progress_connect_to_wifi" msgid="472251154628863539">"वाय-फाय ला कनेक्ट करत आहे..."</string>
-    <string name="progress_connect_to_mobile_network" msgid="3852054186860657088">"मोबाईल नेटवर्कशी कनेक्ट करत आहे…"</string>
+    <string name="progress_connect_to_mobile_network" msgid="3852054186860657088">"मोबाइल नेटवर्कशी कनेक्ट करत आहे…"</string>
     <string name="progress_download" msgid="3522436271691064624">"ॲडमिन अ‍ॅप डाउनलोड करत आहे..."</string>
     <string name="progress_install" msgid="2258045670385866183">"ॲडमिन अ‍ॅप इंस्टॉल करत आहे..."</string>
     <string name="progress_delete_non_required_apps" msgid="7633458399262691256">"आवश्यक-नसलेले सिस्टम अ‍ॅप्स काढत आहे..."</string>
@@ -141,7 +141,7 @@
     <string name="learn_more_label" msgid="2723716758654655009">"अधिक जाणून घ्‍या बटण"</string>
     <string name="mdm_icon_label" msgid="3399134595549660561">"<xliff:g id="ICON_LABEL">%1$s</xliff:g> आयकन"</string>
     <string name="section_heading" msgid="3924666803774291908">"<xliff:g id="SECTION_HEADING">%1$s</xliff:g> विभाग कॅप्शन."</string>
-    <string name="section_content" msgid="8875502515704374394">"<xliff:g id="SECTION_HEADING">%1$s</xliff:g> विभाग सामग्री: <xliff:g id="SECTION_CONTENT">%2$s</xliff:g>"</string>
+    <string name="section_content" msgid="8875502515704374394">"<xliff:g id="SECTION_HEADING">%1$s</xliff:g> विभाग आशय: <xliff:g id="SECTION_CONTENT">%2$s</xliff:g>"</string>
     <string name="expand" msgid="37188292156131304">"विस्तृत करा"</string>
     <string name="collapse" msgid="7817530505064432580">"संकुचित करा"</string>
     <string name="access_list_of_links" msgid="7094123315959323372">"दुव्यांच्या सूची अ‍ॅक्सेस करा"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 7d0dacf..c2cb5b9 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -132,7 +132,7 @@
     <string name="copying_certs" msgid="5697938664953550881">"CA प्रमाणपत्रहरू सेटअप गरिँदै"</string>
     <string name="setup_profile" msgid="5573950582159698549">"आफ्नो प्रोफाइल सेटअप गर्नुहोस्"</string>
     <string name="profile_benefits_description" msgid="758432985984252636">"तपाईं कुनै कार्य प्रोफाइलको प्रयोग गरी कार्य सम्बन्धी डेटालाई व्यक्तिगत डेटाबाट छुट्याउन सक्नुहुन्छ।"</string>
-    <string name="comp_profile_benefits_description" msgid="379837075456998273">"कुनै कार्य प्रोफाइलको प्रयोग गरेर तपाईं आफ्ना कार्य सम्बन्धी अनुप्रयोगहरूलाई एकै ठाउँमा राख्न सक्नुहुन्छ"</string>
+    <string name="comp_profile_benefits_description" msgid="379837075456998273">"कुनै कार्य प्रोफाइलको प्रयोग गरेर तपाईं आफ्ना कार्य सम्बन्धी एपहरूलाई एकै ठाउँमा राख्न सक्नुहुन्छ"</string>
     <string name="setup_profile_encryption" msgid="5241291404536277038">"तपाईँको प्रोफाइल सेटअप गर्नुहोस्। इन्क्रिप्सन"</string>
     <string name="setup_profile_progress" msgid="7742718527853325656">"तपाईँको प्रोफाइल सेटअप गर्नुहोस्। कार्य प्रगति देखाउँदै"</string>
     <string name="setup_device" msgid="6725265673245816366">"आफ्नो यन्त्रलाई सेटअप गर्नुहोस्"</string>
@@ -179,7 +179,7 @@
     <string name="fully_managed_device_provisioning_step_2_header" msgid="7165472083121590030">"यो यन्त्र निजी होइन"</string>
     <string name="fully_managed_device_provisioning_step_2_subheader" msgid="2848998570491578119">"तपाईंका IT व्यवस्थापकले तपाईंको यस यन्त्रका डेटा र गतिविधि हेर्न सक्ने सम्भावना हुन्छ।"</string>
     <string name="fully_managed_device_provisioning_progress_label" msgid="3925516135130021966">"तपाईंको यन्त्र सेटअप गर्दै…"</string>
-    <string name="fully_managed_device_provisioning_summary" msgid="1176062866187662479">"तपाईंका कार्यस्थलका अनुप्रयोगहरूमाथि सजिलै पहुँच गर्न यो यन्त्र प्रयोग गर्नुहोस्। यो यन्त्र निजी होइन त्यसैले तपाईंका IT व्यवस्थापक तपाईंको डेटा र क्रियाकलाप हेर्न सक्छन्। थप जानकारी प्राप्त गर्न आफ्ना IT व्यवस्थापकसँग सम्पर्क गर्नुहोस्।"</string>
+    <string name="fully_managed_device_provisioning_summary" msgid="1176062866187662479">"तपाईंका कार्यस्थलका एपमाथि सजिलै पहुँच गर्न यो यन्त्र प्रयोग गर्नुहोस्। यो यन्त्र निजी होइन त्यसैले तपाईंका IT व्यवस्थापक तपाईंको डेटा र क्रियाकलाप हेर्न सक्छन्। थप जानकारी प्राप्त गर्न आफ्ना IT व्यवस्थापकसँग सम्पर्क गर्नुहोस्।"</string>
     <string name="cope_provisioning_step_1_header" msgid="1945759718804756423">"IT एडमिन कार्य प्रोफाइलमा राखिने कार्य एप व्यवस्थित गर्छन्"</string>
     <string name="cope_provisioning_step_2_header" msgid="2388399739294883042">"छुट्टै राखिने व्यक्तिगत एप कामसम्बन्धी एपसँगै देखिँदैनन्"</string>
     <string name="cope_provisioning_step_3_header" msgid="7161795433847296201">"IT एडमिन यो यन्त्र र यसका केही एपहरू नियन्त्रण गर्न सक्छन्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index a5e2425..b77cf21 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -77,7 +77,7 @@
     <string name="device_doesnt_allow_encryption_contact_admin" msgid="5124643338424539794">"Op dit apparaat is versleuteling niet toegestaan, wat is vereist voor het instellen. Neem contact op met je IT-beheerder voor hulp."</string>
     <string name="stop_setup_reset_device_question" msgid="7547191251522623210">"Instellen stoppen en apparaat resetten?"</string>
     <string name="this_will_reset_take_back_first_screen" msgid="4623290347188404725">"Hiermee wordt je apparaat gereset en ga je terug naar het eerste scherm"</string>
-    <string name="device_owner_cancel_message" msgid="2529288571742712065">"Configureren stoppen en de gegevens op je apparaat wissen?"</string>
+    <string name="device_owner_cancel_message" msgid="2529288571742712065">"Instellen stoppen en de gegevens op je apparaat wissen?"</string>
     <string name="device_owner_cancel_cancel" msgid="1052951540909389275">"Annuleren"</string>
     <string name="device_owner_error_ok" msgid="2002250763093787051">"OK"</string>
     <string name="reset" msgid="6467204151306265796">"Resetten"</string>
@@ -89,14 +89,14 @@
     <string name="reset_device" msgid="5483853913241939262">"Reset dit apparaat en probeer het opnieuw in te stellen"</string>
     <string name="device_already_set_up" msgid="507881934487140294">"Apparaat is al ingesteld"</string>
     <string name="error_wifi" msgid="1850288843966836571">"Kan geen verbinding maken met wifi"</string>
-    <string name="device_has_reset_protection_contact_admin" msgid="2662050020376475656">"Bescherming tegen resetten is ingeschakeld voor je apparaat. Neem contact op met je beheerder voor hulp."</string>
+    <string name="device_has_reset_protection_contact_admin" msgid="2662050020376475656">"Je apparaat is beveiligd tegen resetten. Neem contact op met je beheerder voor hulp."</string>
     <string name="frp_clear_progress_title" msgid="8628074089458234965">"Wissen"</string>
     <string name="frp_clear_progress_text" msgid="1740164332830598827">"Even geduld..."</string>
     <string name="error_hash_mismatch" msgid="1145488923243178454">"Kan de beheer-app niet gebruiken vanwege een controlesomfout. Neem contact op met je IT-beheerder voor hulp."</string>
     <string name="error_download_failed" msgid="3274283629837019452">"Kan de beheer-app niet downloaden"</string>
     <string name="error_package_invalid" msgid="555402554502033988">"Kan de beheer-app niet gebruiken. Er ontbreken onderdelen of de app is beschadigd. Neem contact op met je IT-beheerder voor hulp."</string>
     <string name="error_installation_failed" msgid="2282903750318407285">"Kan de beheer-app niet installeren"</string>
-    <string name="profile_owner_cancel_message" msgid="6868736915633023477">"Configureren stoppen?"</string>
+    <string name="profile_owner_cancel_message" msgid="6868736915633023477">"Instellen stoppen?"</string>
     <string name="profile_owner_cancel_cancel" msgid="4408725524311574891">"Nee"</string>
     <string name="profile_owner_cancel_ok" msgid="5951679183850766029">"Ja"</string>
     <string name="profile_owner_cancelling" msgid="5679573829145112822">"Annuleren…"</string>
@@ -134,12 +134,12 @@
     <string name="profile_benefits_description" msgid="758432985984252636">"Met een werkprofiel kun je je werkgegevens scheiden van je persoonsgegevens"</string>
     <string name="comp_profile_benefits_description" msgid="379837075456998273">"Met een werkprofiel heb je op één centrale locatie toegang tot je werk-apps"</string>
     <string name="setup_profile_encryption" msgid="5241291404536277038">"Je profiel instellen. Versleuteling"</string>
-    <string name="setup_profile_progress" msgid="7742718527853325656">"Je profiel instelling. Voortgang weergeven"</string>
+    <string name="setup_profile_progress" msgid="7742718527853325656">"Stel je profiel in. Voortgang tonen"</string>
     <string name="setup_device" msgid="6725265673245816366">"Je apparaat instellen"</string>
     <string name="setup_device_encryption" msgid="7852944465414197103">"Je apparaat instellen. Versleuteling"</string>
-    <string name="setup_device_progress" msgid="7035335208571175393">"Je apparaat instellen. Voortgang weergeven"</string>
+    <string name="setup_device_progress" msgid="7035335208571175393">"Stel je apparaat in. Voortgang tonen"</string>
     <string name="learn_more_label" msgid="2723716758654655009">"Knop \'Meer informatie\'"</string>
-    <string name="mdm_icon_label" msgid="3399134595549660561">"Pictogram <xliff:g id="ICON_LABEL">%1$s</xliff:g>"</string>
+    <string name="mdm_icon_label" msgid="3399134595549660561">"Icoon <xliff:g id="ICON_LABEL">%1$s</xliff:g>"</string>
     <string name="section_heading" msgid="3924666803774291908">"Kop van sectie <xliff:g id="SECTION_HEADING">%1$s</xliff:g>."</string>
     <string name="section_content" msgid="8875502515704374394">"Content van sectie <xliff:g id="SECTION_HEADING">%1$s</xliff:g>: <xliff:g id="SECTION_CONTENT">%2$s</xliff:g>"</string>
     <string name="expand" msgid="37188292156131304">"Uitvouwen"</string>
@@ -164,7 +164,7 @@
     <string name="setup_provisioning_header_description" msgid="2567041263563823566">"Beheer-app instellen"</string>
     <string name="set_up_everything_else" msgid="4407706086957916501">"De rest instellen"</string>
     <string name="now_lets_set_up_everything_else" msgid="5829716209795747105">"Voeg een persoonlijk account toe om meer uit je apparaat te halen"</string>
-    <string name="now_lets_set_up_everything_else_explanation" msgid="2730458857511288697">"Nu je werkprofiel gereed is, kun je ook een persoonlijk Google-account toevoegen voor toegang tot je apps en content."</string>
+    <string name="now_lets_set_up_everything_else_explanation" msgid="2730458857511288697">"Nu je werkprofiel klaar is, kun je ook een persoonlijk Google-account toevoegen voor toegang tot je apps en content."</string>
     <string name="brand_screen_header" msgid="8865808542690116648">"Dit apparaat is eigendom van je organisatie"</string>
     <string name="brand_screen_subheader" msgid="7664792208784456436">"De volgende app wordt gebruikt om deze telefoon te beheren en te controleren"</string>
     <string name="downloading_administrator_header" msgid="8660294318893902915">"Instellingen klaarmaken voor werk…"</string>
@@ -188,7 +188,7 @@
     <string name="fully_managed_device_provisioning_privacy_title" msgid="4017627906103556021">"Privacyherinnering"</string>
     <string name="fully_managed_device_provisioning_privacy_body" msgid="2219074604343348608">"Je IT-beheerder kan mogelijk je gegevens en activiteit op dit apparaat zien"</string>
     <string name="device_provisioning_finished" msgid="3981783240592092906">"Je kunt je apparaat nu gebruiken."</string>
-    <string name="done" msgid="7755227776955952318">"Gereed"</string>
+    <string name="done" msgid="7755227776955952318">"Klaar"</string>
     <string name="financed_device_screen_header" msgid="7890706080917322376">"Dit apparaat is gekocht op krediet van <xliff:g id="CREDITOR_NAME">%1$s</xliff:g>"</string>
     <string name="creditor_capabilities_header" msgid="6217362648469323253">"<xliff:g id="CREDITOR_NAME">%1$s</xliff:g> kan:"</string>
     <string name="install_creditor_app_description" msgid="6159751782301108878">"De <xliff:g id="CREDITOR_NAME">%1$s</xliff:g>-app installeren zodat je betalingen kunt doen voor dit apparaat"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 7f6ebfe..2a80cdc 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -33,7 +33,7 @@
     <string name="theft_protection_disabled_warning" msgid="3708092473574738478">"ଚୋରି-ପ୍ରତିରକ୍ଷା ବିଶେଷତା ବ୍ୟବହାର କରିବାକୁ, ଆପଣଙ୍କ ଡିଭାଇସ୍‌ରେ ଏକ ପାସ୍‌ୱର୍ଡ-ସୁରକ୍ଷିତ ସ୍କ୍ରୀନ୍‍ ଲକ୍‍ ଥିବା ଜରୁରୀ।"</string>
     <string name="contact_your_admin_for_more_info" msgid="9209568156969966347">"ଆପଣଙ୍କ ସଂସ୍ଥାର ଗୋପନିୟତା ନୀତି ସମେତ ଅଧିକ ସୂଚନା ପାଇଁ ଆପଣଙ୍କର IT ବ୍ୟବସ୍ଥାପକଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
     <string name="learn_more_link" msgid="3012495805919550043">"ଅଧିକ ଜାଣନ୍ତୁ"</string>
-    <string name="cancel_setup" msgid="2949928239276274745">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
+    <string name="cancel_setup" msgid="2949928239276274745">"ବାତିଲ୍‍ କରନ୍ତୁ"</string>
     <string name="ok_setup" msgid="4593707675416137504">"ଠିକ୍‌ ଅଛି"</string>
     <string name="user_consent_msg" msgid="8820951802130353584">"ମୁଁ ସହମତି ଦେଉଛି"</string>
     <string name="url_error" msgid="5958494012986243186">"ଏହି ଲିଙ୍କ ଡିସପ୍ଲେ କରାଯାଇପାରିବ ନାହିଁ।"</string>
@@ -47,7 +47,7 @@
     <string name="read_more_delete_profile" msgid="7789171620401666343">"ଆଗକୁ ବଢ଼ିବା ପୂର୍ବରୁ, "<a href="#read_this_link">"ଏହା ପଢ଼ନ୍ତୁ"</a>"।"</string>
     <string name="sure_you_want_to_delete_profile" msgid="6927697984573575564">"ଯଦି ଆପଣ ଜାରି ରଖନ୍ତି, ଏହି ପ୍ରୋଫାଇଲ୍‌ରେ ଥିବା ସମସ୍ତ ଆପ୍‍ ଓ ଡାଟା ଡିଲିଟ୍‍ ହୋଇଯିବ।"</string>
     <string name="delete_profile" msgid="2299218578684663459">"ଡିଲିଟ୍‌ କରନ୍ତୁ"</string>
-    <string name="cancel_delete_profile" msgid="5155447537894046036">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
+    <string name="cancel_delete_profile" msgid="5155447537894046036">"ବାତିଲ୍‍ କରନ୍ତୁ"</string>
     <string name="encrypt_device_text_for_profile_owner_setup" msgid="7828515754696057140">"ଆପଣଙ୍କ ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ସେଟଅପ୍‍ କରିବାକୁ, ଆପଣଙ୍କ ଡିଭାଇସକୁ ପ୍ରଥମେ ଏନକ୍ରୀପ୍ଟ କରିବା ଆବଶ୍ୟକ। ଏହା କିଛି ସମୟ ନେଇପାରେ।"</string>
     <string name="encrypt_device_text_for_device_owner_setup" msgid="5194673142404735676">"ଏହି ଡିଭାଇସ୍‍ ସେଟଅପ୍‍ କରିବାକୁ, ଏହାକୁ ପ୍ରଥମେ ଏନକ୍ରୀପ୍ଟ କରିବା ଆବଶ୍ୟକ। ଏହା କିଛି ସମୟ ନେଇପାରେ।"</string>
     <string name="encrypt_this_device_question" msgid="8719916619866892601">"ଏହି ଡିଭାଇସକୁ ଏନକ୍ରୀପ୍ଟ କରିବେ?"</string>
@@ -60,7 +60,7 @@
     <string name="work_profile_cant_be_added_contact_admin" msgid="5393019630297157418">"ଏହି ଡିଭାଇସ୍‌ରେ ଏକ ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ଯୋଗ କରାଯାଇପାରିବ ନାହିଁ। ଯଦି ଆପଣଙ୍କର କୌଣସି ପ୍ରଶ୍ନ ରହିଥାଏ, ତେବେ ନିଜ ବ୍ୟବସ୍ଥାପକଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
     <string name="change_device_launcher" msgid="4523563368433637980">"ଡିଭାଇସ୍‍ ଲଞ୍ଚର୍‍ ବଦଳାନ୍ତୁ"</string>
     <string name="launcher_app_cant_be_used_by_work_profile" msgid="3524366082000739743">"ଆପଣଙ୍କ ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ଦ୍ୱାରା ଲଞ୍ଚର୍‍ ଆପ୍‍ ବ୍ୟବହାର କରାଯାଇପାରିବ ନାହିଁ"</string>
-    <string name="cancel_provisioning" msgid="3408069559452653724">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
+    <string name="cancel_provisioning" msgid="3408069559452653724">"ବାତିଲ୍‍ କରନ୍ତୁ"</string>
     <string name="pick_launcher" msgid="4257084827403983845">"ଠିକ୍‌ ଅଛି"</string>
     <string name="user_setup_incomplete" msgid="6494920045526591079">"ୟୁଜର୍‍ ସେଟ୍‌ ଅପ୍‍ ଅସମ୍ପୂର୍ଣ୍ଣ"</string>
     <string name="default_owned_device_username" msgid="3915120202811807955">"ୱର୍କ ଡିଭାଇସ୍‌ର ୟୁଜର୍‍"</string>
@@ -78,7 +78,7 @@
     <string name="stop_setup_reset_device_question" msgid="7547191251522623210">"ସେଟଅପ୍‍ ବନ୍ଦ କରିବେ ଏବଂ ଡିଭାଇସ୍‍ ରିସେଟ୍‍ କରିବେ କି?"</string>
     <string name="this_will_reset_take_back_first_screen" msgid="4623290347188404725">"ଏହା ଦ୍ୱାରା ଆପଣଙ୍କ ଡିଭାଇସ୍‍ ରିସେଟ୍ ହେବ ଏବଂ ଆପଣଙ୍କୁ ପ୍ରଥମ ସ୍କ୍ରୀନକୁ ନିଆଯିବ।"</string>
     <string name="device_owner_cancel_message" msgid="2529288571742712065">"ସେଟ୍‍ ଅପ୍‍ କରିବା ବନ୍ଦ କରି ଆପଣଙ୍କ ଡିଉଭାଇସ୍‌ର ଡାଟା ଲିଭାଇଦେବେ?"</string>
-    <string name="device_owner_cancel_cancel" msgid="1052951540909389275">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
+    <string name="device_owner_cancel_cancel" msgid="1052951540909389275">"ବାତିଲ୍‍ କରନ୍ତୁ"</string>
     <string name="device_owner_error_ok" msgid="2002250763093787051">"ଠିକ୍‌ ଅଛି"</string>
     <string name="reset" msgid="6467204151306265796">"ରିସେଟ୍‍ କରନ୍ତୁ"</string>
     <string name="cant_set_up_profile" msgid="4341825293970158436">"ପ୍ରୋଫାଇଲ୍‍ ସେଟ୍‍ ଅପ୍‍ କରିପାରିବ ନାହିଁ"</string>
@@ -99,7 +99,7 @@
     <string name="profile_owner_cancel_message" msgid="6868736915633023477">"ସେଟ୍‌ ଅପ୍‍ କରିବା ବନ୍ଦ କରିବେ?"</string>
     <string name="profile_owner_cancel_cancel" msgid="4408725524311574891">"ନା"</string>
     <string name="profile_owner_cancel_ok" msgid="5951679183850766029">"ହଁ"</string>
-    <string name="profile_owner_cancelling" msgid="5679573829145112822">"କ୍ୟାନ୍ସଲ୍‍ କରାଯାଉଛି…"</string>
+    <string name="profile_owner_cancelling" msgid="5679573829145112822">"ବାତିଲ୍‍ କରାଯାଉଛି…"</string>
     <string name="work_profile_setup_later_title" msgid="9069148190226279892">"ପ୍ରୋଫାଇଲ୍‍ ସେଟ୍‌ ଅପ୍‍ ବନ୍ଦ କରିବେ?"</string>
     <string name="work_profile_setup_later_message" msgid="122069011117225292">"ଆପଣଙ୍କ ସ6ସ୍ଥାର ଡିଭାଇସ ପରିଚାଳନା ଆପରେ ନିଜ ୱର୍କ ପ୍ରୋଫାଇଲ୍‍ ଆପଣ ପରେ ସେଟଅପ୍‍ କରିପାରିବେ।"</string>
     <string name="continue_button" msgid="7177918589510964446">"ଜାରି ରଖନ୍ତୁ"</string>
@@ -151,7 +151,7 @@
     <string name="close_list" msgid="9053538299788717597">"ବନ୍ଦ କରୁଥିବା ତାଲିକା"</string>
     <string name="cancel_setup_and_factory_reset_dialog_title" msgid="5416045931532004811">"ସେଟଅପ୍‍ ଶେଷ କରି ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍‍ କରିବେ?"</string>
     <string name="cancel_setup_and_factory_reset_dialog_msg" msgid="808442439937994485">"ଏହି ସେଟଅପ୍‍ ଶେଷ କରିବା ଦ୍ୱାରା ଆପଣଙ୍କ ଡିଭାଇସ୍ ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍‍ ହେବ ଏବଂ ଆପଣଙ୍କୁ ପ୍ରଥମ ସ୍କ୍ରୀନକୁ ନିଆଯିବ।"</string>
-    <string name="cancel_setup_and_factory_reset_dialog_cancel" msgid="2810966091829264727">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
+    <string name="cancel_setup_and_factory_reset_dialog_cancel" msgid="2810966091829264727">"ବାତିଲ୍‍ କରନ୍ତୁ"</string>
     <string name="cancel_setup_and_factory_reset_dialog_ok" msgid="7168008267496150529">"ଡିଭାଇସ୍‌ ରିସେଟ୍‍ କରନ୍ତୁ"</string>
     <string name="join_two_items" msgid="6110273439759895837">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> ଏବଂ <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="7469666990442158802">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> ଏବଂ <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 69d7e93..fbc5441 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -38,7 +38,7 @@
     <string name="user_consent_msg" msgid="8820951802130353584">"Zgadzam się"</string>
     <string name="url_error" msgid="5958494012986243186">"Nie można wyświetlić linku."</string>
     <string name="terms" msgid="8295436105384703903">"Warunki"</string>
-    <string name="work_profile_info" msgid="5433388376309583996">"Informacje o profilu do pracy"</string>
+    <string name="work_profile_info" msgid="5433388376309583996">"Informacje o profilu służbowym"</string>
     <string name="managed_device_info" msgid="1529447646526616811">"Informacje o urządzeniu zarządzanym"</string>
     <string name="default_managed_profile_name" msgid="5370257687074907055">"Profil służbowy"</string>
     <string name="default_first_meat_user_name" msgid="7540515892748490540">"Główny użytkownik"</string>
@@ -48,23 +48,23 @@
     <string name="sure_you_want_to_delete_profile" msgid="6927697984573575564">"Pamiętaj, że wszystkie aplikacje i dane w tym profilu zostaną usunięte."</string>
     <string name="delete_profile" msgid="2299218578684663459">"Usuń"</string>
     <string name="cancel_delete_profile" msgid="5155447537894046036">"Anuluj"</string>
-    <string name="encrypt_device_text_for_profile_owner_setup" msgid="7828515754696057140">"Skonfigurowanie profilu do pracy wymaga zaszyfrowania urządzenia. Może to trochę potrwać."</string>
+    <string name="encrypt_device_text_for_profile_owner_setup" msgid="7828515754696057140">"Skonfigurowanie profilu służbowego wymaga zaszyfrowania urządzenia. Może to trochę potrwać."</string>
     <string name="encrypt_device_text_for_device_owner_setup" msgid="5194673142404735676">"Przed skonfigurowaniem urządzenie trzeba zaszyfrować. Może to trochę potrwać."</string>
     <string name="encrypt_this_device_question" msgid="8719916619866892601">"Zaszyfrować to urządzenie?"</string>
     <string name="encrypt" msgid="1749320161747489212">"Zaszyfruj"</string>
     <string name="continue_provisioning_notify_title" msgid="5191449100153186648">"Szyfrowanie zostało zakończone"</string>
-    <string name="continue_provisioning_notify_text" msgid="1066841819786425980">"Kliknij, by kontynuować konfigurowanie profilu do pracy"</string>
-    <string name="managed_provisioning_error_text" msgid="7063621174570680890">"Nie można skonfigurować profilu do pracy. Skontaktuj się z działem IT lub spróbuj później jeszcze raz."</string>
-    <string name="cant_add_work_profile" msgid="9217268909964154934">"Nie można dodać profilu do pracy"</string>
-    <string name="cant_replace_or_remove_work_profile" msgid="7861054306792698290">"Nie można zastąpić lub usunąć profilu do pracy"</string>
-    <string name="work_profile_cant_be_added_contact_admin" msgid="5393019630297157418">"Nie można dodać profilu do pracy na tym urządzeniu. Jeśli masz pytania, skontaktuj się z administratorem IT."</string>
+    <string name="continue_provisioning_notify_text" msgid="1066841819786425980">"Kliknij, by kontynuować konfigurowanie profilu służbowego"</string>
+    <string name="managed_provisioning_error_text" msgid="7063621174570680890">"Nie można skonfigurować profilu służbowego. Skontaktuj się z działem IT lub spróbuj później jeszcze raz."</string>
+    <string name="cant_add_work_profile" msgid="9217268909964154934">"Nie można dodać profilu służbowego"</string>
+    <string name="cant_replace_or_remove_work_profile" msgid="7861054306792698290">"Nie można zastąpić lub usunąć profilu służbowego"</string>
+    <string name="work_profile_cant_be_added_contact_admin" msgid="5393019630297157418">"Nie można dodać profilu służbowego na tym urządzeniu. Jeśli masz pytania, skontaktuj się z administratorem IT."</string>
     <string name="change_device_launcher" msgid="4523563368433637980">"Zmień program uruchamiający na urządzeniu"</string>
-    <string name="launcher_app_cant_be_used_by_work_profile" msgid="3524366082000739743">"Tego programu uruchamiającego nie można używać w profilu do pracy"</string>
+    <string name="launcher_app_cant_be_used_by_work_profile" msgid="3524366082000739743">"Tego programu uruchamiającego nie można używać w profilu służbowym"</string>
     <string name="cancel_provisioning" msgid="3408069559452653724">"Anuluj"</string>
     <string name="pick_launcher" msgid="4257084827403983845">"OK"</string>
     <string name="user_setup_incomplete" msgid="6494920045526591079">"Instalacja użytkownika nie została ukończona"</string>
     <string name="default_owned_device_username" msgid="3915120202811807955">"Użytkownik urządzenia służbowego"</string>
-    <string name="setup_work_device" msgid="6003988351437862369">"Konfiguruję urządzenie do pracy…"</string>
+    <string name="setup_work_device" msgid="6003988351437862369">"Konfiguruję urządzenie służbowe…"</string>
     <string name="progress_data_process" msgid="1707745321954672971">"Przetwarzam dane konfiguracji…"</string>
     <string name="progress_connect_to_wifi" msgid="472251154628863539">"Łączę z Wi-Fi…"</string>
     <string name="progress_connect_to_mobile_network" msgid="3852054186860657088">"Łączę z siecią komórkową…"</string>
@@ -107,8 +107,8 @@
     <string name="dismiss" msgid="9009534756748565880">"Zamknij"</string>
     <string name="profile_owner_info" msgid="8975319972303812298">"Utworzysz profil służbowy, który będzie zarządzany i monitorowany przez Twoją organizację. Obowiązują warunki."</string>
     <string name="profile_owner_info_with_terms_headers" msgid="7373591910245655373">"Utworzysz profil służbowy, który będzie zarządzany i monitorowany przez Twoją organizację. Obowiązują warunki podane na stronach <xliff:g id="TERMS_HEADERS">%1$s</xliff:g>."</string>
-    <string name="profile_owner_info_comp" msgid="9190421701126119142">"Utworzony profil będzie przeznaczony na aplikacje do pracy. Ten profil oraz reszta urządzenia będą zarządzane i monitorowane przez Twoją organizację. Obowiązują warunki."</string>
-    <string name="profile_owner_info_with_terms_headers_comp" msgid="2012766614492554556">"Utworzony profil będzie przeznaczony na aplikacje do pracy. Ten profil oraz reszta urządzenia będą zarządzane i monitorowane przez Twoją organizację. Obowiązują warunki podane na stronach <xliff:g id="TERMS_HEADERS">%1$s</xliff:g>."</string>
+    <string name="profile_owner_info_comp" msgid="9190421701126119142">"Utworzony profil będzie przeznaczony na aplikacje służbowe. Ten profil oraz reszta urządzenia będą zarządzane i monitorowane przez Twoją organizację. Obowiązują warunki."</string>
+    <string name="profile_owner_info_with_terms_headers_comp" msgid="2012766614492554556">"Utworzony profil będzie przeznaczony na aplikacje służbowe. Ten profil oraz reszta urządzenia będą zarządzane i monitorowane przez Twoją organizację. Obowiązują warunki podane na stronach <xliff:g id="TERMS_HEADERS">%1$s</xliff:g>."</string>
     <string name="device_owner_info" msgid="3716661456037934467">"Organizacja <xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g> będzie zarządzać tym urządzeniem, monitorować je i dbać o jego bezpieczeństwo. Obowiązują warunki. <xliff:g id="VIEW_TERMS">%2$s</xliff:g>"</string>
     <string name="device_owner_info_with_terms_headers" msgid="1254243288669282977">"Organizacja <xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g> będzie zarządzać tym urządzeniem, monitorować je i dbać o jego bezpieczeństwo. Obowiązują warunki podane na stronach <xliff:g id="TERMS_HEADERS">%2$s</xliff:g>. <xliff:g id="VIEW_TERMS">%3$s</xliff:g>"</string>
     <string name="link_isnt_secure_and_cant_be_opened_until_device_setup_finished" msgid="1604497932637832657">"Ten link nie jest bezpieczny i nie można go otworzyć do czasu ukończenia konfiguracji urządzenia: <xliff:g id="LINK_RAW_TEST">%1$s</xliff:g>"</string>
@@ -126,13 +126,13 @@
     <string name="set_up_your_device" msgid="1896651520959894681">"Konfigurowanie urządzenia"</string>
     <string name="info_anim_title_0" msgid="3285414600215959704">"Zmień sposób pracy"</string>
     <string name="info_anim_title_1" msgid="2657512519467714760">"Rozdzielanie życia prywatnego i zawodowego"</string>
-    <string name="one_place_for_work_apps" msgid="2595597562302953960">"Aplikacje do pracy w jednym miejscu"</string>
+    <string name="one_place_for_work_apps" msgid="2595597562302953960">"Aplikacje służbowe w jednym miejscu"</string>
     <string name="info_anim_title_2" msgid="4629781398620470204">"Wyłącz pracę, gdy skończysz"</string>
     <string name="provisioning" msgid="4512493827019163451">"Włączam obsługę administracyjną"</string>
     <string name="copying_certs" msgid="5697938664953550881">"Konfiguruję certyfikaty CA"</string>
     <string name="setup_profile" msgid="5573950582159698549">"Konfigurowanie profilu"</string>
     <string name="profile_benefits_description" msgid="758432985984252636">"Profil służbowy pozwala oddzielić dane służbowe od prywatnych"</string>
-    <string name="comp_profile_benefits_description" msgid="379837075456998273">"Dzięki profilowi do pracy wszystkie aplikacje służbowe masz w jednym miejscu"</string>
+    <string name="comp_profile_benefits_description" msgid="379837075456998273">"Dzięki profilowi służbowemu wszystkie aplikacje używane w pracy masz w jednym miejscu"</string>
     <string name="setup_profile_encryption" msgid="5241291404536277038">"Konfigurowanie profilu. Szyfrowanie"</string>
     <string name="setup_profile_progress" msgid="7742718527853325656">"Konfigurowanie profilu. Pokazuje postęp"</string>
     <string name="setup_device" msgid="6725265673245816366">"Konfigurowanie urządzenia"</string>
@@ -158,22 +158,22 @@
     <string name="join_many_items_first" msgid="8365482726853276608">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="8569294838319639963">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
     <string name="take_a_few_minutes" msgid="6282806501305322838">"Może to potrwać kilka minut"</string>
-    <string name="work_profile_description" msgid="8524116010729569213">"Aplikacje do pracy będą dostępne w tym profilu. Będzie nimi zarządzać Twoja organizacja"</string>
+    <string name="work_profile_description" msgid="8524116010729569213">"Aplikacje służbowe będą dostępne w tym profilu. Będzie nimi zarządzać Twoja organizacja"</string>
     <string name="device_owner_description" msgid="168013145812679664">"Bezpieczeństwem tego telefonu i zarządzaniem nim będzie się zajmować Twoja organizacja."</string>
     <string name="setup_provisioning_header" msgid="4282483198266806271">"Przygotowuję się do konfiguracji urządzenia służbowego…"</string>
     <string name="setup_provisioning_header_description" msgid="2567041263563823566">"Konfiguracja aplikacji administratora"</string>
     <string name="set_up_everything_else" msgid="4407706086957916501">"Skonfiguruj resztę"</string>
     <string name="now_lets_set_up_everything_else" msgid="5829716209795747105">"Dodaj konto osobiste, aby w pełni korzystać ze swojego urządzenia"</string>
-    <string name="now_lets_set_up_everything_else_explanation" msgid="2730458857511288697">"Twój profil do pracy jest już gotowy. Możesz dodać osobiste konto Google, by mieć dostęp do swoich aplikacji i materiałów."</string>
+    <string name="now_lets_set_up_everything_else_explanation" msgid="2730458857511288697">"Twój profil służbowy jest już gotowy. Możesz dodać osobiste konto Google, by mieć dostęp do swoich aplikacji i materiałów."</string>
     <string name="brand_screen_header" msgid="8865808542690116648">"To urządzenie należy do Twojej organizacji"</string>
     <string name="brand_screen_subheader" msgid="7664792208784456436">"Do zarządzania tym telefonem i monitorowania go posłuży poniższa aplikacja"</string>
-    <string name="downloading_administrator_header" msgid="8660294318893902915">"Przygotowuję się do konfiguracji profilu do pracy…"</string>
-    <string name="work_profile_provisioning_accept_header_post_suw" msgid="1353127953275291089">"Skonfiguruj profil do pracy"</string>
-    <string name="work_profile_provisioning_step_1_header" msgid="7914961694921466366">"Aplikacje służbowe znajdują się w profilu do pracy"</string>
+    <string name="downloading_administrator_header" msgid="8660294318893902915">"Przygotowuję się do konfiguracji profilu służbowego…"</string>
+    <string name="work_profile_provisioning_accept_header_post_suw" msgid="1353127953275291089">"Skonfiguruj profil służbowy"</string>
+    <string name="work_profile_provisioning_step_1_header" msgid="7914961694921466366">"Aplikacje służbowe znajdują się w profilu służbowym"</string>
     <string name="work_profile_provisioning_step_2_header" msgid="6001172190404670248">"Wstrzymuj aplikacje służbowe, gdy skończysz pracę"</string>
-    <string name="work_profile_provisioning_step_3_header" msgid="4316106639726774330">"Dane z profilu do pracy są widoczne dla Twojego administratora IT"</string>
-    <string name="work_profile_provisioning_progress_label" msgid="2627905308998389193">"Konfiguruję profil do pracy…"</string>
-    <string name="work_profile_provisioning_summary" msgid="3436190271657388747">"Aplikacje do pracy znajdują się w profilu do pracy. Możesz wstrzymać ich działanie, gdy skończysz pracę. Dane z profilu do pracy są widoczne dla Twojego administratora IT."</string>
+    <string name="work_profile_provisioning_step_3_header" msgid="4316106639726774330">"Dane z profilu służbowego są widoczne dla Twojego administratora IT"</string>
+    <string name="work_profile_provisioning_progress_label" msgid="2627905308998389193">"Konfiguruję profil służbowy…"</string>
+    <string name="work_profile_provisioning_summary" msgid="3436190271657388747">"Aplikacje służbowe znajdują się w profilu służbowym. Możesz wstrzymać ich działanie, gdy skończysz pracę. Dane z profilu służbowego są widoczne dla Twojego administratora IT."</string>
     <string name="fully_managed_device_provisioning_accept_header" msgid="2944032660440403130">"Skonfiguruj urządzenie służbowe"</string>
     <string name="fully_managed_device_provisioning_step_1_header" msgid="6396274703116708592">"Miej aplikacje służbowe zawsze pod ręką"</string>
     <string name="fully_managed_device_provisioning_step_2_header" msgid="7165472083121590030">"To urządzenie nie jest prywatne"</string>
@@ -183,7 +183,7 @@
     <string name="cope_provisioning_step_1_header" msgid="1945759718804756423">"Aplikacje służbowe znajdują się w profilu służbowym i zarządza nimi administrator"</string>
     <string name="cope_provisioning_step_2_header" msgid="2388399739294883042">"Aplikacje osobiste znajdują się w innym miejscu i są niewidoczne dla aplikacji służbowych"</string>
     <string name="cope_provisioning_step_3_header" msgid="7161795433847296201">"Administrator może zarządzać tym urządzeniem i blokować niektóre aplikacje"</string>
-    <string name="cope_provisioning_summary" msgid="993014104601034878">"Aplikacje do pracy znajdują się w profilu do pracy, a zarządza nimi administrator IT. Aplikacje osobiste znajdują się w innym miejscu i są niewidoczne dla aplikacji do pracy. Administrator IT może zarządzać tym urządzeniem i blokować niektóre aplikacje."</string>
+    <string name="cope_provisioning_summary" msgid="993014104601034878">"Aplikacje służbowe znajdują się w profilu służbowym, a zarządza nimi administrator IT. Aplikacje osobiste znajdują się w innym miejscu i są niewidoczne dla aplikacji służbowych. Administrator IT może zarządzać tym urządzeniem i blokować niektóre aplikacje."</string>
     <string name="just_a_sec" msgid="6244676028626237220">"Chwileczkę…"</string>
     <string name="fully_managed_device_provisioning_privacy_title" msgid="4017627906103556021">"Przypomnienie o prywatności"</string>
     <string name="fully_managed_device_provisioning_privacy_body" msgid="2219074604343348608">"Twój administrator IT może mieć podgląd Twoich danych i aktywności na tym urządzeniu"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 0457761..bc3e33d 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -128,7 +128,7 @@
     <string name="info_anim_title_1" msgid="2657512519467714760">"Separar profissional de pessoal"</string>
     <string name="one_place_for_work_apps" msgid="2595597562302953960">"Um só lugar para os apps de trabalho"</string>
     <string name="info_anim_title_2" msgid="4629781398620470204">"Desativar o app de trabalho ao concluir"</string>
-    <string name="provisioning" msgid="4512493827019163451">"Aprovisionamento"</string>
+    <string name="provisioning" msgid="4512493827019163451">"Provisionamento"</string>
     <string name="copying_certs" msgid="5697938664953550881">"Instalação de certificados de CA"</string>
     <string name="setup_profile" msgid="5573950582159698549">"Configurar seu perfil"</string>
     <string name="profile_benefits_description" msgid="758432985984252636">"Ao usar um perfil de trabalho, você pode separar os dados de trabalho dos dados pessoais"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0457761..bc3e33d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -128,7 +128,7 @@
     <string name="info_anim_title_1" msgid="2657512519467714760">"Separar profissional de pessoal"</string>
     <string name="one_place_for_work_apps" msgid="2595597562302953960">"Um só lugar para os apps de trabalho"</string>
     <string name="info_anim_title_2" msgid="4629781398620470204">"Desativar o app de trabalho ao concluir"</string>
-    <string name="provisioning" msgid="4512493827019163451">"Aprovisionamento"</string>
+    <string name="provisioning" msgid="4512493827019163451">"Provisionamento"</string>
     <string name="copying_certs" msgid="5697938664953550881">"Instalação de certificados de CA"</string>
     <string name="setup_profile" msgid="5573950582159698549">"Configurar seu perfil"</string>
     <string name="profile_benefits_description" msgid="758432985984252636">"Ao usar um perfil de trabalho, você pode separar os dados de trabalho dos dados pessoais"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index c93a612..cd17309 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -26,7 +26,7 @@
     <string name="company_controls_device" msgid="8230957518758871390">"Organizata jote do ta kontrollojë këtë pajisje dhe do ta mbajë atë të sigurt."</string>
     <string name="the_following_is_your_mdm" msgid="6613658218262376404">"Aplikacionit të mëposhtëm do i nevojitet qasje në këtë profil:"</string>
     <string name="the_following_is_your_mdm_for_device" msgid="6717973404364414816">"Aplikacioni i mëposhtëm do të menaxhojë pajisjen tënde:"</string>
-    <string name="next" msgid="1004321437324424398">"Tjetri"</string>
+    <string name="next" msgid="1004321437324424398">"Para"</string>
     <string name="setting_up_workspace" msgid="7862472373642601041">"Profili i punës po konfigurohet…"</string>
     <string name="admin_has_ability_to_monitor_profile" msgid="7051310668406162979">"Administratori i teknologjisë së informacionit ka aftësinë e monitorimit dhe menaxhimit të cilësimeve, të qasjes së korporatës, të aplikacioneve, të autorizimeve dhe të të dhënave të lidhura me këtë profil, duke përfshirë aktivitetin e rrjetit si dhe vendndodhjen e pajisjes, historikun e telefonatave dhe historikun e kërkimit të kontakteve.<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>Kontakto me administratorin e teknologjisë së informacionit për më shumë informacione, duke përfshirë politikat e privatësisë së organizatës sate."</string>
     <string name="admin_has_ability_to_monitor_device" msgid="6303112630697870695">"Administratori i teknologjisë së informacionit ka aftësinë e monitorimit dhe menaxhimit të cilësimeve, të qasjes së korporatës, të aplikacioneve, të autorizimeve dhe të të dhënave të lidhura me këtë pajisje, duke përfshirë aktivitetin e rrjetit si dhe vendndodhjen e pajisjes, historikun e telefonatave dhe historikun e kërkimit të kontakteve.<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>Kontakto me administratorin e teknologjisë së informacionit për më shumë informacione, duke përfshirë politikat e privatësisë së organizatës sate."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 7f9ea01..387e368 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -66,7 +66,7 @@
     <string name="default_owned_device_username" msgid="3915120202811807955">"Корисник пословног уређаја"</string>
     <string name="setup_work_device" msgid="6003988351437862369">"Подешава се пословни уређај..."</string>
     <string name="progress_data_process" msgid="1707745321954672971">"Обрађују се подаци подешавања..."</string>
-    <string name="progress_connect_to_wifi" msgid="472251154628863539">"Повезујете се са Wi-Fi-јем..."</string>
+    <string name="progress_connect_to_wifi" msgid="472251154628863539">"Повезујете се са WiFi-ем..."</string>
     <string name="progress_connect_to_mobile_network" msgid="3852054186860657088">"Повезујемо се са мобилном мрежом…"</string>
     <string name="progress_download" msgid="3522436271691064624">"Преузима се апликација за администратора..."</string>
     <string name="progress_install" msgid="2258045670385866183">"Инсталира се апликација за администратора..."</string>
@@ -88,7 +88,7 @@
     <string name="contact_your_admin_for_help" msgid="2009904021552323731">"Потражите помоћ од ИТ администратора"</string>
     <string name="reset_device" msgid="5483853913241939262">"Ресетујте овај уређај и пробајте поново да га подесите"</string>
     <string name="device_already_set_up" msgid="507881934487140294">"Уређај је већ подешен"</string>
-    <string name="error_wifi" msgid="1850288843966836571">"Повезивање на Wi-Fi мрежу није успело"</string>
+    <string name="error_wifi" msgid="1850288843966836571">"Повезивање на WiFi мрежу није успело"</string>
     <string name="device_has_reset_protection_contact_admin" msgid="2662050020376475656">"Заштита ресетовања је укључена за уређај. Потражите помоћ од ИТ администратора."</string>
     <string name="frp_clear_progress_title" msgid="8628074089458234965">"Брисање"</string>
     <string name="frp_clear_progress_text" msgid="1740164332830598827">"Сачекајте..."</string>
@@ -157,7 +157,7 @@
     <string name="join_many_items_last" msgid="7469666990442158802">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> и <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="8365482726853276608">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="8569294838319639963">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
-    <string name="take_a_few_minutes" msgid="6282806501305322838">"Ово може да потраје неколико минута"</string>
+    <string name="take_a_few_minutes" msgid="6282806501305322838">"Ово може да потраје пар минута"</string>
     <string name="work_profile_description" msgid="8524116010729569213">"Пословне апликације ће се чувати на овом профилу и њима ће управљати организација"</string>
     <string name="device_owner_description" msgid="168013145812679664">"Организација ће штитити овај уређај и управљаће њиме"</string>
     <string name="setup_provisioning_header" msgid="4282483198266806271">"Припрема се подешавање уређаја за посао…"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 3927694..f52e8d6 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -42,7 +42,7 @@
     <string name="managed_device_info" msgid="1529447646526616811">"Maelezo kuhusu kifaa kinachosimamiwa"</string>
     <string name="default_managed_profile_name" msgid="5370257687074907055">"Wasifu wa kazini"</string>
     <string name="default_first_meat_user_name" msgid="7540515892748490540">"Mtumiaji wa kwanza"</string>
-    <string name="delete_profile_title" msgid="2841349358380849525">"Futa wasifu uliopo?"</string>
+    <string name="delete_profile_title" msgid="2841349358380849525">"Ifute wasifu uliopo?"</string>
     <string name="opening_paragraph_delete_profile" msgid="4913885310795775967">"Tayari una wasifu wa kazini. Unadhibitiwa kwa kutumia programu ifuatayo:"</string>
     <string name="read_more_delete_profile" msgid="7789171620401666343">"Kabla ya kuendelea, "<a href="#read_this_link">"soma hapa"</a>"."</string>
     <string name="sure_you_want_to_delete_profile" msgid="6927697984573575564">"Ukiendelea, utafuta data na programu zote zilizo kwenye wasifu huu."</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index e77eb79..8275ec0 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -45,7 +45,7 @@
     <string name="delete_profile_title" msgid="2841349358380849525">"ప్రస్తుతం ఉన్న ప్రొఫైల్‌ని తొలగించాలా?"</string>
     <string name="opening_paragraph_delete_profile" msgid="4913885310795775967">"ఇప్పటికే మీ వద్ద కార్యాలయ ప్రొఫైల్ ఉంది. కింది యాప్ ద్వారా ఇది నిర్వహించబడుతోంది:"</string>
     <string name="read_more_delete_profile" msgid="7789171620401666343">"కొనసాగడానికి ముందు, "<a href="#read_this_link">"దీన్ని చదవండి"</a>"."</string>
-    <string name="sure_you_want_to_delete_profile" msgid="6927697984573575564">"మీరు కొనసాగిస్తే, ఈ ప్రొఫైల్‌లోని అన్ని అనువర్తనాలు మరియు డేటా తొలగించబడతాయి."</string>
+    <string name="sure_you_want_to_delete_profile" msgid="6927697984573575564">"మీరు కొనసాగిస్తే, ఈ ప్రొఫైల్‌లోని అన్ని యాప్‌లు మరియు డేటా తొలగించబడతాయి."</string>
     <string name="delete_profile" msgid="2299218578684663459">"తొలగించు"</string>
     <string name="cancel_delete_profile" msgid="5155447537894046036">"రద్దు చేయి"</string>
     <string name="encrypt_device_text_for_profile_owner_setup" msgid="7828515754696057140">"మీ కార్యాలయ ప్రొఫైల్‌ని సెటప్ చేయడానికి, మొదట మీ పరికరం గుప్తీకరించబడాలి. దీనికి కొంత సమయం పట్టవచ్చు."</string>
@@ -68,7 +68,7 @@
     <string name="progress_data_process" msgid="1707745321954672971">"సెటప్ డేటాను ప్రాసెస్ చేస్తోంది..."</string>
     <string name="progress_connect_to_wifi" msgid="472251154628863539">"Wi-Fiకి కనెక్ట్ చేస్తోంది..."</string>
     <string name="progress_connect_to_mobile_network" msgid="3852054186860657088">"మొబైల్ నెట్‌వర్క్‌కు కనెక్ట్ చేస్తోంది…"</string>
-    <string name="progress_download" msgid="3522436271691064624">"నిర్వాహక అనువర్తనాన్ని డౌన్‌లోడ్ చేస్తోంది..."</string>
+    <string name="progress_download" msgid="3522436271691064624">"నిర్వాహక యాప్‌ను డౌన్‌లోడ్ చేస్తోంది..."</string>
     <string name="progress_install" msgid="2258045670385866183">"నిర్వాహక యాప్ ఇన్‌స్టాల్ చేస్తోంది..."</string>
     <string name="progress_delete_non_required_apps" msgid="7633458399262691256">"అనావశ్యక సిస్టమ్ అనువర్తనాలను తీసివేస్తోంది…"</string>
     <string name="progress_finishing_touches" msgid="9037776404089697198">"తుది మెరుగులు చేస్తోంది…"</string>
@@ -117,7 +117,7 @@
     <string name="setup_isnt_finished_contact_admin" msgid="8849644190723875952">"సెటప్ పూర్తి కాలేదు. సహాయం కోసం మీ IT నిర్వాహకులను సంప్రదించండి."</string>
     <string name="for_help_contact_admin" msgid="5922538077702487859">"సహాయం కోసం, మీ IT నిర్వాహకులను సంప్రదించండి"</string>
     <string name="organization_admin" msgid="5975914478148511290">"IT నిర్వాహకులు"</string>
-    <string name="your_org_app_used" msgid="5336414768293540831">"కింది అనువర్తనాన్ని ఉపయోగించి <xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g> ఈ పరికరాన్ని నిర్వహిస్తుంది మరియు పర్యవేక్షిస్తుంది:"</string>
+    <string name="your_org_app_used" msgid="5336414768293540831">"కింది యాప్‌ను ఉపయోగించి <xliff:g id="YOUR_ORGANIZATION">%1$s</xliff:g> ఈ పరికరాన్ని నిర్వహిస్తుంది మరియు పర్యవేక్షిస్తుంది:"</string>
     <string name="your_organization_beginning" msgid="5952561489910967255">"మీ సంస్థ"</string>
     <string name="your_organization_middle" msgid="8288538158061644733">"మీ సంస్థ"</string>
     <string name="view_terms" msgid="7230493092383341605">"నిబంధనలను వీక్షించండి"</string>
@@ -126,7 +126,7 @@
     <string name="set_up_your_device" msgid="1896651520959894681">"మీ పరికరాన్ని సెటప్ చేయండి"</string>
     <string name="info_anim_title_0" msgid="3285414600215959704">"మీరు పని చేసే విధానాన్ని మార్చేయండి"</string>
     <string name="info_anim_title_1" msgid="2657512519467714760">"వ్యక్తిగత అంశాల నుండి కార్యాలయ అంశాలను వేరు చేయండి"</string>
-    <string name="one_place_for_work_apps" msgid="2595597562302953960">"ఒకే స్థలంలో అన్ని కార్యాలయ అనువర్తనాలు"</string>
+    <string name="one_place_for_work_apps" msgid="2595597562302953960">"ఒకే స్థలంలో అన్ని కార్యాలయ యాప్‌లు"</string>
     <string name="info_anim_title_2" msgid="4629781398620470204">"మీరు పూర్తి చేసిన తర్వాత కార్యాలయ ప్రొఫైల్ ఆఫ్ చేయండి"</string>
     <string name="provisioning" msgid="4512493827019163451">"కేటాయిస్తోంది"</string>
     <string name="copying_certs" msgid="5697938664953550881">"CA ప్రమాణపత్రాలను సెటప్ చేస్తోంది"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 6126e14..61cb0a4 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -30,7 +30,7 @@
     <string name="setting_up_workspace" msgid="7862472373642601041">"دفتری پروفائل ترتیب دیا جا رہا ہے…"</string>
     <string name="admin_has_ability_to_monitor_profile" msgid="7051310668406162979">"‏آپ کا IT منتظم آپ کے نیٹ ورک کی سرگرمی اور اسی کے ساتھ آپ کے آلے کے مقام، کال کی سرگزشت اور رابطے کی تلاش کی سرگزشت سمیت ترتیبات، کارپوریٹ رسائی، ایپس، اجازتوں اور اس دفتری پروفائل کے ساتھ وابستہ ڈیٹا کو مانیٹر کرنے اور ان کا نظم کرنے کا اہل ہے۔<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>اپنی تنظیم کی رازداری پالیسیوں سمیت مزید معلومات کے لیے اپنے IT منتظم سے رابطہ کریں۔"</string>
     <string name="admin_has_ability_to_monitor_device" msgid="6303112630697870695">"‏آپ کا IT منتظم آپ کے نیٹ ورک کی سرگرمی اور اسی کے ساتھ آپ کے آلے کے مقام، کال کی سرگزشت اور رابطے کی تلاش کی سرگزشت سمیت ترتیبات، کارپوریٹ رسائی، ایپس، اجازتوں اور اس آلہ کے ساتھ وابستہ ڈیٹا کو مانیٹر کرنے اور ان کا نظم کرنے کا اہل ہے۔<xliff:g id="LINE_BREAK">&lt;br&gt;&lt;br&gt;</xliff:g>اپنی تنظیم کی رازداری پالیسیوں سمیت مزید معلومات کے لیے اپنے IT منتظم سے رابطہ کریں۔"</string>
-    <string name="theft_protection_disabled_warning" msgid="3708092473574738478">"چوری سے تحٖفظ کی خصوصیات استعمال کرنے کیلئے آپ کے پاس آپ کے آلہ کیلئے پاسورڈ کے ذریعے تحفظ یافتہ ایک اسکرین قفل ہونا چاہیئیے۔"</string>
+    <string name="theft_protection_disabled_warning" msgid="3708092473574738478">"چوری سے تحٖفظ کی خصوصیات استعمال کرنے کیلئے آپ کے پاس آپ کے آلہ کیلئے پاس ورڈ کے ذریعے تحفظ یافتہ ایک اسکرین قفل ہونا چاہیئیے۔"</string>
     <string name="contact_your_admin_for_more_info" msgid="9209568156969966347">"‏اپنی تنظیم کی رازداری کی پالیسیوں سمیت مزید معلومات کے لیے اپنے IT منتظم سے رابطہ کریں۔"</string>
     <string name="learn_more_link" msgid="3012495805919550043">"مزید جانیں"</string>
     <string name="cancel_setup" msgid="2949928239276274745">"منسوخ کریں"</string>
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index fd297e3..0000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# Include all makefiles in subdirectories
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/instrumentation/Android.bp b/tests/instrumentation/Android.bp
new file mode 100644
index 0000000..709a8d2
--- /dev/null
+++ b/tests/instrumentation/Android.bp
@@ -0,0 +1,26 @@
+android_test {
+    name: "ManagedProvisioningTests",
+
+    libs: [
+        "android.test.runner",
+        "android.test.base",
+        "android.test.mock",
+    ],
+
+    srcs: ["src/**/*.java"],
+
+    platform_apis: true,
+    certificate: "platform",
+
+    static_libs: [
+        "androidx.test.rules",
+        "mockito-target-minus-junit4",
+        "androidx.test.espresso.core",
+        "androidx.test.espresso.intents",
+        "truth-prebuilt",
+    ],
+
+    instrumentation_for: "ManagedProvisioning",
+    test_suites: ["device-tests"],
+
+}
diff --git a/tests/instrumentation/Android.mk b/tests/instrumentation/Android.mk
deleted file mode 100644
index e3469e0..0000000
--- a/tests/instrumentation/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := ManagedProvisioningTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := platform
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    androidx.test.rules \
-    mockito-target-minus-junit4 \
-    androidx.test.espresso.core \
-    androidx.test.espresso.intents \
-    truth-prebuilt
-
-LOCAL_INSTRUMENTATION_FOR := ManagedProvisioning
-LOCAL_COMPATIBILITY_SUITE := device-tests
-
-include $(BUILD_PACKAGE)
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
new file mode 100644
index 0000000..c105cff
--- /dev/null
+++ b/tests/robotests/Android.bp
@@ -0,0 +1,26 @@
+//############################################################
+// ManagedProvisioning Robolectric test target.              #
+//############################################################
+android_robolectric_test {
+
+    name: "ManagedProvisioningRoboTests",
+
+    srcs: ["src/**/*.java"],
+
+    java_resource_dirs: ["config"],
+
+    // Include the testing libraries
+    libs: [
+        "robolectric_android-all-stub",
+        "Robolectric_all-target",
+        "mockito-robolectric-prebuilt",
+        "truth-prebuilt",
+        "androidx.test.core",
+        "androidx.test.rules",
+        "androidx.core_core",
+    ],
+
+    static_libs: ["managedprovisioning_protoslite"],
+
+    instrumentation_for: "ManagedProvisioning",
+}
diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
deleted file mode 100644
index 8903722..0000000
--- a/tests/robotests/Android.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#############################################################
-# ManagedProvisioning Robolectric test target.              #
-#############################################################
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := ManagedProvisioningRoboTests
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_JAVA_RESOURCE_DIRS := config
-
-# Include the testing libraries
-LOCAL_JAVA_LIBRARIES := \
-    robolectric_android-all-stub \
-    Robolectric_all-target \
-    mockito-robolectric-prebuilt \
-    truth-prebuilt \
-    androidx.test.core \
-    androidx.test.rules \
-    androidx.core_core
-
-LOCAL_STATIC_JAVA_LIBRARIES := managedprovisioning_protoslite
-
-LOCAL_INSTRUMENTATION_FOR := ManagedProvisioning
-LOCAL_COMPATIBILITY_SUITE := general-tests
-
-LOCAL_MODULE_TAGS := optional
-
-# Generate test_config.properties
-include external/robolectric-shadows/gen_test_config.mk
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-#################################################################
-# ManagedProvisioning runner target to run the previous target. #
-#################################################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := RunManagedProvisioningRoboTests
-
-LOCAL_JAVA_LIBRARIES := \
-    ManagedProvisioningRoboTests \
-    robolectric_android-all-stub \
-    Robolectric_all-target \
-    mockito-robolectric-prebuilt \
-    truth-prebuilt \
-    androidx.test.core \
-    androidx.test.rules \
-    androidx.core_core
-
-LOCAL_TEST_PACKAGE := ManagedProvisioning
-
-LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src
-
-include external/robolectric-shadows/run_robotests.mk
\ No newline at end of file