COVIDSafe code from version 1.13 (#28)

app/build.gradle

@@ -28,13 +28,9 @@ android {
     defaultConfig {
         applicationId "au.gov.health.covidsafe"
         minSdkVersion rootProject.ext.minSdkVersion
-        /*
-        TargetSdk is currently set to 28 because we are using a greylisted api in SDK 29, in order to fix a BLE vulnerability
-        Before you increase the targetSdkVersion make sure that all its usage are still working
-         */
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 72
+        versionCode 78
-        versionName "1.11.0"
+        versionName "1.13.0"
         buildConfigField "String", "GITHASH", "\"${getGitHash()}\""
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
 
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

app/src/main/java/au/gov/health/covidsafe/extensions/PermissionExtensions.kt

@@ -1,6 +1,6 @@
 package au.gov.health.covidsafe.extensions
 
-import android.Manifest.permission.ACCESS_COARSE_LOCATION
+import android.Manifest.permission.ACCESS_FINE_LOCATION
 import android.bluetooth.BluetoothAdapter
 import android.bluetooth.BluetoothManager
 import android.content.Context
@@ -47,13 +47,13 @@ private fun Fragment.requestFineLocationAndCheckBleSupportThenNextPermission(onE
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
         activity?.let {
             when {
-                EasyPermissions.hasPermissions(it, ACCESS_COARSE_LOCATION) -> {
+                EasyPermissions.hasPermissions(it, ACCESS_FINE_LOCATION) -> {
                     checkBLESupport()
                     excludeFromBatteryOptimization(onEndCallback)
                 }
                 else -> {
                     EasyPermissions.requestPermissions(
-                            PermissionRequest.Builder(this, LOCATION, ACCESS_COARSE_LOCATION)
+                            PermissionRequest.Builder(this, LOCATION, ACCESS_FINE_LOCATION)
                                     .setRationale(R.string.permission_location_rationale)
                                     .build())
                 }
@@ -110,7 +110,7 @@ fun Context.isBlueToothEnabled(): Boolean? {
 }
 
 fun Context.isLocationPermissionAllowed(): Boolean? {
-    return EasyPermissions.hasPermissions(this, ACCESS_COARSE_LOCATION)
+    return EasyPermissions.hasPermissions(this, ACCESS_FINE_LOCATION)
 }
 
 fun Context.isLocationEnabledOnDevice(): Boolean {
@@ -135,9 +135,9 @@ fun Context.isBatteryOptimizationDisabled(): Boolean? {
 fun Fragment.askForLocationPermission() {
     activity?.let {
         when {
-            !EasyPermissions.hasPermissions(it, ACCESS_COARSE_LOCATION) -> {
+            !EasyPermissions.hasPermissions(it, ACCESS_FINE_LOCATION) -> {
                 EasyPermissions.requestPermissions(
-                        PermissionRequest.Builder(this, LOCATION, ACCESS_COARSE_LOCATION)
+                        PermissionRequest.Builder(this, LOCATION, ACCESS_FINE_LOCATION)
                                 .setRationale(R.string.permission_location_rationale)
                                 .build())
             }

app/src/main/java/au/gov/health/covidsafe/interactor/usecase/GetOnboardingOtp.kt

@@ -15,6 +15,7 @@ class GetOnboardingOtp(private val awsClient: AwsClient, lifecycle: Lifecycle) :
     private val TAG = this.javaClass.simpleName
 
     override suspend fun run(params: GetOtpParams): Either<Exception, OTPChallengeResponse> {
+        
         return try {
             val response = awsClient.initiateAuth(
                     OTPChallengeRequest(

app/src/main/java/au/gov/health/covidsafe/links/LinkBuilder.kt

@@ -61,6 +61,22 @@ object LinkBuilder {
         return url
     }
 
+    fun getCollectionMassageLearnMore(context: Context): SpannableString {
+        return buildSpannableStringContent(
+                context,
+                TracerApp.AppContext.getString(R.string.collection_message),
+                listOf(getPrivacyTopicsUrl())
+        )
+    }
+
+    fun getLocationPermission(context: Context): SpannableString {
+        return buildSpannableStringContent(
+                context,
+                TracerApp.AppContext.getString(R.string.update_screen_location),
+                listOf(getLocationPairingRequestUrl())
+        )
+    }
+
     private fun buildLocalisedURL(path: String): String {
         val localeLanguageTag = Locale.getDefault().toLanguageTag()
 
@@ -143,12 +159,12 @@ object LinkBuilder {
         val privacyUrl = getPrivacyTopicsUrl()
         return buildSpannableStringContent(
                 context,
-                TracerApp.AppContext.getString(R.string.data_privacy_content),
+                TracerApp.AppContext.getString(R.string.data_privacy_content_android),
                 listOf(
                         privacyUrl,
                         privacyUrl,
                         getHelpTopicsUrl(),
-                        DEPARTMENT_OF_HEALTH_URL,
+                        HOST_URL,
                         privacyUrl
                 )
         )

app/src/main/java/au/gov/health/covidsafe/preference/Preference.kt

@@ -35,6 +35,8 @@ object Preference {
     private const val AGE = "AGE"
     private const val CASE_STATISTIC = "CASESTATISTIC"
     private const val IS_DEVICE_NAME_CHANGE_PROMPT_DISPLAYED = "IS_DEVICE_NAME_CHANGE_DISPLAYED"
+    private const val BUILD_NUMBER_FOR_POP_UP_NOTIFICATION = "BUILD_NUMBER_FOR_POP_UP_NOTIFICATION"
+    private const val TURN_CASE_NUMBER = "TURN_CASE_NUMBER"
 
     fun putDeviceID(context: Context, value: String) {
         context.getSharedPreferences(PREF_ID, Context.MODE_PRIVATE)
@@ -287,4 +289,24 @@ object Preference {
                 .getString(CASE_STATISTIC, null)
     }
 
+    fun putBuildNumber(context: Context, buildNumber: Int) {
+        return context.getSharedPreferences(PREF_ID, Context.MODE_PRIVATE)
+                .edit().putInt(BUILD_NUMBER_FOR_POP_UP_NOTIFICATION, buildNumber).apply()
+    }
+
+    fun getBuildNumber(context: Context): Int {
+        return context.getSharedPreferences(PREF_ID, Context.MODE_PRIVATE)
+                ?.getInt(BUILD_NUMBER_FOR_POP_UP_NOTIFICATION, 0)
+                ?: 0
+    }
+
+    fun setTurnCaseNumber(context: Context, turnOff: Boolean): Boolean {
+        return context.getSharedPreferences(PREF_ID, Context.MODE_PRIVATE)
+                .edit().putBoolean(TURN_CASE_NUMBER, turnOff).commit()
+    }
+
+    fun getTurnCaseNumber(context: Context): Boolean {
+        return context.getSharedPreferences(PREF_ID, Context.MODE_PRIVATE)
+            .getBoolean(TURN_CASE_NUMBER, true)
+    }
 }

app/src/main/java/au/gov/health/covidsafe/streetpass/IBluetoothGattInvocationHandler.java

@@ -0,0 +1,65 @@
+package au.gov.health.covidsafe.streetpass;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import au.gov.health.covidsafe.logging.CentralLog;
+
+        /* This class is used by StreetPassPairingFix to proxy calls between BluetoothGatt and the underlying
+ * IBluetoothGatt implementation (the interface between Android SDK's bluetooth API and the system
+ * bluetooth daemon)
+
+ * It rewrites the authReq field of calls to readCharacteristic and writeCharacteristic to
+ * AUTHENTICATION_NONE in order to prevent pairing attempts being initiated in proximity to a malicious
+ * COVIDSafe/fake device requiring MITM or Encryption. This is still secure as COVIDSafe uses its own
+ * asymmetric encryption of sent payloads.
+
+ * The ultimate purpose of the class is to mitigate CVE-2020-12856 when targeting API29, or on older
+ * devices that do not receive android security patches, as the previous fix utilised a field which
+ * is to be blacklisted by Google in November 2020.
+ *
+ * https://docs.oracle.com/javase/8/docs/technotes/guides/reflection/proxy.html
+ * https://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Proxy.html
+ * */
+
+ public class IBluetoothGattInvocationHandler implements InvocationHandler {
+    private Object mService; // The IBluetoothGatt instance being proxied for
+    private static String TAG = "IBluetoothGattInvocationHandler";
+
+    IBluetoothGattInvocationHandler(Object mService) {
+        this.mService = mService;
+    }
+
+    @Override
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        String memberName = method.getName();
+        Integer oldAuthReq = null; // Use Integer so null can be used to detect if a rewrite occurred
+        
+        // This switch statement is used to rewrite the authReq field of IBLuetoothGatt to always
+        // be the value BluetoothGatt.AUTHENTICATION_NONE in order to prevent pairing
+        //
+        // https://cs.android.com/android/platform/superproject//master:system/bt/binder/android/bluetooth/IBluetoothGatt.aidl;drc=c704fc6d805b4772a2dd11c1f40b1bc72a19f832
+        // https://android.googlesource.com/platform/frameworks/base//master/core/java/android/bluetooth/BluetoothGatt.java#371
+        // https://android.googlesource.com/platform/frameworks/base//master/core/java/android/bluetooth/BluetoothGatt.java#431
+        switch (memberName) {
+            case "readCharacteristic":
+                // 4th argument is int authReq
+                oldAuthReq = (int) args[3];
+                args[3] = 0; // AUTHENTICATION_NONE
+                break;
+                case "writeCharacteristic":
+                    // 5th argument is authReq
+                    oldAuthReq = (int) args[4];
+                    args[4] = 0; // AUTHENTICATION_NONE
+                    break;
+        }
+
+        // If oldAuthReq got updated it indicates either of the target methods were called
+        if (oldAuthReq != null) {
+            CentralLog.Companion.i(TAG, "Rewrote " + memberName + " authReq=" + oldAuthReq + " to authReq=0");
+        }
+
+        // Invoke whichever method was called on the object, potentially with modified arguments
+        CentralLog.Companion.i(TAG, "Invoking method:" + memberName);
+        return method.invoke(mService, args);
+    }
+}

app/src/main/java/au/gov/health/covidsafe/streetpass/StreetPassPairingFix.kt

@@ -7,22 +7,62 @@ import au.gov.health.covidsafe.logging.CentralLog
 import java.lang.NullPointerException
 import java.lang.RuntimeException
 import java.lang.reflect.Field
+import java.lang.reflect.Proxy
 
+/**
+ * When BluetoothGatt.readCharacteristic is called on a characteristic that requires bonding of some
+ * sort (i.e. Authenticated/Authorised/Encrypted), BluetoothGatt.mBluetoothGattCallback will
+ * automatically attempt to bond with the remote device (see
+ * https://android.googlesource.com/platform/frameworks/base/+/76c1d9d5e15f48e54fc810c3efb683a0c5fd14b0/core/java/android/bluetooth/BluetoothGatt.java).
+ *
+ * Specifically, BluetoothGatt.mBluetoothGattCallback.onCharacteristicRead and
+ * BluetoothGatt.mBluetoothGattCallback.onCharacteristicWrite will be called by the operating system
+ * (see https://android.googlesource.com/platform/system/bt/) and, should the response status  be
+ * GATT_INSUFFICIENT_AUTHENTICATION or GATT_INSUFFICIENT_ENCRYPTION it will attempt to re-read/write
+ * the characteristic requesting either AUTHENTICATION_MITM or AUTHENTICATION_NO_MITM and increment
+ * the retry counter BluetoothGatt.mAuthRetryState. Should the counter already be equal to
+ * AUTH_RETRY_STATE_MITM (int 2) the read will fail.
+ *
+ * Should the read succeed, mAuthRetryState will be reset to AUTH_RETRY_STATE_IDLE (int 0)
+ *
+ * In a previous version of this patch, the mAuthRetryState (or older mAuthState) fields were
+ * rewritten, using the reflection API, prior to a GATT such that, should authentication be required
+ * for the next GATT operation the device would not offer it. This relied on the application targeting
+ * API28 as mAuthRetryState was marked as greylist-max-p and Google is instituting an API29 (post-P)
+ * requirement on all published applications in November 2020. This would mean the fix could not be
+ * included in releases post November 2020 and devices without android security patches would become
+ * vulnerable to CVE-2020-12856 again.
+ *
+ * In order to protect devices, a second version of the patch has been written which does not target
+ * API29 blacklisted APIs. Specifically, the mService field of BLuetoothGatt is marked as grey-listed,
+ * meaning that it may be blacklisted in a future version but is available for use in API29 (and it
+ * appears API30 too). The patch replaces the reference to mService with a Proxy object which rewrites
+ * the arguments of readCharacteristic and writeCharacterstic to ensure, even if the Android platform
+ * attempts to initiate pairing to exchange with a malicious COVIDSafe/fake device, the request sent
+ * to the underlying bluetooth daemon will not contain this pairing directive.
 
+ *
+ * This leverages Java's reflection API.
+ *
+ * Caveats:
+ *   * Nil presently as mService is currently greylisted with no enforced max API version yet.
+ */
 object StreetPassPairingFix {
     private const val TAG = "StreetPassPairingFix"
     private var initFailed = false
     private var initComplete = false
 
     private var bluetoothGattClass = BluetoothGatt::class.java
+    private var iBluetoothGattClass: Class<*>? = null
 
-    private var mAuthRetryStateField: Field? = null
+
-    private var mAuthRetryField: Field? = null
+    private var mServiceField: Field? = null
 
     /**
      * Initialises all the reflection references used by bypassAuthenticationRetry
      *
-     * This has been checked against the source of Android 10_r36
+     * It has been verified that the accessed fields have existed since android's initial BLE
+     * support was added
      *
      * Returns true if object is in valid state
      */
@@ -32,41 +72,25 @@ object StreetPassPairingFix {
         if (initFailed || initComplete) {
             return !initFailed
         }
-
-        // This technique works only up to Android P/API 28. This is due to mAuthRetryState being
-        // a greylisted non-SDK interface.
-        // See
-        // https://developer.android.com/distribute/best-practices/develop/restrictions-non-sdk-interfaces
-        // https://android.googlesource.com/platform/frameworks/base/+/45d2c252b19c08bbd20acaaa2f52ae8518150169%5E%21/core/java/android/bluetooth/BluetoothGatt.java
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P && ApplicationInfo().targetSdkVersion > Build.VERSION_CODES.P) {
-            CentralLog.i(TAG,
-                    "Failed to initialise: mAuthRetryState is in restricted grey-list post API 28")
-            initFailed = true
-            initComplete = true
-            return !initFailed
-        }
-
         CentralLog.i(TAG, "Initialising StreetPassParingFix fields")
         try {
-            try {
-                // Get a reference to the mAuthRetryState
-                // This will throw NoSuchFieldException on older android, which is handled below
-                mAuthRetryStateField = bluetoothGattClass.getDeclaredField("mAuthRetryState")
-                CentralLog.i(TAG, "Found mAuthRetryState")
-
-            } catch (e: NoSuchFieldException) {
-                // Prior to https://android.googlesource.com/platform/frameworks/base/+/3854e2267487ecd129bdd0711c6d9dfbf8f7ed0d%5E%21/#F0,
-                // And at least after Nougat (7), mAuthRetryField (a boolean) was used instead
-                // of mAuthRetryState
-                CentralLog.i(TAG,
-                        "No mAuthRetryState on this device, trying for mAuthRetry")
-
-                // This will throw NoSuchFieldException again on fail, which is handled below
-                mAuthRetryField = bluetoothGattClass.getDeclaredField("mAuthRetry")
-                CentralLog.i(TAG, "Found mAuthRetry")
-
-            }
 
+            // mService has been available since the first Android BLE commit
+            // https://android.googlesource.com/platform/frameworks/base/+/9908112fd085d8b0d91e0562d32eebd1884f09a5
+            //
+            // As of 22/07/2020, Android 10/API29 marks BluetoothGatt mService as "greylist" and are
+            // not restricted at any API level
+            // Landroid/bluetooth/BluetoothGatt;->mService:Landroid/bluetooth/IBluetoothGatt;,greylist
+            //
+            // Per googles documentation, "Greylist: Non-SDK interfaces that you can use as long as
+            // they are not restricted for your app's target API level."
+            // https://developer.android.com/distribute/best-practices/develop/restrictions-non-sdk-interfaces
+            mServiceField = bluetoothGattClass.getDeclaredField("mService")
+            CentralLog.i(TAG, "Found mService")
+            // IBLuetoothGatt is not included in the android SDK, but we can get a reference to it
+            // via the field type
+            iBluetoothGattClass = mServiceField?.type
+            CentralLog.i(TAG, "Found IBluetoothGatt")
             // Should be good to go now
             CentralLog.i(TAG, "Initialisation complete")
             initComplete = true
@@ -115,49 +139,37 @@ object StreetPassPairingFix {
         }
 
         try {
-            // Attempt the bypass for newer android
+            CentralLog.i(TAG, "Attempting to proxy mService IBluetoothGatt instance")
-            if (mAuthRetryStateField != null) {
-                CentralLog.i(TAG, "Attempting to bypass mAuthRetryState bonding conditional")
             // Set the field accessible (if required)
-                val mAuthRetryStateAccessible = mAuthRetryStateField!!.isAccessible
+            val mServiceAccessible = mServiceField!!.isAccessible
-                if (!mAuthRetryStateAccessible) {
+            if (!mServiceAccessible) {
-                    mAuthRetryStateField!!.isAccessible = true
+                mServiceField!!.isAccessible = true
             }
+            //Get a reference to the IBLuetoothGatt implementation being used by this BluetoothGatt
+            // Instance - this is what is called to initiate a read/write to a preipheral
+            val mService: Object = mServiceField!!.get(gatt) as Object
 
-                // The conditional branch that causes binding to occur in BluetoothGatt do not occur
+            // Wrap the IBLuetoothGatt instance in a Proxy object in order to intercept calls to
-                // if mAuthRetryState == AUTH_RETRY_STATE_MITM (int 2), as this signifies that both
+            // readCharacteristic and writeCharacteristic. IBluetoothGattInvocationHandler will catch
-                // steps of authenticated/encrypted reading have failed to establish. See
+            // calls to these functions and rewrite their authReq field to ensure no pairing attempts
-                // https://android.googlesource.com/platform/frameworks/base/+/76c1d9d5e15f48e54fc810c3efb683a0c5fd14b0/core/java/android/bluetooth/BluetoothGatt.java#70
+            // occur
-                //
+            val mServiceProxy = Proxy.newProxyInstance(gatt.javaClass.classLoader,
-                // Previously this class reflectively read the value of AUTH_RETRY_STATE_MITM,
+                    Array(1) { iBluetoothGattClass!! },
-                // instead of using a constant, but reportedly this doesn't work API 27+.
+                    IBluetoothGattInvocationHandler(mService))
-                //
+
-                // Write mAuthRetryState to this value so it appears that bonding has already failed
+            // Write the proxy back to BluetoothGatt.mService
-                mAuthRetryStateField!!.setInt(gatt, 2) // Unwrap is safe
+            mServiceField!!.set(gatt, mServiceProxy)
 
             // Reset accessibility
-                mAuthRetryStateField!!.isAccessible = mAuthRetryStateAccessible
+            mServiceField!!.isAccessible = mServiceAccessible
-            } else  {
-                CentralLog.i(TAG, "Attempting to bypass mAuthRetry bonding conditional")
-                // Set the field accessible (if required)
-                val mAuthRetryAccessible = mAuthRetryField!!.isAccessible
-                if (!mAuthRetryAccessible) {
-                    mAuthRetryField!!.isAccessible = true
             }
+        catch (e: IllegalAccessException) {
+            // Field was inaccessible when written
+            CentralLog.i(TAG,
+                    "Encountered access excepion in bypassAuthenticationRetry: " + e.message)
 
-                // The conditional branch that causes binding to occur in BluetoothGatt do not occur
-                // if mAuthRetry == true, as this signifies an attempt was made to bind
-                //
-                // See https://android.googlesource.com/platform/frameworks/base/+/63b4f6f5db4d5ea0114d195a0f33970e7070f21b/core/java/android/bluetooth/BluetoothGatt.java#263
-                //
-                // Write mAuthRetry to true so it appears that bonding has already failed
-                mAuthRetryField!!.setBoolean(gatt, true)
-
-                // Reset accessibility
-                mAuthRetryField!!.isAccessible = mAuthRetryAccessible
             }
-
+        catch (e: SecurityException) {
-        } catch (e: SecurityException) {
             // Sandbox didn't like reflection
             CentralLog.i(TAG,
                     "Encountered sandbox exception in bypassAuthenticationRetry: " + e.message)

app/src/main/java/au/gov/health/covidsafe/ui/home/HomeFragment.kt

@@ -3,7 +3,10 @@ package au.gov.health.covidsafe.ui.home
 import android.Manifest
 import android.annotation.SuppressLint
 import android.bluetooth.BluetoothAdapter
-import android.content.*
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
 import android.graphics.Typeface
 import android.os.Bundle
 import android.text.method.LinkMovementMethod
@@ -13,12 +16,15 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.view.accessibility.AccessibilityEvent
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
-import au.gov.health.covidsafe.*
+import au.gov.health.covidsafe.BuildConfig
+import au.gov.health.covidsafe.HomeActivity
+import au.gov.health.covidsafe.R
 import au.gov.health.covidsafe.app.TracerApp
 import au.gov.health.covidsafe.databinding.FragmentHomeBinding
 import au.gov.health.covidsafe.extensions.*
@@ -28,15 +34,19 @@ import au.gov.health.covidsafe.notifications.NotificationBuilder
 import au.gov.health.covidsafe.preference.Preference
 import au.gov.health.covidsafe.talkback.setHeading
 import au.gov.health.covidsafe.ui.base.BaseFragment
+import au.gov.health.covidsafe.utils.AnimationUtils.slideAnimation
 import au.gov.health.covidsafe.utils.NetworkConnectionCheck
-import kotlinx.android.synthetic.main.fragment_home_case_statistics.*
+import au.gov.health.covidsafe.utils.SlideDirection
+import au.gov.health.covidsafe.utils.SlideType
 import kotlinx.android.synthetic.main.fragment_home.*
+import kotlinx.android.synthetic.main.fragment_home_case_statistics.*
 import kotlinx.android.synthetic.main.fragment_home_external_links.*
 import kotlinx.android.synthetic.main.fragment_home_header.*
 import kotlinx.android.synthetic.main.view_covid_share_tile.*
 import kotlinx.android.synthetic.main.view_help_topics_tile.*
 import kotlinx.android.synthetic.main.view_home_setup_complete.*
 import kotlinx.android.synthetic.main.view_home_setup_incomplete.*
+import kotlinx.android.synthetic.main.view_national_case_statistics.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import pub.devrel.easypermissions.AppSettingsDialog
@@ -44,6 +54,7 @@ import pub.devrel.easypermissions.EasyPermissions
 import java.text.SimpleDateFormat
 import java.util.*
 
+
 private const val TAG = "HomeFragment"
 
 private const val ONE_DAY_IN_MILLIS = 24 * 60 * 60 * 1000L
@@ -59,6 +70,7 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks, Networ
 
     private var checkIsInternetConnected = false
     private var isAppWithLatestVersion = false
+    lateinit var staticsLayout: ConstraintLayout
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -76,6 +88,8 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks, Networ
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        staticsLayout = national_case_layout
+        initialisePrivacyPolicyMessageAfterUpdate()
         initializeSettingsNavigation()
         setAppVersionNumber()
         initializeDebugTestActivity()
@@ -116,6 +130,26 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks, Networ
             isAppUpdateAvailableLiveData.observe(this@HomeFragment, latestAppAvailable)
             isWindowFocusChangeLiveData.observe(this@HomeFragment, refreshUiObserver)
         }
+
+        homeFragmentViewModel.turnCaseNumber.observe(this, Observer { turnOn ->
+            showAndHideCaseNumber(turnOn)
+        })
+
+        homeFragmentViewModel.caseStatisticsLiveData.observe(this, Observer { caseNumber ->
+            if (caseNumber == null) {
+                national_case_layout.visibility = GONE
+            }
+        })
+
+        homeFragmentViewModel.collectionMessageVisible.observe(this, Observer { visible ->
+            visible?.let {
+                if (visible) {
+                    enableParentViewWhenNotificationIsShowing(false)
+                } else {
+                    enableParentViewWhenNotificationIsShowing(true)
+                }
+            }
+        })
     }
 
     private val latestAppAvailable = Observer<Boolean> {
@@ -154,6 +188,15 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks, Networ
         initializeBluetoothPairingInfo()
     }
 
+    private fun initialisePrivacyPolicyMessageAfterUpdate() {
+        homeFragmentViewModel.getCollectionMessage()
+        txt_collection_message.text = LinkBuilder.getCollectionMassageLearnMore(requireContext())
+        txt_collection_message.movementMethod = LinkMovementMethod.getInstance()
+
+        txt_location_permission.text = LinkBuilder.getLocationPermission(requireContext())
+        txt_location_permission.movementMethod = LinkMovementMethod.getInstance()
+    }
+
     private fun initializeSettingsNavigation() {
         home_header_settings.setOnClickListener {
             navigateToSettingsFragment()
@@ -172,6 +215,10 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks, Networ
         bluetooth_card_view.setOnClickListener { requestBlueToothPermissionThenNextPermission() }
         location_card_view.setOnClickListener { askForLocationPermission() }
         battery_card_view.setOnClickListener { excludeFromBatteryOptimization() }
+        txt_proceed.setOnClickListener {
+            homeFragmentViewModel.collectionMessageVisible.value = false
+            askForLocationPermission()
+        }
     }
 
     private fun initializeUploadTestDataNavigation() {
@@ -454,7 +501,7 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks, Networ
     }
 
     override fun onPermissionsDenied(requestCode: Int, perms: MutableList<String>) {
-        if (requestCode == LOCATION && EasyPermissions.somePermissionPermanentlyDenied(this, listOf(Manifest.permission.ACCESS_COARSE_LOCATION))) {
+        if (requestCode == LOCATION && EasyPermissions.somePermissionPermanentlyDenied(this, listOf(Manifest.permission.ACCESS_FINE_LOCATION))) {
             AppSettingsDialog.Builder(this).build().show()
         }
     }
@@ -482,6 +529,23 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks, Networ
         }
     }
 
+    private fun showAndHideCaseNumber(turnOn: Boolean) {
+        //When we open the app, should show the previous setting (hide/show) and doesn't need animation
+        if (homeFragmentViewModel.getTurningCaseAfterOpenPage()) {
+            if (turnOn) {
+                national_case_layout.visibility = VISIBLE
+            } else {
+                national_case_layout.visibility = GONE
+            }
+        } else {
+            if (turnOn) {
+                national_case_layout.slideAnimation(SlideDirection.DOWN, SlideType.SHOW)
+            } else {
+                national_case_layout.slideAnimation(SlideDirection.UP, SlideType.HIDE)
+            }
+        }
+    }
+
     override fun onNetworkStatusChanged(isAvailable: Boolean) {
         CentralLog.d(TAG, "onNetworkStatusChanged: $checkIsInternetConnected $isAvailable")
         checkIsInternetConnected = isAvailable
@@ -510,4 +574,12 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks, Networ
             }
         }
     }
+
+    private fun enableParentViewWhenNotificationIsShowing(enableParent: Boolean) {
+        txt_hide_number.isEnabled = enableParent
+        txt_show_number.isEnabled = enableParent
+        bluetooth_card_view.isEnabled = enableParent
+        location_card_view.isEnabled = enableParent
+        battery_card_view.isEnabled = enableParent
+    }
 }

app/src/main/java/au/gov/health/covidsafe/ui/home/HomeFragmentViewModel.kt

@@ -1,8 +1,13 @@
 package au.gov.health.covidsafe.ui.home
 
+import android.Manifest
 import android.app.Application
 import android.content.Context
 import androidx.lifecycle.*
+import au.gov.health.covidsafe.BuildConfig
+import au.gov.health.covidsafe.R
+import au.gov.health.covidsafe.extensions.LOCATION
+import au.gov.health.covidsafe.extensions.askForLocationPermission
 import au.gov.health.covidsafe.factory.RetrofitServiceGenerator
 import au.gov.health.covidsafe.interactor.usecase.GetCaseStatisticsUseCase
 import au.gov.health.covidsafe.logging.CentralLog
@@ -13,6 +18,8 @@ import au.gov.health.covidsafe.preference.Preference
 import com.google.gson.Gson
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import pub.devrel.easypermissions.EasyPermissions
+import pub.devrel.easypermissions.PermissionRequest
 
 private const val TAG = "HomeFragmentViewModel"
 
@@ -21,12 +28,19 @@ class HomeFragmentViewModel(application: Application) : AndroidViewModel(applica
     val caseNumberDataState = MutableLiveData<CaseNumbersState>()
     val caseStatisticsLiveData = MutableLiveData<CaseStatisticResponse>()
     val isRefreshing = MutableLiveData<Boolean>()
+    val collectionMessageVisible = MutableLiveData<Boolean>()
+    // Show = true and hide = false
+    val turnCaseNumber = MutableLiveData<Boolean>()
+    lateinit var context: Context
+    var turnCaseAfterOpenPage = true
 
     val awsClient: AwsClient by lazy {
         RetrofitServiceGenerator.createService(AwsClient::class.java)
     }
 
     fun fetchGetCaseStatistics(lifecycle: Lifecycle) {
+        context = getApplication() as Context
+        turnCaseNumber.value = Preference.getTurnCaseNumber(context)
         if(caseNumberDataState.value != CaseNumbersState.LOADING) {
             caseNumberDataState.value = CaseNumbersState.LOADING
 
@@ -58,12 +72,27 @@ class HomeFragmentViewModel(application: Application) : AndroidViewModel(applica
         }
     }
 
+    fun getCollectionMessage() {
+        val context = getApplication() as Context
+
+        val latestVersion = Preference.getBuildNumber(context)
+        // When We want to show disclaimer to user after update, minVersionShowPolicy should be as same as the current version
+        val minVersionShowPolicy = 74
+        val currentVersion = BuildConfig.VERSION_CODE
+        if (latestVersion == 0) {
+            collectionMessageVisible.value = true
+        } else {
+            collectionMessageVisible.value = currentVersion <= minVersionShowPolicy && currentVersion > latestVersion
+        }
+        Preference.putBuildNumber(context, currentVersion)
+    }
+
     private fun showErrorMessage() {
         viewModelScope.launch {
 
             isRefreshing.value = false
 
-            val context = getApplication() as Context
+            context = getApplication() as Context
             caseStatisticsLiveData.value = getCachedCaseStatisticDataFromPersistent(context)
             if (context.isInternetAvailable()) {
                 caseNumberDataState.value = CaseNumbersState.ERROR_UNKNOWN
@@ -85,4 +114,13 @@ class HomeFragmentViewModel(application: Application) : AndroidViewModel(applica
             caseStatisticData
         }
     }
+
+    fun turnCaseNumber(turnoff: Boolean) {
+        turnCaseAfterOpenPage = false
+        context = getApplication() as Context
+        Preference.setTurnCaseNumber(context, turnoff)
+        turnCaseNumber.value = turnoff
+    }
+
+    fun getTurningCaseAfterOpenPage() = turnCaseAfterOpenPage
 }

app/src/main/java/au/gov/health/covidsafe/ui/onboarding/fragment/enterpin/EnterPinPresenter.kt

@@ -4,6 +4,7 @@ import android.text.TextUtils
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
+import au.gov.health.covidsafe.BuildConfig
 import au.gov.health.covidsafe.preference.Preference
 import au.gov.health.covidsafe.extensions.isInternetAvailable
 import au.gov.health.covidsafe.factory.NetworkFactory
@@ -90,6 +91,9 @@ class EnterPinPresenter(private val enterPinFragment: EnterPinFragment,
                     }
                     enterPinFragment.hideKeyboard()
                     enterPinFragment.navigateToNextPage()
+
+                    val context = enterPinFragment.requireContext()
+                    Preference.putBuildNumber(context, BuildConfig.VERSION_CODE)
                 } else {
                     onError()
                 }

app/src/main/java/au/gov/health/covidsafe/ui/onboarding/fragment/permission/PermissionFragment.kt

@@ -31,7 +31,7 @@ class PermissionFragment : PagerChildFragment(), EasyPermissions.PermissionCallb
         val requiredPermissions = arrayOf(
                 Manifest.permission.BLUETOOTH,
                 Manifest.permission.BLUETOOTH_ADMIN,
-                Manifest.permission.ACCESS_COARSE_LOCATION
+                Manifest.permission.ACCESS_FINE_LOCATION
         )
     }
 

app/src/main/java/au/gov/health/covidsafe/ui/onboarding/fragment/personal/PersonalDetailsFragment.kt

@@ -2,6 +2,8 @@ package au.gov.health.covidsafe.ui.onboarding.fragment.personal
 
 import android.app.Activity
 import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
 import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
@@ -10,7 +12,6 @@ import android.view.accessibility.AccessibilityEvent
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import android.widget.ArrayAdapter
-import android.widget.TextView.OnEditorActionListener
 import androidx.appcompat.app.AlertDialog
 import androidx.core.os.bundleOf
 import au.gov.health.covidsafe.preference.Preference
@@ -53,7 +54,6 @@ class PersonalDetailsFragment : PagerChildFragment() {
 
     private fun checkAgeAndDisplayAgeError(): Boolean {
         val isValidAge = isValidAge()
-
         if (isValidAge) {
             personal_details_age_error.visibility = View.GONE
         } else {
@@ -70,7 +70,6 @@ class PersonalDetailsFragment : PagerChildFragment() {
 
     override fun onResume() {
         super.onResume()
-
         ArrayAdapter.createFromResource(
                 requireContext(),
                 R.array.age_range_array,
@@ -110,18 +109,20 @@ class PersonalDetailsFragment : PagerChildFragment() {
             }
         })
 
+        val position = getAgePosition(age)
+        personal_details_age.setSelection(position)
         personal_details_name.setOnFocusChangeListener { _, hasFocus ->
             updatePersonalDetailsDataField()
             updateButtonState()
 
-            personal_details_name_error.visibility = if (hasFocus || isValidName()) {
+            this.personal_details_name_error.visibility = if (hasFocus || isValidName()) {
                 View.GONE
             } else {
                 View.VISIBLE
             }
         }
 
-        personal_details_name.setOnEditorActionListener(OnEditorActionListener { textView, actionId, _ ->
+        personal_details_name.setOnEditorActionListener { textView, actionId, _ ->
             if (actionId == EditorInfo.IME_ACTION_NEXT) {
                 hideKeyboard()
                 textView.clearFocus()
@@ -130,7 +131,7 @@ class PersonalDetailsFragment : PagerChildFragment() {
             }
 
             true
-        })
+        }
 
         personal_details_post_code.setOnFocusChangeListener { _, hasFocus ->
             if (hasFocus) {
@@ -161,7 +162,7 @@ class PersonalDetailsFragment : PagerChildFragment() {
 
             false // pass on to other listeners.
         }
-
+        setUpListener()
         personal_details_headline.setHeading()
         personal_details_headline.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
     }
@@ -200,4 +201,46 @@ class PersonalDetailsFragment : PagerChildFragment() {
             navigateTo(PersonalDetailsFragmentDirections.actionPersonalDetailsToEnterNumberFragment().actionId, bundle)
         }
     }
+
+    private fun setUpListener() {
+        personal_details_name.addTextChangedListener(object: TextWatcher {
+            override fun afterTextChanged(p0: Editable?) {
+                updateButtonState()
+            }
+            override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
+            }
+
+            override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
+            }
+        })
+
+        personal_details_post_code.addTextChangedListener(object: TextWatcher {
+            override fun afterTextChanged(p0: Editable?) {
+                updateButtonState()
+            }
+
+            override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
+            }
+
+            override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
+            }
+
+        })
+    }
+
+    private fun getAgePosition(age: Int): Int {
+        return when (age) {
+            -1 -> 0
+            8 -> 1
+            22 -> 2
+            35 -> 3
+            45 -> 4
+            55 -> 5
+            65 -> 6
+            75 -> 7
+            85 -> 8
+            95 -> 9
+            else -> 0
+        }
+    }
 }

app/src/main/java/au/gov/health/covidsafe/ui/utils/Utils.kt

@@ -46,7 +46,7 @@ object Utils {
     private const val TAG = "Utils"
 
     fun getRequiredPermissions(): Array<String> {
-        return arrayOf(Manifest.permission.ACCESS_COARSE_LOCATION)
+        return arrayOf(Manifest.permission.ACCESS_FINE_LOCATION)
     }
 
     fun getBatteryOptimizerExemptionIntent(packageName: String): Intent {

app/src/main/java/au/gov/health/covidsafe/utils/AnimationSlide.kt

@@ -0,0 +1,93 @@
+package au.gov.health.covidsafe.utils
+
+import android.content.Context
+import android.util.DisplayMetrics
+import android.view.View
+import android.view.WindowManager
+import android.view.animation.Animation
+import android.view.animation.TranslateAnimation
+
+
+enum class SlideDirection{
+    UP,
+    DOWN,
+    LEFT,
+    RIGHT
+}
+
+enum class SlideType{
+    SHOW,
+    HIDE
+}
+
+object AnimationUtils {
+
+    fun View.slideAnimation(direction: SlideDirection, type: SlideType, duration: Long = 500) {
+        val fromX: Float
+        val toX: Float
+        val fromY: Float
+        val toY: Float
+        val array = IntArray(2)
+        getLocationInWindow(array)
+        if ((type == SlideType.HIDE && (direction == SlideDirection.RIGHT || direction == SlideDirection.DOWN)) ||
+                (type == SlideType.SHOW && (direction == SlideDirection.LEFT || direction == SlideDirection.UP))) {
+            val displayMetrics = DisplayMetrics()
+            val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
+            windowManager.defaultDisplay.getMetrics(displayMetrics)
+            val deviceWidth = displayMetrics.widthPixels
+            val deviceHeight = displayMetrics.heightPixels
+            array[0] = deviceWidth
+            array[1] = deviceHeight
+        }
+        when (direction) {
+            SlideDirection.UP -> {
+                fromX = 0f
+                toX = 0f
+                fromY = if (type == SlideType.HIDE) 0f else (array[1] + height).toFloat()
+                toY = if (type == SlideType.HIDE) -1f * (array[1] + height) else 0f
+            }
+            SlideDirection.DOWN -> {
+                fromX = 0f
+                toX = 0f
+                fromY = if (type == SlideType.HIDE) 0f else -1f * (array[1] + height)
+                toY = if (type == SlideType.HIDE) 1f * (array[1] + height) else 0f
+            }
+            SlideDirection.LEFT -> {
+                fromX = if (type == SlideType.HIDE) 0f else 1f * (array[0] + width)
+                toX = if (type == SlideType.HIDE) -1f * (array[0] + width) else 0f
+                fromY = 0f
+                toY = 0f
+            }
+            SlideDirection.RIGHT -> {
+                fromX = if (type == SlideType.HIDE) 0f else -1f * (array[0] + width)
+                toX = if (type == SlideType.HIDE) 1f * (array[0] + width) else 0f
+                fromY = 0f
+                toY = 0f
+            }
+        }
+        val animate = TranslateAnimation(
+                fromX,
+                toX,
+                fromY,
+                toY
+        )
+        animate.duration = duration
+        animate.setAnimationListener(object : Animation.AnimationListener {
+            override fun onAnimationRepeat(animation: Animation?) {
+
+            }
+
+            override fun onAnimationEnd(animation: Animation?) {
+                if (type == SlideType.HIDE) {
+                    visibility = View.GONE
+                }
+            }
+
+            override fun onAnimationStart(animation: Animation?) {
+                visibility = View.VISIBLE
+            }
+
+        })
+        startAnimation(animate)
+    }
+}

app/src/main/res/layout/fragment_data_privacy.xml

@@ -38,7 +38,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/keyline_4"
-            android:text="@string/data_privacy_content"
+            android:text="@string/data_privacy_content_android"
             android:textAlignment="viewStart"
             android:textAppearance="?textAppearanceBody1"
             android:textColorLink="@color/hyperlink_enabled"

app/src/main/res/layout/fragment_home.xml

@@ -8,7 +8,6 @@
         <variable
             name="viewModel"
             type="au.gov.health.covidsafe.ui.home.HomeFragmentViewModel" />
-
     </data>
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -111,6 +110,74 @@
 
         </LinearLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/black"
+            android:alpha="@{viewModel.collectionMessageVisible ? 0.7f : 0.0f}" />
+
+        <FrameLayout
+            android:id="@+id/layout_collection_message"
+            android:layout_width="290dp"
+            android:layout_height="wrap_content"
+            app:layout_anchor="@+id/swipeRefreshLayout"
+            app:layout_anchorGravity="center"
+            android:background="@color/white"
+            android:elevation="12dp"
+            visibility="@{viewModel.collectionMessageVisible}">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:layout_marginTop="12dp">
+
+                <TextView
+                    android:id="@+id/txt_collection_message"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="12dp"
+                    android:textColor="#141515"
+                    style="?textAppearanceBody1"
+                    android:textAlignment="center"
+                    android:lineSpacingExtra="5dp"
+                    android:textSize="16sp"
+                    android:text="@string/collection_message" />
+
+                <TextView
+                    android:id="@+id/txt_location_permission"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="12dp"
+                    android:textColor="#141515"
+                    style="?textAppearanceBody1"
+                    android:textAlignment="center"
+                    android:lineSpacingExtra="5dp"
+                    android:textSize="16sp"
+                    android:text="@string/update_screen_location" />
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="52dp"
+                    android:layout_gravity="bottom"
+                    android:background="@color/lighter_green"
+                    android:foreground="?selectableItemBackground"
+                    android:layout_marginTop="12dp">
+
+                    <TextView
+                        android:id="@+id/txt_proceed"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:textStyle="bold"
+                        android:textSize="18sp"
+                        android:textColor="@color/dark_green"
+                        android:text="@string/permission_button"
+                        tools:text="Proceed" />
+
+                </FrameLayout>
+            </LinearLayout>
+        </FrameLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>

app/src/main/res/layout/fragment_home_case_statistics.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:card_view="http://schemas.android.com/tools">
-    xmlns:tools="http://schemas.android.com/tools">
 
     <data>
 
@@ -68,32 +67,53 @@
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
 
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="60dp">
+
                     <TextView
                         android:id="@+id/national_numbers_text_view"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:layout_marginStart="@dimen/space_16"
-                        android:layout_marginTop="@dimen/space_16"
+                        android:gravity="center_vertical"
-                        android:layout_marginBottom="@dimen/space_8"
                         android:text="@string/national_numbers"
+                        android:textSize="20sp"
                         android:textAppearance="@style/fontRobotoRegular28"
                         android:textColor="@color/slate_black_1"
                         android:textStyle="bold" />
 
                         <TextView
-                        android:id="@+id/date_text_view"
+                            android:id="@+id/txt_show_number"
-                        dateFormat="@{viewModel.caseStatisticsLiveData.updatedDate}"
-                        visibility="@{viewModel.caseStatisticsLiveData != null}"
                             android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                            android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/space_16"
                             android:layout_marginEnd="@dimen/space_16"
-                        android:layout_marginBottom="@dimen/space_16"
+                            android:gravity="center_vertical"
-                        android:text="27 August 2020 at 3pm AEST"
+                            android:text="@string/show"
-                        android:textAppearance="@style/fontRobotoRegular16"
+                            android:textAppearance="@style/fontRobotoRegular28"
-                        android:textColor="@color/slate_black_2"
+                            android:textColor="@color/dark_green"
-                        android:visibility="visible"
+                            android:textSize="@dimen/text_size_16"
-                        tools:text="27 August 2020 at 3pm AEST" />
+                            android:layout_alignParentEnd="true"
+                            style="@style/fontRobotoRegular20"
+                            visibility="@{!viewModel.turnCaseNumber}"
+                            android:onClick="@{() -> viewModel.turnCaseNumber(true)}"/>
+
+                        <TextView
+                            android:id="@+id/txt_hide_number"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_marginEnd="@dimen/space_16"
+                            android:gravity="center_vertical"
+                            android:text="@string/hide"
+                            android:textAppearance="@style/fontRobotoRegular28"
+                            android:textColor="@color/dark_green"
+                            android:textSize="@dimen/text_size_16"
+                            android:layout_alignParentEnd="true"
+                            style="@style/fontRobotoRegular20"
+                            visibility="@{viewModel.turnCaseNumber}"
+                            android:onClick="@{() -> viewModel.turnCaseNumber(false)}"/>
+
+                    </RelativeLayout>
 
                     <FrameLayout
                         android:id="@+id/show_error_message"
@@ -147,10 +167,6 @@
                         android:textColor="@color/dark_green"
                         android:visibility="gone" />
 
-                    <include
-                        layout="@layout/view_national_case_statistics"
-                        app:viewModel="@{viewModel}" />
-
                     <include
                         layout="@layout/view_state_case_statistics"
                         app:viewModel="@{viewModel}" />

app/src/main/res/layout/fragment_registration_consent.xml

@@ -60,6 +60,19 @@
             app:layout_constraintTop_toBottomOf="@+id/registration_consent_first_paragraph"
             app:ul_view_text="@string/registration_consent_second_paragraph" />
 
+        <au.gov.health.covidsafe.ui.view.UlView
+            android:id="@+id/registration_consent_third_paragraph"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_4"
+            android:textAlignment="viewStart"
+            android:textAppearance="?textAppearanceBody1"
+            android:textColorLink="@color/hyperlink_enabled"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/registration_consent_second_paragraph"
+            app:ul_view_text="@string/registration_consent_diagnostic" />
+
         <TextView
             android:id="@+id/registration_consent_call_for_action"
             android:layout_width="0dp"
@@ -71,7 +84,7 @@
             android:textColorLink="@color/hyperlink_enabled"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/registration_consent_second_paragraph" />
+            app:layout_constraintTop_toBottomOf="@+id/registration_consent_third_paragraph" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

app/src/main/res/layout/fragment_under_sixteen.xml

@@ -62,6 +62,20 @@
             app:layout_constraintTop_toBottomOf="@+id/under_sixteen_first_paragraph"
             app:ul_view_text="@string/under_sixteen_second_paragraph" />
 
+        <au.gov.health.covidsafe.ui.view.UlView
+            android:id="@+id/under_sixteen_third_paragraph"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/keyline_4"
+            android:textAlignment="viewStart"
+            android:textAppearance="?textAppearanceBody1"
+            android:textColorLink="@color/hyperlink_enabled"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/under_sixteen_second_paragraph"
+            app:ul_view_text="@string/us_registration_consent_diagnostic" />
+
+
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -72,7 +86,7 @@
             android:textColorLink="@color/hyperlink_enabled"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/under_sixteen_second_paragraph" />
+            app:layout_constraintTop_toBottomOf="@+id/under_sixteen_third_paragraph" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

app/src/main/res/layout/view_national_case_statistics.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <data>
 
@@ -18,7 +19,6 @@
             android:id="@+id/national_case_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            visibility="@{viewModel.caseStatisticsLiveData != null}"
             android:background="@color/white"
             android:orientation="vertical">
 
@@ -29,6 +29,24 @@
                 android:background="@color/divider_line_grey"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <TextView
+                android:id="@+id/date_text_view"
+                dateFormat="@{viewModel.caseStatisticsLiveData.updatedDate}"
+                visibility="@{viewModel.caseStatisticsLiveData != null}"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/space_16"
+                android:layout_marginEnd="@dimen/space_16"
+                android:layout_marginBottom="@dimen/space_16"
+                android:layout_marginTop="@dimen/space_16"
+                android:text="27 August 2020 at 3pm AEST"
+                android:textAppearance="@style/fontRobotoRegular16"
+                android:textColor="@color/slate_black_2"
+                android:visibility="visible"
+                tools:text="27 August 2020 at 3pm AEST"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/top_case_line_divider" />
+
             <au.gov.health.covidsafe.ui.home.view.ExternalLinkCard
                 android:id="@+id/national_new_case_card"
                 externalCardTitle="@{viewModel.caseStatisticsLiveData.national.newCases}"
@@ -40,7 +58,7 @@
                 app:external_linkCard_start_icon="@drawable/ic_trending_up"
                 app:external_linkCard_start_icon_background="@drawable/background_circular_green"
                 app:external_linkCard_start_icon_padding="@dimen/space_8"
-                app:layout_constraintTop_toBottomOf="@+id/top_case_line_divider" />
+                app:layout_constraintTop_toBottomOf="@+id/date_text_view" />
 
             <au.gov.health.covidsafe.ui.home.view.ExternalLinkCard
                 android:id="@+id/national_confirmed_case_card"

app/src/main/res/layout/view_state_case_statistics.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <data>
 
@@ -11,13 +13,99 @@
 
     <merge>
 
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/national_case_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:orientation="vertical"
+            android:animateLayoutChanges="true">
+
+            <View
+                android:id="@+id/top_case_line_divider"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/divider_line_grey"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/date_text_view"
+                dateFormat="@{viewModel.caseStatisticsLiveData.updatedDate}"
+                visibility="@{viewModel.caseStatisticsLiveData != null}"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/space_16"
+                android:layout_marginEnd="@dimen/space_16"
+                android:layout_marginBottom="@dimen/space_16"
+                android:layout_marginTop="@dimen/space_16"
+                android:text="27 August 2020 at 3pm AEST"
+                android:textAppearance="@style/fontRobotoRegular16"
+                android:textColor="@color/slate_black_2"
+                android:visibility="visible"
+                tools:text="27 August 2020 at 3pm AEST"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/top_case_line_divider" />
+
+            <au.gov.health.covidsafe.ui.home.view.ExternalLinkCard
+                android:id="@+id/national_new_case_card"
+                externalCardTitle="@{viewModel.caseStatisticsLiveData.national.newCases}"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                app:external_linkCard_content="@string/new_cases"
+                app:external_linkCard_end_icon_visible="false"
+                app:external_linkCard_start_icon="@drawable/ic_trending_up"
+                app:external_linkCard_start_icon_background="@drawable/background_circular_green"
+                app:external_linkCard_start_icon_padding="@dimen/space_8"
+                app:layout_constraintTop_toBottomOf="@+id/date_text_view" />
+
+            <au.gov.health.covidsafe.ui.home.view.ExternalLinkCard
+                android:id="@+id/national_confirmed_case_card"
+                externalCardTitle="@{viewModel.caseStatisticsLiveData.national.totalCases}"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                app:external_linkCard_content="@string/total_confirmed_cases"
+                app:external_linkCard_end_icon_visible="false"
+                app:external_linkCard_start_icon="@drawable/ic_confirmed_cases"
+                app:external_linkCard_start_icon_background="@drawable/background_circular_green"
+                app:external_linkCard_start_icon_padding="@dimen/space_8"
+                app:layout_constraintTop_toBottomOf="@+id/national_new_case_card" />
+
+            <au.gov.health.covidsafe.ui.home.view.ExternalLinkCard
+                android:id="@+id/national_total_case_recovered_card"
+                externalCardTitle="@{viewModel.caseStatisticsLiveData.national.recoveredCases}"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                app:external_linkCard_content="@string/recovered"
+                app:external_linkCard_end_icon_visible="false"
+                app:external_linkCard_start_icon="@drawable/ic_heart"
+                app:external_linkCard_start_icon_background="@drawable/background_circular_green"
+                app:external_linkCard_start_icon_padding="@dimen/space_8"
+                app:layout_constraintTop_toBottomOf="@+id/national_confirmed_case_card" />
+
+            <au.gov.health.covidsafe.ui.home.view.ExternalLinkCard
+                android:id="@+id/total_deaths_card"
+                externalCardTitle="@{viewModel.caseStatisticsLiveData.national.deaths}"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                app:external_linkCard_content="@string/deaths"
+                app:external_linkCard_end_icon_visible="false"
+                app:external_linkCard_start_icon="@drawable/ic_confirmed_cases"
+                app:external_linkCard_start_icon_background="@drawable/background_circular_grey"
+                app:external_linkCard_start_icon_padding="@dimen/space_8"
+                app:layout_constraintTop_toBottomOf="@+id/national_total_case_recovered_card" />
+
         <LinearLayout
             android:id="@+id/state_level_case_layout"
             visibility="@{viewModel.caseStatisticsLiveData != null}"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/white"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            app:layout_constraintTop_toBottomOf="@+id/total_deaths_card">
 
             <View
                 android:layout_width="match_parent"
@@ -349,7 +437,7 @@
             </RelativeLayout>
 
         </LinearLayout>
-
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </merge>
 
 </layout>

app/src/main/res/values-ar/strings.xml

@@ -9,7 +9,7 @@
   <string name="australian_capital_territory">إقليم العاصمة الأسترالية</string>
   <string name="battery_optimisation_prompt">يجب عليك تعطيل وضع توفير الطاقة.</string>
   <string name="change_device_name_content_line_1">الاسم الحالي لجهازك هو %s .</string>
-  <string name="change_device_name_content_line_2">ستتمكن أجهزة الـ Bluetooth® الأخرى من حولك من رؤية اسم جهازك. نوصي باستخدام اسم جهاز لا يتضمن تفاصيلك الشخصية ويكون شائع الاستخدام، كموديل جهازك.</string>
+  <string name="change_device_name_content_line_2">ستتمكن أجهزة Bluetooth® الأخرى من حولك من رؤية اسم جهازك. نوصي باستخدام اسم جهاز لا يتضمن تفاصيلك الشخصية ويكون شائع الاستخدام، كموديل جهازك.</string>
   <string name="change_device_name_default_device_name">%s</string>
   <!-- Onboarding Change Device Name -->
   <string name="change_device_name_headline">اسم جهازك</string>
@@ -19,7 +19,8 @@
   <string name="change_device_name_secondary_action">تخطى واتركها كما هي</string>
   <string name="change_language">تغيير اللغة</string>
   <string name="change_language_content">اقرأ الدليل حول استخدام تطبيق COVIDSafe بلغة مختلفة.</string>
-  <string name="CodeHasExpired">انتهت صلاحية الرمز الخاص بك.</string>
+  <string name="CodeHasExpired">انتهت صلاحية رقم التعريف الشخصي الخاص بك.</string>
+  <string name="collection_message">يقوم تطبيق COVIDSafe الآن بجمع معلومات تشخيصية لمساعدتك على استكشاف المشكلات في تطبيقك وإصلاحها. *أعرف المزيد*</string>
   <string name="consent_button">أوافق</string>
   <!-- Shared Consent Actions -->
   <string name="consent_call_for_action">اختر \"أوافق\" لتأكيد الموافقة.</string>
@@ -236,7 +237,6 @@
   <string name="country_region_name_zm">زامبيا</string>
   <string name="country_region_name_zw">زيمبابوي</string>
   <string name="data_privacy_button">التالي</string>
-  <string name="data_privacy_content">من المهم أن تقرأ *سياسة الخصوصية* تطبيق COVIDSafe قبل التسجيل. \n\n إذا كان عمرك أقل من 16 عاماً، يجب على أحد والديك/ الوصي أيضاً قراءة *سياسة الخصوصية*. \n\n استخدام تطبيق COVIDSafe هو أمر إختياري تماماً. يمكنك تثبيت التطبيق أو حذفه في أي وقت. إذا قمت بحذف تطبيق COVIDSafe، *يمكنك أيضاً طلب حذف معلوماتك* من الخادم الآمن. \n\n للتسجيل في تطبيق COVIDSafe، ستحتاج إلى إدخال اسم (أو اسم مستعار) ورقم هاتف محمول وفئة عمرية ورمز بريدي. \n\n سيتم جمع المعلومات التي ترسلها عند التسجيل، ومعلومات استخدامك لتطبيق COVIDSafe  وتخزينها في خادم آمن للغاية. \n\n لن يقوم تطبيق COVIDSafe بجمع معلومات عن موقعك الجغرافي. \n\n سيدوّن تطبيق COVIDSafe وقت الاتصال ورمز مجهول الهوية لمستخدمي COVIDSafe الآخرين الذين تتواصل معهم وقوة إشارة الـ Bluetooth، وموديل الهاتف المحمول للمستخدمين الآخرين على جهازك. \n\nكما سيدون تطبيق COVIDSafe لدى المستخدمين الآخرين الذين تتواصل معهم أيضاً الرمز مجهول الهوية الخاص بك وتاريخ ووقت الاتصال بك وقوة إشارة الـ Bluetooth وموديل هاتفك المحمول على أجهزتهم.  \n\n إذا أظهرت نتائج فحص COVID-19 إصابة مستخدم آخر، فقد يقوم هذا المستخدم بتحميل تفاصيل الاتصال به وقد يتصل بك موظف دائرة الصحة في الولاية أو الإقليم لأغراض تقفّي المخالطة. \n\n سيتم استخدام تفاصيل التسجيل الخاصة بك أو الكشف عنها فقط لتقفّي المخالطة وللأغراض المناسبة والقانونية لـ COVIDSafe. \n\n يتوفر المزيد من المعلومات على الموقع الإلكتروني لـ*وزارة الصحة في الحكومة الأسترالية*. \n\n راجع *سياسة الخصوصية* لتطبيق COVIDSafe للاطلاع على مزيد من التفاصيل حول حقوقك المتعلقة بمعلوماتك وكيف سيتم التعامل معها ومشاركتها.</string>
   <string name="data_privacy_content_android">من المهم أن تقرأ *سياسة الخصوصية* تطبيق COVIDSafe قبل التسجيل. \n\n إذا كان عمرك أقل من 16 عاماً، يجب على أحد والديك/ الوصي أيضاً قراءة *سياسة الخصوصية*. \n\n استخدام تطبيق COVIDSafe هو أمر إختياري تماماً. يمكنك تثبيت التطبيق أو حذفه في أي وقت. إذا قمت بحذف تطبيق COVIDSafe، *يمكنك أيضاً طلب حذف معلوماتك* من الخادم الآمن. \n\n للتسجيل في تطبيق COVIDSafe، ستحتاج إلى إدخال اسم (أو اسم مستعار) ورقم هاتف محمول وفئة عمرية ورمز بريدي. \n\n سيتم جمع المعلومات التي ترسلها عند التسجيل، ومعلومات استخدامك لتطبيق COVIDSafe  وتخزينها في خادم آمن للغاية. \n\n لن يقوم تطبيق COVIDSafe بجمع معلومات عن موقعك الجغرافي. \n\n سيدوّن تطبيق COVIDSafe وقت الاتصال ورمز مجهول الهوية لمستخدمي COVIDSafe الآخرين الذين تتواصل معهم وقوة إشارة الـ Bluetooth، وموديل الهاتف المحمول للمستخدمين الآخرين على جهازك. \n\nكما سيدون تطبيق COVIDSafe لدى المستخدمين الآخرين الذين تتواصل معهم أيضاً الرمز مجهول الهوية الخاص بك وتاريخ ووقت الاتصال بك وقوة إشارة الـ Bluetooth وموديل هاتفك المحمول على أجهزتهم.  \n\n إذا أظهرت نتائج فحص COVID-19 إصابة مستخدم آخر، فقد يقوم هذا المستخدم بتحميل تفاصيل الاتصال به وقد يتصل بك موظف دائرة الصحة في الولاية أو الإقليم لأغراض تقفّي المخالطة. \n\n سيتم استخدام تفاصيل التسجيل الخاصة بك أو الكشف عنها فقط لتقفّي المخالطة وللأغراض المناسبة والقانونية لـ COVIDSafe. \n\n يتوفر المزيد من المعلومات على الموقع الإلكتروني لـ*وزارة الصحة في الحكومة الأسترالية*. \n\n راجع *سياسة الخصوصية* لتطبيق COVIDSafe للاطلاع على مزيد من التفاصيل حول حقوقك المتعلقة بمعلوماتك وكيف سيتم التعامل معها ومشاركتها.</string>
   <!-- OnBoarding Data Privacy -->
   <string name="data_privacy_headline">التسجيل والخصوصية</string>
@@ -247,6 +247,7 @@
   <string name="dialog_error_uploading_positive">حاول مرة أخرى</string>
   <string name="dialog_uploading_message">يتم الآن تحميل معلومات COVIDSafe الخاصة بك. \n\n الرجاء عدم إغلاق التطبيق.</string>
   <string name="disabled">معطل</string>
+  <string name="dismiss">تجاهل</string>
   <string name="done_success">تـمّ</string>
   <string name="enabled">ممكّنة</string>
   <string name="enter_number_button">احصل على رقم تعريف شخصي</string>
@@ -267,6 +268,7 @@
   <string name="generic_error">الرجاء إعادة المحاولة لاحقًا </string>
   <string name="generic_internet_error">يرجى التحقق من اتصال جهازك بشبكة الانترنت</string>
   <string name="heading">العنوان</string>
+  <string name="hide">إخفاء</string>
   <string name="home_app_permission_push_notification_prompt">السماح لتطبيق COVIDSafe بدفع الإشعارات اللحظية.</string>
   <string name="home_app_permission_status_subtitle">لن يعمل تطبيق COVIDSafe بدون الإعدادات الصحيحة.</string>
   <string name="home_app_permission_status_title">تحقق من إعدادات هاتفك</string>
@@ -343,6 +345,9 @@
   <string name="invalid_phone_number_digits_error_prompt" formatted="false">تتألف أرقام الهواتف المحمولة في %1s من %2s أرقام.</string>
   <string name="invalid_post_code">رمز بريدي غير صحيح</string>
   <string name="IssueFooter">قد نتصل بك للحصول على مزيد من التفاصيل حول ملاحظاتك. لن يتم استخدام عنوان بريدك الإلكتروني لأي غرض آخر.</string>
+  <string name="jwt_description">هناك مشكلة في تفاصيل التسجيل الخاصة بك.</string>
+  <string name="jwt_heading">يرجى التسجيل مرة أخرى</string>
+  <string name="loading_numbers">تحميل أحدث الأرقام</string>
   <!-- Splash Screen -->
   <string name="migration_in_progress">تحديث تطبيق COVIDSafe قيد الإنجاز. \n\nيُرجى التأكد من عدم إغلاق هاتفك إلى أن يتم اكتمال التحديث.</string>
   <string name="national_numbers">الأرقام على الصعيد الوطني</string>
@@ -359,7 +364,8 @@
   <string name="notification_battery">قم بتعطيل وضع توفير الطاقة ليتمكن تطبيق COVIDSafe من العمل.</string>
   <string name="notification_bluetooth">قم بتشغيل البلوتوث لكي يتمكن تطبيق COVIDSafe من العمل.</string>
   <string name="notification_bt_and_battery">قم بتشغيل البلوتوث وتعطيل وضع توفير الطاقة ليتمكن تطبيق COVIDSafe من العمل.</string>
-  <string name="notification_internet_content">افتح التطبيق وتحقق من اتصال جهازك بالإنترنت ليتمكن تطبيق COVIDSafe من العمل.</string>
+  <string name="notification_internet_content">افتح التطبيق وتحقق من اتصال جهازك بالإنترنت.</string>
+  <string name="notification_location">اسمح بتشغيل الموقع الجغرافي للسماح باستخدام Bluetooth.</string>
   <string name="notification_not_active_body">تأكد من أن تطبيق COVIDSafe يعمل قبل مغادرتك المنزل أو عند وجودك في الأماكن العامة.</string>
   <string name="notification_not_active_title">\u200F COVIDSafe لا يعمل</string>
   <string name="notification_settings">افتح التطبيق للتحقق من الإعدادات.</string>
@@ -371,14 +377,17 @@
   <string name="NotificationsDisabledBlurb">لن تتلقى إشعارًا إذا كان تطبيق COVIDSafe لا يعمل. \nغيّر إعدادات الإشعارات</string>
   <!-- Figma page iOS Screens (05/06) -->
   <string name="NotificationsEnabledBlurb">سوف تتلقى إشعارًا إذا كان تطبيق COVIDSafe لا يعمل. غيّر إعدادات الإشعارات</string>
+  <string name="numbers_error">تعذر التحقق من أحدث الأرقام.</string>
+  <string name="numbers_no_internet">اتصل بالإنترنت لكي تحصل على آخر الأرقام.</string>
+  <string name="numbers_refresh">قم بالتحديث الآن</string>
   <string name="options_for_australia">خيارات لأستراليا</string>
   <string name="permission_button">تابع</string>
-  <string name="permission_content">يحتاج تطبيق COVIDSafe إلى تمكين الـ Bluetooth® والإشعارات لكي يعمل. \n\n اختر \"تابع\" من أجل: \n\n 1. تمكين Bluetooth® \n\n 2. السماح لأذونات الموقع الجغرافي \n\n 3. تعطيل وضع توفير الطاقة \n\n\n يحتاج نظام اندرويد إلى أذونات الموقع الجغرافي لتمكين تشغيل الـ Bluetooth®. \n\n لا يرسل تطبيق COVIDSafe طلبات الاقتران.</string>
+  <string name="permission_content">يحتاج تطبيق COVIDSafe إلى تمكين Bluetooth® والإشعارات لكي يعمل. \n\n اختر \"تابع\" من أجل: \n\n 1. تمكين Bluetooth \n\n 2. السماح بتشغيل الموقع الجغرافي \n\n 3. تعطيل وضع توفير الطاقة \n\n يحتاج Google إلى تشغيل الموقع الجغرافي لتتمكن تطبيقات أجهزة أندرويد من استخدام Bluetooth. لا يقوم تطبيق COVIDSafe بتخزين بيانات الموقع الجغرافي أو استخدامها. \n\n لا يرسل تطبيق COVIDSafe طلبات الاقتران.</string>
   <!-- OnBoarding Permission -->
   <string name="permission_headline">إعدادات التطبيق</string>
   <string name="permission_location_rationale">يطلب نظام اندرويد الحصول على الموقع الجغرافي لتفعيل وظائف Bluetooth® المطلوبة لتطبيق COVIDSafe. لا يمكن لتطبيق COVIDSafe العمل بشكل صحيح بدونه</string>
   <string name="permission_success_button">تمّ</string>
-  <string name="permission_success_content">1. عندما تغادر المنزل، ابق هاتفك بحوزتك وتأكد من أن تطبيق COVIDSafe يعمل. \n\n2. يجب إبقاء Bluetooth® مشغلًا. \n\n3. يجب تعطيل وضع توفير الطاقة.\n\n 4. لا يرسل تطبيق COVIDSafe طلبات الاقتران. *اعرف المزيد*.\n \n 5. * إذن بتشغيل الموقع الجغرافي في أنظمة Android * مطلوب لاستخدام Bluetooth®. لا يقوم تطبيق COVIDSafe بتخزين بيانات الموقع الجغرافي أو استخدمها. </string>
+  <string name="permission_success_content">1. عندما تغادر المنزل، ابق هاتفك بحوزتك وتأكد من أن تطبيق COVIDSafe يعمل. \n\n2. يجب إبقاء Bluetooth® مشغلًا. \n\n3. يجب تعطيل وضع توفير الطاقة.\n\n 4. لا يرسل تطبيق COVIDSafe طلبات الاقتران. *اعرف المزيد*.\n \n 5. يتطلب Google *تشغيل الموقع الجغرافي لتتمكن تطبيقات أجهزة Android* من استخدام Bluetooth. لا يقوم تطبيق COVIDSafe بتخزين بيانات الموقع الجغرافي أو استخدامها.</string>
   <!-- OnBoarding Permission Success -->
   <string name="permission_success_headline">لقد قمت بالتسجيل بنجاح</string>
   <string name="permission_success_warning">استمر في تشغيل دفع الإشعارات اللحظية لتطبيق COVIDSafe حتى نتمكن من إخطارك بسرعة إذا كان التطبيق لا يعمل بشكل صحيح.</string>
@@ -403,10 +412,11 @@
   <string name="pin_number">رقم التعريف الشخصي pin</string>
   <string name="PINNumber_VO_Label">رقم التعريف الشخصي PIN</string>
   <string name="PN_MobileNumber_VOLabel">رقم الهاتف المحمول</string>
-  <string name="queensland">كوينزلاند</string>
+  <string name="queensland">ولاية كوينزلاند</string>
   <string name="ReceivePinIssue">مشكلات في تلقي رقم التعريف الشخصي الخاص بك؟</string>
   <string name="recovered">مجموع الحالات التي تعافت</string>
-  <string name="registration_consent_content">أوافق على أن تكون وكالة التحول الرقمي مسؤولة عن تخزين البيانات، بموجب قرار قانوني صادر عن أمين عام وزارة الصحة في الحكومة الأسترالية لجمع:</string>
+  <string name="registration_consent_content">أوافق على أن تقوم وكالة التحول الرقمي، كونها مسؤولة عن تخزين البيانات، بموجب قرار قانوني صادر عن أمين عام وزارة الصحة في الحكومة الأسترالية بجمع:</string>
+  <string name="registration_consent_diagnostic">معلومات للتأكد من أن تطبيق COVIDSafe يعمل بشكل صحيح على جهازي.</string>
   <string name="registration_consent_first_paragraph">معلومات التسجيل الخاصة بي.</string>
   <!-- Onboarding Registration Consent -->
   <string name="registration_consent_headline">الموافقة على التسجيل</string>
@@ -423,11 +433,12 @@
   <string name="service_ok_title">\u200F COVIDSafe يعمل</string>
   <string name="settings">الإعدادات</string>
   <string name="share_this_app_content">إنضم لي لنعمل على وقف انتشار COVID-19! قم بتنزيل COVIDSafe، وهو تطبيق من الحكومة الأسترالية. # COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
-  <string name="south_australia">جنوب أستراليا</string>
+  <string name="show">اظهار</string>
+  <string name="south_australia">ولاية جنوب أستراليا</string>
   <string name="stepCounter" formatted="false">الخطوة %d من %d</string>
   <string name="support">الدعم</string>
   <string name="support_content">للحصول على مساعدة بشأن المشكلات التي لا تغطيها مواضيع المساعدة</string>
-  <string name="tasmania">تسمانيا</string>
+  <string name="tasmania">ولاية تسمانيا</string>
   <string name="title_help">مساعدة</string>
   <string name="total_confirmed_cases">مجموع الحالات المؤكدة</string>
   <string name="total_per_state">مجموع الحالات المؤكدة في كل ولاية وإقليم</string>
@@ -442,9 +453,10 @@
   <!-- Figma page Android Screens (05/06) -->
   <string name="under_sixteen_consent_call_for_action">اختر \"أوافق\" لتأكيد الموافقة.</string>
   <string name="update_available_dismiss_btn">ذكّرني لاحقًا</string>
-  <string name="update_available_message_android">لقد أجرينا تحسينات على تطبيق COVIDSafe. \nقم بتحديث التطبيق عبر متجر Google Play .</string>
+  <string name="update_available_message_android">لقد أجرينا تحسينات على تطبيق COVIDSafe. \nقم بتحديث التطبيق عبر متجر التطبيقات Google Play Store .</string>
   <string name="update_available_play_store_btn">انتقل إلى متجر Google Play</string>
   <string name="update_available_title">التحديث متوفر!</string>
+  <string name="update_screen_location">يتطلب Google *تشغيل الموقع الجغرافي لتتمكن تطبيقات أجهزة Android* من استخدام Bluetooth®. لا يقوم تطبيق COVIDSafe بتخزين بيانات الموقع الجغرافي أو استخدامها.</string>
   <string name="upload_answer_no">لا</string>
   <!-- Upload flow -->
   <string name="upload_answer_yes">نعم</string>
@@ -463,7 +475,8 @@
   <string name="upload_step_verify_pin_header_content_description">العنوان، قم بتحميل معلوماتك</string>
   <string name="upload_step_verify_pin_sub_header">سيرسل أحد موظفي دائرة الصحة في الولاية أو الإقليم رقم التعريف الشخصي (PIN) إلى جهازك عبر رسالة نصية. أدخله أدناه لتحميل معلوماتك.</string>
   <string name="us_consent_button">أوافق</string>
-  <string name="victoria">فيكتوريا</string>
+  <string name="us_registration_consent_diagnostic">معلومات للتأكد من أن تطبيق COVIDSafe يعمل بشكل صحيح على جهازي.</string>
-  <string name="western_australia">غرب أستراليا</string>
+  <string name="victoria">ولاية فيكتوريا</string>
+  <string name="western_australia">ولاية أستراليا الغربية</string>
   <string name="wrong_ping_number">تم إدخال رقم تعريف شخصي خاطئ</string>
 </resources>

app/src/main/res/values-el-rGR/strings.xml

@@ -20,6 +20,7 @@
   <string name="change_language">Αλλάξτε γλώσσα</string>
   <string name="change_language_content">Διαβάστε τον οδηγό για τη χρήση του COVIDSafe σε διαφορετική γλώσσα.</string>
   <string name="CodeHasExpired">Ο κωδικός σας έχει λήξει.</string>
+  <string name="collection_message">Η COVIDSafe συλλέγει τώρα διαγνωστικές πληροφορίες για να σας βοηθήσει να αντιμετωπίσετε προβλήματα με την εφαρμογή σας. *Μάθετε περισσότερα*</string>
   <string name="consent_button">Συμφωνώ</string>
   <!-- Shared Consent Actions -->
   <string name="consent_call_for_action">Επιλέξτε «Συμφωνώ» για επιβεβαίωση της συγκατάθεσης.</string>
@@ -236,7 +237,6 @@
   <string name="country_region_name_zm">Ζάμπια</string>
   <string name="country_region_name_zw">Ζιμπάμπουε</string>
   <string name="data_privacy_button">Επόμενο</string>
-  <string name="data_privacy_content">Συνίσταται να διαβάσετε την *πολιτική απορρήτου* της COVIDSafe πριν εγγραφείτε στην COVIDSafe. \n\nΕάν είστε κάτω των 16 ετών, ο γονέας/κηδεμόνας σας πρέπει επίσης να διαβάσει την *πολιτική απορρήτου*. \n\nΗ χρήση της COVIDSafe είναι εντελώς εθελοντική. Μπορείτε να εγκαταστήσετε ή να διαγράψετε την εφαρμογή ανά πάσα στιγμή. Εάν διαγράψετε την COVIDSafe, *μπορείτε επίσης να ζητήσετε τη διαγραφή των στοιχείων σας* από τον ασφαλή διακομιστή. \n\nΓια να εγγραφείτε στην COVIDSafe, θα πρέπει να εισάγετε όνομα (ή ψευδώνυμο), αριθμό κινητού τηλεφώνου, ηλικιακή ομάδα και ταχυδρομικό κώδικα. \n\nΟι πληροφορίες που εισάγετε κατά την εγγραφή σας και οι πληροφορίες από τη χρήση σας της COVIDSafe θα συλλέγονται και θα αποθηκεύονται σε έναν εξαιρετικά ασφαλή διακομιστή. \n\nΗ COVIDSafe δε θα συλλέξει τις πληροφορίες τοποθεσίας σας. \n\nΗ COVIDSafe θα καταγράφει την ώρα της επικοινωνίας και έναν ανώνυμο κωδικό ταυτότητας άλλων χρηστών COVIDSafe με τους οποίους έρχεστε σε επαφή. \n\nΆλλοι χρήστες της COVIDSafe με τους οποίους έρχεστε σε επαφή θα σημειώσουν έναν ανώνυμο κωδικό ταυτότητας και την ώρα επαφής μαζί σας στη συσκευή τους. \n\nΕάν ένας άλλος χρήστης διαγνωστεί θετικά με COVID-19, μπορεί να αναρτήσει τα στοιχεία επικοινωνίας του και ο υπάλληλος υγείας της Πολιτείας ή της Επικράτειάς σας μπορεί να επικοινωνήσει μαζί σας για λόγους ανίχνευσης επαφών. \n\nΤα στοιχεία εγγραφής σας θα χρησιμοποιηθούν ή θα αποκαλυφθούν μόνο για τον εντοπισμό επαφών και για την ορθή και νόμιμη λειτουργία της COVIDSafe. \n\nΠερισσότερες πληροφορίες διατίθενται στον ιστότοπο *Υπουργείο Υγείας της Αυστραλιανής Κυβέρνησης*. \n\nΔιαβάστε την *πολιτική απορρήτου* της COVIDSafe για περισσότερες λεπτομέρειες για τα δικαιώματά σας σχετικά με τις πληροφορίες σας και τον τρόπο χειρισμού και κοινοποίησής τους.</string>
   <string name="data_privacy_content_android">Συνίσταται να διαβάσετε την *πολιτική απορρήτου* της COVIDSafe πριν εγγραφείτε στην COVIDSafe. \n\nΕάν είστε κάτω των 16 ετών, ο γονέας/κηδεμόνας σας πρέπει επίσης να διαβάσει την *πολιτική απορρήτου*. \n\nΗ χρήση της COVIDSafe είναι εντελώς εθελοντική. Μπορείτε να εγκαταστήσετε ή να διαγράψετε την εφαρμογή ανά πάσα στιγμή. Εάν διαγράψετε την COVIDSafe, *μπορείτε επίσης να ζητήσετε τη διαγραφή των στοιχείων σας* από τον ασφαλή διακομιστή. \n\nΓια να εγγραφείτε στην COVIDSafe, θα πρέπει να εισάγετε όνομα (ή ψευδώνυμο), αριθμό κινητού τηλεφώνου, ηλικιακή ομάδα και ταχυδρομικό κώδικα. \n\nΟι πληροφορίες που εισάγετε κατά την εγγραφή σας και οι πληροφορίες από τη χρήση σας της COVIDSafe θα συλλέγονται και θα αποθηκεύονται σε έναν εξαιρετικά ασφαλή διακομιστή. \n\nΗ COVIDSafe δε θα συλλέξει τις πληροφορίες τοποθεσίας σας. \n\nΗ COVIDSafe θα καταγράφει την ώρα της επικοινωνίας και έναν ανώνυμο κωδικό ταυτότητας άλλων χρηστών COVIDSafe με τους οποίους έρχεστε σε επαφή. \n\nΆλλοι χρήστες της COVIDSafe με τους οποίους έρχεστε σε επαφή θα σημειώσουν έναν ανώνυμο κωδικό ταυτότητας και την ώρα επαφής μαζί σας στη συσκευή τους. \n\nΕάν ένας άλλος χρήστης διαγνωστεί θετικά με COVID-19, μπορεί να αναρτήσει τα στοιχεία επικοινωνίας του και ο υπάλληλος υγείας της Πολιτείας ή της Επικράτειάς σας μπορεί να επικοινωνήσει μαζί σας για λόγους ανίχνευσης επαφών. \n\nΤα στοιχεία εγγραφής σας θα χρησιμοποιηθούν ή θα αποκαλυφθούν μόνο για τον εντοπισμό επαφών και για την ορθή και νόμιμη λειτουργία της COVIDSafe. \n\nΠερισσότερες πληροφορίες διατίθενται στον ιστότοπο *Υπουργείο Υγείας της Αυστραλιανής Κυβέρνησης*. \n\nΔιαβάστε την *πολιτική απορρήτου* της COVIDSafe για περισσότερες λεπτομέρειες για τα δικαιώματά σας σχετικά με τις πληροφορίες σας και τον τρόπο χειρισμού και κοινοποίησής τους.</string>
   <!-- OnBoarding Data Privacy -->
   <string name="data_privacy_headline">Εγγραφή και προστασία του απορρήτου</string>
@@ -247,6 +247,7 @@
   <string name="dialog_error_uploading_positive">Προσπαθήστε ξανά</string>
   <string name="dialog_uploading_message">Τα στοιχεία σας αναρτίζονται στην COVIDSafe αυτή τη στιγμή. \n\nΜην κλείσετε την εφαρμογή.</string>
   <string name="disabled">Απενεργοποιημένη</string>
+  <string name="dismiss">Απόρριψη</string>
   <string name="done_success">Ολοκλήρωση</string>
   <string name="enabled">Ενεργοποιημένη</string>
   <string name="enter_number_button">Αποκτήστε PIN</string>
@@ -267,6 +268,7 @@
   <string name="generic_error">Προσπαθήστε ξανά αργότερα.</string>
   <string name="generic_internet_error">Ελέγξτε τη σύνδεσή σας στο διαδίκτυο</string>
   <string name="heading">Επικεφαλίδα</string>
+  <string name="hide">Απόκρυψη</string>
   <string name="home_app_permission_push_notification_prompt">Επιτρέψτε στην COVIDSafe να προωθεί αυτόματες ειδοποιήσεις.</string>
   <string name="home_app_permission_status_subtitle">Η COVIDSafe δε θα λειτουργήσει χωρίς τις σωστές ρυθμίσεις.</string>
   <string name="home_app_permission_status_title">Ελέγξτε τις ρυθμίσεις σας</string>
@@ -311,7 +313,7 @@
   <string name="home_set_complete_external_link_self_isolation_register_url">https://covid-form.service.gov.au</string>
   <string name="home_set_complete_external_link_share_content">Ζητήστε τη βοήθεια και άλλων. Μαζί, είμαστε πιο δυνατοί.</string>
   <string name="home_set_complete_external_link_share_title">Μοιραστείτε την COVIDSafe</string>
-  <string name="home_set_location_why">Οι εφαρμογές Android χρειάζονται ενεργοποιημένα δικαιώματα τοποθεσίας για πρόσβαση στο Bluetooth®. Το COVIDSafe δεν αποθηκεύει ούτε χρησιμοποιεί δεδομένα τοποθεσίας.</string>
+  <string name="home_set_location_why">Η Google απαιτεί *Άδεια τοποθεσίας για εφαρμογές Android* για πρόσβαση στο Bluetooth®. Το COVIDSafe δεν αποθηκεύει ή χρησιμοποιεί δεδομένα τοποθεσίας.</string>
   <string name="home_setup_help">Βοήθεια</string>
   <string name="home_setup_incomplete_subtitle">Η COVIDSafe χρειάζεται άδεια για πρόσβαση σε αυτές τις δυνατότητες.</string>
   <string name="home_setup_incomplete_title">Ελέγξτε\nτην άδεια</string>
@@ -322,6 +324,7 @@
   <!-- OnBoarding How it works -->
   <string name="how_it_works_headline">Πώς λειτουργεί η COVIDSafe</string>
   <string name="how_it_works_headline_content_description">Επικεφαλίδα, Πώς λειτουργεί η COVIDSafe</string>
+  <string name="improve">Βελτιώστε την απόδοση της εφαρμογής</string>
   <string name="improve_heading">Βελτιώστε την απόδοση της COVIDSafe</string>
   <string name="internet_connection_content">Συνδεθείτε στο Διαδίκτυο για να βεβαιωθείτε ότι λαμβάνετε ειδοποιήσεις για ζητήματα και ανανεώσεις.</string>
   <string name="internet_connection_heading">Δεν υπάρχει σύνδεση στο διαδίκτυο</string>
@@ -342,6 +345,9 @@
   <string name="invalid_phone_number_digits_error_prompt" formatted="false">Οι αριθμοί κινητών στο %1s περιέχουν %2s ψηφία.</string>
   <string name="invalid_post_code">Μη έγκυρος ταχυδρομικός κώδικας</string>
   <string name="IssueFooter">Μπορεί να επικοινωνήσουμε μαζί σας για περισσότερες λεπτομέρειες σχετικά με τα σχόλια σας. Η διεύθυνση email σας δε θα χρησιμοποιηθεί για κανέναν άλλο σκοπό.</string>
+  <string name="jwt_description">Υπάρχει ένα πρόβλημα με τα στοιχεία εγγραφής σας.</string>
+  <string name="jwt_heading">Παρακαλούμε εγγραφείτε ξανά</string>
+  <string name="loading_numbers">Φόρτωση τελευταίων αριθμών</string>
   <!-- Splash Screen -->
   <string name="migration_in_progress">Η ενημέρωση της COVIDSafe συνεχίζεται. \n\nΒεβαιωθείτε ότι το τηλέφωνό σας δεν είναι απενεργοποιημένο έως ότου ολοκληρωθεί η ενημέρωση.</string>
   <string name="national_numbers">Στατιστικές για όλη την Αυστραλία</string>
@@ -359,6 +365,7 @@
   <string name="notification_bluetooth">Ενεργοποιήστε το Bluetooth για να λειτουργεί η COVIDSafe.</string>
   <string name="notification_bt_and_battery">Ενεργοποιήστε το Bluetooth και απενεργοποιήστε τη βελτιστοποίηση της μπαταρίας για να λειτουργήσει η COVIDSafe.</string>
   <string name="notification_internet_content">Ανοίξτε την εφαρμογή και ελέγξτε τη σύνδεσή σας στο internet για να λειτουργήσει η COVIDSafe.</string>
+  <string name="notification_location">Επιτρέψτε τα δικαιώματα τοποθεσίας για να λειτουργεί το Bluetooth.</string>
   <string name="notification_not_active_body">Βεβαιωθείτε ότι η COVIDSafe είναι ενεργή πριν βγείτε από το σπίτι και όταν βρίσκεστε σε δημόσιους χώρους.</string>
   <string name="notification_not_active_title">Η COVIDSafe δεν είναι ενεργή</string>
   <string name="notification_settings">Ανοίξτε την εφαρμογή για να ελέγξετε τις ρυθμίσεις σας.</string>
@@ -370,14 +377,17 @@
   <string name="NotificationsDisabledBlurb">Δε θα λάβετε ειδοποίηση εάν η COVIDSafe δεν είναι ενεργή. \n Αλλαγή στις ρυθμίσεις ειδοποιήσεων</string>
   <!-- Figma page iOS Screens (05/06) -->
   <string name="NotificationsEnabledBlurb">Θα λάβετε ειδοποίηση εάν η COVIDSafe δεν είναι ενεργή. \n Αλλάξετε τις ρυθμίσεις ειδοποιήσεων</string>
+  <string name="numbers_error">Δεν είναι δυνατός ο έλεγχος για ενημερωμένους αριθμούς.</string>
+  <string name="numbers_no_internet">Συνδεθείτε στο Διαδίκτυο για να βεβαιωθείτε ότι λαμβάνετε ενημερωμένους αριθμούς.</string>
+  <string name="numbers_refresh">Ανανεώστε τώρα</string>
   <string name="options_for_australia">Επιλογές για την Αυστραλία</string>
   <string name="permission_button">Προχωρήστε</string>
-  <string name="permission_content">Η COVIDSafe χρειάζεται Bluetooth® και ενεργοποιημένες ειδοποιήσεις για να λειτουργήσει.\n\nΕπιλέξτε «Προχωρώ» για να:\n\n1. Ενεργοποιήσετε το Bluetooth®\n\n2. Επιτραπεί η άδεια Τοποθεσίας\n\n3. Απενεργοποιηθεί η Βελτιστοποίηση Μπαταρίας\n\n\nΤο Android χρειάζεται άδεια Τοποθεσίας για να λειτουργήσει το Bluetooth®\n\nΗ COVIDSafe δε στέλνει αιτήματα σύζευξης.</string>
+  <string name="permission_content">Η COVIDSafe χρειάζεται Bluetooth® και ενεργοποιημένες ειδοποιήσεις για να λειτουργήσει.\n\nΕπιλέξτε «Προχωρώ» για να:\n\n1. Ενεργοποιήσετε το Bluetooth®\n\n2. Επιτραπεί η άδεια Τοποθεσίας\n\n3. Απενεργοποιηθεί η Βελτιστοποίηση Μπαταρίας\n\nΗ Google απαιτεί *Άδεια τοποθεσίας για εφαρμογές Android*  για πρόσβαση στο Bluetooth®. Το COVIDSafe δεν αποθηκεύει ούτε χρησιμοποιεί δεδομένα τοποθεσίας.\n\nΗ COVIDSafe δε στέλνει αιτήματα σύζευξης.</string>
   <!-- OnBoarding Permission -->
   <string name="permission_headline">Ρυθμίσεις εφαρμογής</string>
   <string name="permission_location_rationale">Το Android απαιτεί πρόσβαση τοποθεσίας για την ενεργοποίηση των λειτουργιών Bluetooth® για την COVIDSafe. Η COVIDSafe δεν μπορεί να λειτουργήσει σωστά χωρίς αυτό</string>
   <string name="permission_success_button">Ολοκληρώθηκε</string>
-  <string name="permission_success_content">1. Όταν φεύγετε από το σπίτι, κρατήστε το τηλέφωνό σας μαζί σας και βεβαιωθείτε ότι η COVIDSafe είναι ενεργή. \n\n2. Το Bluetooth® πρέπει να παραμείνει ενεργοποιημένο. \n\n3. Η βελτιστοποίηση της μπαταρίας πρέπει να είναι απενεργοποιημένη. \n\n4. Η COVIDSafe δεν αποστέλλει αιτήματα σύζευξης. *Μάθετε περισσότερα*.</string>
+  <string name="permission_success_content">1. Όταν φεύγετε από το σπίτι, κρατήστε το τηλέφωνό σας μαζί σας και βεβαιωθείτε ότι το COVIDSafe είναι ενεργό.\n\n2. Το Bluetooth® θα πρέπει να διατηρείται σε λειτουργία.\n\n3. Η βελτιστοποίηση της μπαταρίας θα πρέπει να είναι απενεργοποιημένη.\n\n4. Η COVIDSafe δεν αποστέλλει αιτήματα ζεύξης. *Μάθετε περισσότερα*.\n\n5. Η Google απαιτεί *Άδεια τοποθεσίας για εφαρμογές Android* για πρόσβαση στο Bluetooth. Το COVIDSafe δεν αποθηκεύει ή χρησιμοποιεί δεδομένα τοποθεσίας.</string>
   <!-- OnBoarding Permission Success -->
   <string name="permission_success_headline">Έχετε εγγραφεί επιτυχώς</string>
   <string name="permission_success_warning">Να έχετε τις αυτόματες γνωστοποιήσεις ανοιχτές για την COVIDSafe, ώστε να μπορούμε να σας ειδοποιήσουμε γρήγορα εάν η εφαρμογή δε λειτουργεί σωστά.</string>
@@ -406,6 +416,7 @@
   <string name="ReceivePinIssue">Προβλήματα με τη λήψη του PIN σας;</string>
   <string name="recovered">Σύνολο ασθενών που ανάρρωσαν</string>
   <string name="registration_consent_content">Συναινώ στον Οργανισμό Ψηφιακού Μετασχηματισμού ως διαχειριστή της αποθήκευσης δεδομένων, σύμφωνα με τη νομική απόφαση του Γενικού Γραμματέα Υγείας της Αυστραλίας που συλλέγει:</string>
+  <string name="registration_consent_diagnostic">Πληροφορίες για να διασφαλιστεί ότι η COVIDSafe λειτουργεί σωστά στη συσκευή μου.</string>
   <string name="registration_consent_first_paragraph">Τα στοιχεία εγγραφής μου.</string>
   <!-- Onboarding Registration Consent -->
   <string name="registration_consent_headline">Συναίνεση εγγραφής</string>
@@ -420,7 +431,9 @@
   <string name="service_not_ok_title">Η COVIDSafe δεν είναι ενεργή</string>
   <string name="service_ok_body">Να έχετε η COVIDSafe ενεργή όταν βγαίνετε από το σπίτι ή βρίσκεστε σε δημόσιους χώρους.</string>
   <string name="service_ok_title">Η COVIDSafe είναι ενεργή</string>
+  <string name="settings">Ρυθμίσεις</string>
   <string name="share_this_app_content">Ελάτε μαζί μου να σταματήσουμε την εξάπλωση του COVID-19! Κατεβάστε την COVIDSafe, μια εφαρμογή της Αυστραλιανής Κυβέρνησης. # COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
+  <string name="show">Εμφάνιση</string>
   <string name="south_australia">Νότια Αυστραλία</string>
   <string name="stepCounter" formatted="false">Βήμα %d του %d</string>
   <string name="support">Υποστήριξη</string>
@@ -443,6 +456,7 @@
   <string name="update_available_message_android">Έχουμε κάνει βελτιώσεις στην COVIDSafe. Ανανεώστε την έκδοσή σας μέσῳ του Google Play Store.</string>
   <string name="update_available_play_store_btn">Μεταβείτε στο Google Play Store</string>
   <string name="update_available_title">Η ενημερωμένη έκδοση είναι διαθέσιμη!</string>
+  <string name="update_screen_location">Η Google απαιτεί *Άδεια τοποθεσίας για εφαρμογές Android* για πρόσβαση στο Bluetooth®. Το COVIDSafe δεν αποθηκεύει ή χρησιμοποιεί δεδομένα τοποθεσίας.</string>
   <string name="upload_answer_no">Όχι</string>
   <!-- Upload flow -->
   <string name="upload_answer_yes">Ναι</string>
@@ -461,6 +475,7 @@
   <string name="upload_step_verify_pin_header_content_description">Επικεφαλίδα, Αναρτήστε τα στοιχεία σας</string>
   <string name="upload_step_verify_pin_sub_header">Ένας υπάλληλος υγείας της Πολιτείας ή της Επικράτειάς σας θα στείλει ένα PIN στη συσκευή σας μέσω μηνύματος. Εισάγετέ το παρακάτω για να αναρτήσετε τα στοιχεία σας.</string>
   <string name="us_consent_button">Συμφωνώ</string>
+  <string name="us_registration_consent_diagnostic">Πληροφορίες για να διασφαλιστεί ότι η COVIDSafe λειτουργεί σωστά στη συσκευή μου.</string>
   <string name="victoria">Βικτώρια</string>
   <string name="western_australia">Δυτική Αυστραλία</string>
   <string name="wrong_ping_number">Εισήχθη λάθος PIN</string>

app/src/main/res/values-it-rIT/strings.xml

@@ -3,23 +3,24 @@
   <string name="action_continue">Continua</string>
   <string name="action_report_an_issue">Segnala un problema</string>
   <string name="action_upload_done">Eseguito</string>
-  <string name="action_verify_invalid_pin">PIN non valido, chiedi al funzionario sanitario di inviarti un altro PIN.</string>
+  <string name="action_verify_invalid_pin">PIN non valido, chiedi al funzionario sanitario d\'inviarti un altro PIN.</string>
   <string name="action_verify_upload_pin">Carica i miei dati</string>
   <string name="activity_self_isolation_button">Continua</string>
-  <string name="australian_capital_territory">Territorio della Capitale Australiana</string>
+  <string name="australian_capital_territory">Australian Capital Territory</string>
-  <string name="battery_optimisation_prompt">È necessario disabilitare l\'ottimizzazione della batteria.</string>
+  <string name="battery_optimisation_prompt">Disabilita l\'ottimizzazione della batteria.</string>
   <string name="change_device_name_content_line_1">Il nome attuale del tuo dispositivo è %s.</string>
-  <string name="change_device_name_content_line_2">Altri dispositivi Bluetooth® intorno a te saranno in grado di vedere il nome del tuo dispositivo. Ti consigliamo di utilizzare un nome di dispositivo che non include i tuoi dati personali e che sia di uso comune, come ad esempio il nome del modello del tuo dispositivo.</string>
+  <string name="change_device_name_content_line_2">Gli altri dispositivi Bluetooth® intorno a voi sono in grado di vedere il nome del vostro dispositivo. Vi consigliamo di utilizzare un nome di dispositivo che non includa i vostri dati personali e che sia di uso comune, come ad esempio il nome del modello del vostro cellulare.</string>
   <string name="change_device_name_default_device_name">%s</string>
   <!-- Onboarding Change Device Name -->
   <string name="change_device_name_headline">Il nome del tuo dispositivo</string>
-  <string name="change_device_name_headline_content_description">Titolo, Il nome del tuo dispositivo</string>
+  <string name="change_device_name_headline_content_description">Titolo, nome del dispositivo</string>
   <string name="change_device_name_new_device_name">Modifica il nome del dispositivo</string>
   <string name="change_device_name_primary_action">Continua</string>
-  <string name="change_device_name_secondary_action">Salta e continua così com\'è</string>
+  <string name="change_device_name_secondary_action">Salta e continua così </string>
   <string name="change_language">Cambia lingua</string>
-  <string name="change_language_content">Leggi la guida sull\'uso del COVIDSafe in un\'altra lingua.</string>
+  <string name="change_language_content">Leggi la guida sull\'uso di COVIDSafe in un\'altra lingua.</string>
-  <string name="CodeHasExpired">Il tuo codice è scaduto</string>
+  <string name="CodeHasExpired">Il codice PIN è scaduto</string>
+  <string name="collection_message">COVIDSafe raccoglie ora informazioni diagnostiche per aiutarti a risolvere i problemi con l\'App. *Per saperne di più*</string>
   <string name="consent_button">Sono d\'accordo</string>
   <!-- Shared Consent Actions -->
   <string name="consent_call_for_action">Seleziona \"Sono d\'accordo\" per confermare il consenso.</string>
@@ -236,25 +237,25 @@
   <string name="country_region_name_zm">Zambia</string>
   <string name="country_region_name_zw">Zimbabwe</string>
   <string name="data_privacy_button">Avanti</string>
-  <string name="data_privacy_content">È importante leggere *l\'informativa sulla privacy* del COVIDSafe prima di eseguire la registrazione per il COVIDSafe. \n\nSe hai meno di 16 anni, anche il tuo genitore / tutore dovrà leggere *l\'informativa sulla privacy*. \n\nL\'uso del COVIDSafe è completamente volontario. È possibile installare o eliminare l\'applicazione in qualsiasi momento. Se elimini il COVIDSafe, *puoi anche chiedere che i tuoi dati vengano eliminati* dal server sicuro. \n\nPer registrarti al COVIDSafe, dovrai inserire un nome (o pseudonimo), un numero di cellulare, una fascia di età e un codice postale. \n\nI dati trasmessi al momento della registrazione e i dati sul tuo utilizzo del COVIDSafe verranno raccolti e archiviati su un server altamente sicuro. \n\nIl COVIDSafe non raccoglierà dati sulla tua posizione. \n\nIl COVIDSafe annoterà l\'ora del contatto e un codice ID anonimo degli altri utenti COVIDSafe con cui tu entri in contatto, l\'intensità del segnale Bluetooth® e il modello di cellulare degli altri utenti, sul tuo dispositivo. \n\nAnche gli altri utenti COVIDSafe con cui entri in contatto noteranno il tuo codice ID anonimo, la data e l\'ora del contatto con te, l\'intensità del segnale Bluetooth® e il modello del tuo cellulare, sul loro dispositivo. \n\nSe un altro utente risulta positivo al COVID-19, può caricare i propri dati di contatto e un funzionario sanitario statale o del territorio può contattarti a scopi di ricerca dei contatti. \n\nI tuoi dettagli di registrazione verranno utilizzati o divulgati esclusivamente per l\'esecuzione di traccia dei contatti e per il corretto e legittimo funzionamento del COVIDSafe. \n\nMaggiori informazioni sono disponibili sul sito web del *Dipartimento della sanità del governo australiano*. \n\nVedi *l\'informativa sulla privacy* del COVIDSafe per ulteriori dettagli sui tuoi diritti ai tuoi dati e su come verranno gestiti e condivisi.</string>
   <string name="data_privacy_content_android">È importante leggere *l\'informativa sulla privacy* del COVIDSafe prima di eseguire la registrazione per il COVIDSafe. \n\nSe hai meno di 16 anni, anche il tuo genitore / tutore dovrà leggere *l\'informativa sulla privacy*. \n\nL\'uso del COVIDSafe è completamente volontario. È possibile installare o eliminare l\'applicazione in qualsiasi momento. Se elimini il COVIDSafe, *puoi anche chiedere che i tuoi dati vengano eliminati* dal server sicuro. \n\nPer registrarti al COVIDSafe, dovrai inserire un nome (o pseudonimo), un numero di cellulare, una fascia di età e un codice postale. \n\nI dati trasmessi al momento della registrazione e i dati sul tuo utilizzo del COVIDSafe verranno raccolti e archiviati su un server altamente sicuro. \n\nIl COVIDSafe non raccoglierà dati sulla tua posizione. \n\nIl COVIDSafe annoterà l\'ora del contatto e un codice ID anonimo degli altri utenti COVIDSafe con cui tu entri in contatto, l\'intensità del segnale Bluetooth® e il modello di cellulare degli altri utenti, sul tuo dispositivo. \n\nAnche gli altri utenti COVIDSafe con cui entri in contatto noteranno il tuo codice ID anonimo, la data e l\'ora del contatto con te, l\'intensità del segnale Bluetooth® e il modello del tuo cellulare, sul loro dispositivo. \n\nSe un altro utente risulta positivo al COVID-19, può caricare i propri dati di contatto e un funzionario sanitario statale o del territorio può contattarti a scopi di ricerca dei contatti. \n\nI tuoi dettagli di registrazione verranno utilizzati o divulgati esclusivamente per l\'esecuzione di traccia dei contatti e per il corretto e legittimo funzionamento del COVIDSafe. \n\nMaggiori informazioni sono disponibili sul sito web del *Dipartimento della sanità del governo australiano*. \n\nVedi *l\'informativa sulla privacy* del COVIDSafe per ulteriori dettagli sui tuoi diritti ai tuoi dati e su come verranno gestiti e condivisi.</string>
   <!-- OnBoarding Data Privacy -->
   <string name="data_privacy_headline">Registrazione e privacy</string>
   <string name="data_privacy_headline_content_description">Titolo, Registrazione e privacy</string>
-  <string name="deaths">Deceduti</string>
+  <string name="deaths">Decessi</string>
   <string name="dialog_error_uploading_message">Si è verificato un errore durante il caricamento delle informazioni. Riprova.</string>
   <string name="dialog_error_uploading_negative">Annulla</string>
   <string name="dialog_error_uploading_positive">Riprova</string>
-  <string name="dialog_uploading_message">I tuoi dati COVIDSafe sono attualmente in fase di caricamento. \n\nSi prega di non chiudere l\'app.</string>
+  <string name="dialog_uploading_message">I dati di COVIDSafe sono attualmente in fase di caricamento. \n\nNon chiudere l\'app.</string>
   <string name="disabled">Disabilitato</string>
+  <string name="dismiss">Ignora</string>
   <string name="done_success">Fatto</string>
   <string name="enabled">Abilitato</string>
-  <string name="enter_number_button">Ottenere il PIN</string>
+  <string name="enter_number_button">Ottieni il PIN</string>
-  <string name="enter_number_content">Ti invieremo un PIN di 6 cifre per verificare il tuo numero di cellulare.</string>
+  <string name="enter_number_content">Invieremo un PIN di 6 cifre per verificare il numero di cellulare.</string>
   <string name="enter_number_for_example">Per esempio:</string>
-  <string name="enter_number_headline">Inserisci il tuo numero di cellulare</string>
+  <string name="enter_number_headline">Inserisci il numero di cellulare</string>
   <string name="enter_number_prefix">+61</string>
-  <string name="enter_number_relative">Cerchi di registrare per conto di un amico o un parente? \n\nDovranno registrarsi utilizzando il proprio dispositivo e numero di cellulare in modo che il COVIDSafe possa funzionare per loro.</string>
+  <string name="enter_number_relative">State effettuando la registrazione per conto di un amico o un parente? \n\nDevono registrarsi utilizzando il proprio dispositivo e numero di cellulare in modo che COVIDSafe possa funzionare per loro.</string>
   <string name="enter_pin_button">Verifica</string>
   <!-- OnBoarding Enter PIN -->
   <string name="enter_pin_headline" formatted="false">Inserisci il PIN inviato a %s %s</string>
@@ -262,128 +263,137 @@
   <string name="enter_pin_timer_expire">Il tuo codice PIN scadrà tra</string>
   <string name="enter_pin_wrong_number">Questo numero di cellulare è sbagliato?</string>
   <!-- Figma page Android Screens (05/06) -->
-  <string name="Enter_your_mobile_number_label">Inserisci il tuo numero di cellulare</string>
+  <string name="Enter_your_mobile_number_label">Inserisci il numero di cellulare</string>
   <!-- for production -->
-  <string name="generic_error">Si prega di riprovare più tardi</string>
+  <string name="generic_error">Riprova più tardi</string>
-  <string name="generic_internet_error">Si prega di controllare la connessione internet</string>
+  <string name="generic_internet_error">Controlla la connessione internet</string>
   <string name="heading">Titolo</string>
-  <string name="home_app_permission_push_notification_prompt">Consentire al COVIDSafe di inviare notifiche.</string>
+  <string name="hide">Nascondi</string>
-  <string name="home_app_permission_status_subtitle">Il COVIDSafe non funzionerà senza le impostazioni corrette. </string>
+  <string name="home_app_permission_push_notification_prompt">Autorizza COVIDSafe ad inviare notifiche.</string>
-  <string name="home_app_permission_status_title">Controlla le tue impostazioni</string>
+  <string name="home_app_permission_status_subtitle">COVIDSafe non funziona senza le impostazioni corrette. </string>
+  <string name="home_app_permission_status_title">Controlla le impostazioni</string>
   <string name="home_been_tested_title">Un funzionario sanitario ti ha chiesto di caricare i tuoi dati?</string>
   <string name="home_bluetooth_permission">Bluetooth®: %s</string>
   <string name="home_data_has_been_uploaded">I tuoi dati sono stati caricati</string>
   <string name="home_data_has_been_uploaded_message">Stai aiutando a fermare la diffusione del COVID-19 caricando i tuoi dati ogni giorno mentre sei in autoisolamento.</string>
-  <string name="home_data_uploaded">Registrati per autoisolamento</string>
+  <string name="home_data_uploaded">Registrati per l\'autoisolamento</string>
   <string name="home_data_uploaded_button">Registrati</string>
-  <string name="home_data_uploaded_message">Aiuta a fermare la diffusione del COVID-19 e tenere traccia dei tuoi sintomi.</string>
+  <string name="home_data_uploaded_message">Aiuta a fermare la diffusione di COVID-19 e a monitorare i sintomi.</string>
-  <string name="home_header_active_no_action_required">Non è richiesta alcuna ulteriore azione.</string>
+  <string name="home_header_active_no_action_required">Non sono necessarie ulteriori azioni.</string>
   <!-- Home -->
-  <string name="home_header_active_title">Il COVIDSafe è attivo</string>
+  <string name="home_header_active_title">COVIDSafe è attiva</string>
   <!-- Home -->
-  <string name="home_header_active_title_thanks">Grazie, il COVIDSafe ora è attivo.</string>
+  <string name="home_header_active_title_thanks">Grazie, COVIDSafe è ora attiva.</string>
-  <string name="home_header_inactive_check_your_permissions">Controlla le tue impostazioni</string>
+  <string name="home_header_inactive_check_your_permissions">Controlla le impostazioni</string>
-  <string name="home_header_inactive_title">Il COVIDSafe non è attivo</string>
+  <string name="home_header_inactive_title">COVIDSafe non è attiva</string>
-  <string name="home_header_no_pairing">Il COVIDSafe non invia *richieste di accoppiamento*.</string>
+  <string name="home_header_no_pairing">COVIDSafe non invia *richieste di accoppiamento*.</string>
-  <string name="home_header_uploaded_on_date">I tuoi dati sono stati caricati su %s.</string>
+  <string name="home_header_uploaded_on_date">I tuoi dati sono stati caricati su %@</string>
   <string name="home_location_permission">Posizione: %s</string>
   <string name="home_non_battery_optimization_permission">Ottimizzazione della batteria: %s</string>
   <string name="home_permission_off">Off</string>
   <string name="home_permission_on">On</string>
   <string name="home_push_notification_permission">Notifica push: %s</string>
-  <string name="home_set_complete_disclaimer_title">Fermiamo la diffusione del COVID-19.</string>
+  <string name="home_set_complete_disclaimer_title">Fermiamo la diffusione di COVID-19.</string>
   <string name="home_set_complete_external_link_app_content">Scarica l\'app governativa per le ultime notizie e consigli.</string>
   <string name="home_set_complete_external_link_app_title">Scarica l\'app Coronavirus</string>
   <string name="home_set_complete_external_link_app_url">https://www.health.gov.au/resources/apps-and-tools/coronavirus-australia-app</string>
-  <string name="home_set_complete_external_link_been_contacted_content">Puoi caricare i tuoi dati solo se sei risultato positivo.</string>
+  <string name="home_set_complete_external_link_been_contacted_content">Puoi caricare i tuoi dati solo se risulti positivo.</string>
   <string name="home_set_complete_external_link_been_contacted_title">Un funzionario sanitario ti ha contattato?</string>
-  <string name="home_set_complete_external_link_help_topics_content">Guida su come individuare e risolvere problemi tecnici</string>
+  <string name="home_set_complete_external_link_help_topics_content">Guida all\'individuazione e risoluzione di problemi tecnici</string>
   <string name="home_set_complete_external_link_help_topics_title">Argomenti della Guida</string>
   <string name="home_set_complete_external_link_news_content">Vai su aus.gov.au per le ultime notizie sul Coronavirus.</string>
   <string name="home_set_complete_external_link_news_title">Ultime notizie e aggiornamenti</string>
   <string name="home_set_complete_external_link_news_url">https://www.australia.gov.au</string>
   <!-- Figma page iOS Screens (05/06) -->
-  <string name="home_set_complete_external_link_notifications_content_iOS_off">Non riceverai alcuna notifica se il COVIDSafe non è attivo.</string>
+  <string name="home_set_complete_external_link_notifications_content_iOS_off">Non riceverai alcuna notifica se COVIDSafe non è attiva.</string>
   <!-- Figma page iOS Screens (05/06) -->
   <string name="home_set_complete_external_link_notifications_title_iOS">Le notifiche sono abilitate</string>
   <!-- Figma page iOS Screens (05/06) -->
   <string name="home_set_complete_external_link_notifications_title_iOS_off">Le notifiche sono disabilitate</string>
   <string name="home_set_complete_external_link_self_isolation_register_url">https://covid-form.service.gov.au</string>
-  <string name="home_set_complete_external_link_share_content">Invita altri ad aiutare. Insieme, siamo più forti.</string>
+  <string name="home_set_complete_external_link_share_content">Invita altri ad collaborare. Insieme, siamo più forti.</string>
-  <string name="home_set_complete_external_link_share_title">Condividi il COVIDSafe</string>
+  <string name="home_set_complete_external_link_share_title">Condividi COVIDSafe</string>
-  <string name="home_set_location_why">Le applicazioni Android necessitano che le autorizzazioni di posizione siano attivate per accedere al Bluetooth®. COVIDSafe non memorizza né utilizza i dati di posizione.</string>
+  <string name="home_set_location_why">Google richiede *l\'Autorizzazione alla posizione per le app Android * per accedere al Bluetooth®. COVIDSafe non memorizza né utilizza i dati sulla posizione.</string>
   <string name="home_setup_help">Guida</string>
-  <string name="home_setup_incomplete_subtitle">Il COVIDSafe necessita di un\'autorizzazione per accedere a queste funzioni.</string>
+  <string name="home_setup_incomplete_subtitle">COVIDSafe ha bisogno di un permesso per accedere a queste funzioni.</string>
   <string name="home_setup_incomplete_title">Verifica le autorizzazioni</string>
   <string name="home_version_number">Numero di versione: %s</string>
   <string name="how_it_works_button">Avanti</string>
-  <string name="how_it_works_consent">Il tuo consenso sarà sempre richiesto del caso di richiesta di tracciabilità sanitaria.</string>
+  <string name="how_it_works_consent">Il vostro consenso sarà sempre richiesto se è richiesta la tracciabilità sanitaria.</string>
-  <string name="how_it_works_content">I segnali Bluetooth® vengono utilizzati per determinare quando sei vicino a un altro utente COVIDSafe.\n\nOgni istanza di stretto contatto tra te e gli altri utenti COVIDSafe viene notata per creare informazioni sui contatti ravvicinati. Queste informazioni sono crittografate e memorizzate solo nel tuo cellulare.\n\nQualora risulti positivo al COVID-19 come utente COVIDSafe, sarai contattato da un funzionario sanitario statale o del territorio. Loro ti aiuteranno con il caricamento volontario dei tuoi dati di stretto contatto su un sistema altamente sicuro di archiviazione delle informazioni.\n\nI funzionari sanitari statali o del territorio possono anche contattarti se sei entrato in stretto contatto con un altro utente COVIDSafe che è risultato positivo.\n\nPer ulteriori informazioni, consultare la pagina *Argomenti della Guida*.</string>
+  <string name="how_it_works_content">I segnali Bluetooth vengono utilizzati per determinare la vicinanza ad altri utenti di COVIDSafe. \nOgni istanza di stretto contatto tra voi e gli altri utenti di COVIDSafe viene annotata per creare informazioni sui contatti. Queste informazioni sono crittografate e memorizzate solo sul vostro cellulare. \nSe risultate positivi al COVID-19, come utenti di COVIDSafe sarete contattati da un funzionario sanitario statale o del territorio per assistervi con il caricamento volontario delle vostre informazioni di stretto contatto in un sistema di archiviazione delle informazioni altamente sicuro. \nI funzionari sanitari statali o territoriali possono anche contattarvi se siete entrati in stretto contatto con un altro utente di COVIDSafe risultato positivo. \nPer ulteriori informazioni, consultare la pagina Argomenti della Guida.</string>
   <!-- OnBoarding How it works -->
   <string name="how_it_works_headline">Come funziona il COVIDSafe</string>
   <string name="how_it_works_headline_content_description">Titolo, Come funziona il COVIDSafe</string>
-  <string name="improve_heading">Migliora le prestazioni del COVIDSafe</string>
+  <string name="improve">Migliora le prestazioni dell\'app</string>
-  <string name="internet_connection_content">Connettiti a Internet per assicurarti di ricevere notifiche su problemi e aggiornamenti.</string>
+  <string name="improve_heading">Migliora le prestazioni di COVIDSafe</string>
-  <string name="internet_connection_heading">Si prega di controllare la connessione internet</string>
+  <string name="internet_connection_content">Connettersi a Internet per ricevere notifiche su problemi e aggiornamenti.</string>
-  <string name="internet_screen_content">Il COVIDSafe deve connettersi al server di volta in volta per garantire di poter identificare eventuali problemi dell\'app. \n\n La connessione a Internet ti garantisce di ricevere notifiche su:</string>
+  <string name="internet_connection_heading">Nessuna connessione internet</string>
-  <string name="internet_screen_content_1">come risolvere problemi e riattivare il COVIDSafe di nuovo</string>
+  <string name="internet_screen_content">COVIDSafe deve connettersi al server periodicamente per identificare eventuali problemi dell\'app. \n\n La connessione Internet permette di ricevere notifiche su:</string>
+  <string name="internet_screen_content_1">come risolvere problemi e riattivare nuovamente COVIDSafe </string>
   <string name="internet_screen_content_2">quando sarà disponibile un nuovo aggiornamento della versione</string>
-  <string name="internet_screen_heading">Connettiti a Internet per migliorare le prestazioni del COVIDSafe</string>
+  <string name="internet_screen_heading">Connettersi a Internet per migliorare le prestazioni di COVIDSafe</string>
   <string name="intro_button">Voglio aiutare</string>
-  <string name="intro_content">Il COVIDSafe è stato sviluppato dal Governo australiano per aiutare a proteggere la comunità dalla diffusione del coronavirus. \n\nIl COVIDSafe noterà in modo sicuro i contatti che hai con altri utenti dell\'app. Ciò consentirà ai funzionari sanitari statali e del territorio di contattarti, se sei stato in stretto contatto con qualcuno che è risultato positivo al virus. \n\nInsieme possiamo aiutare a fermare la diffusione e rimanere sani.</string>
+  <string name="intro_content">COVIDSafe è stata sviluppata dal Governo australiano per aiutare a proteggere la comunità dalla diffusione del coronavirus. \n\nCOVIDSafe rileva in modo sicuro i contatti che avete con altri utenti dell\'app e consente ai funzionari sanitari statali e del territorio di contattarvi, se siete stati in stretto contatto con qualcuno risultato positivo al virus. \n\nInsieme possiamo aiutare a fermare la diffusione e rimanere sani.</string>
   <!-- OnBoarding Intro -->
   <string name="intro_headline">Insieme possiamo fermare la diffusione del COVID-19</string>
   <string name="intro_headline_content_description">Titolo, Insieme possiamo fermare la diffusione del COVID-19</string>
-  <string name="invalid_age">L\'età non può essere vuota</string>
+  <string name="invalid_age">L\'età deve essere inserita</string>
   <string name="invalid_australian_phone_number_error_prompt">I numeri di cellulare australiani contengono un massimo di 10 cifre.</string>
   <string name="invalid_name">Nome non valido</string>
   <string name="invalid_norfolk_island_phone_number_error_prompt">I numeri di cellulare nell\'Isola di Norfolk contengono da 5 a 6 cifre.</string>
   <string name="invalid_phone_number">Numero di cellulare non valido.</string>
   <string name="invalid_phone_number_digits_error_prompt" formatted="false">I numeri di cellulare in %1s contengono %2s cifre.</string>
   <string name="invalid_post_code">Codice postale non valido</string>
-  <string name="IssueFooter">Potremmo contattarti per ulteriori dettagli sul tuo feedback. Il tuo indirizzo email non verrà utilizzato per nessun altro scopo.</string>
+  <string name="IssueFooter">Potremmo contattarvi per ulteriori dettagli sul vostro feedback. Il vostro indirizzo email non verrà utilizzato per nessun altro scopo.</string>
+  <string name="jwt_description">C\'è un problema con i dati di registrazione.</string>
+  <string name="jwt_heading">Si prega di registrarsi di nuovo</string>
+  <string name="loading_numbers">Caricamento degli ultimi numeri</string>
   <!-- Splash Screen -->
   <string name="migration_in_progress">Aggiornamento COVIDSafe in corso. \n\nAssicurarsi che il cellulare non sia spento fino al completamento dell\'aggiornamento.</string>
   <string name="national_numbers">Numeri nazionali</string>
   <string name="navigation_back_button_content_description">Pagina precedente</string>
-  <string name="need_location_service">Per far sì che il COVIDSafe App funzioni occorre attivare la Posizione nelle Impostazioni.</string>
+  <string name="need_location_service">Per il funzionamento di COVIDSafe, attivare la Posizione nelle Impostazioni.</string>
-  <string name="new_cases">Nuovi casi negli ultimi 24 ore</string>
+  <string name="new_cases">Nuovi casi nelle ultime 24 ore</string>
   <string name="new_south_wales">New South Wales</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="norfolk_hint">Per esempio: 51234</string>
-  <string name="northern_territory">Territorio del Nord</string>
+  <string name="northern_territory">Northern Territory</string>
-  <string name="notification_active_body">Mantieni il COVIDSafe attivo quando esci di casa o sei in luoghi pubblici.</string>
+  <string name="notification_active_body">Mantieni il COVIDSafe attiva quando esci di casa o sei in luoghi pubblici.</string>
   <!-- Notifications -->
-  <string name="notification_active_title">Il COVIDSafe è attivo</string>
+  <string name="notification_active_title">COVIDSafe è attiva</string>
-  <string name="notification_battery">Disattivare l\'ottimizzazione della batteria per far funzionare il COVIDSafe.</string>
+  <string name="notification_battery">Disattiva l\'ottimizzazione della batteria per far funzionare COVIDSafe.</string>
-  <string name="notification_bluetooth">Attivare il Bluetooth per far funzionare il COVIDSafe.</string>
+  <string name="notification_bluetooth">Attiva il Bluetooth per far funzionare COVIDSafe.</string>
-  <string name="notification_bt_and_battery">Attivare il Bluetooth e disattivare l\'ottimizzazione della batteria per far funzionare il COVIDSafe.</string>
+  <string name="notification_bt_and_battery">Attiva il Bluetooth e disattiva l\'ottimizzazione della batteria per far funzionare COVIDSafe.</string>
-  <string name="notification_internet_content">Aprire l\'app e controllare la connessione Internet per far funzionare il COVIDSafe.</string>
+  <string name="notification_internet_content">Apri l\'app e controlla la connessione Internet.</string>
-  <string name="notification_not_active_body">Assicurati che il COVIDSafe sia attivo prima di uscire di casa o quando sei in luoghi pubblici.</string>
+  <string name="notification_location">Consenti le autorizzazioni di localizzazione per il funzionamento del Bluetooth.</string>
-  <string name="notification_not_active_title">Il COVIDSafe non è attivo</string>
+  <string name="notification_not_active_body">Assicurati che COVIDSafe sia attiva prima di uscire di casa o quando sei in luoghi pubblici.</string>
+  <string name="notification_not_active_title">COVIDSafe non è attiva</string>
   <string name="notification_settings">Apri l\'app per controllare le impostazioni.</string>
-  <string name="notification_update_content">Aggiorna la tua app per accedere agli ultimi miglioramenti.</string>
+  <string name="notification_update_content">Aggiorna l\'app per accedere agli ultimi miglioramenti.</string>
   <string name="notification_update_heading">Aggiornamento COVIDSafe disponibile</string>
   <!-- Figma page iOS Screens (05/06) -->
-  <string name="NotificationsBlurbLink">Modifica le impostazioni delle notifiche</string>
+  <string name="NotificationsBlurbLink">Modifica le impostazioni di notifica</string>
   <!-- Figma page iOS Screens (05/06) -->
-  <string name="NotificationsDisabledBlurb">Non riceverai una notifica se il COVIDSafe non è attivo. \nModifica le impostazioni delle notifiche</string>
+  <string name="NotificationsDisabledBlurb">Non riceverai una notifica se COVIDSafe non è attiva. \nModifica le impostazioni di notifica</string>
   <!-- Figma page iOS Screens (05/06) -->
-  <string name="NotificationsEnabledBlurb">Riceverai una notifica se il COVIDSafe non è attivo. \nModifica le impostazioni delle notifiche</string>
+  <string name="NotificationsEnabledBlurb">Riceverai una notifica se il COVIDSafe non è attivo. \nModifica le impostazioni di notifica</string>
+  <string name="numbers_error">Impossibile controllare i numeri aggiornati.</string>
+  <string name="numbers_no_internet">Connettiti a Internet per ricevere notifiche sui numeri aggiornati.</string>
+  <string name="numbers_refresh">Aggiorna ora</string>
   <string name="options_for_australia">Opzioni per l\'Australia</string>
-  <string name="permission_button">Proceda</string>
+  <string name="permission_button">Procedi</string>
-  <string name="permission_content">Il COVIDSafe necessita del Bluetooth® e delle notifiche abilitate per funzionare. \n\n Seleziona \'Proceda\' per: \n\n 1. Abilitare il Bluetooth® \n\n 2. Consentire le autorizzazioni di posizione \n\n 3. Disabilitare l\'ottimizzazione della batteria \n\n\nIl sistema Android ha bisogno delle autorizzazioni della Posizione per il funzionamento del Bluetooth®. \n\nIl COVIDSafe non invia richieste di accoppiamento.</string>
+  <string name="permission_content">Il funzionamento di COVIDSafe richiede l\'abilitazione di Bluetooth® e delle notifiche. \n\n Seleziona \'Procedi\': \n\n 1. Abilita il Bluetooth® \n\n 2. Consenti le autorizzazioni di posizione \n\n 3. Disabilita l\'ottimizzazione della batteria \n\n\nGoogle richiede *Autorizzazione alla posizione per le app Android * per accedere al Bluetooth®. COVIDSafe non memorizza né utilizza i dati sulla posizione. \n\nCOVIDSafe non invia richieste di accoppiamento.</string>
   <!-- OnBoarding Permission -->
   <string name="permission_headline">Impostazioni dell\'app</string>
-  <string name="permission_location_rationale">Il sistema Android richiede l\'accesso alla posizione per abilitare le funzioni Bluetooth® per il COVIDSafe. Il COVIDSafe non può funzionare correttamente senza.</string>
+  <string name="permission_location_rationale">Il sistema Android richiede l\'accesso alla posizione per abilitare le funzioni Bluetooth® per COVIDSafe. COVIDSafe non può funzionare correttamente senza.</string>
   <string name="permission_success_button">Eseguito</string>
-  <string name="permission_success_content">1. Quando esci di casa, porti il cellulare con te e assicurati che il COVIDSafe sia attivo. \n\n2. Bluetooth® dovrà rimanere ON. \n\n3. L\'ottimizzazione della batteria dovrebbe essere OFF. \n\n4. Il COVIDSafe non invia richieste di accoppiamento. *Per saperne di più*.\n\n5. *Permesso di posizione per Android* è richiesto per accedere al Bluetooth®. COVIDSafe non memorizza né utilizza i dati relativi alla posizione.</string>
+  <string name="permission_success_content">1. Quando esci di casa, porta il cellulare con te e assicurati che COVIDSafe sia attiva. \n\n2. Bluetooth® deve rimanere ON. \n\n3. L\'ottimizzazione della batteria deve essere OFF. \n\n4. COVIDSafe non invia richieste di accoppiamento. *Per saperne di più*.\n\n5. Google richiede *l\'Autorizzazione alla posizione per le app Android * per accedere al Bluetooth®. COVIDSafe non memorizza né utilizza i dati sulla posizione.</string>
   <!-- OnBoarding Permission Success -->
   <string name="permission_success_headline">Ti sei registrato con successo</string>
-  <string name="permission_success_warning">Tieni attive le notifiche push per il COVIDSafe in modo che possiamo informarti rapidamente se l\'app non funziona correttamente.</string>
+  <string name="permission_success_warning">Mantieni attive le notifiche push di COVIDSafe in modo da essere tempestivamente avvisato se l\'app non funziona correttamente.</string>
   <string name="personal_details_age_content_description">Seleziona la fascia d\'età</string>
   <string name="personal_details_age_dialog_title">Seleziona la tua età</string>
-  <string name="personal_details_age_error_prompt">Seleziona la tua fascia d\'età.</string>
+  <string name="personal_details_age_error_prompt">Seleziona la fascia d\'età.</string>
   <string name="personal_details_age_title">Fascia d\'età (seleziona)</string>
   <string name="personal_details_button">Continua</string>
   <string name="personal_details_dialog_ok">Selezionare</string>
@@ -392,37 +402,39 @@
   <string name="personal_details_headline_content_description">Titolo, Inserisci i tuoi dati</string>
   <string name="personal_details_name_characters_prompt">Si prega di utilizzare caratteri inglesi per il nome completo. Non utilizzare altre lingue o simboli come \',\' o \'?\'.</string>
   <string name="personal_details_name_content_description">Inserisci il nome completo</string>
-  <string name="personal_details_name_error_prompt">Inserisci il tuo nome e cognome.</string>
+  <string name="personal_details_name_error_prompt">Inserisci nome e cognome.</string>
   <string name="personal_details_name_title">Nome e cognome (o pseudonimo)</string>
   <string name="personal_details_post_code">CAP in Australia</string>
   <string name="personal_details_post_code_content_description">Inserire il codice postale</string>
   <string name="personal_details_post_code_dialog_title">Codice postale</string>
-  <string name="personal_details_post_code_error_prompt">Il tuo codice postale australiano deve contenere 4 cifre.</string>
+  <string name="personal_details_post_code_error_prompt">Il codice postale australiano deve contenere 4 cifre.</string>
   <string name="personal_details_post_code_hint">ad es. 2000</string>
   <string name="pin_number">codice PIN</string>
   <string name="PINNumber_VO_Label">Codice PIN</string>
   <string name="PN_MobileNumber_VOLabel">Numero di cellulare</string>
   <string name="queensland">Queensland</string>
-  <string name="ReceivePinIssue">Problemi a ricevere il PIN?</string>
+  <string name="ReceivePinIssue">Problemi nel ricevere il PIN?</string>
-  <string name="recovered">Totale casi guariti</string>
+  <string name="recovered">Totale guarigioni</string>
-  <string name="registration_consent_content">Acconsento alla raccolta da parte dell\'Agenzia di trasformazione digitale come amministratrice dell\'archivio dati, in base alla decisione legale presa dal Segretario del Dipartimento della sanità del governo australiano per:</string>
+  <string name="registration_consent_content">Acconsento alla raccolta di dati da parte della Digital Transformation Agency nel ruolo di amministratrice dell\'archivio dati, in base alle disposizioni legali stabilite dal segretario del Dipartimento della sanità del governo australiano per:</string>
+  <string name="registration_consent_diagnostic">Informazioni per garantire il corretto funzionamento di COVIDSafe sul mio dispositivo.</string>
   <string name="registration_consent_first_paragraph">I miei dati di registrazione.</string>
   <!-- Onboarding Registration Consent -->
   <string name="registration_consent_headline">Consenso alla registrazione</string>
-  <string name="registration_consent_second_paragraph">I dati sui miei contatti con altri utenti COVIDSafe, se un altro utente con il quale io sono entrato in contatto risultasse positivo al COVID-19 e carica i propri dati di contatti.</string>
+  <string name="registration_consent_second_paragraph">Informazioni sul contatto con altri utenti di COVIDSafe, se un utente con cui sono entrato in contatto risulta positivo al COVID-19 e carica i suoi dati.</string>
-  <string name="search">Ricerca</string>
+  <string name="search">Cerca</string>
   <!-- OnBoarding Enter Number -->
   <string name="select_country_or_region">Seleziona il paese o la regione</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="Select_country_or_region_headline">Seleziona il paese o la regione</string>
   <string name="service_not_ok_action">Controlla l\'app ora</string>
   <string name="service_not_ok_body">Assicurati che il COVIDSafe sia attivo prima di uscire di casa o quando sei in luoghi pubblici.</string>
-  <string name="service_not_ok_title">Il COVIDSafe non è attivo</string>
+  <string name="service_not_ok_title">COVIDSafe non è attiva</string>
-  <string name="service_ok_body">Mantieni il COVIDSafe attivo quando esci di casa o sei in luoghi pubblici.</string>
+  <string name="service_ok_body">Mantieni attivo COVIDSafe quando esci di casa o sei in luoghi pubblici.</string>
-  <string name="service_ok_title">Il COVIDSafe è attivo</string>
+  <string name="service_ok_title">COVIDSafe è attivo</string>
   <string name="settings">Impostazioni</string>
-  <string name="share_this_app_content">Unisciti a me per fermare la diffusione del COVID-19! Scarica il COVIDSafe, un\'app del Governo australiano. #COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
+  <string name="share_this_app_content">Unisciti a noi per fermare la diffusione del COVID-19! Scarica il COVIDSafe, un\'app del Governo australiano. #COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
-  <string name="south_australia">Sud Australia</string>
+  <string name="show">Visualizza</string>
+  <string name="south_australia">South Australia</string>
   <string name="stepCounter" formatted="false">Passo %d di %d</string>
   <string name="support">Supporto</string>
   <string name="support_content">Per assistenza su questioni non trattate dagli argomenti della Guida</string>
@@ -430,20 +442,21 @@
   <string name="title_help">Guida</string>
   <string name="total_confirmed_cases">Totale casi confermati</string>
   <string name="total_per_state">Totale casi confermati per stato e territorio</string>
-  <string name="under_sixteen_content">Confermo il consenso da parte del mio genitore o tutore perché l\'Agenzia di trasformazione digitale come amministratrice dell\'archivio dati, in base alla decisione legale presa dal Segretario del Dipartimento della sanità del governo australiano possa raccogliere:</string>
+  <string name="under_sixteen_content">Confermo il consenso dei miei genitori o del mio tutore a Digital Transformation Agency nel suo ruolo di amministratore della banca dati, in base alle disposizioni legali stabilite dal segretario del Dipartimento della sanità del governo australiano:</string>
   <string name="under_sixteen_first_paragraph">I miei dati di registrazione.</string>
   <!-- OnBoarding Under Sixteen -->
   <string name="under_sixteen_headline">È necessario il consenso di un genitore o di un tutore per procedere</string>
-  <string name="under_sixteen_headline_content_description">Titolo, Hai bisogno del consenso del genitore/tutore per procedere</string>
+  <string name="under_sixteen_headline_content_description">Titolo, Hai bisogno del consenso dei genitori/tutore per procedere</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="under_sixteen_registration_consent_first_paragraph">I miei dati di registrazione.</string>
-  <string name="under_sixteen_second_paragraph">I dati sui miei contatti con altri utenti COVIDSafe, se un altro utente con il quale io sono entrato in contatto risultasse positivo al COVID-19 e carica i propri dati di contatti.</string>
+  <string name="under_sixteen_second_paragraph">Informazioni sul contatto tra me e altri utenti di COVIDSafe, se un altro utente con cui sono entrato in contatto risulta positivo al COVID-19 e carica i suoi dati.</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="under_sixteen_consent_call_for_action">Seleziona \"Sono d\'accordo\" per confermare il consenso.</string>
   <string name="update_available_dismiss_btn">Ricordamelo più tardi</string>
-  <string name="update_available_message_android">Abbiamo apportato dei miglioramenti al COVIDSafe.  Aggiornamento tramite il Google Play Store.</string>
+  <string name="update_available_message_android">Abbiamo apportato miglioramenti a COVIDSafe. \nAggiorna tramite Google Play Store.</string>
-  <string name="update_available_play_store_btn">Vai su Google Play Store</string>
+  <string name="update_available_play_store_btn">Vai al Google Play Store</string>
   <string name="update_available_title">Aggiornamento disponibile!</string>
+  <string name="update_screen_location">Google richiede *l\'Autorizzazione alla posizione per le app Android * per accedere al Bluetooth®. COVIDSafe non memorizza né utilizza i dati sulla posizione.</string>
   <string name="upload_answer_no">No</string>
   <!-- Upload flow -->
   <string name="upload_answer_yes">Sì</string>
@@ -451,18 +464,19 @@
   <string name="upload_failed">Caricamento non riuscito</string>
   <string name="upload_finished_header">Grazie per aver aiutato a fermare la diffusione del COVID-19!</string>
   <string name="upload_finished_header_content_description">Titolo, Grazie per aver aiutato a fermare la diffusione del COVID-19!</string>
-  <string name="upload_finished_sub_header">Hai caricato con successo i tuoi dati sul sistema altamente sicuro di archiviazione COVIDSafe. \n\nI funzionari sanitari statali o del territorio informeranno gli altri utenti COVIDSafe che hanno registrato casi di stretto contatto con te. La tua identità rimarrà anonima per gli altri utenti.</string>
+  <string name="upload_finished_sub_header">I  vostri dati sono stati caricati sul sistema altamente sicuro di archiviazione di COVIDSafe. \n\nI funzionari sanitari statali o del territorio informeranno gli altri utenti COVIDSafe che hanno registrato casi di stretto contatto con voi. La vostra identità rimarrà anonima per gli altri utenti.</string>
-  <string name="upload_step_1_body">Un funzionario sanitario statale o del territorio ti contatterà per aiutarti con il caricamento volontario dei tuoi dati solo nel caso tu risulti positivo al COVID-19.\n\nDopo aver premuto \'Sì\', dovrai fornire il consenso per caricare i tuoi dati.</string>
+  <string name="upload_step_1_body">Un funzionario sanitario statale o del territorio vi contatterà per aiutarvi con il caricamento volontario dei vostri dati solo se siete risultati positivi al COVID-19.\n\nDopo aver premuto \'Sì\', bisogna fornire il proprio consenso per caricare i  dati.</string>
-  <string name="upload_step_1_header">Un funzionario sanitario ti sta chiedendo di caricare i tuoi dati?</string>
+  <string name="upload_step_1_header">Hai ricevuto richiesta di caricamento dati da un ufficiale sanitario?</string>
-  <string name="upload_step_1_header_content_description">Titolo, Un funzionario sanitario ti sta chiedendo di caricare i tuoi dati?</string>
+  <string name="upload_step_1_header_content_description">Titolo, Hai ricevuto richiesta di caricamento dati da un ufficiale sanitario?</string>
   <string name="upload_step_4_header">Consenso al caricamento</string>
   <string name="upload_step_4_header_content_description">Titolo, Consenso al caricamento</string>
-  <string name="upload_step_4_sub_header">Senza il tuo consenso, i tuoi dati di stretto contatto non verranno caricati.\n\nSe dai il tuo consenso, i tuoi dati di stretto contatto verranno caricati e condivisi con funzionari sanitari statali o del territorio a scopo di tracciamento di contatti.\n\nI funzionari sanitari statali e del territorio solo potranno accedere alle informazioni sui tuoi contatti stretti.\n\nLeggi *l\'informativa sulla privacy* del COVIDSafe per ulteriori informazioni.</string>
+  <string name="upload_step_4_sub_header">I dati di stretto contatto non vengono caricati senza il vostro consenso.\n\nUna volta dato il consenso, i vostri dati di stretto contatto vengono caricati e condivisi con funzionari sanitari statali o del territorio a scopo di tracciamento di contatti.\n\nI funzionari sanitari statali e del territorio potranno accedere solo alle informazioni sui contatti stretti.\n\nLeggere *l\'informativa sulla privacy* del COVIDSafe per ulteriori informazioni.</string>
   <string name="upload_step_verify_pin_header">Carica i tuoi dati</string>
   <string name="upload_step_verify_pin_header_content_description">Titolo, Carica i tuoi dati</string>
   <string name="upload_step_verify_pin_sub_header">Un funzionario sanitario statale o del territorio invierà un PIN al tuo dispositivo tramite messaggio di testo. Inseriscilo qui sotto per caricare i tuoi dati.</string>
   <string name="us_consent_button">Sono d\'accordo</string>
+  <string name="us_registration_consent_diagnostic">Informazioni per garantire il corretto funzionamento di COVIDSafe sul mio dispositivo.</string>
   <string name="victoria">Victoria</string>
   <string name="western_australia">Western Australia</string>
-  <string name="wrong_ping_number">PIN errato inserito</string>
+  <string name="wrong_ping_number">PIN errato </string>
 </resources>

app/src/main/res/values-ko/strings.xml

@@ -20,6 +20,7 @@
   <string name="change_language">언어를 변경하십시오</string>
   <string name="change_language_content">다른 언어로 COVIDSafe 사용에 대한 안내서를 읽으십시오.</string>
   <string name="CodeHasExpired">코드가 만료되었습니다.</string>
+  <string name="collection_message">이제 COVIDSafe는 앱 문제를 해결하는 데 도움이 되는 진단 정보를 수집합니다. *더 알아보기*</string>
   <string name="consent_button">동의</string>
   <!-- Shared Consent Actions -->
   <string name="consent_call_for_action">동의 확인을 위해 \'동의\'를 선택하세요. </string>
@@ -236,7 +237,6 @@
   <string name="country_region_name_zm">잠비아</string>
   <string name="country_region_name_zw">짐바브웨</string>
   <string name="data_privacy_button">다음</string>
-  <string name="data_privacy_content">COVIDSafe에 등록하기 전에 COVIDSafe *개인 정보 보호 정책*을 읽는 것이 중요합니다. \n\n16세 미만이라면, 그 부모 또는 보호자도 반드시 *개인 정보 보호 정책*을 읽어야 합니다. \n\nCOVIDSafe의 사용은 전적으로 자발적입니다. 언제든지 앱을 설치 또는 삭제할 수 있습니다. COVIDSafe를 삭제하면, *여러분은 보안 서버에 있는 자신의 정보 삭제*도 요청할 수 있습니다. \n\nCOVIDSafe에 등록하려면, 성명 (또는 가명), 휴대폰 번호, 연령대 및 우편 번호를 입력해야 합니다. \n\n등록 시 제출한 정보 및 여러분의 COVIDSafe 사용 정보는 보안성 높은 서버에 수집 및 저장됩니다. \n\nCOVIDSafe는 여러분의 위치 정보를 수집하지 않습니다. \n\nCOVIDSafe는 접촉 시각 및 여러분과 접촉한 다른 COVIDSafe 사용자의 익명 ID 코드, 블루투스® 신호 강도 및 다른 사용자의 전화기 모델 등을 여러분 장치에 기록합니다. \n\n여러분과 접촉한 다른 COVIDSafe 사용자의 장치에도 여러분의 익명 ID 코드 및 접촉일과 시각, 블루투스® 신호 강도 및 다른 사용자의 전화기 모델 등이 여러분 장치에 기록됩니다.  \n\n다른 사용자가 COVID-19 양성 결과를 받으면, 그들은 자신의 접촉 정보를 업로드할 수 있으며, 주 또는 테리토리 보건 담당자가 접촉 추적 목적으로 여러분에게 연락을 취할 수 있습니다. \n\n여러분의 등록 정보는 접촉 추적 및 COVIDSafe의 적절하고 합법적인 기능을 위해서만 사용 또는 공개됩니다. \n\n자세한 정보는 *호주 정부 보건부* 웹사이트에서 확인할 수 있습니다. \n\n자신의 정보에 대한 권리와 개인 정보의 취급 및 공유 방법에 대한 자세한 내용은 COVIDSafe *개인 정보 보호 정책*을 참조하십시오.</string>
   <string name="data_privacy_content_android">COVIDSafe에 등록하기 전에 COVIDSafe *개인 정보 보호 정책*을 읽는 것이 중요합니다. \n\n16세 미만이라면, 그 부모 또는 보호자도 반드시 *개인 정보 보호 정책*을 읽어야 합니다. \n\nCOVIDSafe의 사용은 전적으로 자발적입니다. 언제든지 앱을 설치 또는 삭제할 수 있습니다. COVIDSafe를 삭제하면, *여러분은 보안 서버에 있는 자신의 정보 삭제*도 요청할 수 있습니다. \n\nCOVIDSafe에 등록하려면, 성명 (또는 가명), 휴대폰 번호, 연령대 및 우편 번호를 입력해야 합니다. \n\n등록 시 제출한 정보 및 여러분의 COVIDSafe 사용 정보는 보안성 높은 서버에 수집 및 저장됩니다. \n\nCOVIDSafe는 여러분의 위치 정보를 수집하지 않습니다. \n\nCOVIDSafe는 접촉 시각 및 여러분과 접촉한 다른 COVIDSafe 사용자의 익명 ID 코드, 블루투스® 신호 강도 및 다른 사용자의 전화기 모델 등을 여러분 장치에 기록합니다. \n\n여러분과 접촉한 다른 COVIDSafe 사용자의 장치에도 여러분의 익명 ID 코드 및 접촉일과 시각, 블루투스® 신호 강도 및 다른 사용자의 전화기 모델 등이 여러분 장치에 기록됩니다.  \n\n다른 사용자가 COVID-19 양성 결과를 받으면, 그들은 자신의 접촉 정보를 업로드할 수 있으며, 주 또는 테리토리 보건 담당자가 접촉 추적 목적으로 여러분에게 연락을 취할 수 있습니다. \n\n여러분의 등록 정보는 접촉 추적 및 COVIDSafe의 적절하고 합법적인 기능을 위해서만 사용 또는 공개됩니다. \n\n자세한 정보는 *호주 정부 보건부* 웹사이트에서 확인할 수 있습니다. \n\n자신의 정보에 대한 권리와 개인 정보의 취급 및 공유 방법에 대한 자세한 내용은 COVIDSafe *개인 정보 보호 정책*을 참조하십시오.</string>
   <!-- OnBoarding Data Privacy -->
   <string name="data_privacy_headline">등록 및 개인정보 보호</string>
@@ -247,6 +247,7 @@
   <string name="dialog_error_uploading_positive">다시 시도</string>
   <string name="dialog_uploading_message">당신의 COVIDSafe 정보가 현재 업로드 중입니다. \n\n앱을 닫지 마세요.</string>
   <string name="disabled">비활성화 됨</string>
+  <string name="dismiss">무시하기</string>
   <string name="done_success">완료</string>
   <string name="enabled">활성화 됨</string>
   <string name="enter_number_button">PIN 받기</string>
@@ -267,6 +268,7 @@
   <string name="generic_error">나중에 다시 시도하세요.</string>
   <string name="generic_internet_error">인터넷 연결상태를 확인하세요.</string>
   <string name="heading">제목</string>
+  <string name="hide">숨기기</string>
   <string name="home_app_permission_push_notification_prompt">COVIDSafe가 푸시 알림을 하도록 허용해 주세요.</string>
   <string name="home_app_permission_status_subtitle">COVIDSafe는 올바른 설정없이는 작동되지 않습니다.</string>
   <string name="home_app_permission_status_title">설정을 확인하세요.</string>
@@ -311,7 +313,7 @@
   <string name="home_set_complete_external_link_self_isolation_register_url">https://covid-form.service.gov.au</string>
   <string name="home_set_complete_external_link_share_content">다른 이들에게 참여를 권유하세요. 우리는 함께할 때 더 강해집니다.</string>
   <string name="home_set_complete_external_link_share_title">COVIDSafe 공유하기</string>
-  <string name="home_set_location_why">안드로이드 앱에서 블루투스®에 접속하려면 위치 권한이 켜져 있어야합니다. COVIDSafe는 위치 데이터를 저장하거나 사용하지 않습니다.</string>
+  <string name="home_set_location_why">안드로이드 앱에서 블루투스®에 접속하려면 위치 권한이 켜져 있어야 합니다. COVIDSafe는 위치 데이터를 저장하거나 사용하지 않습니다.</string>
   <string name="home_setup_help">도움</string>
   <string name="home_setup_incomplete_subtitle">COVIDSafe가 이러한 기능에 액세스하려면 승인이 필요합니다.</string>
   <string name="home_setup_incomplete_title">승인 \n확인</string>
@@ -343,6 +345,9 @@
   <string name="invalid_phone_number_digits_error_prompt" formatted="false">%1s 휴대폰 번호에는 %2s자리가 있습니다.</string>
   <string name="invalid_post_code">잘못된 우편번호</string>
   <string name="IssueFooter">여러분의 피드백에 대한 자세한 내용에 대해 연락을 드릴 수도 있습니다. 여러분의 이메일 주소는 다른 목적으로 사용되지 않습니다.</string>
+  <string name="jwt_description">등록 세부 정보에 문제가 있습니다.</string>
+  <string name="jwt_heading">다시 등록하십시오</string>
+  <string name="loading_numbers">최신 번호 로드 중</string>
   <!-- Splash Screen -->
   <string name="migration_in_progress">COVIDSafe 업데이트 진행 중. \n\n업데이트가 완료될 때까지 휴대폰이 꺼지지 않도록 해주세요.</string>
   <string name="national_numbers">전국 수</string>
@@ -359,7 +364,8 @@
   <string name="notification_battery">COVIDSafe 작동을 위해 배터리 최적화를 비활성화해 주세요.</string>
   <string name="notification_bluetooth">COVIDSafe 작동을 위해 블루투스를 켜 주세요.</string>
   <string name="notification_bt_and_battery">COVIDSafe 작동을 위해 블루투스를 켜고 배터리 최적화를 비활성화해 주세요.</string>
-  <string name="notification_internet_content">COVIDSafe 작동을 위해 앱을 열고 인터넷 연결을 확인해 주세요.</string>
+  <string name="notification_internet_content">앱을 열고 인터넷 연결을 확인하십시오.</string>
+  <string name="notification_location">블루투스가 작동하도록 위치 권한을 허용하십시오.</string>
   <string name="notification_not_active_body">외출 시 혹은 공공 장소에 있을 때 COVIDSafe가 활성화되어 있도록 하세요.</string>
   <string name="notification_not_active_title">COVIDSafe가 활성화되어 있지 않습니다.</string>
   <string name="notification_settings">앱을 열어 여러분의 설정을 확인하십시오.</string>
@@ -371,6 +377,9 @@
   <string name="NotificationsDisabledBlurb">COVIDSafe가 비활성화되어 있으면 알림을 받을 것입니다.</string>
   <!-- Figma page iOS Screens (05/06) -->
   <string name="NotificationsEnabledBlurb">COVIDSafe가 비활성화되어 있으면 알림을 받을 것입니다.\n알림 설정 변경하기</string>
+  <string name="numbers_error">업데이트된 번호를 확인할 수 없습니다.</string>
+  <string name="numbers_no_internet">업데이트된 번호를 얻으려면 인터넷에 연결하십시오.</string>
+  <string name="numbers_refresh">지금 새로 고침</string>
   <string name="options_for_australia">호주 관련 옵션</string>
   <string name="permission_button">진행</string>
   <string name="permission_content">COVIDSafe는 블루투스® 및 알림 기능이 활성화되어야 작동됩니다. \n\n \'진행\'을 선택하여 다음을 수행하십시오: \n\n 1. 블루투스® 사용 \n\n 2. 위치 액세스 허용 \n\n 3. 배터리 최적화 비활성화 \n\n\n 안드로이드 상 블루투스®가 작동하려면 위치 액세스 권한이 필요합니다. \n\n COVIDSafe는 페어링 요청을 보내지 않습니다.</string>
@@ -378,7 +387,7 @@
   <string name="permission_headline">앱 설정</string>
   <string name="permission_location_rationale">안드로이드 상 COVIDSafe 관련 블루투스® 기능을 사용하려면 위치 액세스 권한이 필요합니다. 그 권한 없이는 COVIDSafe가 제대로 작동하지 않습니다</string>
   <string name="permission_success_button">완료</string>
-  <string name="permission_success_content">1. 외출 시, 휴대폰을 소지하고, COVIDSafe가 켜져 있도록 하십시오. \n\n2. 블루투스®가 켜져있어야 합니다. \n\n3. 배터리 최적화는 꺼져있어야 합니다.\n\n4. COVIDSafe는 페어링 요청을 보내지 않습니다. *더 자세히 알아보십시오*.\n\n5. * 안드로이드 *에 대한 위치 권한이 있어야 블루투스®에 접속할 수 있습니다. COVIDSafe는 위치 데이터를 저장하거나 사용하지 않습니다.</string>
+  <string name="permission_success_content">1. 외출 시, 휴대폰을 소지하고, COVIDSafe가 켜져 있도록 하십시오. \n\n2. 블루투스®가 켜져 있어야 합니다. \n\n3. 배터리 최적화는 꺼져 있어야 합니다.\n\n4. COVIDSafe는 페어링 요청을 보내지 않습니다. *더 자세히 알아보십시오*.\n\n5. * 안드로이드*에 대한 위치 권한이 있어야 블루투스®에 접속할 수 있습니다. COVIDSafe는 위치 데이터를 저장하거나 사용하지 않습니다.</string>
   <!-- OnBoarding Permission Success -->
   <string name="permission_success_headline">등록에 성공했습니다.</string>
   <string name="permission_success_warning">COVIDSafe에 대한 푸시 알림을 켜 놓으면 앱이 제대로 작동하지 않는 경우 신속하게 알려드릴 수 있습니다.</string>
@@ -407,6 +416,7 @@
   <string name="ReceivePinIssue">PIN을 받는 데 문제가 있습니까?</string>
   <string name="recovered">회복된 총 확진자 수</string>
   <string name="registration_consent_content">본인은 호주 정부 보건부 장관의 법적 결정에 따라, 데이터 저장소 관리자로서 Digital Transformation Agency가 다음 정보를 수집하는 것에 동의합니다:</string>
+  <string name="registration_consent_diagnostic">COVIDSafe가 내 장치에서 제대로 작동하는지 확인하기 위한 정보.</string>
   <string name="registration_consent_first_paragraph">나의 등록 정보.</string>
   <!-- Onboarding Registration Consent -->
   <string name="registration_consent_headline">등록 동의</string>
@@ -423,6 +433,7 @@
   <string name="service_ok_title">COVIDSafe가 활성화되어 있습니다.</string>
   <string name="settings">설정</string>
   <string name="share_this_app_content">COVID-19의 확산을 막아주세요! 호주 정부의 앱인 COVIDSafe를 다운로드하세요. # COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
+  <string name="show">보여주기</string>
   <string name="south_australia">남호주</string>
   <string name="stepCounter" formatted="false">%d 의 단계들 중 %d 단계</string>
   <string name="support">지원</string>
@@ -445,6 +456,7 @@
   <string name="update_available_message_android">저희는 COVIDSafe의 기능들을 향상시키고 있습니다. 구글 플레이 스토어를 통해 업데이트하십시오.</string>
   <string name="update_available_play_store_btn">구글 플레이 스토어 가기</string>
   <string name="update_available_title">업데이트 가능!</string>
+  <string name="update_screen_location">안드로이드 앱에서 블루투스®에 접속하려면 위치 권한이 켜져 있어야 합니다. COVIDSafe는 위치 데이터를 저장하거나 사용하지 않습니다.</string>
   <string name="upload_answer_no">아니요</string>
   <!-- Upload flow -->
   <string name="upload_answer_yes">예</string>
@@ -463,6 +475,7 @@
   <string name="upload_step_verify_pin_header_content_description">제목, 본인의 정보를 업로드하세요</string>
   <string name="upload_step_verify_pin_sub_header">주 또는 테리토리 보건 담당자가 당신의 장치에 문자 메시지로 PIN을 보낼 것입니다. 본인의 정보를 업로드하려면 아래에 그 번호를 입력하십시오.</string>
   <string name="us_consent_button">동의</string>
+  <string name="us_registration_consent_diagnostic">COVIDSafe가 내 장치에서 제대로 작동하는지 확인하기 위한 정보.</string>
   <string name="victoria">빅토리아</string>
   <string name="western_australia">서호주</string>
   <string name="wrong_ping_number">잘못된 PIN 입력</string>

app/src/main/res/values-pa-rIN/strings.xml

@@ -19,7 +19,8 @@
   <string name="change_device_name_secondary_action">ਛੱਡੋ ਅਤੇ ਜਿਂਵੇ ਦਾ ਤਿਵੇਂ ਰੱਖੋ</string>
   <string name="change_language">ਭਾਸ਼ਾ ਬਦਲੋ</string>
   <string name="change_language_content">COVIDSafe ਦੀ ਵਰਤੋਂ ਕਿਸੇ ਵੱਖਰੀ ਭਾਸ਼ਾ ਵਿੱਚ ਕਰਨ ਲਈ ਇਹ ਗਾਈਡ ਪੜ੍ਹੋ।</string>
-  <string name="CodeHasExpired">ਤੁਹਾਡਾ ਕੋਡ ਖਤਮ ਹੋ ਗਿਆ ਹੈ।</string>
+  <string name="CodeHasExpired">ਤੁਹਾਡਾ ਪਿੰਨ ਖਤਮ ਹੋ ਗਿਆ ਹੈ।</string>
+  <string name="collection_message">COVIDSafe ਐਪ ਦੀ ਟ੍ਰਬਲਸ਼ੂਟ ਲਈ ਤੁਹਾਡੀ ਸਹਾਇਤਾ ਵਜੋਂ  ਹੁਣ ਤੁਹਾਡੀ ਡਾਇਗਨੌਸਟਿਕ ਜਾਣਕਾਰੀ ਇਕੱਤਰ ਕਰਦਾ ਹੈ। *ਵਧੇਰੇ ਜਾਣੋ*</string>
   <string name="consent_button">ਮੈਂ ਸਹਿਮਤ ਹਾਂ</string>
   <!-- Shared Consent Actions -->
   <string name="consent_call_for_action">ਸਹਿਮਤੀ ਦੀ ਪੁਸ਼ਟੀ ਲਈ \'ਮੈਂ ਸਹਿਮਤ ਹਾਂ\' ਚੋਣ ਕਰੋ।</string>
@@ -236,7 +237,6 @@
   <string name="country_region_name_zm">ਜ਼ਾਂਬੀਆ</string>
   <string name="country_region_name_zw">ਜਿੰਮਬਾਬਵੇ</string>
   <string name="data_privacy_button">ਅੱਗੇ</string>
-  <string name="data_privacy_content">ਇਹ ਮਹੱਤਵਪੂਰਨ ਹੈ ਕਿ ਤੁਸੀਂ COVIDSafe ਪੰਜੀਕਰਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ  COVIDSafe *ਪ੍ਰਾਈਵੇਸੀ ਨੀਤੀ* ਪੜ੍ਹੋ।\n\nਜੇ ਤੁਹਾਡੀ ਉਮਰ 16 ਸਾਲ ਤੋਂ ਘੱਟ ਹੈ, ਤਾਂ ਤੁਹਾਡੇ ਮਾਪੇ/ਸਰਪ੍ਰਸਤ ਨੂੰ ਵੀ *ਪ੍ਰਾਈਵੇਸੀ ਨੀਤੀ* ਪੜ੍ਹਨੀ ਚਾਹੀਦੀ ਹੈ।\n\nCOVIDSafe ਦੀ ਵਰਤੋਂ ਪੂਰੀ ਤਰ੍ਹਾਂ ਸਵੈ-ਇੱਛਤ ਹੈ। ਤੁਸੀਂ ਕਿਸੇ ਵੀ ਸਮੇਂ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਇੰਸਟਾਲ ਜਾਂ ਡਿਲੀਟ ਕਰ ਸਕਦੇ ਹੋ। ਜੇ ਤੁਸੀਂ COVIDSafe ਨੂੰ ਡਿਲੀਟ ਕਰ ਦਿੰਦੇ ਹੋ,  ਤਾਂ ਸੁਰੱਖਿਅਤ ਸਰਵਰ ਤੋਂ *ਤੁਸੀਂ ਆਪਣੀ ਜਾਣਕਾਰੀ ਨੂੰ ਮਿਟਾਉਣ ਲਈ ਵੀ ਕਹਿ ਸਕਦੇ ਹੋ*।\n\nCOVIDSafe ਪੰਜੀਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਅਪਣਾ ਨਾਮ (ਜਾਂ ਨਕਲੀ ਨਾਮ), ਮੋਬਾਈਲ ਨੰਬਰ, ਉਮਰ ਸੀਮਾ ਅਤੇ ਪੋਸਟਕੋਡ ਭਰਨਾ ਪਵੇਗਾ।\n\nਜਦ ਤੁਸੀਂ ਰਜਿਸਟਰ ਕਰਦੇ ਹੋ ਤਾਂ COVIDSafe ਦੀ ਤੁਹਾਡੀ ਵਰਤੋਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਨੂੰ ਇਕੱਤਰ ਕੀਤਾ ਜਾਵੇਗਾ ਅਤੇ ਇਸ ਜਾਣਕਾਰੀ  ਨੂੰ ਇੱਕ ਬੇਹੱਦ ਸੁਰੱਖਿਅਤ ਸਰਵਰ \'ਤੇ ਸਟੋਰ ਕੀਤਾ ਜਾਵੇਗਾ।\n\nCOVIDSafe ਤੁਹਾਡੀ ਲੋਕੇਸ਼ਨ ਜਾਣਕਾਰੀ ਨੂੰ ਇਕੱਤਰ ਨਹੀਂ ਕਰੇਗਾ।\n\n COVIDSafe ਤੁਹਾਡੀ  ਡਿਵਾਈਸ \'ਤੇ, ਤੁਹਾਡੇ ਸੰਪਰਕ ਦੇ ਸਮੇਂ, ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰਾਂ ਦੇ ਗੁੰਮਨਾਮ ਆਈਡੀ ਕੋਡ, ਬਲੂਟੁੱਥ® ਸਿਗਨਲ ਸ਼ਕਤੀ ਅਤੇ ਹੋਰ ਵਰਤੋਂਕਾਰਾਂ ਦੇ ਫ਼ੋਨ ਮਾਡਲ ਨੋਟ ਕਰੇਗਾ।\n\nਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰ ਜਿੰਨ੍ਹਾਂ ਨਾਲ ਤੁਸੀਂ ਸੰਪਰਕ ਵਿੱਚ ਆਉਂਦੇ ਹੋ, ਤੁਹਾਡੇ ਗੁੰਮਨਾਮ ਆਈਡੀ ਕੋਡ, ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਦੀ ਤਾਰੀਖ਼ ਅਤੇ ਸਮਾਂ, ਬਲੂਟੁੱਥ® ਸਿਗਨਲ ਸ਼ਕਤੀ ਅਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ ਮਾਡਲ ਨੂੰ ਉਹਨਾਂ ਦੀ ਡੀਵਾਈਸ \'ਤੇ ਨੋਟ ਕਰਨਗੇ।\n\nਜੇ ਕੋਈ ਹੋਰ ਵਰਤੋਂਕਾਰ ਕੋਵਿਡ-19   ਪਾਜ਼ੇਟਿਵ ਟੈਸਟ ਕਰਦਾ ਹੈ, ਤਾਂ ਉਹ ਆਪਣੀ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਨੂੰ ਅੱਪਲੋਡ ਕਰ ਸਕਦੇ ਹਨ ਅਤੇ ਕੋਈ  ਪ੍ਰਾਂਤਿਕ ਜਾਂ ਹਲਕਾ ਸਿਹਤ ਅਧਿਕਾਰੀ ਸੰਪਰਕ ਟਰੇਸਿੰਗ ਲਈ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰ ਸਕਦਾ ਹੈ। \n\nਤੁਹਾਡੇ ਪੰਜੀਕਰਨ ਦੇ ਵਿਸਥਾਰਾਂ ਨੂੰ ਕੇਵਲ ਸੰਪਰਕ ਟਰੇਸਿੰਗ ਲਈ ਅਤੇ COVIDSafe ਦੇ ਉਚਿਤ ਅਤੇ ਕਨੂੰਨੀ ਕਾਰਜ-ਖੇਤਰ ਲਈ ਹੀ ਵਰਤਿਆ ਜਾਂ ਖੁਲਾਸਾ ਕੀਤਾ ਜਾਵੇਗਾ। \n\nਵਧੇਰੇ ਜਾਣਕਾਰੀ *ਆਸਟਰੇਲੀਆਈ ਸਰਕਾਰ ਦੇ ਸਿਹਤ ਵਿਭਾਗ* ਦੀ ਵੈੱਬਸਾਈਟ \'ਤੇ ਉਪਲਬਧ ਹੈ।\n\nਤੁਹਾਡੀ ਜਾਣਕਾਰੀ ਅਤੇ ਅਧਿਕਾਰਾਂ ਬਾਰੇ ਅਤੇ ਇਸ ਨਾਲ ਕਿਵੇਂ ਨਿਪਟਿਆ ਜਾਵੇਗਾ ਅਤੇ ਇਸਨੂੰ ਸਾਂਝਾ ਕਿਵੇਂ ਕੀਤਾ ਜਾਵੇਗਾ, ਇਸ ਬਾਰੇ ਹੋਰ ਵਿਸਥਾਰਾਂ ਲਈ COVIDSafe *ਪ੍ਰਾਈਵੇਸੀ ਨੀਤੀ* ਦੇਖੋ।</string>
   <string name="data_privacy_content_android">ਇਹ ਮਹੱਤਵਪੂਰਨ ਹੈ ਕਿ ਤੁਸੀਂ COVIDSafe ਪੰਜੀਕਰਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ  COVIDSafe *ਪ੍ਰਾਈਵੇਸੀ ਨੀਤੀ* ਪੜ੍ਹੋ।\n\nਜੇ ਤੁਹਾਡੀ ਉਮਰ 16 ਸਾਲ ਤੋਂ ਘੱਟ ਹੈ, ਤਾਂ ਤੁਹਾਡੇ ਮਾਪੇ/ਸਰਪ੍ਰਸਤ ਨੂੰ ਵੀ *ਪ੍ਰਾਈਵੇਸੀ ਨੀਤੀ* ਪੜ੍ਹਨੀ ਚਾਹੀਦੀ ਹੈ।\n\nCOVIDSafe ਦੀ ਵਰਤੋਂ ਪੂਰੀ ਤਰ੍ਹਾਂ ਸਵੈ-ਇੱਛਤ ਹੈ। ਤੁਸੀਂ ਕਿਸੇ ਵੀ ਸਮੇਂ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਇੰਸਟਾਲ ਜਾਂ ਡਿਲੀਟ ਕਰ ਸਕਦੇ ਹੋ। ਜੇ ਤੁਸੀਂ COVIDSafe ਨੂੰ ਡਿਲੀਟ ਕਰ ਦਿੰਦੇ ਹੋ,  ਤਾਂ ਸੁਰੱਖਿਅਤ ਸਰਵਰ ਤੋਂ *ਤੁਸੀਂ ਆਪਣੀ ਜਾਣਕਾਰੀ ਨੂੰ ਮਿਟਾਉਣ ਲਈ ਵੀ ਕਹਿ ਸਕਦੇ ਹੋ*।\n\nCOVIDSafe ਪੰਜੀਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਅਪਣਾ ਨਾਮ (ਜਾਂ ਨਕਲੀ ਨਾਮ), ਮੋਬਾਈਲ ਨੰਬਰ, ਉਮਰ ਸੀਮਾ ਅਤੇ ਪੋਸਟਕੋਡ ਭਰਨਾ ਪਵੇਗਾ।\n\nਜਦ ਤੁਸੀਂ ਰਜਿਸਟਰ ਕਰਦੇ ਹੋ ਤਾਂ COVIDSafe ਦੀ ਤੁਹਾਡੀ ਵਰਤੋਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਨੂੰ ਇਕੱਤਰ ਕੀਤਾ ਜਾਵੇਗਾ ਅਤੇ ਇਸ ਜਾਣਕਾਰੀ  ਨੂੰ ਇੱਕ ਬੇਹੱਦ ਸੁਰੱਖਿਅਤ ਸਰਵਰ \'ਤੇ ਸਟੋਰ ਕੀਤਾ ਜਾਵੇਗਾ।\n\nCOVIDSafe ਤੁਹਾਡੀ ਲੋਕੇਸ਼ਨ ਜਾਣਕਾਰੀ ਨੂੰ ਇਕੱਤਰ ਨਹੀਂ ਕਰੇਗਾ।\n\n COVIDSafe ਤੁਹਾਡੀ  ਡਿਵਾਈਸ \'ਤੇ, ਤੁਹਾਡੇ ਸੰਪਰਕ ਦੇ ਸਮੇਂ, ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰਾਂ ਦੇ ਗੁੰਮਨਾਮ ਆਈਡੀ ਕੋਡ, ਬਲੂਟੁੱਥ® ਸਿਗਨਲ ਸ਼ਕਤੀ ਅਤੇ ਹੋਰ ਵਰਤੋਂਕਾਰਾਂ ਦੇ ਫ਼ੋਨ ਮਾਡਲ ਨੋਟ ਕਰੇਗਾ।\n\nਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰ ਜਿੰਨ੍ਹਾਂ ਨਾਲ ਤੁਸੀਂ ਸੰਪਰਕ ਵਿੱਚ ਆਉਂਦੇ ਹੋ, ਤੁਹਾਡੇ ਗੁੰਮਨਾਮ ਆਈਡੀ ਕੋਡ, ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਦੀ ਤਾਰੀਖ਼ ਅਤੇ ਸਮਾਂ, ਬਲੂਟੁੱਥ® ਸਿਗਨਲ ਸ਼ਕਤੀ ਅਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ ਮਾਡਲ ਨੂੰ ਉਹਨਾਂ ਦੀ ਡੀਵਾਈਸ \'ਤੇ ਨੋਟ ਕਰਨਗੇ।\n\nਜੇ ਕੋਈ ਹੋਰ ਵਰਤੋਂਕਾਰ ਕੋਵਿਡ-19   ਪਾਜ਼ੇਟਿਵ ਟੈਸਟ ਕਰਦਾ ਹੈ, ਤਾਂ ਉਹ ਆਪਣੀ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਨੂੰ ਅੱਪਲੋਡ ਕਰ ਸਕਦੇ ਹਨ ਅਤੇ ਕੋਈ  ਪ੍ਰਾਂਤਿਕ ਜਾਂ ਹਲਕਾ ਸਿਹਤ ਅਧਿਕਾਰੀ ਸੰਪਰਕ ਟਰੇਸਿੰਗ ਲਈ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰ ਸਕਦਾ ਹੈ। \n\nਤੁਹਾਡੇ ਪੰਜੀਕਰਨ ਦੇ ਵਿਸਥਾਰਾਂ ਨੂੰ ਕੇਵਲ ਸੰਪਰਕ ਟਰੇਸਿੰਗ ਲਈ ਅਤੇ COVIDSafe ਦੇ ਉਚਿਤ ਅਤੇ ਕਨੂੰਨੀ ਕਾਰਜ-ਖੇਤਰ ਲਈ ਹੀ ਵਰਤਿਆ ਜਾਂ ਖੁਲਾਸਾ ਕੀਤਾ ਜਾਵੇਗਾ। \n\nਵਧੇਰੇ ਜਾਣਕਾਰੀ *ਆਸਟਰੇਲੀਆਈ ਸਰਕਾਰ ਦੇ ਸਿਹਤ ਵਿਭਾਗ* ਦੀ ਵੈੱਬਸਾਈਟ \'ਤੇ ਉਪਲਬਧ ਹੈ।\n\nਤੁਹਾਡੀ ਜਾਣਕਾਰੀ ਅਤੇ ਅਧਿਕਾਰਾਂ ਬਾਰੇ ਅਤੇ ਇਸ ਨਾਲ ਕਿਵੇਂ ਨਿਪਟਿਆ ਜਾਵੇਗਾ ਅਤੇ ਇਸਨੂੰ ਸਾਂਝਾ ਕਿਵੇਂ ਕੀਤਾ ਜਾਵੇਗਾ, ਇਸ ਬਾਰੇ ਹੋਰ ਵਿਸਥਾਰਾਂ ਲਈ COVIDSafe *ਪ੍ਰਾਈਵੇਸੀ ਨੀਤੀ* ਦੇਖੋ।</string>
   <!-- OnBoarding Data Privacy -->
   <string name="data_privacy_headline">ਪੰਜੀਕਰਨ ਅਤੇ ਪ੍ਰਾਈਵੇਸੀ</string>
@@ -247,6 +247,7 @@
   <string name="dialog_error_uploading_positive">ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ</string>
   <string name="dialog_uploading_message">ਤੁਹਾਡੀ COVIDSafe ਜਾਣਕਾਰੀ ਨੂੰ  ਇਸ ਵੇਲੇ ਅੱਪਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।\n\nਕਿਰਪਾ ਕਰਕੇ ਐਪ ਬੰਦ ਨਾ ਕਰੋ।</string>
   <string name="disabled">ਬੰਦ  ਹੈ (ਡਿਸੇਬਲੇਡ)</string>
+  <string name="dismiss">ਰੱਦ ਕਰਨਾ</string>
   <string name="done_success">ਕੀਤਾ</string>
   <string name="enabled">ਚਾਲੂ ਹੈ  (ਅਨੇਬਲਡ)</string>
   <string name="enter_number_button">ਪਿੰਨ ਲਓ</string>
@@ -267,6 +268,7 @@
   <string name="generic_error">ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।</string>
   <string name="generic_internet_error">ਕਿਰਪਾ ਕਰਕੇ ਅਪਣਾ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਚੈੱਕ ਕਰੋ</string>
   <string name="heading">ਸਿਰਲੇਖ</string>
+  <string name="hide">ਛੁਪਾਣਾ</string>
   <string name="home_app_permission_push_notification_prompt">COVIDSafe ਨੂੰ ਸੂਚਨਾਵਾਂ ਦੇਣ ਦਿਓ।</string>
   <string name="home_app_permission_status_subtitle">COVIDSafe ਸਹੀ ਸੈਟਿੰਗਾਂ ਤੋਂ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰੇਗਾ।</string>
   <string name="home_app_permission_status_title">ਆਪਣੀਆਂ ਸੈਟਿੰਗਾਂ ਚੈੱਕ ਕਰੋ</string>
@@ -297,7 +299,7 @@
   <string name="home_set_complete_external_link_app_url">https://www.health.gov.au/resources/apps-and-tools/coronavirus-australia-app</string>
   <string name="home_set_complete_external_link_been_contacted_content">ਤੁਸੀਂ ਆਪਣੀ ਜਾਣਕਾਰੀ ਤਾਂ ਹੀ ਅੱਪਲੋਡ ਕਰ ਸਕਦੇ ਹੋ ਜੇਕਰ ਤੁਹਾਡਾ ਟੈਸਟ ਪਾਜ਼ੇਟਿਵ ਆਇਆ ਹੋਵੇ|</string>
   <string name="home_set_complete_external_link_been_contacted_title">ਕੀ ਕਿਸੇ ਸਿਹਤ ਅਧਿਕਾਰੀ ਨੇ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕੀਤਾ ਹੈ?</string>
-  <string name="home_set_complete_external_link_help_topics_content">ਤਕਨੀਕੀ ਸਮੱਸਿਆਵਾਂ ਨੂੰ ਹੱਲ ਕਰਨ ਅਤੇ ਠੀਕ ਕਰਨ ਦੇ ਤਰੀਕੇ ਬਾਰੇ ਮਾਰਗ ਦਰਸ਼ਨ।</string>
+  <string name="home_set_complete_external_link_help_topics_content">ਤਕਨੀਕੀ ਸਮੱਸਿਆਵਾਂ ਨੂੰ ਟ੍ਰਬਲਸ਼ੂਟ ਅਤੇ ਹੱਲ ਕਰਨ ਬਾਰੇ ਮਾਰਗ ਦਰਸ਼ਨ</string>
   <string name="home_set_complete_external_link_help_topics_title">ਸਹਾਇਤਾ ਵਿਸ਼ੇ</string>
   <string name="home_set_complete_external_link_news_content">ਤਾਜ਼ਾ ਕੋਰੋਨਾਵਾਇਰਸ ਖ਼ਬਰਾਂ  ਲਈ aus.gov.au ਵੱਲ ਜਾਓ।</string>
   <string name="home_set_complete_external_link_news_title">ਤਾਜ਼ਾ ਖ਼ਬਰਾਂ ਅਤੇ ਅੱਪਡੇਟ</string>
@@ -311,14 +313,14 @@
   <string name="home_set_complete_external_link_self_isolation_register_url">https://covid-form.service.gov.au</string>
   <string name="home_set_complete_external_link_share_content">ਹੋਰਨਾਂ ਨੂੰ ਸਹਾਇਤਾ ਲਈ ਬੁਲਾਓ। ਇਕੱਠੇ ਅਸੀਂ ਵਧੇਰੇ ਮਜ਼ਬੂਤ ਹਾਂ।</string>
   <string name="home_set_complete_external_link_share_title">COVIDSafe ਸਾਂਝਾ ਕਰੋ</string>
-  <string name="home_set_location_why">ਐਂਡਰਾਇਡ ਐਪ ਨੂੰ ਬਲੁਟੁੱਥ® ਲਈ ਲੋਕੇਸ਼ਨ ਆਗਿਆ ਚਾਲੂ ਹੋਣ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ. COVIDSafe ਲੋਕੇਸ਼ਨ ਡਾਟਾ ਨੂੰ ਸਟੋਰ ਜਾਂ ਇਸਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰਦਾ ਹੈ।</string>
+  <string name="home_set_location_why">Bluetooth® ਤੱਕ ਪਹੁੰਚਣ ਲਈ ਗੂਗਲ ਨੂੰ *ਐਂਡਰਾਇਡ ਐਪਾਂ ਲਈ ਲੋਕੇਸ਼ਨ ਆਗਿਆ* ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। COVIDSafe ਲੋਕੇਸ਼ਨ ਡੇਟਾ ਸਟੋਰ ਜਾਂ ਵਰਤੋਂ ਨਹੀਂ ਕਰਦਾ।</string>
   <string name="home_setup_help">ਸਹਾਇਤਾ</string>
   <string name="home_setup_incomplete_subtitle">COVIDSafe ਨੂੰ ਇਹਨਾਂ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੱਕ ਜਾਣ ਲਈ ਆਗਿਆ ਦੀ ਲੋੜ ਹੈ।</string>
   <string name="home_setup_incomplete_title">ਮਨਜ਼ੂਰੀਆਂ ਦੀ ਜਾਂਚ ਕਰੋ</string>
   <string name="home_version_number">ਵਰਜਨ ਨੰਬਰ:%s</string>
   <string name="how_it_works_button">ਅੱਗੇ</string>
   <string name="how_it_works_consent">ਜੇ ਸਿਹਤ ਟਰੇਸਿੰਗ ਦੀ ਲੋੜ ਪਈ ਤਾਂ ਤੁਹਾਡੀ ਸਹਿਮਤੀ  ਲਈ ਹਮੇਸ਼ਾ ਬੇਨਤੀ ਕੀਤੀ ਜਾਵੇਗੀ।</string>
-  <string name="how_it_works_content">ਬਲੂਟੁੱਥ ਸਿਗਨਲਾਂ ਦੀ ਵਰਤੋਂ ਇਹ ਦੱਸਦੀ ਹੈ ਜਦੋਂ ਤੁਸੀਂ ਕਿਸੇ ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰ ਦੇ ਨੇੜੇ ਹੁੰਦੇ ਹੋ।\n\nਤੁਹਾਡੇ ਅਤੇ ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰਾਂ ਵਿਚਕਾਰ ਨਜ਼ਦੀਕੀ ਸੰਪਰਕ ਦੀ ਹਰੇਕ ਇਕਾਈ ਨੂੰ ਨਜ਼ਦੀਕੀ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਲਈ ਨੋਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਇਹ ਜਾਣਕਾਰੀ ਏਨਕ੍ਰਿਪਟਿਡ ਹੁੰਦੀ ਹੈ ਅਤੇ ਕੇਵਲ ਤੁਹਾਡੇ ਫ਼ੋਨ ਵਿੱਚ ਹੀ ਸਟੋਰ ਕੀਤੀ ਜਾਂਦੀ ਹੈ।\n\nਜੇ ਤੁਸੀਂ COVIDSafe ਵਰਤੋਂਕਾਰ ਵਜੋਂ  ਕੋਵਿਡ-19  ਪਾਜ਼ੇਟਿਵ  ਟੈਸਟ ਕਰਦੇ ਹੋ, ਤਾਂ ਕੋਈ ਪ੍ਰਾਂਤਿਕ ਜਾਂ ਹਲਕਾ ਸਿਹਤ ਅਧਿਕਾਰੀ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰੇਗਾ। ਉਹ ਤੁਹਾਡੀ ਨਜ਼ਦੀਕੀ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਨੂੰ ਇੱਕ ਬੇਹੱਦ ਸੁਰੱਖਿਅਤ ਜਾਣਕਾਰੀ ਸਟੋਰੇਜ ਸਿਸਟਮ ਵਿੱਚ ਅੱਪਲੋਡ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਨਗੇ।  \n\nਜੇ ਤੁਸੀਂ ਕਿਸੇ ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰ  ਜੋ ਪਾਜ਼ੇਟਿਵ ਟੈਸਟ ਹੋਇਆ ਸੀ ਦੇ ਸੰਪਰਕ ਵਿੱਚ ਆਏ ਤਾਂ ਭੀ ਪ੍ਰਾਂਤਿਕ ਜਾਂ ਹਲਕਾ ਸਿਹਤ ਅਧਿਕਾਰੀ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰ ਸਕਦੇ ਹਨ|\n\nਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ ਕਿਰਪਾ ਕਰਕੇ *ਸਹਾਇਤਾ ਵਿਸ਼ੇ* ਪੰਨਾ  ਦੇਖੋ।\n</string>
+  <string name="how_it_works_content">Bluetooth ਸਿਗਨਲਾਂ ਦੀ ਵਰਤੋਂ ਇਹ ਦੱਸਦੀ ਹੈ ਜਦੋਂ ਤੁਸੀਂ ਕਿਸੇ ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰ ਦੇ ਨੇੜੇ ਹੁੰਦੇ ਹੋ।\n\nਤੁਹਾਡੇ ਅਤੇ ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰਾਂ ਵਿਚਕਾਰ ਨਜ਼ਦੀਕੀ ਸੰਪਰਕ ਦੀ ਹਰੇਕ ਇਕਾਈ ਨੂੰ ਨਜ਼ਦੀਕੀ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਲਈ ਨੋਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਇਹ ਜਾਣਕਾਰੀ ਏਨਕ੍ਰਿਪਟਿਡ ਹੁੰਦੀ ਹੈ ਅਤੇ ਕੇਵਲ ਤੁਹਾਡੇ ਫ਼ੋਨ ਵਿੱਚ ਹੀ ਸਟੋਰ ਕੀਤੀ ਜਾਂਦੀ ਹੈ।\n\nਜੇ ਤੁਸੀਂ COVIDSafe ਵਰਤੋਂਕਾਰ ਵਜੋਂ  ਕੋਵਿਡ-19  ਪਾਜ਼ੇਟਿਵ  ਟੈਸਟ ਕਰਦੇ ਹੋ, ਤਾਂ ਕੋਈ ਪ੍ਰਾਂਤਿਕ ਜਾਂ ਹਲਕਾ ਸਿਹਤ ਅਧਿਕਾਰੀ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰੇਗਾ। ਉਹ ਤੁਹਾਡੀ ਨਜ਼ਦੀਕੀ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਨੂੰ ਇੱਕ ਬੇਹੱਦ ਸੁਰੱਖਿਅਤ ਜਾਣਕਾਰੀ ਸਟੋਰੇਜ ਸਿਸਟਮ ਵਿੱਚ ਅੱਪਲੋਡ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਨਗੇ।  \n\nਜੇ ਤੁਸੀਂ ਕਿਸੇ ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰ  ਜੋ ਪਾਜ਼ੇਟਿਵ ਟੈਸਟ ਹੋਇਆ ਸੀ ਦੇ ਸੰਪਰਕ ਵਿੱਚ ਆਏ ਤਾਂ ਭੀ ਪ੍ਰਾਂਤਿਕ ਜਾਂ ਹਲਕਾ ਸਿਹਤ ਅਧਿਕਾਰੀ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰ ਸਕਦੇ ਹਨ|\n\nਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ ਕਿਰਪਾ ਕਰਕੇ *ਸਹਾਇਤਾ ਵਿਸ਼ੇ* ਪੰਨਾ  ਦੇਖੋ।</string>
   <!-- OnBoarding How it works -->
   <string name="how_it_works_headline">COVIDSafe ਕਿਵੇਂ ਕੰਮ ਕਰਦਾ ਹੈ</string>
   <string name="how_it_works_headline_content_description">ਸਿਰਲੇਖ, COVIDSafe ਕਿਵੇਂ ਕੰਮ ਕਰਦਾ ਹੈ</string>
@@ -331,7 +333,7 @@
   <string name="internet_screen_content_2">ਜਦੋਂ ਕੋਈ ਅੱਪਡੇਟ ਦਾ ਨਵਾਂ ਵਰਜਨ  ਉਪਲਬਧ ਹੋਵੇ|</string>
   <string name="internet_screen_heading">COVIDSafe ਦੇ ਪ੍ਰਦਰਸ਼ਨ ਵਿੱਚ ਸੁਧਾਰ ਕਰਨ ਲਈ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਬਾਰੇ</string>
   <string name="intro_button">ਮੈਂ ਸਹਾਇਤਾ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹਾਂ</string>
-  <string name="intro_content">COVIDSafe ਨੂੰ ਆਸਟਰੇਲੀਆਈ ਸਰਕਾਰ ਦੁਆਰਾ ਵਿਕਸਤ ਕੀਤਾ ਗਿਆ ਹੈ ਤਾਂ ਜੋ ਸਮਾਜ ਨੂੰ ਕੋਰੋਨਾਵਾਇਰਸ ਦੇ ਫੈਲਣ ਤੋਂ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਵਿੱਚ ਸਹਾਇਤਾ ਮਿਲ ਸਕੇ।\n\nCOVIDSafe ਤੁਹਾਡੇ ਐਪ ਦੇ ਹੋਰ ਵਰਤੋਂਕਾਰਾਂ ਨਾਲ ਸੰਪਰਕ ਸੁਰੱਖਿਅਤ ਤਰੀਕੇ ਨਾਲ ਨੋਟ ਕਰੇਗਾ। ਜੇ ਤੁਸੀਂ ਕਿਸੇ ਅਜਿਹੇ ਵਿਅਕਤੀ ਦੇ ਸੰਪਰਕ ਵਿੱਚ ਆਏ ਹੋ ਜਿਸਦਾ ਵਾਇਰਸ ਟੈਸਟ ਪਾਜ਼ੇਟਿਵ ਆਇਆ ਹੈ ਤਾਂ ਇਹ ਰਾਜ ਅਤੇ ਹਲਕਾ ਸਿਹਤ ਅਧਿਕਾਰੀਆਂ ਨੂੰ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰਨ ਦੇ ਯੋਗ ਬਣਾਵੇਗਾ|\n\nਇਕੱਠੇ ਅਸੀਂ ਫੈਲਣ ਨੂੰ ਰੋਕਣ ਅਤੇ ਸਿਹਤਮੰਦ ਬਣੇ ਰਹਿਣ ਵਿੱਚ ਸਹਾਈ ਹੋ ਸਕਦੇ ਹਾਂ।\n\n\n\n\n\n\n</string>
+  <string name="intro_content">COVIDSafe ਨੂੰ ਆਸਟਰੇਲੀਆਈ ਸਰਕਾਰ ਦੁਆਰਾ ਵਿਕਸਤ ਕੀਤਾ ਗਿਆ ਹੈ ਤਾਂ ਜੋ ਸਮਾਜ ਨੂੰ ਕੋਰੋਨਾਵਾਇਰਸ ਦੇ ਫੈਲਣ ਤੋਂ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਵਿੱਚ ਸਹਾਇਤਾ ਮਿਲ ਸਕੇ।\n\nCOVIDSafe ਤੁਹਾਡੇ ਐਪ ਦੇ ਹੋਰ ਵਰਤੋਂਕਾਰਾਂ ਨਾਲ ਸੰਪਰਕ ਸੁਰੱਖਿਅਤ ਤਰੀਕੇ ਨਾਲ ਨੋਟ ਕਰੇਗਾ। ਜੇ ਤੁਸੀਂ ਕਿਸੇ ਅਜਿਹੇ ਵਿਅਕਤੀ ਦੇ ਸੰਪਰਕ ਵਿੱਚ ਆਏ ਹੋ ਜਿਸਦਾ ਵਾਇਰਸ ਟੈਸਟ ਪਾਜ਼ੇਟਿਵ ਆਇਆ ਹੈ ਤਾਂ ਇਹ ਰਾਜ ਅਤੇ ਹਲਕਾ ਸਿਹਤ ਅਧਿਕਾਰੀਆਂ ਨੂੰ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰਨ ਦੇ ਯੋਗ ਬਣਾਵੇਗਾ|\n\nਇਕੱਠੇ ਅਸੀਂ ਫੈਲਣ ਨੂੰ ਰੋਕਣ ਅਤੇ ਸਿਹਤਮੰਦ ਬਣੇ ਰਹਿਣ ਵਿੱਚ ਸਹਾਈ ਹੋ ਸਕਦੇ ਹਾਂ।</string>
   <!-- OnBoarding Intro -->
   <string name="intro_headline">ਇਕੱਠੇ ਅਸੀਂ ਕੋਵਿਡ-19 ਦੇ ਫੈਲਾਅ ਨੂੰ ਰੋਕ ਸਕਦੇ ਹਾਂ।</string>
   <string name="intro_headline_content_description">ਸਿਰਲੇਖ, ਇਕੱਠੇ ਅਸੀਂ ਕੋਵਿਡ-19 ਦੇ ਫੈਲਾਅ ਨੂੰ ਰੋਕ ਸਕਦੇ ਹਾਂ।</string>
@@ -343,6 +345,8 @@
   <string name="invalid_phone_number_digits_error_prompt" formatted="false">%1s ਵਿੱਚ ਮੋਬਾਈਲ ਨੰਬਰਾਂ ਦੇ %2s ਅੰਕ ਹੁੰਦੇ ਹਨ।</string>
   <string name="invalid_post_code">ਗਲਤ ਪੋਸਟਕੋਡ</string>
   <string name="IssueFooter">ਤੁਹਾਡੇ ਫੀਡਬੈਕ ਬਾਰੇ ਹੋਰ ਵਿਸਥਾਰਾਂ ਲਈ ਅਸੀਂ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰ ਸਕਦੇ ਹਾਂ| ਤੁਹਾਡੀ ਈਮੇਲ ਦੀ ਵਰਤੋਂ ਕਿਸੇ ਹੋਰ ਉਦੇਸ਼ ਲਈ ਨਹੀਂ ਕੀਤੀ ਜਾਵੇਗੀ|</string>
+  <string name="jwt_description">ਤੁਹਾਡੇ ਪੰਜੀਕਰਨ (ਰਜ਼ਿਸਟ੍ਰੇਸ਼ਨ) ਦੇ ਵਿਸਥਾਰਾਂ ਵਿੱਚ ਕੋਈ ਸਮੱਸਿਆ ਹੈ।</string>
+  <string name="jwt_heading">ਕਿਰਪਾ ਕਰਕੇ ਦੁਬਾਰਾ ਰਜਿਸਟਰ ਕਰੋ</string>
   <string name="loading_numbers">ਤਾਜ਼ਾ ਅੰਕੜੇ ਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ</string>
   <!-- Splash Screen -->
   <string name="migration_in_progress">COVIDSafe ਅੱਪਡੇਟ ਚੱਲ ਰਿਹਾ ਹੈ। \n\nਕਿਰਪਾ ਕਰਕੇ ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਤੁਹਾਡਾ ਫ਼ੋਨ ਤਦ ਤੱਕ ਬੰਦ ਨਹੀਂ ਹੋਣਾ ਚਾਹੀਦਾ ਜਦ ਤੱਕ ਅੱਪਡੇਟ ਪੂਰਾ ਨਹੀਂ ਹੋ ਜਾਂਦਾ।</string>
@@ -360,11 +364,11 @@
   <string name="notification_battery">COVIDSafe ਦੇ ਕੰਮ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਬੈਟਰੀ ਅਨੁਕੂਲਤਾ (ਆਪਟੀਮਾਈਜੇਸ਼ਨ) ਬੰਦ ਕਰੋ|</string>
   <string name="notification_bluetooth">COVIDSafe ਦੇ ਕੰਮ ਕਰਨ ਲਈ ਬਲੂਟੁੱਥ ਚਾਲੂ ਕਰੋ।</string>
   <string name="notification_bt_and_battery">COVIDSafe  ਦੇ ਕੰਮ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਬਲੂਟੁਥ ਚਾਲੂ ਕਰੋ ਅਤੇ ਬੈਟਰੀ ਅਨੁਕੂਲਤਾ (ਆਪਟੀਮਾਈਜੇਸ਼ਨ) ਬੰਦ ਕਰੋ।</string>
-  <string name="notification_internet_content">COVIDSafe  ਦੇ ਕੰਮ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਇਸਦਾ ਐਪ ਖੋਲੋ ਅਤੇ ਆਪਣਾ ਇੰਟਰਨੇਟ ਕੁਨੈਕਸ਼ਨ ਚੈਕ ਕਰੋ।</string>
+  <string name="notification_internet_content">ਐਪ ਖੋਲੋ ਅਤੇ ਆਪਣਾ ਇੰਟਰਨੇਟ ਕੁਨੈਕਸ਼ਨ ਚੈਕ ਕਰੋ।</string>
-  <string name="notification_location">ਬਲੂਟੁੱਥ ਨੂੰ ਕੰਮ ਕਰਨ ਲਈ ਲੋਕੇਸ਼ਨ ਇਜ਼ਾਜ਼ਤ ਦਿਓ।</string>
+  <string name="notification_location">Bluetooth® ਨੂੰ ਕੰਮ ਕਰਨ ਲਈ ਲੋਕੇਸ਼ਨ ਆਗਿਆ ਦਿਓ।</string>
   <string name="notification_not_active_body">ਘਰੋਂ ਬਾਹਰ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਜਾਂ ਜਦੋਂ ਤੁਸੀਂ ਜਨਤਕ ਸਥਾਨਾਂ ਤੇ ਹੋ ਤਾਂ ਇਹ ਯਕੀਨੀ ਬਣਾਓ ਕਿ COVIDSafe ਐਕਟਿਵ ਹੈ|</string>
   <string name="notification_not_active_title">COVIDSafe ਐਕਟਿਵ ਨਹੀਂ ਹੈ|</string>
-  <string name="notification_settings">ਆਪਣੀਆਂ ਸੈਟਿੰਗਾਂ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਖੋਲ੍ਹੋ।</string>
+  <string name="notification_settings">ਆਪਣੀਆਂ ਸੈਟਿੰਗਾਂ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਐਪ ਖੋਲ੍ਹੋ।</string>
   <string name="notification_update_content">ਤਾਜ਼ਾ ਸੁਧਾਰਾਂ ਲਈ ਆਪਣੀ ਐਪ ਨੂੰ ਅੱਪਡੇਟ ਕਰੋ।</string>
   <string name="notification_update_heading">COVIDSafe ਅੱਪਡੇਟ ਉਪਲਬਧ ਹੈ|</string>
   <!-- Figma page iOS Screens (05/06) -->
@@ -374,16 +378,16 @@
   <!-- Figma page iOS Screens (05/06) -->
   <string name="NotificationsEnabledBlurb">ਜੇ COVIDSafe ਐਕਟਿਵ ਨਹੀਂ  ਤਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾ ਮਿਲੇਗੀ| \nਸੂਚਨਾ ਸੈਟਿੰਗ ਬਦਲੋ</string>
   <string name="numbers_error">ਅੱਪਡੇਟ ਕੀਤੇ ਨੰਬਰਾਂ ਦੀ ਜਾਂਚ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ।</string>
-  <string name="numbers_no_internet">ਅੱਪਡੇਟ ਅੰਕੜੇ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ|</string>
+  <string name="numbers_no_internet">ਇਹ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ  ਕਿ ਤੁਹਾਨੂੰ ਅੱਪਡੇਟਿਡ ਨੰਬਰ ਪ੍ਰਾਪਤ ਹੋਣ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ|</string>
-  <string name="numbers_refresh">ਹੁਣ ਰਿਫਰੈਸ਼ ਕਰੋ|</string>
+  <string name="numbers_refresh">ਹੁਣ ਰਿਫਰੈਸ਼ ਕਰੋ</string>
   <string name="options_for_australia">ਆਸਟਰੇਲੀਆ ਲਈ ਵਿਕਲਪ</string>
   <string name="permission_button">ਅੱਗੇ ਵਧੋ</string>
-  <string name="permission_content">ਕੰਮ ਕਰਣ ਲਈ COVIDSafe ਨੂੰ ਬਲੂਟੁੱਥ®  ਚਾਹੀਦਾ ਹੈ ਅਤੇ ਸੂਚਨਾਵਾਂ ਅਨੇਬਲਡ ਹੋਣੀਆਂ ਚਾਹੀਦੀਆਂ ਹਨ\n\n\'ਅੱਗੇ ਵਧੋ\' ਚੁਣੋ:\n\n1. ਬਲੂਟੁੱਥ ਅਨੇਬਲ ਕਰੋ®\n\n2. ਲੋਕੇਸ਼ਨ ਇਜਾਜ਼ਤ ਦਿਓ\n\n3. ਬੈਟਰੀ ਅਨੁਕੂਲਣ (ਆਪਟੀਮਾਈਜੇਸ਼ਨ) ਬੰਦ ਕਰੋ\n\nਕੰਮ ਕਰਨ ਲਈ ਐਂਡਰਾਇਡ ਨੂੰ ਬਲੂਟੁੱਥ® ਲਈ ਲੋਕੇਸ਼ਨ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ।\n\nCOVIDSafe ਪੇਅਰਿੰਗ ਦੀਆਂ ਬੇਨਤੀਆਂ ਨਹੀਂ ਭੇਜਦੀ।</string>
+  <string name="permission_content">COVIDSafe ਨੂੰ ਕੰਮ ਕਰਣ ਲਈ Bluetooth® ਚਾਹੀਦਾ ਹੈ ਅਤੇ ਸੂਚਨਾਵਾਂ  ਇਨੇਬਲਡ ਹੋਣੀਆਂ ਚਾਹੀਦੀਆਂ ਹਨ\n\n\'ਅੱਗੇ ਵਧੋ\' ਲਈ ਚੁਣੋ:\n\n1. Bluetooth® ਇਨੇਬਲ ਕਰੋ\n\n2. ਲੋਕੇਸ਼ਨ ਆਗਿਆ ਦਿਓ\n\n3. ਬੈਟਰੀ ਅਨੁਕੂਲਣ (ਆਪਟੀਮਾਈਜੇਸ਼ਨ) ਬੰਦ ਕਰੋ\n\n Bluetooth® ਤੱਕ ਪਹੁੰਚਣ ਲਈ ਗੂਗਲ ਨੂੰ ਐਂਡਰਾਇਡ ਐਪਾਂ ਲਈ ਲੋਕੇਸ਼ਨ ਆਗਿਆ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। COVIDSafe ਲੋਕੇਸ਼ਨ ਡੇਟਾ ਸਟੋਰ ਜਾਂ ਵਰਤੋਂ ਨਹੀਂ ਕਰਦਾ।\n\nCOVIDSafe ਪੇਅਰਿੰਗ ਦੀਆਂ ਬੇਨਤੀਆਂ ਨਹੀਂ ਭੇਜਦੀ।</string>
   <!-- OnBoarding Permission -->
   <string name="permission_headline">ਐਪ ਸੈਟਿੰਗਾਂ</string>
   <string name="permission_location_rationale">COVIDSafe ਲਈ ਬਲੂਟੁੱਥ® ਫੰਕਸ਼ਨਾਂ ਨੂੰ ਅਨੇਬਲ ਕਰਣ ਲਈ ਐਂਡਰਾਇਡ ਨੂੰ ਲੋਕੇਸ਼ਨ ਐਕਸੈਸ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। ਇਸ ਤੋਂ ਬਿਨਾਂ COVIDSafe ਸਹੀ ਤਰੀਕੇ ਨਾਲ ਕੰਮ ਨਹੀਂ ਕਰ ਸਕਦਾ|</string>
   <string name="permission_success_button">ਕੀਤਾ</string>
-  <string name="permission_success_content">1. ਜਦੋਂ ਤੁਸੀਂ ਘਰੋਂ ਬਾਹਰ ਜਾਂਦੇ ਹੋ, ਤਾਂ ਫ਼ੋਨ ਅਪਣੇ ਨਾਲ ਰੱਖੋ ਅਤੇ ਇਹ ਯਕੀਨੀ ਬਣਾਓ ਕਿ COVIDSafe ਐਕਟਿਵ ਹੈ।\n\n2. ਬਲੂਟੁੱਥ® ਔਨ ਰੱਖਣਾ ਚਾਹੀਦਾ ਹੈ।\n\n3. ਬੈਟਰੀ ਅਨੁਕੂਲਨ (ਆਪਟੀਮਾਈਜੇਸ਼ਨ) ਔੱਫ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।\n\n4. COVIDSafe ਪੇਅਰਿੰਗ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਭੇਜਦਾ। *ਹੋਰ ਸਿੱਖੋ*।\n\n5. *ਬਲੂਟੁੱਥ® ਅੇਕਸੇਸ ਕਰਨ ਲਈ \'ਐਂਡਰਾਇਡ ਲਈ ਲੋਕੇਸ਼ਨ ਪਰਮਿਸ਼ਨ\' ਜ਼ਰੂਰੀ ਹੈ। COVIDSafe ਲੋਕੇਸ਼ਨ ਡੇਟਾ ਨੂੰ ਸਟੋਰ ਜਾਂ ਇਸਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰਦਾ।</string>
+  <string name="permission_success_content">1. ਜਦੋਂ ਤੁਸੀਂ ਘਰੋਂ ਬਾਹਰ ਜਾਂਦੇ ਹੋ, ਤਾਂ ਫ਼ੋਨ ਅਪਣੇ ਨਾਲ ਰੱਖੋ ਅਤੇ ਇਹ ਯਕੀਨੀ ਬਣਾਓ ਕਿ COVIDSafe ਐਕਟਿਵ ਹੈ।\n\n2. Bluetooth® ਔਨ ਰੱਖਣਾ ਚਾਹੀਦਾ ਹੈ।\n\n3. ਬੈਟਰੀ ਅਨੁਕੂਲਨ (ਆਪਟੀਮਾਈਜੇਸ਼ਨ) ਔੱਫ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।\n\n4. COVIDSafe ਪੇਅਰਿੰਗ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਭੇਜਦਾ। *ਹੋਰ ਸਿੱਖੋ*।\n\n5. Bluetooth® ਤੱਕ ਪਹੁੰਚਣ ਲਈ ਗੂਗਲ ਨੂੰ *ਐਂਡਰਾਇਡ ਐਪਾਂ ਲਈ ਲੋਕੇਸ਼ਨ ਆਗਿਆ* ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। COVIDSafe ਲੋਕੇਸ਼ਨ ਡੇਟਾ ਸਟੋਰ ਜਾਂ ਵਰਤੋਂ ਨਹੀਂ ਕਰਦਾ।</string>
   <!-- OnBoarding Permission Success -->
   <string name="permission_success_headline">ਤੁਸੀਂ ਸਫਲਤਾ ਪੂਰਵਕ ਰਜਿਸਟਰ ਕੀਤਾ ਹੈ</string>
   <string name="permission_success_warning">COVIDSafe ਲਈ ਪੁਸ਼ ਸੂਚਨਾਵਾਂ ਨੂੰ ਔਨ ਰੱਖੋ ਤਾਂ ਜੋ ਜੇ ਐਪ ਸਹੀ ਕੰਮ ਨਹੀਂ ਕਰ ਰਹੀ ਤਾਂ ਅਸੀਂ ਤੁਹਾਨੂੰ ਤੁਰੰਤ ਸੂਚਿਤ ਕਰ ਸਕੀਏ|</string>
@@ -411,7 +415,8 @@
   <string name="queensland">ਕੁਈਨਜ਼ਲੈਂਡ</string>
   <string name="ReceivePinIssue">ਤੁਹਾਡੇ ਪਿੰਨ ਮਿਲਣ ਵਿੱਚ ਮੁੱਦੇ?</string>
   <string name="recovered">ਠੀਕ ਹੋਏ ਕੁੱਲ ਕੇਸ</string>
-  <string name="registration_consent_content">ਮੈਂ ਆਸਟਰੇਲੀਆਈ ਸਰਕਾਰ ਦੇ ਸਿਹਤ ਵਿਭਾਗ ਦੇ ਸਕੱਤਰ ਦੁਆਰਾ ਕੀਤੇ ਕਨੂੰਨੀ ਨਿਰਣੇ ਦੇ ਤਹਿਤ, ਡੇਟਾ ਸਟੋਰ ਪ੍ਰਸ਼ਾਸ਼ਕ ਵਜੋਂ ਡਿਜ਼ਿਟਲ ਤਬਦੀਲੀ ਏਜੰਸੀ ਨੂੰ ਡੇਟਾ ਇਕੱਤਰ ਕਰਣ ਬਾਰੇ ਸਹਿਮਤੀ ਦਿੰਦਾ/ਦਿੰਦੀ ਹਾਂ:</string>
+  <string name="registration_consent_content">ਮੈਂ ਆਸਟਰੇਲੀਆਈ ਸਰਕਾਰ ਦੇ ਸਿਹਤ ਵਿਭਾਗ ਦੇ ਸਕੱਤਰ ਦੁਆਰਾ ਕੀਤੇ ਕਨੂੰਨੀ ਨਿਰਣੇ ਦੇ ਤਹਿਤ, ਡੇਟਾ ਸਟੋਰ ਪ੍ਰਸ਼ਾਸਕ ਵਜੋਂ, ਡਿਜ਼ਿਟਲ ਤਬਦੀਲੀ ਏਜੰਸੀ ਨੂੰ ਸਹਿਮਤੀ ਦਿੰਦਾ/ਦਿੰਦੀ ਹਾਂ|</string>
+  <string name="registration_consent_diagnostic">ਇਹ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਜਾਣਕਾਰੀ ਕਿ COVIDSafe ਮੇਰੀ ਡੀਵਾਈਸ \'ਤੇ  ਠੀਕ ਕੰਮ ਕਰ ਰਹੀ ਹੈ।</string>
   <string name="registration_consent_first_paragraph">ਮੇਰੀ ਪੰਜੀਕਰਨ ਜਾਣਕਾਰੀ।</string>
   <!-- Onboarding Registration Consent -->
   <string name="registration_consent_headline">ਰਜਿਸਟਰੇਸ਼ਨ ਸਹਿਮਤੀ</string>
@@ -428,14 +433,15 @@
   <string name="service_ok_title">COVIDSafe ਐਕਟਿਵ ਹੈ|</string>
   <string name="settings">ਸੈਟਿੰਗਾਂ</string>
   <string name="share_this_app_content">ਕੋਵਿਡ-19 ਦੇ ਫੈਲਾਅ ਨੂੰ ਰੋਕਣ ਲਈ ਮੇਰੇ ਨਾਲ ਜੁੜੋ!  COVIDSafe ਨੂੰ ਡਾਊਨਲੋਡ ਕਰੋ, ਜੋ ਕਿ ਆਸਟਰੇਲੀਆਈ ਸਰਕਾਰ ਦੀ ਐਪ ਹੈ। #COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
+  <string name="show">ਦਿਖਾਓ</string>
   <string name="south_australia">ਦੱਖਣੀ ਆਸਟਰੇਲੀਆ</string>
   <string name="stepCounter" formatted="false">ਸਟੈਪ %d ਦਾ%d</string>
   <string name="support">ਸਹਾਇਤਾ</string>
-  <string name="support_content">ਜੋ ਮੁੱਦੇ ਸਹਾਇਤਾ ਵਿਸ਼ੇ ਦੁਆਰਾ ਕਵਰ ਨਹੀਂ ਹੁੰਦੇ ਉਨ੍ਹਾਂ ਵਾਸਤੇ ਮਦਦ</string>
+  <string name="support_content">ਜੋ ਮੁੱਦੇ ਸਹਾਇਤਾ ਵਿਸ਼ੇ ਦੁਆਰਾ ਕਵਰ ਨਹੀਂ ਹੁੰਦੇ ਉਨ੍ਹਾਂ ਲਈ ਸਹਾਇਤਾ</string>
   <string name="tasmania">ਤਸਮਾਨੀਆ</string>
   <string name="title_help">ਸਹਾਇਤਾ</string>
   <string name="total_confirmed_cases">ਕੁੱਲ ਪੁਸ਼ਟੀ ਕੀਤੇ ਕੇਸ</string>
-  <string name="total_per_state">ਰਾਜ ਅਤੇ ਖੇਤਰ ਮੁਤਾਬਕ ਕੁੱਲ ਪੁਸ਼ਟੀ ਕੀਤੇ ਕੇਸ</string>
+  <string name="total_per_state">ਪ੍ਰਾਂਤ ਅਤੇ ਹਲਕੇ ਅਨੁਸਾਰ ਕੁੱਲ ਪੁਸ਼ਟੀ ਕੀਤੇ ਕੇਸ</string>
   <string name="under_sixteen_content">ਮੈਂ ਆਸਟਰੇਲੀਆਈ ਸਰਕਾਰ ਦੇ ਸਿਹਤ ਵਿਭਾਗ ਦੇ ਸਕੱਤਰ ਦੁਆਰਾ ਕੀਤੇ ਕਨੂੰਨੀ ਨਿਰਣੇ ਦੇ ਤਹਿਤ, ਡੇਟਾ ਸਟੋਰ ਪ੍ਰਸ਼ਾਸ਼ਕ ਵਜੋਂ ਡਿਜ਼ਿਟਲ ਤਬਦੀਲੀ ਏਜੰਸੀ ਨੂੰ ਮੇਰੇ ਮਾਪੇ ਜਾਂ ਸਰਪ੍ਰਸਤ ਦੀਆਂ ਸਹਿਮਤੀਆਂ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦਾ/ਕਰਦੀ ਹਾਂ:</string>
   <string name="under_sixteen_first_paragraph">ਮੇਰੀ ਪੰਜੀਕਰਨ ਜਾਣਕਾਰੀ।</string>
   <!-- OnBoarding Under Sixteen -->
@@ -450,6 +456,7 @@
   <string name="update_available_message_android">ਅਸੀਂ COVIDSafe ਵਿੱਚ ਸੁਧਾਰ ਕਰਦੇ ਆ ਰਹੇ ਹਾਂ। ਗੂਗਲ ਪਲੇ ਸਟੋਰ ਰਾਹੀਂ ਅੱਪਡੇਟ ਕਰੋ।</string>
   <string name="update_available_play_store_btn">ਗੂਗਲ ਪਲੇ ਸਟੋਰ \'ਤੇ ਜਾਓ</string>
   <string name="update_available_title">ਅੱਪਡੇਟ ਉਪਲਬਧ ਹੈ|</string>
+  <string name="update_screen_location">Bluetooth® ਤੱਕ ਪਹੁੰਚਣ ਲਈ ਗੂਗਲ ਨੂੰ *ਐਂਡਰਾਇਡ ਐਪਾਂ ਲਈ ਲੋਕੇਸ਼ਨ ਆਗਿਆ* ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। COVIDSafe ਲੋਕੇਸ਼ਨ ਡੇਟਾ ਸਟੋਰ ਜਾਂ ਵਰਤੋਂ ਨਹੀਂ ਕਰਦਾ।</string>
   <string name="upload_answer_no">ਨਹੀਂ</string>
   <!-- Upload flow -->
   <string name="upload_answer_yes">ਹਾਂ</string>
@@ -468,6 +475,7 @@
   <string name="upload_step_verify_pin_header_content_description">ਸਿਰਲੇਖ, ਆਪਣੀ ਜਾਣਕਾਰੀ ਅੱਪਲੋਡ ਕਰੋ</string>
   <string name="upload_step_verify_pin_sub_header">ਕੋਈ ਰਾਜ ਜਾਂ ਹਲਕਾ ਸਿਹਤ ਅਧਿਕਾਰੀ ਲਿਖਤੀ ਸੰਦੇਸ਼ ਰਾਹੀਂ ਤੁਹਾਡੀ ਡੀਵਾਈਸ \'ਤੇ ਪਿੰਨ ਭੇਜੇਗਾ। ਆਪਣੀ ਜਾਣਕਾਰੀ ਨੂੰ ਅੱਪਲੋਡ ਕਰਨ ਲਈ ਹੇਠਾਂ ਭਰੋ।</string>
   <string name="us_consent_button">ਮੈਂ ਸਹਿਮਤ ਹਾਂ</string>
+  <string name="us_registration_consent_diagnostic">ਇਹ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਜਾਣਕਾਰੀ ਕਿ COVIDSafe ਮੇਰੀ ਡੀਵਾਈਸ \'ਤੇ  ਠੀਕ ਕੰਮ ਕਰ ਰਹੀ ਹੈ।</string>
   <string name="victoria">ਵਿਕਟੋਰੀਆ</string>
   <string name="western_australia">ਪੱਛਮੀ ਆਸਟਰੇਲੀਆ</string>
   <string name="wrong_ping_number">ਗਲਤ ਪਿੰਨ ਭਰਿਆ</string>

app/src/main/res/values-tr/strings.xml

@@ -19,7 +19,8 @@
   <string name="change_device_name_secondary_action">Atla ve mevcut adı koru</string>
   <string name="change_language">Dili değiştir</string>
   <string name="change_language_content">COVIDSafe\'i farklı bir dilde kullanmak için ilgili kılavuzu okuyunuz.</string>
-  <string name="CodeHasExpired">Kodunuzun süresi doldu.</string>
+  <string name="CodeHasExpired">PIN kodunuzun süresi doldu.</string>
+  <string name="collection_message">COVIDSafe artık uygulamanızla ilgili sorunları gidermenize yardımcı olmak için tanılama bilgileri toplamaktadır. *Daha fazla bilgi edin*</string>
   <string name="consent_button">Kabul ediyorum</string>
   <!-- Shared Consent Actions -->
   <string name="consent_call_for_action">Rızanızı onaylamak için \'Kabul ediyorum\'u seçiniz.</string>
@@ -236,7 +237,6 @@
   <string name="country_region_name_zm">Zambiya</string>
   <string name="country_region_name_zw">Zimbabve</string>
   <string name="data_privacy_button">Sonraki</string>
-  <string name="data_privacy_content">COVIDSafe\'a kaydolmadan önce *COVIDSafe gizlilik ilkesini* okumanız önemlidir. \n\n16 yaşından küçükseniz, ebeveyniniz/veliniz de *gizlilik ilkesini* okumalıdır. \n\nCOVIDSafe kullanımı tamamen isteğe bağlıdır. Uygulamayı istediğiniz zaman yükleyebilir veya silebilirsiniz. COVIDSafe\'i silerseniz *bilgilerinizin güvenli sunucudan silinmesini de* isteyebilirsiniz. \n\nCOVIDSafe\'e kaydolmak için bir ad (veya takma ad), cep telefonu numarası, yaş aralığı ve posta kodu girmeniz gerekir. \n\nKayıt olurken gönderdiğiniz bilgiler ve COVIDSafe kullanımınızla ilgili bilgiler yüksek düzeyde güvenli bir sunucuda toplanacak ve saklanacaktır. \n\nCOVIDSafe konum bilgilerinizi toplamaz. \n\nCOVIDSafe temas saatini, temas ettiğiniz diğer COVIDSafe kullanıcılarının gizli kimlik kodlarını, Bluetooth® sinyal gücünü ve diğer kullanıcıların telefon modellerini cihazınıza kaydeder. \n\nTemas ettiğiniz diğer COVIDSafe kullanıcıları da gizli  kimlik kodunuzu, sizinle temas tarih ve saatini, Bluetooth® sinyal gücünü ve telefon modelinizi kendi cihazlarında kaydedecektir. \n\nBaşka bir kullanıcının COVID-19 testinin pozitif çıkması durumunda kendi iletişim bilgilerini sisteme yükleyebilir ve bir eyalet veya bölge sağlık yetkilisi temas takibi amacıyla sizinle iletişime geçebilir. \n\nKayıt bilgileriniz yalnızca temas takibi ve COVIDSafe\'in düzgün ve yasalara uygun çalışması için kullanılacak ya da açıklanacaktır. \n\nDaha fazla bilgiyi *Avustralya Hükümeti Sağlık Bakanlığı* web sitesinde bulabilirsiniz. \n\nBilgileriniz ve bu bilgilerin nasıl işleneceği ve paylaşılacağına dair haklarınızla ilgili daha fazla bilgi için COVIDSafe *gizlilik ilkesine* bakınız.</string>
   <string name="data_privacy_content_android">COVIDSafe\'a kaydolmadan önce *COVIDSafe gizlilik ilkesini* okumanız önemlidir. \n\n16 yaşından küçükseniz, ebeveyniniz/veliniz de *gizlilik ilkesini* okumalıdır. \n\nCOVIDSafe kullanımı tamamen isteğe bağlıdır. Uygulamayı istediğiniz zaman yükleyebilir veya silebilirsiniz. COVIDSafe\'i silerseniz *bilgilerinizin güvenli sunucudan silinmesini de* isteyebilirsiniz. \n\nCOVIDSafe\'e kaydolmak için bir ad (veya takma ad), cep telefonu numarası, yaş aralığı ve posta kodu girmeniz gerekir. \n\nKayıt olurken gönderdiğiniz bilgiler ve COVIDSafe kullanımınızla ilgili bilgiler yüksek düzeyde güvenli bir sunucuda toplanacak ve saklanacaktır. \n\nCOVIDSafe konum bilgilerinizi toplamaz. \n\nCOVIDSafe temas saatini, temas ettiğiniz diğer COVIDSafe kullanıcılarının gizli kimlik kodlarını, Bluetooth® sinyal gücünü ve diğer kullanıcıların telefon modellerini cihazınıza kaydeder. \n\nTemas ettiğiniz diğer COVIDSafe kullanıcıları da gizli  kimlik kodunuzu, sizinle temas tarih ve saatini, Bluetooth® sinyal gücünü ve telefon modelinizi kendi cihazlarında kaydedecektir. \n\nBaşka bir kullanıcının COVID-19 testinin pozitif çıkması durumunda kendi iletişim bilgilerini sisteme yükleyebilir ve bir eyalet veya bölge sağlık yetkilisi temas takibi amacıyla sizinle iletişime geçebilir. \n\nKayıt bilgileriniz yalnızca temas takibi ve COVIDSafe\'in düzgün ve yasalara uygun çalışması için kullanılacak ya da açıklanacaktır. \n\nDaha fazla bilgiyi *Avustralya Hükümeti Sağlık Bakanlığı* web sitesinde bulabilirsiniz. \n\nBilgileriniz ve bu bilgilerin nasıl işleneceği ve paylaşılacağına dair haklarınızla ilgili daha fazla bilgi için COVIDSafe *gizlilik ilkesine* bakınız.</string>
   <!-- OnBoarding Data Privacy -->
   <string name="data_privacy_headline">Kayıt ve gizlilik</string>
@@ -247,6 +247,7 @@
   <string name="dialog_error_uploading_positive">Tekrar deneyin</string>
   <string name="dialog_uploading_message">COVIDSafe bilgileriniz şu anda sisteme yükleniyor. \n\n Lütfen uygulamayı kapatmayın.</string>
   <string name="disabled">Devre dışı</string>
+  <string name="dismiss">Reddet</string>
   <string name="done_success">Bitti</string>
   <string name="enabled">Etkin</string>
   <string name="enter_number_button">PIN al</string>
@@ -267,6 +268,7 @@
   <string name="generic_error">Lütfen daha sonra tekrar deneyin</string>
   <string name="generic_internet_error">Lütfen internet bağlantınızı kontrol edin</string>
   <string name="heading">Başlık</string>
+  <string name="hide">Gizle</string>
   <string name="home_app_permission_push_notification_prompt">COVIDSafe\'in anında bildirimleri iletmesine izin verin.</string>
   <string name="home_app_permission_status_subtitle">COVIDSafe doğru ayarlar olmadan çalışmaz. </string>
   <string name="home_app_permission_status_title">Ayarlarınızı kontrol edin</string>
@@ -311,7 +313,7 @@
   <string name="home_set_complete_external_link_self_isolation_register_url">https://covid-form.service.gov.au</string>
   <string name="home_set_complete_external_link_share_content">Başkalarını yardıma davet edin. Birlikte daha da güçlüyüz.</string>
   <string name="home_set_complete_external_link_share_title">COVIDSafe\'i paylaşın</string>
-  <string name="home_set_location_why">Bluetooth®\'a erişmek için Android uygulamalarının konum izinlerinin açık olması gerekir. COVIDSafe, konum verilerini saklamaz ve kullanmaz.</string>
+  <string name="home_set_location_why">Google\'ın Bluetooth®\'a erişmesi için Android uygulamaları için konum izni gereklidir. COVIDSafe, konum verilerini saklamaz ve kullanmaz.</string>
   <string name="home_setup_help">Yardım</string>
   <string name="home_setup_incomplete_subtitle">COVIDSafe\'in bu özelliklere erişmek için izne ihtiyacı vardır.</string>
   <string name="home_setup_incomplete_title">İzinleri\nkontrol edin</string>
@@ -343,7 +345,9 @@
   <string name="invalid_phone_number_digits_error_prompt" formatted="false">%1s ülkesindeki cep telefonu numaraları %2s rakam içerir.</string>
   <string name="invalid_post_code">Geçersiz posta kodu</string>
   <string name="IssueFooter">Geri bildiriminiz hakkında daha fazla bilgi için sizinle iletişime geçebiliriz. E-posta adresiniz başka hiçbir amaçla kullanılmayacaktır.</string>
-  <string name="loading_numbers">En son sayıla yükleniyor</string>
+  <string name="jwt_description">Kayıt bilgilerinizle ilgili bir sorun var.</string>
+  <string name="jwt_heading">Lütfen tekrar kayıt olun</string>
+  <string name="loading_numbers">En son sayılar yükleniyor</string>
   <!-- Splash Screen -->
   <string name="migration_in_progress"> COVIDSafe güncellemesi devam ediyor. \n\n Lütfen güncelleme tamamlanana kadar telefonunuzu kapatmayın.</string>
   <string name="national_numbers">Ulusal sayılar</string>
@@ -360,7 +364,7 @@
   <string name="notification_battery">COVIDSafe\'in çalışması için Pil optimizasyonunu devre dışı bırakınız.</string>
   <string name="notification_bluetooth">COVIDSafe\'in çalışması için Bluetooth\'u açınız.</string>
   <string name="notification_bt_and_battery">COVIDSafe\'in çalışması için Bluetooth\'u açınız ve Pil optimizasyonunu devre dışı bırakınız.</string>
-  <string name="notification_internet_content">Uygulamayı açınız ve COVIDSafe\'in çalışması için internet bağlantınızı kontrol ediniz.</string>
+  <string name="notification_internet_content">Uygulamayı açın ve internet bağlantınızı kontrol edin.</string>
   <string name="notification_location">Bluetooth\'un çalışması için Konum izinlerini verin.</string>
   <string name="notification_not_active_body">Evden çıkarken veya halka açık yerlerde COVIDSafe\'yi aktif tuttuğunuzdan emin olun.</string>
   <string name="notification_not_active_title">COVIDSafe aktif değildir</string>
@@ -374,16 +378,16 @@
   <!-- Figma page iOS Screens (05/06) -->
   <string name="NotificationsEnabledBlurb">COVIDSafe aktif olmadığında bildirim alacaksınız.\nBildirim ayarlarını değiştir</string>
   <string name="numbers_error">Güncellenen sayılar kontrol edilemiyor.</string>
-  <string name="numbers_no_internet">Güncellenen sayıları aldığınızdan emin olmak için internete bağlanın</string>
+  <string name="numbers_no_internet">Güncellenen sayıları aldığınızdan emin olmak için internete bağlanın.</string>
   <string name="numbers_refresh">Şimdi yenile</string>
   <string name="options_for_australia">Avustralya için seçenekler</string>
   <string name="permission_button">İlerle</string>
-  <string name="permission_content">COVIDSafe\'in çalışması için Bluetooth® ve bildirimlerin etkin olmalıdır. \n\nAşağıdakileri yapmak için \'İlerle\'yi seçin: \n\n1. Bluetooth®\'u etkinleştirmek \n\n2. Konum izinlerini vermek\n\n3. Pil optimizasyonunu devre dışı bırakmak \n\n\nAndroid, Bluetooth®\'un çalışması için Konum izinlerine ihtiyaç duyar. \n\nCOVIDSafe eşleştirme istekleri göndermez.</string>
+  <string name="permission_content">COVIDSafe\'in çalışması için Bluetooth® ve bildirimler etkin olmalıdır. \n\nAşağıdakileri yapmak için \'İlerle\'yi seçin: \n\n1. Bluetooth®\'u etkinleştirmek \n\n2. Konum izinlerini vermek\n\n3. Pil optimizasyonunu devre dışı bırakmak \n\nGoogle\'ın Bluetooth®\'a erişmesi için Android uygulamaları için konum izni gereklidir. COVIDSafe konum verilerini saklamaz ve kullanmaz. \n\nCOVIDSafe eşleştirme istekleri göndermez.</string>
   <!-- OnBoarding Permission -->
   <string name="permission_headline">Uygulama ayarları</string>
   <string name="permission_location_rationale">Android, COVIDSafe için Bluetooth® işlevlerini etkinleştirmek amacıyla konuma erişim gerektirir. COVIDSafe, Bluetooth® olmadan düzgün çalışamaz</string>
   <string name="permission_success_button">Bitti</string>
-  <string name="permission_success_content">1. Evden çıkarken telefonunuzu yanınıza alın ve COVIDSafe\'in aktif olduğundan emin olun. \n\n2. Bluetooth® AÇIK tutulmalıdır.\n\n3. Pil optimizasyonu KAPALI olmalıdır.\n\n4. COVIDSafe eşleştirme istekleri göndermez. *Daha fazla bilgi edinin*.\n\n5. Bluetooth®\'a erişmek için *Android için konum izinleri* gereklidir. COVIDSafe konum verilerini saklamaz ve kullanmaz.</string>
+  <string name="permission_success_content">1. Evden çıkarken telefonunuzu yanınıza alın ve COVIDSafe\'in aktif olduğundan emin olun. \n\n2. Bluetooth® AÇIK tutulmalıdır.\n\n3. Pil optimizasyonu KAPALI olmalıdır.\n\n4. COVIDSafe eşleştirme istekleri göndermez. *Daha fazla bilgi edinin*.\n\n5. Google\'ın Bluetooth®\'a erişmesi için *Android uygulamaları için konum izni* gereklidir. COVIDSafe konum verilerini saklamaz ve kullanmaz.</string>
   <!-- OnBoarding Permission Success -->
   <string name="permission_success_headline">Başarıyla kayıt oldunuz</string>
   <string name="permission_success_warning">COVIDSafe için anlık bildirimleri açık tutun, böylece uygulama düzgün çalışmıyorsa sizi hızlı bir şekilde bilgilendirebiliriz.</string>
@@ -410,8 +414,9 @@
   <string name="PN_MobileNumber_VOLabel">Cep telefonu numarası</string>
   <string name="queensland">Queensland</string>
   <string name="ReceivePinIssue">PIN alma sorunu mu yaşıyorsunuz?</string>
-  <string name="recovered">İyileşen toplam vakalar</string>
+  <string name="recovered">Toplam iyileşen vakalar</string>
   <string name="registration_consent_content">Avustralya Hükümeti Sağlık Bakanının yasal olarak belirlediğine uygun olarak aşağıdaki bilgileri toplayan Dijital Dönüşüm Ajansı\'nı veri deposu yöneticisi olarak onaylıyorum:</string>
+  <string name="registration_consent_diagnostic">COVIDSafe\'in cihazımda düzgün çalıştığından emin olmak için gereken bilgiler.</string>
   <string name="registration_consent_first_paragraph">Kayıt bilgilerim.</string>
   <!-- Onboarding Registration Consent -->
   <string name="registration_consent_headline">Kayıt onayı</string>
@@ -428,6 +433,7 @@
   <string name="service_ok_title">COVIDSafe aktif durumdadır</string>
   <string name="settings">Ayarlar</string>
   <string name="share_this_app_content">COVID-19\'un yayılmasını durdurmada bana katılın! Avustralya Hükümeti\'nin bir uygulaması olan COVIDSafe\'i indirin. # COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
+  <string name="show">Göster</string>
   <string name="south_australia">Güney Avustralya</string>
   <string name="stepCounter" formatted="false">Adım %d / %d</string>
   <string name="support">Destek</string>
@@ -450,6 +456,7 @@
   <string name="update_available_message_android">COVIDSafe\'de iyileştirmeler yapmaktayız.\nGoogle Play Store üzerinden güncelleme yapın</string>
   <string name="update_available_play_store_btn">Google Play Store\'a git</string>
   <string name="update_available_title">Güncelleme mevcut!</string>
+  <string name="update_screen_location">Google\'ın Bluetooth®\'a erişmesi için *Android uygulamaları için konum izni* gereklidir. COVIDSafe, konum verilerini saklamaz veya kullanmaz.</string>
   <string name="upload_answer_no">Hayır</string>
   <!-- Upload flow -->
   <string name="upload_answer_yes">Evet</string>
@@ -468,6 +475,7 @@
   <string name="upload_step_verify_pin_header_content_description">Başlık, bilgilerinizi sisteme yükleyiniz</string>
   <string name="upload_step_verify_pin_sub_header">Eyalet veya bölge sağlık yetkilisi cihazınıza mesaj olarak bir PIN gönderecektir. Bilgilerinizi sisteme yüklemek için PIN\'i aşağıya giriniz.</string>
   <string name="us_consent_button">Kabul ediyorum</string>
+  <string name="us_registration_consent_diagnostic">COVIDSafe\'in cihazımda düzgün çalıştığından emin olmak için gereken bilgiler.</string>
   <string name="victoria">Viktorya</string>
   <string name="western_australia">Batı Avustralya</string>
   <string name="wrong_ping_number"> Yanlış PIN girildi</string>

app/src/main/res/values-vi/strings.xml

@@ -19,7 +19,8 @@
   <string name="change_device_name_secondary_action">Bỏ qua và giữ nguyên</string>
   <string name="change_language">Thay đổi ngôn ngữ</string>
   <string name="change_language_content">Đọc hướng dẫn về cách sử dụng COVIDSafe bằng ngôn ngữ khác.</string>
-  <string name="CodeHasExpired">Mã của bạn đã hết hạn.</string>
+  <string name="CodeHasExpired">Mã PIN của bạn đã hết hạn.</string>
+  <string name="collection_message">COVIDSafe hiện đang thu thập thông tin chẩn đoán để giúp bạn khắc phục sự cố với Ứng dụng của mình. *Tìm hiểu thêm *</string>
   <string name="consent_button">Tôi đồng ý</string>
   <!-- Shared Consent Actions -->
   <string name="consent_call_for_action">Chọn \'Tôi đồng ý\' để xác nhận đồng ý.</string>
@@ -236,7 +237,6 @@
   <string name="country_region_name_zm">Zambia</string>
   <string name="country_region_name_zw">Zimbabwe</string>
   <string name="data_privacy_button">Tiếp theo</string>
-  <string name="data_privacy_content">Điều quan trọng là bạn phải đọc *chính sách bảo mật* COVIDSafe trước khi đăng ký COVIDSafe. \n\nNếu bạn dưới 16 tuổi, cha mẹ/người giám hộ của bạn cũng phải đọc *chính sách bảo mật *. \n\nSử dụng COVIDSafe là hoàn toàn tự nguyện. Bạn có thể cài đặt hoặc xóa ứng dụng bất cứ lúc nào. Nếu bạn xóa COVIDSafe, *bạn cũng có thể yêu cầu xóa thông tin của mình* khỏi máy chủ bảo mật. \n\nĐể đăng ký COVIDSafe, bạn sẽ cần nhập tên (hoặc biệt danh), số điện thoại di động, độ tuổi và mã bưu điện. \n\nThông tin bạn gửi khi đăng ký và thông tin về việc sử dụng COVIDSafe của bạn sẽ được thu thập và lưu trữ trên một máy chủ có độ an toàn cao. \n\nCOVIDSafe sẽ không thu thập thông tin vị trí của bạn. \n\nCOVIDSafe sẽ ghi nhớ thời gian tiếp xúc, mã ID ẩn danh của những người dùng COVIDSafe khác mà bạn tiếp xúc, cường độ tín hiệu Bluetooth® và kiểu điện thoại của người dùng khác trên thiết bị của bạn. \n\nNhững người dùng COVIDSafe khác mà bạn tiếp xúc cũng sẽ ghi nhớ mã ID ẩn danh của bạn, thời gian tiếp xúc, cường độ tín hiệu Bluetooth® và kiểu điện thoại của bạn, trên thiết bị của họ.\n\nNếu người dùng khác xét nghiệm dương tính với COVID-19, họ có thể đăng tải thông tin tiếp xúc của họ và nhân viên y tế của tiểu bang hoặc lãnh thổ có thể liên hệ với bạn nhằm mục đích truy tìm tiếp xúc. \n\nChi tiết đăng ký của bạn sẽ chỉ được sử dụng hoặc tiết lộ để theo dõi việc tiếp xúc và hoạt động đúng đắn và hợp pháp của COVIDSafe. \n\nThông tin để tìm hiểu thêm có tại trang mạng của *Bộ Y tế Chính phủ Úc*. \n\n Xem *chính sách bảo mật* của COVIDSafe để biết thêm chi tiết các quyền về thông tin của bạn và cách xử lý và chia sẻ thông tin đó.\n </string>
   <string name="data_privacy_content_android">Điều quan trọng là bạn phải đọc *chính sách bảo mật* COVIDSafe trước khi đăng ký COVIDSafe. \n\nNếu bạn dưới 16 tuổi, cha mẹ/người giám hộ của bạn cũng phải đọc *chính sách bảo mật *. \n\nSử dụng COVIDSafe là hoàn toàn tự nguyện. Bạn có thể cài đặt hoặc xóa ứng dụng bất cứ lúc nào. Nếu bạn xóa COVIDSafe, *bạn cũng có thể yêu cầu xóa thông tin của mình* khỏi máy chủ bảo mật. \n\nĐể đăng ký COVIDSafe, bạn sẽ cần nhập tên (hoặc biệt danh), số điện thoại di động, độ tuổi và mã bưu điện. \n\nThông tin bạn gửi khi đăng ký và thông tin về việc sử dụng COVIDSafe của bạn sẽ được thu thập và lưu trữ trên một máy chủ có độ an toàn cao. \n\nCOVIDSafe sẽ không thu thập thông tin vị trí của bạn. \n\nCOVIDSafe sẽ ghi nhớ thời gian tiếp xúc, mã ID ẩn danh của những người dùng COVIDSafe khác mà bạn tiếp xúc, cường độ tín hiệu Bluetooth® và kiểu điện thoại của người dùng khác trên thiết bị của bạn. \n\nNhững người dùng COVIDSafe khác mà bạn tiếp xúc cũng sẽ ghi nhớ mã ID ẩn danh của bạn, thời gian tiếp xúc, cường độ tín hiệu Bluetooth® và kiểu điện thoại của bạn, trên thiết bị của họ.\n\nNếu người dùng khác xét nghiệm dương tính với COVID-19, họ có thể đăng tải thông tin tiếp xúc của họ và nhân viên y tế của tiểu bang hoặc lãnh thổ có thể liên hệ với bạn nhằm mục đích truy tìm tiếp xúc. \n\nChi tiết đăng ký của bạn sẽ chỉ được sử dụng hoặc tiết lộ để theo dõi việc tiếp xúc và hoạt động đúng đắn và hợp pháp của COVIDSafe. \n\nThông tin để tìm hiểu thêm có tại trang mạng của *Bộ Y tế Chính phủ Úc*. \n\n Xem *chính sách bảo mật* của COVIDSafe để biết thêm chi tiết các quyền về thông tin của bạn và cách xử lý và chia sẻ thông tin đó.\n </string>
   <!-- OnBoarding Data Privacy -->
   <string name="data_privacy_headline">Đăng ký và bảo mật</string>
@@ -247,6 +247,7 @@
   <string name="dialog_error_uploading_positive">Thử lại</string>
   <string name="dialog_uploading_message">Thông tin COVIDSafe của bạn hiện đang được đăng tải. \n\n Vui lòng không đóng ứng dụng.</string>
   <string name="disabled">Đã tắt</string>
+  <string name="dismiss">Bỏ qua</string>
   <string name="done_success">Hoàn tất</string>
   <string name="enabled">Đã bật</string>
   <string name="enter_number_button">Nhận mã PIN</string>
@@ -267,6 +268,7 @@
   <string name="generic_error">Vui lòng thử lại sau</string>
   <string name="generic_internet_error">Xin vui lòng kiểm tra kết nối Internet của bạn</string>
   <string name="heading">Tiêu đề</string>
+  <string name="hide">Ẩn</string>
   <string name="home_app_permission_push_notification_prompt">Cho phép COVIDSafe gửi thông báo.</string>
   <string name="home_app_permission_status_subtitle">COVIDSafe sẽ không hoạt động nếu không có cài đặt phù hợp.</string>
   <string name="home_app_permission_status_title">Kiểm tra cài đặt của bạn</string>
@@ -284,7 +286,7 @@
   <string name="home_header_active_title_thanks">Cảm ơn, COVIDSafe hiện đang hoạt động.</string>
   <string name="home_header_inactive_check_your_permissions">Kiểm tra cài đặt của bạn.</string>
   <string name="home_header_inactive_title">COVIDSafe không hoạt động</string>
-  <string name="home_header_no_pairing">COVIDSafe không gửi *yêu cầu kết nối*.</string>
+  <string name="home_header_no_pairing">COVIDSafe không gửi *yêu cầu ghép nối*.</string>
   <string name="home_header_uploaded_on_date">Thông tin của bạn đã được đăng tải lên %s .</string>
   <string name="home_location_permission">Vị trí: %s</string>
   <string name="home_non_battery_optimization_permission">Tối ưu hóa pin: %s</string>
@@ -297,7 +299,7 @@
   <string name="home_set_complete_external_link_app_url">https://www.health.gov.au/resource/apps-and-tools/coronavirus-australia-app</string>
   <string name="home_set_complete_external_link_been_contacted_content">Bạn chỉ có thể đăng tải thông tin của mình nếu bạn được xét nghiệm có kết quả dương tính.</string>
   <string name="home_set_complete_external_link_been_contacted_title">Nhân viên y tế có liên lạc với bạn không?</string>
-  <string name="home_set_complete_external_link_help_topics_content">Hướng dẫn cách khắc phục và sửa chữa sự cố kỹ thuật</string>
+  <string name="home_set_complete_external_link_help_topics_content">Hướng dẫn cách khắc phục và sửa chữa các sự cố kỹ thuật</string>
   <string name="home_set_complete_external_link_help_topics_title">Các chủ đề trợ giúp</string>
   <string name="home_set_complete_external_link_news_content">Vào aus.gov.au để biết tin tức mới nhất về Coronavirus.</string>
   <string name="home_set_complete_external_link_news_title">Tin tức và cập nhật mới nhất</string>
@@ -311,7 +313,7 @@
   <string name="home_set_complete_external_link_self_isolation_register_url">https://covid-form.service.gov.au</string>
   <string name="home_set_complete_external_link_share_content">Mời những người khác giúp đỡ. Cùng nhau, chúng ta mạnh mẽ hơn.</string>
   <string name="home_set_complete_external_link_share_title">Chia sẻ COVIDSafe</string>
-  <string name="home_set_location_why">Ứng dụng Android cần được bật quyền truy cập vị trí để tiếp cận Bluetooth®. COVIDSafe không lưu trữ hoặc sử dụng dữ liệu về vị trí.</string>
+  <string name="home_set_location_why">Google cần quyền truy cập Vị trí để các ứng dụng Android truy cập Bluetooth®. COVIDSafe không lưu trữ hoặc sử dụng dữ liệu vị trí.</string>
   <string name="home_setup_help">Trợ giúp</string>
   <string name="home_setup_incomplete_subtitle">COVIDSafe cần được cho phép để truy cập các tính năng này.</string>
   <string name="home_setup_incomplete_title">Kiểm tra \nsự cho phép</string>
@@ -322,6 +324,7 @@
   <!-- OnBoarding How it works -->
   <string name="how_it_works_headline">COVIDSafe hoạt động như thế nào</string>
   <string name="how_it_works_headline_content_description">Tiêu đề, COVIDSafe hoạt động như thế nào</string>
+  <string name="improve">Cải thiện hiệu năng của ứng dụng</string>
   <string name="improve_heading">Cải thiện hoạt động của COVIDSafe</string>
   <string name="internet_connection_content">Kết nối với internet để đảm bảo nhận được thông báo về các sự cố và cập nhật.</string>
   <string name="internet_connection_heading">Không có kết nối Internet</string>
@@ -342,6 +345,9 @@
   <string name="invalid_phone_number_digits_error_prompt" formatted="false">Số điện thoại di động ở %1s chứa %2s chữ số.</string>
   <string name="invalid_post_code">Mã bưu điện không hợp lệ</string>
   <string name="IssueFooter">Chúng tôi có thể liên lạc với bạn để biết thêm chi tiết về phản hồi của bạn. Địa chỉ email của bạn sẽ không được sử dụng cho bất kỳ mục đích nào khác.</string>
+  <string name="jwt_description">Có vấn đề với thông tin đăng ký của bạn.</string>
+  <string name="jwt_heading">Vui lòng đăng ký lại</string>
+  <string name="loading_numbers">Đang tải các số mới nhất</string>
   <!-- Splash Screen -->
   <string name="migration_in_progress">COVIDSafe trong tiến trình cập nhật. \n\nVui lòng đảm bảo điện thoại của bạn không bị tắt cho đến khi cập nhật hoàn tất.</string>
   <string name="national_numbers">Số ca nhiễm trên toàn quốc</string>
@@ -358,7 +364,8 @@
   <string name="notification_battery">Tắt tính năng tối ưu hóa pin để COVIDSafe hoạt động.</string>
   <string name="notification_bluetooth">Bật Bluetooth để COVIDSafe hoạt động</string>
   <string name="notification_bt_and_battery">Bật Bluetooth và tắt tính năng tối ưu hóa Pin để COVIDSafe hoạt động.</string>
-  <string name="notification_internet_content">Mở ứng dụng và kiểm tra kết nối internet của bạn để COVIDSafe hoạt động.</string>
+  <string name="notification_internet_content">Mở ứng dụng và kiểm tra kết nối internet của bạn.</string>
+  <string name="notification_location">Cho phép quyền truy cập Vị trí để Bluetooth hoạt động.</string>
   <string name="notification_not_active_body">Đảm bảo COVIDSafe hoạt động trước khi bạn rời khỏi nhà hoặc khi ở những nơi công cộng.</string>
   <string name="notification_not_active_title">COVIDSafe không hoạt động</string>
   <string name="notification_settings">Mở ứng dụng để kiểm tra cài đặt của bạn.</string>
@@ -370,14 +377,17 @@
   <string name="NotificationsDisabledBlurb">Bạn sẽ không nhận được thông báo nếu COVIDSafe không hoạt động. \nThay đổi cài đặt thông báo</string>
   <!-- Figma page iOS Screens (05/06) -->
   <string name="NotificationsEnabledBlurb">Bạn sẽ nhận được thông báo nếu COVIDSafe không hoạt động. \nThay đổi cài đặt thông báo</string>
+  <string name="numbers_error">Không thể kiểm tra các số đã cập nhật.</string>
+  <string name="numbers_no_internet">Kết nối với internet để đảm bảo bạn nhận được các số cập nhật.</string>
+  <string name="numbers_refresh">Làm mới ngay</string>
   <string name="options_for_australia">Tùy chọn cho Úc</string>
   <string name="permission_button">Kích hoạt</string>
-  <string name="permission_content">COVIDSafe cần Bluetooth® và thông báo được bật mở để hoạt động. \n\n Chọn \'Kích hoạt\' để: \n\n 1. Bật mở Bluetooth® \n\n 2. Cho phép quyền truy cập vị trí \n\n 3. Tắt tối ưu hóa pin \n\n\nAndroid cần quyền truy cập Vị trí để Bluetooth® hoạt động. \n\nCOVIDSafe không gửi yêu cầu kết nối.</string>
+  <string name="permission_content">Bluetooth® và thông báo cần được bật để COVIDSafe hoạt động. \n\n Chọn \'Kích hoạt\' để: \n\n 1. Bật Bluetooth® \n\n 2. Cho phép quyền truy cập vị trí \n\n 3. Tắt tối ưu hóa pin \n\nGoodle cần quyền truy cập Vị trí để các ứng dụng Android truy cập Bluetooth. COVIDSafe không lưu trữ hoặc sử dụng dữ liệu vị trí. COVIDSafe không gửi yêu cầu ghép nối.</string>
   <!-- OnBoarding Permission -->
   <string name="permission_headline">Cài đặt ứng dụng</string>
   <string name="permission_location_rationale">Android yêu cầu quyền truy cập vị trí để kích hoạt các chức năng Bluetooth® cho COVIDSafe. Nếu không, COVIDSafe sẽ không thể hoạt động đúng cách</string>
   <string name="permission_success_button">Hoàn tất</string>
-  <string name="permission_success_content">1. Hãy mang theo điện thoại khi rời khỏi nhà và chắc rằng COVIDSafe đang hoạt động. \n\n2. Nên BẬT Bluetooth®. \n\n3. Nên TẮT tối ưu hóa pin. \n\n4. COVIDSafe không gửi yêu cầu ghép nối. *Tìm hiểu thêm*.\n \n5. *Quyền truy cập vị trí cho Android* là cần thiết để tiếp cận Bluetooth® . COVIDsafe không lưu trữ hoặc sử dụng dữ liệu vị trí.</string>
+  <string name="permission_success_content">1. Hãy mang theo điện thoại khi rời khỏi nhà và chắc rằng COVIDSafe đang hoạt động. \n\n2. Nên BẬT Bluetooth®. \n\n3. Nên TẮT tối ưu hóa pin. \n\n4. COVIDSafe không gửi yêu cầu ghép nối. *Tìm hiểu thêm*.\n \n5. Google cần *Quyền truy cập vị trí cho các ứng dụng Android* để truy cập Bluetooth. COVIDsafe không lưu trữ hoặc sử dụng dữ liệu vị trí.</string>
   <!-- OnBoarding Permission Success -->
   <string name="permission_success_headline">Bạn đã đăng ký thành công</string>
   <string name="permission_success_warning">Luôn bật gửi thông báo của COVIDSafe để chúng tôi có thể nhanh chóng thông báo cho bạn nếu ứng dụng không hoạt động đúng cách.</string>
@@ -405,7 +415,8 @@
   <string name="queensland">Queensland</string>
   <string name="ReceivePinIssue">Có vấn đề với việc nhận mã PIN?</string>
   <string name="recovered">Tổng số ca phục hồi</string>
-  <string name="registration_consent_content">Tôi đồng ý cho Cơ quan Chuyển đổi Kỹ thuật số với tư cách là nhà quản trị cửa hàng dữ liệu, theo quyết định pháp lý của Bộ trưởng Bộ Y tế Chính phủ Úc thu thập:</string>
+  <string name="registration_consent_content">Tôi đồng ý cho Cơ quan Chuyển đổi Kỹ thuật số với tư cách là nhà quản trị kho dữ liệu, theo quyết định pháp lý của Bộ trưởng Bộ Y tế Chính phủ Úc thu thập:</string>
+  <string name="registration_consent_diagnostic">Thông tin để đảm bảo rằng COVIDSafe đang hoạt động bình thường trên thiết bị của tôi.</string>
   <string name="registration_consent_first_paragraph">Thông tin đăng ký của tôi.</string>
   <!-- Onboarding Registration Consent -->
   <string name="registration_consent_headline">Đồng ý đăng ký</string>
@@ -420,11 +431,13 @@
   <string name="service_not_ok_title">COVIDSafe không hoạt động</string>
   <string name="service_ok_body">Giữ COVIDSafe hoạt động khi bạn rời khỏi nhà hoặc ở những nơi công cộng.</string>
   <string name="service_ok_title">COVIDSafe đang hoạt động</string>
+  <string name="settings">Cài đặt</string>
   <string name="share_this_app_content">Hãy cùng tôi ngăn chặn sự lây lan của COVID-19! Tải COVIDSafe, ứng dụng của Chính phủ Úc. # COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
+  <string name="show">Hiển thị</string>
   <string name="south_australia">Nam Úc</string>
   <string name="stepCounter" formatted="false">Bước %d của %d</string>
   <string name="support">Hỗ trợ</string>
-  <string name="support_content">Để được hỗ trợ về các vấn đề không có trong chủ đề Trợ giúp</string>
+  <string name="support_content">Để được trợ giúp về các vấn đề không có trong chủ đề Trợ giúp</string>
   <string name="tasmania">Tasmania</string>
   <string name="title_help">Trợ giúp</string>
   <string name="total_confirmed_cases">Tổng số ca nhiễm</string>
@@ -440,9 +453,10 @@
   <!-- Figma page Android Screens (05/06) -->
   <string name="under_sixteen_consent_call_for_action">Chọn \'Tôi đồng ý\' để xác nhận sự đồng ý.</string>
   <string name="update_available_dismiss_btn">Nhắc tôi sau</string>
-  <string name="update_available_message_android">Chúng tôi đã và đang cải thiện COVIDSafe. Cập nhật qua Cửa hàng Google Play (Google Play Store).</string>
+  <string name="update_available_message_android">Chúng tôi đã và đang cải thiện COVIDSafe. Cập nhật qua Kho Google Play (Google Play Store).</string>
   <string name="update_available_play_store_btn">Vào Google Play Store</string>
   <string name="update_available_title">Cập nhật có sẵn!</string>
+  <string name="update_screen_location">Google cần *quyền truy cập vị trí cho các ứng dụng Android* để truy cập Bluetooth®. COVIDSafe không lưu trữ hoặc sử dụng dữ liệu vị trí.</string>
   <string name="upload_answer_no">Không</string>
   <!-- Upload flow -->
   <string name="upload_answer_yes">Có</string>
@@ -461,6 +475,7 @@
   <string name="upload_step_verify_pin_header_content_description">Tiêu đề, Đăng tải thông tin của bạn</string>
   <string name="upload_step_verify_pin_sub_header">Nhân viên y tế của tiểu bang hoặc lãnh thổ sẽ gửi mã PIN qua tin nhắn đến thiết bị của bạn. Nhập mã PIN vào đây để đăng tải thông tin của bạn.</string>
   <string name="us_consent_button">Tôi đồng ý</string>
+  <string name="us_registration_consent_diagnostic">Thông tin để đảm bảo rằng COVIDSafe đang hoạt động bình thường trên thiết bị của tôi.</string>
   <string name="victoria">Victoria</string>
   <string name="western_australia">Tây Úc</string>
   <string name="wrong_ping_number">Nhập sai mã PIN</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -20,6 +20,7 @@
   <string name="change_language">更改语言</string>
   <string name="change_language_content">阅读其他语言版本的COVIDSafe使用指南。</string>
   <string name="CodeHasExpired">您的PIN码已失效。</string>
+  <string name="collection_message">COVIDSafe现在会收集诊断信息，以帮助您解决应用程序中的问题。*了解更多信息*</string>
   <string name="consent_button">我同意</string>
   <!-- Shared Consent Actions -->
   <string name="consent_call_for_action">选择“我同意”以确认同意。</string>
@@ -236,7 +237,6 @@
   <string name="country_region_name_zm">赞比亚</string>
   <string name="country_region_name_zw">津巴布韦</string>
   <string name="data_privacy_button">下一步</string>
-  <string name="data_privacy_content">注册COVIDSafe之前，请务必阅读COVIDSafe的*隐私政策*。 \n\n如果您未满16岁，您的父母/监护人也必须阅读*隐私政策*。 \n\n使用COVIDSafe属自愿行为。您可以随时安装或删除该应用程序。如果删除COVIDSafe，*您也可以要求从安全服务器上删除您的信息*。 \n\n您需要输入姓名（或化名），手机号码，年龄段和邮政编码来注册使用COVIDSafe。 \n\n注册时提交的信息以及有关COVIDSafe使用的信息将被收集并存储在高度安全的服务器上。 \n\nCOVIDSafe不会收集您的位置信息。 \n\nCOVIDSafe将在您的设备上记录发生接触的时间、与您发生过接触的其他用户的匿名ID码、蓝牙®信号强度以及其他用户的手机型号。 \n\n与您发生接触的其他COVIDSafe用户的设备上也会记录您的匿名ID代码、与您发生接触的日期和时间、蓝牙®信号强度以及您的手机型号。 \n\n如果其他用户的COVID-19检测结果为阳性，他们可以上传自己的接触者信息，而州或领地的卫生官员可能会出于追踪接触者的目的与您联系。 \n\n您的详细注册信息仅在追踪接触者以及维持COVIDSafe的合法正常运行时使用或披露。  \n\n如需了解更多信息，请访问*澳大利亚政府卫生部*网站。 \n\n如需进一步了解您对个人信息的权利，以及个人信息的处理和共享方式，请参阅COVIDSafe *隐私政策*。</string>
   <string name="data_privacy_content_android">注册COVIDSafe之前，请务必阅读COVIDSafe的*隐私政策*。 \n\n如果您未满16岁，您的父母/监护人也必须阅读*隐私政策*。 \n\n使用COVIDSafe属自愿行为。您可以随时安装或删除该应用程序。如果删除COVIDSafe，*您也可以要求从安全服务器上删除您的信息*。 \n\n您需要输入姓名（或化名），手机号码，年龄段和邮政编码来注册使用COVIDSafe。 \n\n注册时提交的信息以及有关COVIDSafe使用的信息将被收集并存储在高度安全的服务器上。 \n\nCOVIDSafe不会收集您的位置信息。 \n\nCOVIDSafe将在您的设备上记录发生接触的时间、与您发生过接触的其他用户的匿名ID码、蓝牙®信号强度以及其他用户的手机型号。 \n\n与您发生接触的其他COVIDSafe用户的设备上也会记录您的匿名ID代码、与您发生接触的日期和时间、蓝牙®信号强度以及您的手机型号。 \n\n如果其他用户的COVID-19检测结果为阳性，他们可以上传自己的接触者信息，而州或领地的卫生官员可能会出于追踪接触者的目的与您联系。 \n\n您的详细注册信息仅在追踪接触者以及维持COVIDSafe的合法正常运行时使用或披露。  \n\n如需了解更多信息，请访问*澳大利亚政府卫生部*网站。 \n\n如需进一步了解您对个人信息的权利，以及个人信息的处理和共享方式，请参阅COVIDSafe *隐私政策*。</string>
   <!-- OnBoarding Data Privacy -->
   <string name="data_privacy_headline">注册及隐私</string>
@@ -247,6 +247,7 @@
   <string name="dialog_error_uploading_positive">重试</string>
   <string name="dialog_uploading_message">您的COVIDSafe信息正在上传中。 \n\n请不要关闭该应用程序。</string>
   <string name="disabled">已停用</string>
+  <string name="dismiss">取消</string>
   <string name="done_success">完成</string>
   <string name="enabled">已启用</string>
   <string name="enter_number_button">获取PIN码</string>
@@ -267,6 +268,7 @@
   <string name="generic_error">请稍后再试</string>
   <string name="generic_internet_error">请检查您的互联网连接</string>
   <string name="heading">标题</string>
+  <string name="hide">隐藏</string>
   <string name="home_app_permission_push_notification_prompt">允许COVIDSafe推送通知。</string>
   <string name="home_app_permission_status_subtitle">若设置不正确，COVIDSafe将无法运行。</string>
   <string name="home_app_permission_status_title">检查您的设置</string>
@@ -311,7 +313,7 @@
   <string name="home_set_complete_external_link_self_isolation_register_url">https://covid-form.service.gov.au</string>
   <string name="home_set_complete_external_link_share_content">邀请他人助力。万众一心，其利断金。</string>
   <string name="home_set_complete_external_link_share_title">分享COVIDSafe</string>
-  <string name="home_set_location_why">安卓应用程序需要获得位置权限才能访问蓝牙®。COVIDSafe 不会存储或使用位置数据。</string>
+  <string name="home_set_location_why">谷歌要求安卓应用程序需获得位置权限才能访问蓝牙®。COVIDSafe不会存储或使用位置数据。</string>
   <string name="home_setup_help">帮助</string>
   <string name="home_setup_incomplete_subtitle">COVIDSafe需要访问这些功能的权限。</string>
   <string name="home_setup_incomplete_title">检查\n权限</string>
@@ -322,6 +324,7 @@
   <!-- OnBoarding How it works -->
   <string name="how_it_works_headline">COVIDSafe 的工作原理</string>
   <string name="how_it_works_headline_content_description">Heading，COVIDSafe的工作原理</string>
+  <string name="improve">提升应用程序性能</string>
   <string name="improve_heading">提升COVIDSafe 的性能</string>
   <string name="internet_connection_content">连接到互联网，以确保您可以收到有关应用程序问题和更新的通知。</string>
   <string name="internet_connection_heading">无网络连接</string>
@@ -342,6 +345,9 @@
   <string name="invalid_phone_number_digits_error_prompt" formatted="false">%1s中的手机号码包含 %2s 位数。</string>
   <string name="invalid_post_code">邮政编码无效</string>
   <string name="IssueFooter">我们可能会与您联系以进一步了解反馈意见。您的电子邮件地址不会被用于其他目的。</string>
+  <string name="jwt_description">您的注册信息存在问题。</string>
+  <string name="jwt_heading">请重新注册</string>
+  <string name="loading_numbers">正在加载最新统计数字</string>
   <!-- Splash Screen -->
   <string name="migration_in_progress">COVIDSafe正在更新。 \n\n请保持开机状态直至更新完成。</string>
   <string name="national_numbers">全国统计数字</string>
@@ -358,7 +364,8 @@
   <string name="notification_battery">请禁用电池优化，以便COVIDSafe可以正常运行。</string>
   <string name="notification_bluetooth">请开启蓝牙，以便COVIDSafe可以正常运行。</string>
   <string name="notification_bt_and_battery">请开启蓝牙并禁用电池优化，以便COVIDSafe可以正常运行。</string>
-  <string name="notification_internet_content">请打开应用程序并检查网络连接，以便COVIDSafe可以正常运行。</string>
+  <string name="notification_internet_content">请打开应用程序并检查网络连接。</string>
+  <string name="notification_location">允许位置权限以便蓝牙可以运行。</string>
   <string name="notification_not_active_body">离家前和在公共场所时，确保COVIDSafe处于激活状态。</string>
   <string name="notification_not_active_title">COVIDSafe未激活</string>
   <string name="notification_settings">请打开应用程序以检查您的设置。</string>
@@ -370,14 +377,17 @@
   <string name="NotificationsDisabledBlurb">如果COVIDSafe未激活，您不会收到任何通知。 \n更改通知设置</string>
   <!-- Figma page iOS Screens (05/06) -->
   <string name="NotificationsEnabledBlurb">如果COVIDSafe未激活，您将收到通知。 \n更改通知设置</string>
+  <string name="numbers_error">无法查询最新统计数字。</string>
+  <string name="numbers_no_internet">请连接到互联网，以获取最新统计数字。</string>
+  <string name="numbers_refresh">请刷新</string>
   <string name="options_for_australia">澳大利亚选项</string>
   <string name="permission_button">继续</string>
-  <string name="permission_content">COVIDSafe需要启用蓝牙®和通知功能才能运行。 \n\n选择“继续”以： \n\n 1.启用蓝牙® \n\n 2.允许获得位置权限\n\n 3.禁用电池优化功能\n\n\n Android需要位置权限才能使蓝牙®正常运行。 \n\n COVIDSafe不会发送配对请求。</string>
+  <string name="permission_content">COVIDSafe需要启用蓝牙®和通知功能才能运行。 \n\n选择“继续”以： \n\n 1.启用蓝牙® \n\n 2.允许获得位置权限\n\n 3.禁用电池优化功能\n \n 谷歌要求安卓应用程序需获得位置权限才能访问蓝牙®。COVIDSafe 不会存储或使用位置数据。\n \n COVIDSafe不会发送配对请求。</string>
   <!-- OnBoarding Permission -->
   <string name="permission_headline">应用设置</string>
   <string name="permission_location_rationale">安卓需要获取您的位置信息才能启用蓝牙功能，运行COVIDSafe，否则COVIDSafe无法正常运行</string>
   <string name="permission_success_button">完成</string>
-  <string name="permission_success_content">1. 离家时，请随身携带手机，并确保COVIDSafe处于激活状态。 \n\n2. 蓝牙®应保持开启状态。 \n\n3. 电池优化应关闭。 \n\n4. COVIDSafe不会发送配对请求。 *了解更多信息* 。\n\n5. *安卓需要获得位置权限* 才能访问蓝牙®。 COVIDSafe 不会存储或使用位置数据。</string>
+  <string name="permission_success_content">1. 离家时，请随身携带手机，并确保COVIDSafe处于激活状态。 \n\n2. 蓝牙®应保持开启状态。 \n\n3. 电池优化应关闭。 \n\n4. COVIDSafe不会发送配对请求。*了解更多信息* 。\n\n5.谷歌要求*安卓应用程序需获得位置权限*才能访问蓝牙®。COVIDSafe 不会存储或使用位置数据。</string>
   <!-- OnBoarding Permission Success -->
   <string name="permission_success_headline">您已成功注册</string>
   <string name="permission_success_warning">开启COVIDSafe的推送通知功能，以便在应用程序无法正常运行时及时通知您。</string>
@@ -406,6 +416,7 @@
   <string name="ReceivePinIssue">接收PIN码时遇到问题？</string>
   <string name="recovered">康复患者总数</string>
   <string name="registration_consent_content">我同意数字转换局作为数据存储管理方可以根据澳大利亚政府卫生部常务副部长依法作出的决议，收集以下信息：</string>
+  <string name="registration_consent_diagnostic">确保 COVIDSafe 在我的设备上正常运行的信息。</string>
   <string name="registration_consent_first_paragraph">我的注册信息。</string>
   <!-- Onboarding Registration Consent -->
   <string name="registration_consent_headline">注册同意书</string>
@@ -420,7 +431,9 @@
   <string name="service_not_ok_title">COVIDSafe未激活</string>
   <string name="service_ok_body">离开家和在公共场所时，请确保COVIDSafe处于激活状态。</string>
   <string name="service_ok_title">COVIDSafe已激活。</string>
+  <string name="settings">设置</string>
   <string name="share_this_app_content">让我们一起阻止COVID-19的传播！下载 COVIDSafe—澳大利亚政府开发的一款应用程序。 #COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
+  <string name="show">显示</string>
   <string name="south_australia">南澳大利亚州</string>
   <string name="stepCounter" formatted="false">第%d步，共%d步</string>
   <string name="support">支持</string>
@@ -443,6 +456,7 @@
   <string name="update_available_message_android">我们一直在改进COVIDSafe。请通过Google Play商店更新。</string>
   <string name="update_available_play_store_btn">前往Google Play Store</string>
   <string name="update_available_title">更新可用！</string>
+  <string name="update_screen_location">谷歌要求*安卓应用程序需获得位置权限*才能访问蓝牙®。COVIDSafe不会存储或使用位置数据。</string>
   <string name="upload_answer_no">否</string>
   <!-- Upload flow -->
   <string name="upload_answer_yes">是</string>
@@ -461,6 +475,7 @@
   <string name="upload_step_verify_pin_header_content_description">Heading，上传个人信息</string>
   <string name="upload_step_verify_pin_sub_header">州或领地卫生官员将通过短信向您的手机发送 PIN码。请在下面输入PIN码以上传个人信息。</string>
   <string name="us_consent_button">我同意</string>
+  <string name="us_registration_consent_diagnostic">确保 COVIDSafe 在我的设备上正常运行的信息。</string>
   <string name="victoria">维多利亚州</string>
   <string name="western_australia">西澳大利亚州</string>
   <string name="wrong_ping_number">错误的PIN码</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -20,6 +20,7 @@
   <string name="change_language">更換語言</string>
   <string name="change_language_content">用其他語言閱讀COVIDSafe使用指南。</string>
   <string name="CodeHasExpired">你的 PIN 碼已無效。</string>
+  <string name="collection_message">COVIDSafe現在會收集診斷資訊，以幫助你解決應用程式中的問題。 *了解更多*</string>
   <string name="consent_button">我同意</string>
   <!-- Shared Consent Actions -->
   <string name="consent_call_for_action">選擇「我同意」以確認同意聲明。</string>
@@ -236,7 +237,6 @@
   <string name="country_region_name_zm">贊比亞</string>
   <string name="country_region_name_zw">津巴布韋</string>
   <string name="data_privacy_button">下一步</string>
-  <string name="data_privacy_content">在註册 COVIDSafe 之前，請務必閱讀 COVIDSafe *私隱政策*。 \n\n如果你未滿 16 歲，你的父母/監護人亦必須閱讀*私隱政策*。 \n\n使用 COVIDSafe 純屬自願性質。你可以隨時安裝或刪除本應用程式。如果刪除 COVIDSafe，*你亦可以要求刪除在保密伺服器内的個人資料*。\n\n要註册使用 COVIDSafe，你需要輸入一个名字（或假名）、手機號碼、年齡組别及郵遞區號。 \n\n我們會收集你註冊時提供的資料和關於你使用COVIDSafe的資料並且儲存在一個高度保密的伺服器內。 \n\nCOVIDSafe 不會收集你的位置資訊。 \n\nCOVIDSafe 將會在你的設備上記錄與你接觸過的其他 COVIDSafe 用戶的接觸時間，其匿名 ID，藍牙®信號強度和其手機型號。\n\n其他與你接觸過的 COVIDSafe 用戶的設備上亦會記錄你的匿名 ID 及與你接觸的日期時間，藍牙®信號強度和你的手機型號。 \n\n如果其他用戶被驗出 COVID-19 陽性，他們可以上傳其接觸者資料。為了追蹤接觸者，各州或領地的衛生部官員可能會聯絡你。 \n\n我們在追蹤接觸者和確保COVIDSafe 正常且合法運作時才會使用並且透露你的詳細註冊資料。 \n\n欲了解更多資訊，請瀏覧*澳洲政府衛生部*的網站。 \n\n如需進一步了解你對個人資料的權利，及個人資料的處理和共享方式，請參閱 COVIDSafe *私隱政策*。</string>
   <string name="data_privacy_content_android">在註册 COVIDSafe 之前，請務必閱讀 COVIDSafe *私隱政策*。 \n\n如果你未滿 16 歲，你的父母/監護人亦必須閱讀*私隱政策*。 \n\n使用 COVIDSafe 純屬自願性質。你可以隨時安裝或刪除本應用程式。如果刪除 COVIDSafe，*你亦可以要求刪除在保密伺服器内的個人資料*。\n\n要註册使用 COVIDSafe，你需要輸入一个名字（或假名）、手機號碼、年齡組别及郵遞區號。 \n\n我們會收集你註冊時提供的資料和關於你使用COVIDSafe的資料並且儲存在一個高度保密的伺服器內。 \n\nCOVIDSafe 不會收集你的位置資訊。 \n\nCOVIDSafe 將會在你的設備上記錄與你接觸過的其他 COVIDSafe 用戶的接觸時間，其匿名 ID，藍牙®信號強度和其手機型號。\n\n其他與你接觸過的 COVIDSafe 用戶的設備上亦會記錄你的匿名 ID 及與你接觸的日期時間，藍牙®信號強度和你的手機型號。 \n\n如果其他用戶被驗出 COVID-19 陽性，他們可以上傳其接觸者資料。為了追蹤接觸者，各州或領地的衛生部官員可能會聯絡你。 \n\n我們在追蹤接觸者和確保COVIDSafe 正常且合法運作時才會使用並且透露你的詳細註冊資料。 \n\n欲了解更多資訊，請瀏覧*澳洲政府衛生部*的網站。 \n\n如需進一步了解你對個人資料的權利，及個人資料的處理和共享方式，請參閱 COVIDSafe *私隱政策*。</string>
   <!-- OnBoarding Data Privacy -->
   <string name="data_privacy_headline">註册及私隱權</string>
@@ -247,6 +247,7 @@
   <string name="dialog_error_uploading_positive">重試</string>
   <string name="dialog_uploading_message">正在上傳你的 COVIDSafe 資料。 \n\n請勿關閉應用程式。</string>
   <string name="disabled">已停用</string>
+  <string name="dismiss">取消</string>
   <string name="done_success">完成</string>
   <string name="enabled">已啟用</string>
   <string name="enter_number_button">收取 PIN 碼</string>
@@ -267,6 +268,7 @@
   <string name="generic_error">請稍後再試</string>
   <string name="generic_internet_error">請檢查你的互聯網連接</string>
   <string name="heading">標題</string>
+  <string name="hide">隱藏</string>
   <string name="home_app_permission_push_notification_prompt">允許 COVIDSafe 傳送通知。</string>
   <string name="home_app_permission_status_subtitle">若設定錯誤，將無法執行 COVIDSafe。</string>
   <string name="home_app_permission_status_title">檢查你的設定</string>
@@ -311,7 +313,7 @@
   <string name="home_set_complete_external_link_self_isolation_register_url">https://covid-form.service.gov.au</string>
   <string name="home_set_complete_external_link_share_content">邀請他人參與防疫。團結便是力量！</string>
   <string name="home_set_complete_external_link_share_title">齊齊使用 COVIDSafe</string>
-  <string name="home_set_location_why">Android應用程式需要獲得位置許可權才能訪問藍牙®。COVIDSafe 不會存儲或使用位置資料。</string>
+  <string name="home_set_location_why">Google需要獲得Android應用程式的位置許可權才能訪問藍牙®。 COVIDSafe不會存儲或使用位置資料。</string>
   <string name="home_setup_help">求助</string>
   <string name="home_setup_incomplete_subtitle">COVIDSafe 需要接入這些功能的權限。</string>
   <string name="home_setup_incomplete_title">檢查\n權限</string>
@@ -343,6 +345,9 @@
   <string name="invalid_phone_number_digits_error_prompt" formatted="false">%1s的手機號碼有 %2s 數位。</string>
   <string name="invalid_post_code">郵遞區號無效</string>
   <string name="IssueFooter">我們可能會聯絡你以進一步了解反饋的詳情。你的電郵地址不會被用於其他目的。</string>
+  <string name="jwt_description">你的註冊詳情存在問題。</string>
+  <string name="jwt_heading">請重新註冊。</string>
+  <string name="loading_numbers">正在載入最新統計數字</string>
   <!-- Splash Screen -->
   <string name="migration_in_progress">正在更新 COVIDSafe。\n\n請保持開機狀態直至更新完成為止。</string>
   <string name="national_numbers">全國統計數字</string>
@@ -359,7 +364,8 @@
   <string name="notification_battery">要使COVIDSafe運作，請關閉電池優化功能。</string>
   <string name="notification_bluetooth">要使COVIDSafe運作，請開啟藍牙。</string>
   <string name="notification_bt_and_battery">要使COVIDSafe運作，請開啟藍牙並關閉電池優化功能。</string>
-  <string name="notification_internet_content">要使COVIDSafe運作，請打開應用程式，檢查網絡連接。</string>
+  <string name="notification_internet_content">打開應用程式，檢查網絡連接。</string>
+  <string name="notification_location">允許位置权限以便蓝牙可以运行。</string>
   <string name="notification_not_active_body">在你離家前或在公共場所時，請確保 COVIDSafe 處於啟用狀態。</string>
   <string name="notification_not_active_title">COVIDSafe 未在啓用狀態</string>
   <string name="notification_settings">打開應用程式以檢查你的設置。</string>
@@ -371,14 +377,17 @@
   <string name="NotificationsDisabledBlurb">如果 COVIDSafe 尚未處於啟用狀態，你將不會收到通知。 \n更改通知設定</string>
   <!-- Figma page iOS Screens (05/06) -->
   <string name="NotificationsEnabledBlurb">如果 COVIDSafe 尚未處於啟用狀態，你將會收到通知。 \n更改通知設定</string>
+  <string name="numbers_error">無法查詢最新統計數字。</string>
+  <string name="numbers_no_internet">請連接到互聯網，以獲取最新統計數字。</string>
+  <string name="numbers_refresh">現在刷新</string>
   <string name="options_for_australia">澳洲適用選項</string>
   <string name="permission_button">繼續</string>
-  <string name="permission_content">COVIDSafe 需要開啓藍牙®及通知功能才能運作。 \n\n選擇 「繼續」以： \n\n 1. 開啓藍牙® \n\n 2. 允許取得定位權限\n\n 3. 關閉電池優化功能\n\n\n Android 需要定位權限才能啓用藍牙®。 \n\n COVIDSafe 不會傳送配對請求。</string>
+  <string name="permission_content">COVIDSafe 需要開啓藍牙®及通知功能才能運作。 \n\n選擇 「繼續」以： \n\n 1. 開啓藍牙® \n\n 2. 允許取得定位權限\n\n 3. 關閉電池優化功能\n\n\nGoogle需要獲得Android應用程式的位置許可權才能訪問藍牙®。COVIDSafe 不會存儲或使用位置資料。\n\n COVIDSafe 不會傳送配對請求。</string>
   <!-- OnBoarding Permission -->
   <string name="permission_headline">應用程式設定</string>
   <string name="permission_location_rationale">為執行 COVIDSafe，Android 需要取得你的定位權限才能啟用藍牙功能，否則無法正常執行 COVIDSafe </string>
   <string name="permission_success_button">完成</string>
-  <string name="permission_success_content">1. 請在離家時隨身攜帶手機，並確保 COVIDSafe 處於啟用狀態。 \n\n2. 藍牙®應保持在開啓狀態。 \n\n3. 應關閉電池優化功能。 \n\n4. COVIDSafe 不會傳送配對請求。 *了解更多* 。\n\n5. 訪問藍牙®需要*Android位置許可* 。 COVIDSafe 不會存儲或使用位置資料。</string>
+  <string name="permission_success_content">1. 請在離家時隨身攜帶手機，並確保 COVIDSafe 處於啟用狀態。 \n\n2. 藍牙®應保持在開啓狀態。 \n\n3. 應關閉電池優化功能。 \n\n4. COVIDSafe 不會傳送配對請求。 *了解更多* 。\n\n5. Google需要獲得 *Android應用程式的位置許可權* 才能訪問藍牙®。COVIDSafe 不會存儲或使用位置資料。</string>
   <!-- OnBoarding Permission Success -->
   <string name="permission_success_headline">你已成功註册</string>
   <string name="permission_success_warning">開啓 COVIDSafe 的傳送通知功能，以便在無法正常執行應用程式時及時通知你。</string>
@@ -407,6 +416,7 @@
   <string name="ReceivePinIssue">接收 PIN 碼時遇到問題？</string>
   <string name="recovered">康復者總數</string>
   <string name="registration_consent_content">我同意數字化轉型局作為數據儲存管理者，根據澳大利亞政府衛生部常務副部長的合法決定，收集以下信息：</string>
+  <string name="registration_consent_diagnostic">確保 COVIDSafe 在我的設備上正常運行的資訊。</string>
   <string name="registration_consent_first_paragraph">我的註册資料。</string>
   <!-- Onboarding Registration Consent -->
   <string name="registration_consent_headline">註册同意書</string>
@@ -423,6 +433,7 @@
   <string name="service_ok_title">COVIDSafe 已在啓用狀態</string>
   <string name="settings">設置</string>
   <string name="share_this_app_content">同我一齊遏止 COVID-19 的擴散！下載澳洲政府提供的 COVIDSafe 應用程式。 ＃COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
+  <string name="show">顯示</string>
   <string name="south_australia">南澳</string>
   <string name="stepCounter" formatted="false">第%d步，共%d步</string>
   <string name="support">支持</string>
@@ -445,6 +456,7 @@
   <string name="update_available_message_android">我們一直都在改良COVIDSafe。通過Google Play商店更新。</string>
   <string name="update_available_play_store_btn">轉往 Google Play 商店</string>
   <string name="update_available_title">更新可用！</string>
+  <string name="update_screen_location">Google需要獲得*Android應用程式的位置許可權*才能訪問藍牙®。 COVIDSafe不會存儲或使用位置資料。</string>
   <string name="upload_answer_no">否</string>
   <!-- Upload flow -->
   <string name="upload_answer_yes">是</string>
@@ -463,6 +475,7 @@
   <string name="upload_step_verify_pin_header_content_description">標題，上傳你的資料</string>
   <string name="upload_step_verify_pin_sub_header">各州或領地的衛生部官員將會透過簡訊傳送一條 PIN 碼到你的設備。請在下面輸入 PIN 碼來上傳個人資料。</string>
   <string name="us_consent_button">我同意</string>
+  <string name="us_registration_consent_diagnostic">確保 COVIDSafe 在我的設備上正常運行的資訊。</string>
   <string name="victoria">維多利亞州</string>
   <string name="western_australia">西澳</string>
   <string name="wrong_ping_number">輸入了錯誤的 PIN 碼</string>

app/src/main/res/values/strings.xml

@@ -20,6 +20,7 @@
   <string name="change_language">Change language</string>
   <string name="change_language_content">Read the guide on using COVIDSafe in a different language.</string>
   <string name="CodeHasExpired">Your PIN has expired.</string>
+  <string name="collection_message">COVIDSafe now collects diagnostic information to help you troubleshoot issues with your App. *Learn more*</string>
   <string name="consent_button">I agree</string>
   <!-- Shared Consent Actions -->
   <string name="consent_call_for_action">Select \'I agree\' to confirm consent.</string>
@@ -236,8 +237,7 @@
   <string name="country_region_name_zm">Zambia</string>
   <string name="country_region_name_zw">Zimbabwe</string>
   <string name="data_privacy_button">Next</string>
-  <string name="data_privacy_content">It is important that you read the COVIDSafe *privacy policy* before you register for COVIDSafe.\n\nIf you are under 16 years of age, your parent/guardian must also read the *privacy policy*.\n\nUse of COVIDSafe is completely voluntary. You can install or delete the application at any time. If you delete COVIDSafe, *you may also ask for your information to be deleted* from the secure server.\n\nTo register for COVIDSafe, you will need to enter a name (or pseudonym), mobile number, age range and postcode.\n\nInformation you submit when you register, and information about your use of COVIDSafe will be collected and stored on a highly secure server.\n\nCOVIDSafe will not collect your location information.\n\nCOVIDSafe will note the time of contact, anonymous ID code of other COVIDSafe users you come into contact with, Bluetooth® signal strength and the phone model of other users, on your device.\n\nOther COVIDSafe users you come into contact with will also note your anonymous ID code, the date and time of contact with you, Bluetooth® signal strength and your phone model, on their device.\n\nIf another user tests positive to COVID-19, they may upload their contact information and a state or territory health official may contact you for contact tracing purposes. \n\nYour registration details will only be used or disclosed for contact tracing and for the proper and lawful functioning of COVIDSafe. \n\nMore information is available at the *Australian Government Department of Health* website.\n\nSee the COVIDSafe *privacy policy* for further details about your rights about your information and how it will be handled and shared.</string>
+  <string name="data_privacy_content_android">It is important that you read the COVIDSafe *privacy policy* before you register for COVIDSafe.\n\nIf you are under 16 years of age, your parent/guardian must also read the *privacy policy*.\n\nUse of COVIDSafe is completely voluntary. You can install or delete the application at any time. If you delete COVIDSafe, *you may also ask for your information* to be deleted from the secure server.\n\nTo register for COVIDSafe, you will need to enter a name (or pseudonym), mobile number, age range and postcode.\n\nInformation you submit when you register and information about your use of COVIDSafe is stored on a highly secure server.\n\nInformation is also collected to make sure that COVIDSafe is working properly on your device. This includes your operating system, the version of the App you have installed, the language your device is set to, whether Bluetooth® is working and if your App has recorded any encounters in the previous seven days.\n\nOn Android devices, it also includes information about whether battery optimisation is disabled and location services is enabled.\n\nCOVIDSafe will not collect your location information.\n\nCOVIDSafe will note the date and time of contact, anonymous ID code of other COVIDSafe users you come into contact with, Bluetooth signal strength and the phone model of other users, on your device.\n\nOther COVIDSafe users you come into contact with will note your anonymous ID code, the date and time of contact with you, Bluetooth signal strength and your phone model, on their device.\n\nIf another user tests positive to COVID-19, they may upload their contact information and a state or territory health official may contact you for contact tracing purposes.\n\nYour registration details will only be used or disclosed for contact tracing and for the proper and lawful functioning of COVIDSafe.\n\nMore information is available at the *covidsafe.gov.au* website.\n\nSee the COVIDSafe *privacy policy* for further details about your rights about your information and how it will be handled and shared. </string>
-  <string name="data_privacy_content_android">It is important that you read the COVIDSafe *privacy policy* before you register for COVIDSafe.\n\nIf you are under 16 years of age, your parent/guardian must also read the *privacy policy*.\n\nUse of COVIDSafe is completely voluntary. You can install or delete the application at any time. If you delete COVIDSafe, *you may also ask for your information* to be deleted from the secure server.\n\nTo register for COVIDSafe, you will need to enter a name (or pseudonym), mobile number, age range and postcode. \n\nInformation you submit when you register and information about your use of COVIDSafe is stored on a highly secure server.\n\nInformation is also collected to make sure that COVIDSafe is working properly based on your device. This includes your operating system, the version of the App you have installed, the language your device is set to, whether Bluetooth® is working and if your App has recorded any encounters in the previous seven days.\n\nOn Android devices, it also includes information about whether battery optimisation is disabled and location services is enabled.\n\nCOVIDSafe will not collect your location information.\n\nCOVIDSafe will note the date and time of contact, anonymous ID code of other COVIDSafe users you come into contact with, Bluetooth® signal strength and the phone model of other users, on your device.\n\nOther COVIDSafe users you come into contact with will note your anonymous ID code, the date and time of contact with you, Bluetooth® signal strength and your phone model, on their device.\n\nIf another user tests positive to COVID-19, they may upload their contact information and a state or territory health official may contact you for contact tracing purposes. \n\nYour registration details will only be used or disclosed for contact tracing and for the proper and lawful functioning of COVIDSafe. \n\nMore information is available at the *covidsafe.gov.au website*.\n\nSee the COVIDSafe *privacy policy* for further details about your rights about your information and how it will be handled and shared.</string>
   <!-- OnBoarding Data Privacy -->
   <string name="data_privacy_headline">Registration and privacy</string>
   <string name="data_privacy_headline_content_description">Heading, Registration and privacy</string>
@@ -247,6 +247,7 @@
   <string name="dialog_error_uploading_positive">Try again</string>
   <string name="dialog_uploading_message">Your COVIDSafe information is currently being uploaded.\n\nPlease do not close the app.</string>
   <string name="disabled">Disabled</string>
+  <string name="dismiss">Dismiss</string>
   <string name="done_success">Done</string>
   <string name="enabled">Enabled</string>
   <string name="enter_number_button">Get PIN</string>
@@ -267,6 +268,7 @@
   <string name="generic_error">Please try again later</string>
   <string name="generic_internet_error">Please check your internet connection</string>
   <string name="heading">Heading</string>
+  <string name="hide">Hide</string>
   <string name="home_app_permission_push_notification_prompt">Allow COVIDSafe to push notifications.</string>
   <string name="home_app_permission_status_subtitle">COVIDSafe won\'t work without the right settings. </string>
   <string name="home_app_permission_status_title">Check your settings</string>
@@ -311,7 +313,7 @@
   <string name="home_set_complete_external_link_self_isolation_register_url">https://covid-form.service.gov.au</string>
   <string name="home_set_complete_external_link_share_content">Invite others to help. Together, we’re stronger.</string>
   <string name="home_set_complete_external_link_share_title">Share COVIDSafe</string>
-  <string name="home_set_location_why">Android apps need location permissions turned on to access Bluetooth®. COVIDSafe does not store or use location data.</string>
+  <string name="home_set_location_why">Google requires Location permission for Android apps to access Bluetooth®. COVIDSafe does not store or use location data.</string>
   <string name="home_setup_help">Help</string>
   <string name="home_setup_incomplete_subtitle">COVIDSafe needs permission to access these features.</string>
   <string name="home_setup_incomplete_title">Check\npermissions</string>
@@ -343,6 +345,8 @@
   <string name="invalid_phone_number_digits_error_prompt" formatted="false">Mobile numbers in %1s contain %2s digits.</string>
   <string name="invalid_post_code">Invalid postcode</string>
   <string name="IssueFooter">We may contact you for further details about your feedback. Your email address won’t be used for any other purpose.</string>
+  <string name="jwt_description">There is an issue with your registration details.</string>
+  <string name="jwt_heading">Please register again</string>
   <string name="loading_numbers">Loading latest numbers</string>
   <!-- Splash Screen -->
   <string name="migration_in_progress"> COVIDSafe update in progress. \n\n Please make sure you phone is not switched off until the update is complete.</string>
@@ -378,12 +382,12 @@
   <string name="numbers_refresh">Refresh now</string>
   <string name="options_for_australia">Options for Australia</string>
   <string name="permission_button">Proceed</string>
-  <string name="permission_content">COVIDSafe needs Bluetooth® and notifications enabled to work.\n\nSelect ‘Proceed’ to:\n\n1. Enable Bluetooth®\n\n2. Allow Location permissions\n\n3. Disable Battery optimisation\n\n\nAndroid needs Location permissions for Bluetooth® to work.\n\nCOVIDSafe does not send pairing requests.</string>
+  <string name="permission_content">COVIDSafe needs Bluetooth® and notifications enabled to work.\n\nSelect ‘Proceed’ to:\n\n1. Enable Bluetooth\n\n2. Allow Location permission\n\n3. Disable Battery optimisation\n\nGoogle requires Location permission for Android apps to access Bluetooth. COVIDSafe does not store or use location data.\n\nCOVIDSafe does not send pairing requests.</string>
   <!-- OnBoarding Permission -->
   <string name="permission_headline">App settings</string>
   <string name="permission_location_rationale">Android requires location access to enable Bluetooth® functions for COVIDSafe. COVIDSafe cannot work properly without it</string>
   <string name="permission_success_button">Done</string>
-  <string name="permission_success_content">1. When you leave home, keep your phone with you and make sure COVIDSafe is active.\n\n2. Bluetooth® should be kept ON.\n\n3. Battery optimisation should be OFF.\n\n4. COVIDSafe does not send pairing requests. *Learn more*.\n\n5. *Location permission for Android* is required to access Bluetooth®. COVIDSafe does not store or use location data.</string>
+  <string name="permission_success_content">1. When you leave home, keep your phone with you and make sure COVIDSafe is active.\n\n2. Bluetooth® should be kept ON.\n\n3. Battery optimisation should be OFF.\n\n4. COVIDSafe does not send pairing requests. *Learn more*.\n\n5. Google requires *Location permission for Android apps* to access Bluetooth. COVIDSafe does not store or use location data.</string>
   <!-- OnBoarding Permission Success -->
   <string name="permission_success_headline">You\'ve successfully registered</string>
   <string name="permission_success_warning">Keep push notifications on for COVIDSafe so we can notify you quickly if the app isn\'t working properly.</string>
@@ -411,11 +415,12 @@
   <string name="queensland">Queensland</string>
   <string name="ReceivePinIssue">Issues receiving your PIN?</string>
   <string name="recovered">Total cases recovered</string>
-  <string name="registration_consent_content">I consent to the Digital Transformation Agency as data store administrator, under legal determination made by the Secretary of the Australian Government Department of Health collecting:</string>
+  <string name="registration_consent_content">I consent to the Digital Transformation Agency, as data store administrator, under legal determination made by the Secretary of the Australian Government Department of Health collecting:</string>
-  <string name="registration_consent_first_paragraph">My registration information.</string>
+  <string name="registration_consent_diagnostic">information to ensure that COVIDSafe is working properly on my device</string>
+  <string name="registration_consent_first_paragraph">my registration information</string>
   <!-- Onboarding Registration Consent -->
   <string name="registration_consent_headline">Registration consent</string>
-  <string name="registration_consent_second_paragraph">Information about my contact with other COVIDSafe users, if another user I have come into contact with tests positive for COVID-19 and uploads their contact data.</string>
+  <string name="registration_consent_second_paragraph">information about my contact with other COVIDSafe users, if another user I have come into contact with tests positive for COVID-19 and uploads their contact data</string>
   <string name="search">Search</string>
   <!-- OnBoarding Enter Number -->
   <string name="select_country_or_region">Select country or region</string>
@@ -428,6 +433,7 @@
   <string name="service_ok_title">COVIDSafe is active</string>
   <string name="settings">Settings</string>
   <string name="share_this_app_content">Join me in stopping the spread of COVID-19! Download COVIDSafe, an app from the Australian Government. #COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
+  <string name="show">Show</string>
   <string name="south_australia">South Australia</string>
   <string name="stepCounter" formatted="false">Step %d of %d</string>
   <string name="support">Support</string>
@@ -437,19 +443,20 @@
   <string name="total_confirmed_cases">Total confirmed cases</string>
   <string name="total_per_state">Total confirmed cases by state and territory</string>
   <string name="under_sixteen_content">I confirm my parent or guardian consents to the Digital Transformation Agency as data store administrator, under legal determination made by the Secretary of the Australian Government Department of Health collecting:</string>
-  <string name="under_sixteen_first_paragraph">My registration information.</string>
+  <string name="under_sixteen_first_paragraph">my registration information</string>
   <!-- OnBoarding Under Sixteen -->
   <string name="under_sixteen_headline">You need the consent of your parent/guardian to proceed</string>
   <string name="under_sixteen_headline_content_description">Heading, You need the consent of your parent/guardian to proceed</string>
   <!-- Figma page Android Screens (05/06) -->
-  <string name="under_sixteen_registration_consent_first_paragraph">My registration information.</string>
+  <string name="under_sixteen_registration_consent_first_paragraph">my registration information</string>
-  <string name="under_sixteen_second_paragraph">Information about my contact with other COVIDSafe users, if another user I have come into contact with tests positive for COVID-19 and uploads their contact data.</string>
+  <string name="under_sixteen_second_paragraph">information about my contact with other COVIDSafe users, if another user I have come into contact with tests positive for COVID-19 and uploads their contact data</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="under_sixteen_consent_call_for_action">Select \'I agree\' to confirm consent. </string>
   <string name="update_available_dismiss_btn">Remind me later</string>
   <string name="update_available_message_android">We’ve been making improvements to COVIDSafe.\nUpdate through the Google Play Store</string>
   <string name="update_available_play_store_btn">Go to Google Play Store</string>
   <string name="update_available_title">Update available!</string>
+  <string name="update_screen_location">Google requires *Location permission for Android apps* to access Bluetooth®. COVIDSafe does not store or use location data.</string>
   <string name="upload_answer_no">No</string>
   <!-- Upload flow -->
   <string name="upload_answer_yes">Yes</string>
@@ -468,6 +475,7 @@
   <string name="upload_step_verify_pin_header_content_description">Heading, Upload your information</string>
   <string name="upload_step_verify_pin_sub_header">A state or territory health official will send a PIN to your device via text message. Enter it below to upload your information.</string>
   <string name="us_consent_button">I agree</string>
+  <string name="us_registration_consent_diagnostic">information to ensure that COVIDSafe is working properly on my device</string>
   <string name="victoria">Victoria</string>
   <string name="western_australia">Western Australia</string>
   <string name="wrong_ping_number"> Wrong PIN entered</string>

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         compileSdkVersion = 29
         buildToolsVersion = "29.0.3"
         minSdkVersion = 21
-        targetSdkVersion = 28
+        targetSdkVersion = 29
 
         kotlin_version = "1.4.0"
         kotlin_coroutines_version = "1.3.7"