COVIDSafe code from version 2.1 (#44)

app/build.gradle

@@ -29,8 +29,8 @@ android {
         applicationId "au.gov.health.covidsafe"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 94
+        versionCode 106
-        versionName "2.0"
+        versionName "2.1"
         buildConfigField "String", "GITHASH", "\"${getGitHash()}\""
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/AndroidManifest.xml

@@ -55,6 +55,8 @@
         <activity android:name="au.gov.health.covidsafe.ui.webview.WebViewActivity" />
         <activity android:name="au.gov.health.covidsafe.ui.devicename.DeviceNameChangePromptActivity" />
         <activity android:name="au.gov.health.covidsafe.ui.connection.InternetConnectionIssuesActivity" />
+        <activity android:name="au.gov.health.covidsafe.ui.settings.ChanePostCodeActivity" />
+        <activity android:name="au.gov.health.covidsafe.ui.settings.CheckBleActivity" />
 
         <activity
             android:name="au.gov.health.covidsafe.HomeActivity"

app/src/main/java/au/gov/health/covidsafe/HomeActivity.kt

@@ -19,6 +19,7 @@ import au.gov.health.covidsafe.ui.utils.Utils
 import au.gov.health.covidsafe.utils.NetworkConnectionCheck
 import com.google.android.gms.tasks.OnCompleteListener
 import com.google.firebase.iid.FirebaseInstanceId
+
 private const val TAG = "HomeActivity"
 private const val UNAUTHORIZED = "Unauthorized"
 

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

@@ -20,7 +20,9 @@ class GetCaseStatisticsUseCase(private val awsClient: AwsClient, lifecycle: Life
         return token?.let { jwtToken ->
              try {
                 CentralLog.d(TAG, "GetCaseStatisticsUseCase run request")
-                val response = retryRetrofitCall { awsClient.getCaseStatistics("Bearer $jwtToken").execute() }
+                val response = retryRetrofitCall {
+                    awsClient.getCaseStatisticsVersion2("Bearer $jwtToken").execute()
+                }
 
                 when {
                     response?.code() == 200 -> {

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

@@ -33,11 +33,13 @@ class UploadData(private val awsClient: AwsClient,
                     awsClient.initiateUpload("Bearer $jwtToken", params).execute()
                 }
                 if (initialUploadResponse == null) {
-                    Failure(UploadDataException.UploadDataIncorrectPinException)
+                    // No data in response
+                    Failure(Exception("100"))
                 } else if (initialUploadResponse.isSuccessful) {
                     val uploadLink = initialUploadResponse.body()?.uploadLink
                     if (uploadLink.isNullOrEmpty()) {
-                        Failure(Exception())
+                        // Upload link is null or empty
+                        Failure(Exception("104"))
                     } else {
                         zipAndUploadData(uploadLink)
                     }
@@ -46,13 +48,16 @@ class UploadData(private val awsClient: AwsClient,
                 } else if (initialUploadResponse.code() == 403) {
                     Failure(UploadDataException.UploadDataJwtExpiredException)
                 } else {
-                    Failure(Exception())
+                    // any other status code
+                    Failure(Exception(initialUploadResponse.code().toString()))
                 }
             } catch (e: Exception) {
-                Failure(e)
+                // unable to parse success response
+                Failure(Exception("101"))
             }
         } ?: run {
-            return Failure(Exception())
+            // Error getting db context
+            return Failure(Exception("001"))
         }
     }
 
@@ -69,15 +74,16 @@ class UploadData(private val awsClient: AwsClient,
         return try {
             val response = retryOkhttpCall { okHttpClient.newCall(request).execute() }
             return if (response == null) {
-                Failure(Exception())
+                // Error creating url obj
+                Failure(Exception("102"))
             } else {
                 Success(None)
             }
         } catch (e: Exception) {
-            Failure(Exception())
+            // Error encoding data to json
+            Failure(Exception("003"))
         }
     }
-
 }
 
 sealed class UploadDataException : Exception() {

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

@@ -12,10 +12,10 @@ import android.view.View
 import au.gov.health.covidsafe.R
 import au.gov.health.covidsafe.app.TracerApp
 import au.gov.health.covidsafe.logging.CentralLog
+import java.lang.Exception
 import java.lang.StringBuilder
 import java.util.*
 
-
 const val TAG = "LinkBuilder"
 
 private const val DEPARTMENT_OF_HEALTH_URL = "https://www.health.gov.au/"
@@ -23,6 +23,7 @@ private const val HOST_URL = "https://www.covidsafe.gov.au"
 
 private const val HELP_TOPICS_BASE = "/help-topics"
 private const val PRIVACY_TOPICS_BASE = "/privacy-policy"
+private const val COLLECTION_NOTICE_BASE = "/collection-notice"
 
 private const val TOPICS_EXT_SUFFIX = ".html"
 private const val HELP_TOPICS_ENGLISH_PAGE = ""
@@ -39,6 +40,8 @@ private const val HELP_TOPICS_TURKISH_PAGE = "/tr"
 private const val HELP_TOPICS_ANCHOR_VERIFY_MOBILE_NUMBER_PIN = "#verify-mobile-number-pin"
 private const val HELP_TOPICS_ANCHOR_BLUETOOTH_PAIRING_REQUEST = "#bluetooth-pairing-request"
 private const val HELP_TOPICS_ANCHOR_LOCATION_PERMISSION_ANDROID = "#location-permission-android"
+private const val HELP_TOPICS_ANCHOR_READ_MORE = "#covidsafe-working-correctly"
+private const val HELP_TOPICS_DELETE_INFORMATION = "#delete-information"
 
 object LinkBuilder {
 
@@ -61,6 +64,12 @@ object LinkBuilder {
         return url
     }
 
+    private fun getCollectionNoticeUrl(): String {
+        val url = buildLocalisedURL(COLLECTION_NOTICE_BASE)
+        CentralLog.d(TAG, "getCollectionNoticeUrl() $url")
+        return url
+    }
+
     fun getCollectionMassageLearnMore(context: Context): SpannableString {
         return buildSpannableStringContent(
                 context,
@@ -109,6 +118,12 @@ object LinkBuilder {
     private fun getVerifyMobileNumberPinLink(linkText: String) = buildHtmlText(
             "<a href=\"${getHelpTopicsUrl() + HELP_TOPICS_ANCHOR_VERIFY_MOBILE_NUMBER_PIN}\">$linkText</a>")
 
+    private fun getReadMoreLink(linkText: String) = buildHtmlText(
+            "<a href=\"${getHelpTopicsUrl() + HELP_TOPICS_ANCHOR_READ_MORE}\">$linkText</a>")
+
+    private fun getHotspotLink(linkText: String?, link: String) = buildHtmlText(
+            "<a href=\"$link\">$linkText</a>")
+
     class LinkSpan(private val context: Context, private val linkURL: String) : ClickableSpan() {
         override fun onClick(widget: View) {
             val intent = Intent(Intent.ACTION_VIEW, Uri.parse(linkURL))
@@ -141,9 +156,12 @@ object LinkBuilder {
         val retVal = SpannableString(stringBuilder.toString().trim())
 
         spanStartEndIndex.forEachIndexed { index, pair ->
-            retVal.setSpan(LinkSpan(context, links[index]), pair.first, pair.second, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+            try {
+                retVal.setSpan(LinkSpan(context, links[index]), pair.first, pair.second, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+            } catch (e: Exception) {
+                return retVal
+            }
         }
-
         return retVal
     }
 
@@ -163,13 +181,37 @@ object LinkBuilder {
                 listOf(
                         privacyUrl,
                         privacyUrl,
-                        getHelpTopicsUrl(),
+                        getHelpTopicsUrl() + HELP_TOPICS_DELETE_INFORMATION,
                         HOST_URL,
                         privacyUrl
                 )
         )
     }
 
+    fun getPostcodeContent(context: Context): SpannableString {
+        val privacyUrl = getPrivacyTopicsUrl()
+        return buildSpannableStringContent(
+                context,
+                TracerApp.AppContext.getString(R.string.change_postcode_intro),
+                listOf(
+                        privacyUrl,
+                        getCollectionNoticeUrl()
+                )
+        )
+    }
+
+    fun getPostcodeUpdatedSuccessfullyContent(context: Context): SpannableString {
+        val privacyUrl = getPrivacyTopicsUrl()
+        return buildSpannableStringContent(
+                context,
+                TracerApp.AppContext.getString(R.string.permission_success_content),
+                listOf(
+                        privacyUrl,
+                        getLocationPairingRequestUrl()
+                )
+        )
+    }
+
     fun getHowPermissionSuccessContent(context: Context): SpannableString {
         return buildSpannableStringContent(
                 context,
@@ -185,6 +227,19 @@ object LinkBuilder {
         }
     }
 
+    fun getReadMore(): Spanned {
+        val linkText = TracerApp.AppContext.getString(R.string.low_handshakes_link)
+        return getReadMoreLink(linkText).also {
+            CentralLog.d(TAG, "getReadMore returns $it")
+        }
+    }
+
+    fun getHotSpot(title: String?, link: String): Spanned {
+        return getHotspotLink(title,link).also {
+            CentralLog.d(TAG, "getReadMore returns $it")
+        }
+    }
+
     fun getNoBluetoothPairingContent(context: Context): SpannableString {
         return buildSpannableStringContent(
                 context,

app/src/main/java/au/gov/health/covidsafe/networking/request/ChangePostcodeRequest.kt

@@ -0,0 +1,6 @@
+package au.gov.health.covidsafe.networking.request
+
+import androidx.annotation.Keep
+
+@Keep
+data class ChangePostcodeRequest(val postcode: String?)

app/src/main/java/au/gov/health/covidsafe/networking/response/CaseStatisticResponse.kt

@@ -14,7 +14,8 @@ data class CaseStatisticResponse(@SerializedName("updated_date") val updatedDate
                                  val sa: CaseDetailsData?,
                                  val tas: CaseDetailsData?,
                                  val vic: CaseDetailsData?,
-                                 val wa: CaseDetailsData?)
+                                 val wa: CaseDetailsData?,
+                                 val version: Int? )
 
 @Keep
 data class CaseDetailsData(
@@ -22,4 +23,9 @@ data class CaseDetailsData(
         @SerializedName("active_cases") var activeCases: Int?,
         @SerializedName("new_cases") var newCases: Int?,
         @SerializedName("recovered_cases") var recoveredCases: Int?,
+        @SerializedName("overseas_acquired") var overseasAcquired: Int?,
+        @SerializedName("recent_tests") var recentTests: Int?,
+        @SerializedName("locally_acquired") var locallyAcquired: Int?,
+        @SerializedName("new_locally_acquired") var newLocallyAcquired: Int?,
+        @SerializedName("new_overseas_acquired") var newOverseasAcquired: Int?,
         var deaths: Int?)

app/src/main/java/au/gov/health/covidsafe/networking/response/UploadPostcodeResponse.kt

@@ -0,0 +1,6 @@
+package au.gov.health.covidsafe.networking.response
+
+import androidx.annotation.Keep
+
+@Keep
+class UploadPostcodeResponse

app/src/main/java/au/gov/health/covidsafe/networking/service/AwsClient.kt

@@ -3,6 +3,7 @@ package au.gov.health.covidsafe.networking.service
 import au.gov.health.covidsafe.BuildConfig
 import au.gov.health.covidsafe.networking.response.CaseStatisticResponse
 import au.gov.health.covidsafe.networking.request.AuthChallengeRequest
+import au.gov.health.covidsafe.networking.request.ChangePostcodeRequest
 import au.gov.health.covidsafe.networking.request.OTPChallengeRequest
 import au.gov.health.covidsafe.networking.response.*
 import retrofit2.Call
@@ -48,4 +49,10 @@ interface AwsClient {
     @GET(BuildConfig.END_POINT_PREFIX + "/statistics")
     fun getCaseStatistics(@Header("Authorization") jwtToken: String?): Call<CaseStatisticResponse>
 
+    @GET(BuildConfig.END_POINT_PREFIX + "/v2/statistics")
+    fun getCaseStatisticsVersion2(@Header("Authorization") jwtToken: String?): Call<CaseStatisticResponse>
+
+    @POST(BuildConfig.END_POINT_PREFIX + "/device")
+    fun changePostcode(@Header("Authorization") jwtToken: String?,
+                       @Body body: ChangePostcodeRequest): Call<UploadPostcodeResponse>
 }

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

@@ -38,6 +38,7 @@ object Preference {
     private const val BUILD_NUMBER_FOR_POP_UP_NOTIFICATION = "BUILD_NUMBER_FOR_POP_UP_NOTIFICATION"
     private const val TURN_CASE_NUMBER = "TURN_CASE_NUMBER"
     private const val IS_REREGISTER = "IS_REREGISTER"
+    private const val SELECTED_STATE = "SELECTED_STATE"
 
     fun putDeviceID(context: Context, value: String) {
         context.getSharedPreferences(PREF_ID, Context.MODE_PRIVATE)
@@ -320,4 +321,14 @@ object Preference {
         return context.getSharedPreferences(PREF_ID, Context.MODE_PRIVATE)
             .getBoolean(TURN_CASE_NUMBER, true)
     }
+
+    fun putSelectedState(context: Context, selectState: String): Boolean {
+        return context.getSharedPreferences(PREF_ID, Context.MODE_PRIVATE)
+                .edit().putString(SELECTED_STATE, selectState).commit()
+    }
+
+    fun getSelectedState(context: Context): String? {
+        return context.getSharedPreferences(PREF_ID, Context.MODE_PRIVATE)
+                .getString(SELECTED_STATE, null)
+    }
 }

app/src/main/java/au/gov/health/covidsafe/sensor/ble/BLEDevice.java

@@ -38,7 +38,8 @@ public class BLEDevice {
     /// Payload data acquired from the device via payloadCharacteristic read, e.g. C19X beacon code or Sonar encrypted identifier
     private PayloadData payloadData;
     /// Most recent RSSI measurement taken by readRSSI or didDiscover.
-    private RSSI rssi;
+    int DUMMY_RSSI = 999;
+    private RSSI rssi = new RSSI(DUMMY_RSSI);
     /// Transmit power data where available (only provided by Android devices)
     private BLE_TxPower txPower;
     /// Is device receive only?

app/src/main/java/au/gov/health/covidsafe/sensor/ble/ConcreteBLESensor.java

@@ -100,6 +100,7 @@ public class ConcreteBLESensor implements BLESensor, BLEDatabaseDelegate, Blueto
                 if (rssi == null) {
                     return;
                 }
+
                 final Proximity proximity = new Proximity(ProximityMeasurementUnit.RSSI, (double) rssi.value);
                 Log.d(LOG_TAG, "device.payloadData():" + device.payloadData());
                 Log.d(LOG_TAG, "device:" + device);
@@ -150,17 +151,11 @@ public class ConcreteBLESensor implements BLESensor, BLEDatabaseDelegate, Blueto
                 }
                 // Notify delegates
                 logger.debug("didRead (device={},payloadData={},payloadData={})", device, device.payloadData(), payloadData.shortName());
-                final RSSI rssi = device.rssi();
-                final Proximity proximity = new Proximity(ProximityMeasurementUnit.RSSI, (double) rssi.value);
                 operationQueue.execute(new Runnable() {
                     @Override
                     public void run() {
                         for (SensorDelegate delegate : delegates) {
-                            if (device.txPower() != null) {
+                            delegate.sensor(SensorType.BLE, payloadData, device.identifier);
-                                delegate.sensor(SensorType.BLE, payloadData, device.identifier, proximity, device.txPower().value, device);
-                            } else {
-                                delegate.sensor(SensorType.BLE, payloadData, device.identifier, proximity, 999, device);
-                            }
                         }
                     }
                 });

app/src/main/java/au/gov/health/covidsafe/sensor/datatype/Base64.java

@@ -29,7 +29,8 @@ public class Base64 {
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            48, 49, 50, 51};
 
     public static String encode(byte[] data) {
         final StringBuilder buffer = new StringBuilder();

app/src/main/java/au/gov/health/covidsafe/sensor/datatype/PseudoDeviceAddress.java

@@ -5,14 +5,12 @@
 package au.gov.health.covidsafe.sensor.datatype;
 
 import android.util.Base64;
-
 import au.gov.health.covidsafe.sensor.data.ConcreteSensorLogger;
 import au.gov.health.covidsafe.sensor.data.SensorLogger;
-
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.security.SecureRandom;
 import java.util.Objects;
+import java.security.SecureRandom;
 import java.util.Random;
 
 /// Pseudo device address to enable caching of device payload without relying on device mac address
@@ -21,21 +19,10 @@ public class PseudoDeviceAddress {
     public final long address;
     public final byte[] data;
 
-    /// Using secure random can cause blocking on app initialisation due to lack of entropy
-    /// on some devices. Worst case scenario is app blocking upon initialisation, bluetooth
-    /// power cycle, or advert refresh that occurs once every 15 minutes, leading to zero
-    /// detection until sufficient entropy has been collected, which may take time given
-    /// the device is likely to be idle. Not using secure random is acceptable and recommended
-    /// in this instance because it is non-blocking and the sequence has sufficient uncertainty
-    /// introduced programmatically to make an attack impractical from limited obeservations.
     public PseudoDeviceAddress() {
         // Bluetooth device address is 48-bit (6 bytes), using
         // the same length to offer the same collision avoidance
-        // Choose between random, secure random, and NIST compliant secure random as random source
+        this.data = encode(getSecureRandomSingletonLong());
-        // - Random is non-blocking and sufficiently secure for this purpose, recommended
-        // - SecureRandom is potentially blocking and unnecessary in this instance, not recommended
-        // - NISTSecureRandom is most likely to block and unnecessary in this instance, not recommended
-        this.data = encode(getSecureRandomLong());
         this.address = decode(this.data);
     }
 
@@ -44,23 +31,11 @@ public class PseudoDeviceAddress {
         this.address = decode(data);
     }
 
-    /// Non-blocking random number generator with appropriate strength for this purpose
-    protected final static long getRandomLong() {
-        // Use a different instance with random seed from another sequence each time
-        final Random random = new Random(Math.round(Math.random() * Long.MAX_VALUE));
-        // Skip a random number of bytes from another sequence
-        random.nextBytes(new byte[256 + (int) Math.round(Math.random() * 1024)]);
-        return random.nextLong();
-    }
-
-    /// Secure random number generator that is potentially blocking. Experiments have
-    /// shown blocking can occur, especially on idle device, due to lack of entropy.
     protected final static long getSecureRandomLong() {
         return new SecureRandom().nextLong();
     }
 
     private static SecureRandom secureRandomSingleton = null;
-    /// Secure random number generator that is potentially blocking.
     protected final static long getSecureRandomSingletonLong() {
         // On-demand initialisation in the hope that sufficient
         // entropy has been gathered during app initialisation
@@ -70,49 +45,6 @@ public class PseudoDeviceAddress {
         return secureRandomSingleton.nextLong();
     }
 
-    /// Get secure random instance seed according to NIST SP800-90A recommendations
-    /// - SHA1PRNG algorithm
-    /// - Algorithm seeded with 440 bits of secure random data
-    /// - Skips first random number of bytes to mitigate against poor implementations
-    /// Compliance to NIST SP800-90A offers quality assurance against an accepted
-    /// standard. The aim here is not to offer the most perfect random source, but
-    /// a source with well defined and understood characteristics, thus enabling
-    /// selection of the most appropropriate method, given the intented purpose.
-    /// This implementation supports security strength for NIST SP800-57
-    /// Part 1 Revision 5 (informally, generation of cryptographic keys for
-    /// encryption of sensitive data).
-    public final static long getNISTSecureRandomLong() {
-        try {
-            // Obtain SHA1PRNG specifically where possible for NIST SP800-90A compliance.
-            // Ignoring Android recommendation to use "new SecureRandom()" because that
-            // decision was taken based on a single peer reviewed statistical test that
-            // showed SHA1PRNG has bias. The test has not been adopted by NIST yet which
-            // already uses 15 other statistical tests for quality assurance. This does
-            // not mean the new test is invalid, but it is more appropriate for this work
-            // to adopt and comply with an accepted standard for security assurance.
-            final SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");
-            // Obtain the most secure PRNG claimed by the platform for generating the seed
-            // according to Android recommendation.
-            final SecureRandom secureRandomForSeed = new SecureRandom();
-            // NIST SP800-90A (see section 10.1) recommends 440 bit seed for SHA1PRNG
-            // to support security strength defined in NIST SP800-57 Part 1 Revision 5.
-            final byte[] seed = secureRandomForSeed.generateSeed(55);
-            // Seed secure random with 440 bit seed according to NIST SP800-90A recommendation.
-            secureRandom.setSeed(seed); // seed with random number
-            // Skip the first 256 - 1280 bytes as mitigation against poor implementations
-            // of SecureRandom where the initial values are predictable given the seed
-            secureRandom.nextBytes(new byte[256 + secureRandom.nextInt(1024)]);
-            return secureRandom.nextLong();
-        } catch (Throwable e) {
-            // Android OS may mandate the use of "new SecureRandom()" and forbid the use
-            // of a specific provider in the future. Fallback to Android mandated option
-            // and log the fact that it is no longer NIST SP800-90A compliant.
-            final SensorLogger logger = new ConcreteSensorLogger("Sensor", "Datatype.PseudoDeviceAddress");
-            logger.fault("NIST SP800-90A compliant SecureRandom initialisation failed, reverting back to SecureRandom", e);
-            return getSecureRandomLong();
-        }
-    }
-
     protected final static byte[] encode(final long value) {
         final ByteBuffer byteBuffer = ByteBuffer.allocate(8);
         byteBuffer.order(ByteOrder.LITTLE_ENDIAN);
@@ -121,6 +53,7 @@ public class PseudoDeviceAddress {
         System.arraycopy(byteBuffer.array(), 0, data, 0, data.length);
         return data;
     }
+
     protected final static long decode(final byte[] data) {
         final ByteBuffer byteBuffer = ByteBuffer.allocate(8);
         byteBuffer.put(data);

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

@@ -28,4 +28,9 @@ interface StreetPassRecordDao {
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     suspend fun insert(record: StreetPassRecord)
 
+    @Query("SELECT * from record_table WHERE timestamp >= :timeInMs")
+    fun getCurrentRecordsFilterTime(timeInMs: Long): List<StreetPassRecord>
+
+    @Query("SELECT * from record_table WHERE timestamp <= :endTime and timestamp >= :startTime")
+    fun getCurrentRecordsBetweenTime(startTime: Long, endTime: Long): List<StreetPassRecord>
 }

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

@@ -25,4 +25,12 @@ class StreetPassRecordStorage(val context: Context) {
     fun getAllRecords(): List<StreetPassRecord> {
         return recordDao.getCurrentRecords()
     }
+
+    fun getAllRecodsFilterTime(timeInMs: Long): List<StreetPassRecord> {
+        return recordDao.getCurrentRecordsFilterTime(timeInMs)
+    }
+
+    fun getAllRecodsBetweenTime(startTime: Long, endTime: Long): List<StreetPassRecord> {
+        return recordDao.getCurrentRecordsBetweenTime(startTime, endTime)
+    }
 }

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

@@ -22,6 +22,7 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.LinearLayoutManager
 import au.gov.health.covidsafe.BuildConfig
 import au.gov.health.covidsafe.HomeActivity
 import au.gov.health.covidsafe.R
@@ -47,14 +48,15 @@ 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.android.synthetic.main.view_national_case_statistics.national_case_layout
+import kotlinx.android.synthetic.main.view_state_case_statistics.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import pub.devrel.easypermissions.AppSettingsDialog
 import pub.devrel.easypermissions.EasyPermissions
 import java.text.SimpleDateFormat
 import java.util.*
-
+import kotlin.collections.ArrayList
 
 private const val TAG = "HomeFragment"
 
@@ -73,6 +75,7 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks, Networ
     private var checkIsInternetConnected = false
     private var isAppWithLatestVersion = false
     lateinit var staticsLayout: ConstraintLayout
+    private lateinit var stateListAdapter: StateAdapter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -100,10 +103,17 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks, Networ
         initializePullToRefresh()
         initialiseReRegistration()
         setupHyperlink()
+        removeRegistrationData()
 
         NetworkConnectionCheck.addNetworkChangedListener(requireContext(), this)
     }
 
+    private fun removeRegistrationData() {
+        Preference.putName(requireContext(), "")
+        Preference.putAge(requireContext(), "")
+        Preference.putPostCode(requireContext(), "")
+    }
+
     private fun setupHyperlink() {
         txt_update_description.movementMethod = LinkMovementMethod.getInstance()
     }
@@ -166,6 +176,20 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks, Networ
                 }
             }
         })
+
+        homeFragmentViewModel.visibleSelectStateLayout.observe(this, Observer { visible ->
+            visible?.let {
+                select_state_layout.visibility = if (visible) VISIBLE else GONE
+            }
+        })
+
+        homeFragmentViewModel.hotSpotLink.observe(this, Observer { link ->
+            link?.let {
+                val title = homeFragmentViewModel.hotSpotTitle.value
+                txt_hotspot.text = LinkBuilder.getHotSpot(title, link)
+                txt_hotspot.movementMethod = LinkMovementMethod.getInstance()
+            }
+        })
     }
 
     private val latestAppAvailable = Observer<Boolean> {
@@ -206,6 +230,22 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks, Networ
 
         updateHealthOfficialTile()
         initializeBluetoothPairingInfo()
+        loadStateAndListener()
+    }
+
+    private fun loadStateAndListener() {
+        stateListAdapter = StateAdapter(this.requireContext())
+        select_state.adapter = stateListAdapter
+        val layoutManager = LinearLayoutManager(this.requireContext())
+        select_state.layoutManager = layoutManager
+
+        stateListAdapter.setRecords(createStateList(), 0)
+
+        stateListAdapter.setOnStateListClickListener(object : StateAdapter.OnStateListClickListener{
+            override fun onStateClick(state: String) {
+                homeFragmentViewModel.setSelectedState(state)
+            }
+        })
     }
 
     private fun initialisePrivacyPolicyMessageAfterUpdate() {
@@ -275,6 +315,14 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks, Networ
             HelpFragment.anchor = "#other-languages"
             findNavController().navigate(HomeFragmentDirections.actionHomeFragmentToHelpFragment())
         }
+
+        home_header_picture_setup_complete.setOnClickListener {
+            counter++
+            if (counter >= 2) {
+                counter = 0
+                findNavController().navigate(HomeFragmentDirections.actionHomeFragmentToPeekActivity())
+            }
+        }
     }
 
     private fun initializeBluetoothPairingInfo() {
@@ -413,6 +461,7 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks, Networ
         }
     }
 
+    @SuppressLint("StringFormatInvalid")
     private fun showLastDataUploadedInfo(context: Context, isDataUploadedInPast14Days: Boolean) {
         if (isDataUploadedInPast14Days) {
             data_last_uploaded_layout.visibility = VISIBLE
@@ -564,17 +613,35 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks, Networ
     }
 
     private fun showAndHideCaseNumber(turnOn: Boolean) {
+        val isV2Available = homeFragmentViewModel.isV2Available.value
         //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
+                if (isV2Available != null && isV2Available) {
+                    state_layout.visibility = VISIBLE
+                } else {
+                    national_case_layout.visibility = VISIBLE
+                }
             } else {
-                national_case_layout.visibility = GONE
+                if (isV2Available != null && isV2Available) {
+                    state_layout.visibility = GONE
+                } else {
+                    national_case_layout.visibility = GONE
+                }
             }
         } else {
             if (turnOn) {
-                national_case_layout.slideAnimation(SlideDirection.DOWN, SlideType.SHOW)
+                if (isV2Available != null && isV2Available) {
+                    state_layout.slideAnimation(SlideDirection.DOWN, SlideType.SHOW)
+                } else {
+                    national_case_layout.slideAnimation(SlideDirection.DOWN, SlideType.SHOW)
+                }
             } else {
+                if (isV2Available != null && isV2Available) {
+                    state_layout.slideAnimation(SlideDirection.UP, SlideType.HIDE)
+                } else {
+                    national_case_layout.slideAnimation(SlideDirection.UP, SlideType.HIDE)
+                }
                 national_case_layout.slideAnimation(SlideDirection.UP, SlideType.HIDE)
             }
         }
@@ -616,4 +683,18 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks, Networ
         location_card_view.isEnabled = enableParent
         battery_card_view.isEnabled = enableParent
     }
+
+    private fun createStateList(): ArrayList<String>{
+        val list = ArrayList<String>()
+        list.add("Australia")
+        list.add("Australian Capital Territory")
+        list.add("New South Wales")
+        list.add("Northern Territory")
+        list.add("Queensland")
+        list.add("South Australia")
+        list.add("Tasmania")
+        list.add("Victoria")
+        list.add("Western Australia")
+        return list
+    }
 }

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

@@ -2,17 +2,24 @@ package au.gov.health.covidsafe.ui.home
 
 import android.app.Application
 import android.content.Context
-import androidx.lifecycle.*
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
 import au.gov.health.covidsafe.BuildConfig
+import au.gov.health.covidsafe.R
+import au.gov.health.covidsafe.extensions.isInternetAvailable
 import au.gov.health.covidsafe.factory.RetrofitServiceGenerator
 import au.gov.health.covidsafe.interactor.usecase.GetCaseStatisticsUseCase
 import au.gov.health.covidsafe.logging.CentralLog
+import au.gov.health.covidsafe.networking.response.CaseDetailsData
 import au.gov.health.covidsafe.networking.response.CaseStatisticResponse
-import au.gov.health.covidsafe.extensions.isInternetAvailable
 import au.gov.health.covidsafe.networking.service.AwsClient
 import au.gov.health.covidsafe.preference.Preference
 import com.google.gson.Gson
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 
 private const val TAG = "HomeFragmentViewModel"
@@ -21,6 +28,7 @@ class HomeFragmentViewModel(application: Application) : AndroidViewModel(applica
 
     val caseNumberDataState = MutableLiveData<CaseNumbersState>()
     val caseStatisticsLiveData = MutableLiveData<CaseStatisticResponse>()
+    val caseStateStatisticsLiveData = MutableLiveData<CaseStatisticResponse>()
     val isRefreshing = MutableLiveData<Boolean>()
     val collectionMessageVisible = MutableLiveData<Boolean>()
     val heraldUpgradeMessage = MutableLiveData<Boolean>()
@@ -28,13 +36,31 @@ class HomeFragmentViewModel(application: Application) : AndroidViewModel(applica
     val turnCaseNumber = MutableLiveData<Boolean>()
     lateinit var context: Context
     var turnCaseAfterOpenPage = true
+    val visibleSelectStateLayout = MutableLiveData<Boolean>()
+    val newCase = MutableLiveData<Int>()
+    val localCase = MutableLiveData<String>()
+    val overseaCase = MutableLiveData<String>()
+    val activeCase = MutableLiveData<Int>()
+    val totalDeaths = MutableLiveData<String>()
+    val titleOfNumber = MutableLiveData<String>()
+    val hotSpotTitle = MutableLiveData<String>()
+    val hotSpotLink = MutableLiveData<String>()
+    val locallyAquired = MutableLiveData<String>()
+    val aquiredOversea = MutableLiveData<String>()
+    val totalyDeathe = MutableLiveData<String>()
+    val isV2Available = MutableLiveData<Boolean>()
+
+    private val viewModelJob = SupervisorJob()
+    private val uiScope = CoroutineScope(Dispatchers.Main + viewModelJob)
 
     val awsClient: AwsClient by lazy {
         RetrofitServiceGenerator.createService(AwsClient::class.java)
     }
 
     fun fetchGetCaseStatistics(lifecycle: Lifecycle) {
+        isV2Available.value = false
         context = getApplication() as Context
+        titleOfNumber.value = context.getString(R.string.national_numbers)
         turnCaseNumber.value = Preference.getTurnCaseNumber(context)
         if(caseNumberDataState.value != CaseNumbersState.LOADING) {
             caseNumberDataState.value = CaseNumbersState.LOADING
@@ -64,6 +90,12 @@ class HomeFragmentViewModel(application: Application) : AndroidViewModel(applica
             caseNumberDataState.value = CaseNumbersState.SUCCESS
             cacheCaseStatisticDataInPersistent(caseStatisticResponse)
             caseStatisticsLiveData.value = caseStatisticResponse
+
+            if ( caseStatisticResponse.version != null) {
+                isV2Available.value = true
+            }
+            caseStateStatisticsLiveData.value = caseStatisticResponse
+            selectState()
         }
     }
 
@@ -120,5 +152,84 @@ class HomeFragmentViewModel(application: Application) : AndroidViewModel(applica
         turnCaseNumber.value = turnoff
     }
 
+    fun showSelectSate(visibleLayout: Boolean) {
+        visibleSelectStateLayout.value = visibleLayout
+    }
+
     fun getTurningCaseAfterOpenPage() = turnCaseAfterOpenPage
+    fun setSelectedState(state: String) {
+        Preference.putSelectedState(context, state)
+    }
+
+    fun selectState() {
+        visibleSelectStateLayout.value = false
+        val stateResponse: CaseDetailsData?
+        locallyAquired.value = context.getString(R.string.locally_acquired).replace("%@", "")
+        aquiredOversea.value = context.getString(R.string.overseas_acquired).replace("%@", "")
+        totalyDeathe.value = context.getString(R.string.total_deaths).replace("%@", "")
+
+        when (Preference.getSelectedState(context).toString()) {
+           "Australia" -> {
+               stateResponse = caseStateStatisticsLiveData.value?.national
+               recordStateData(stateResponse, "National")
+           }
+            "Australian Capital Territory" -> {
+                stateResponse = caseStateStatisticsLiveData.value?.act
+                recordStateData(stateResponse, "ACT")
+                hotSpotLink.value = context.getString(R.string.hotspot_link_ACT)
+            }
+            "New South Wales" -> {
+                stateResponse = caseStateStatisticsLiveData.value?.nsw
+                recordStateData(stateResponse, "NSW")
+                hotSpotLink.value = context.getString(R.string.hotspot_link_NSW)
+            }
+            "Northern Territory" -> {
+                stateResponse = caseStateStatisticsLiveData.value?.nt
+                recordStateData(stateResponse, "NT")
+                hotSpotLink.value = context.getString(R.string.hotspot_link_NT)
+            }
+            "Queensland" -> {
+                stateResponse = caseStateStatisticsLiveData.value?.qld
+                recordStateData(stateResponse, "QLD")
+                hotSpotLink.value = context.getString(R.string.hotspot_link_QLD)
+            }
+            "South Australia" -> {
+                stateResponse = caseStateStatisticsLiveData.value?.sa
+                recordStateData(stateResponse, "SA")
+                hotSpotLink.value = context.getString(R.string.hotspot_link_SA)
+            }
+            "Tasmania" -> {
+                stateResponse = caseStateStatisticsLiveData.value?.tas
+                recordStateData(stateResponse, "TAS")
+                hotSpotLink.value = context.getString(R.string.hotspot_link_TAS)
+            }
+            "Victoria" -> {
+                stateResponse = caseStateStatisticsLiveData.value?.vic
+                recordStateData(stateResponse, "VIC")
+                hotSpotLink.value = context.getString(R.string.hotspot_link_VIC)
+            }
+            "Western Australia" -> {
+                stateResponse = caseStateStatisticsLiveData.value?.wa
+                recordStateData(stateResponse, "WA")
+                hotSpotLink.value = context.getString(R.string.hotspot_link_WA)
+            }
+            else ->  {
+            stateResponse = caseStateStatisticsLiveData.value?.national
+            recordStateData(stateResponse, "National")
+            }
+        }
+    }
+
+    private fun recordStateData(stateResponse: CaseDetailsData?, stateName: String?) {
+        newCase.value = if (stateResponse?.newCases != null) { stateResponse.newCases} else { 0 }
+        localCase.value = if (stateResponse?.locallyAcquired != null) { stateResponse.newLocallyAcquired.toString()} else { "0" }
+        overseaCase.value = if (stateResponse?.overseasAcquired != null) { stateResponse.newOverseasAcquired.toString()} else { "0" }
+        activeCase.value = if (stateResponse?.activeCases != null) { stateResponse.activeCases} else { 0 }
+        totalDeaths.value = if (stateResponse?.deaths != null) { stateResponse.deaths.toString()} else { "0" }
+        titleOfNumber.value = "$stateName numbers"
+        stateName?.let {
+            val hotSpot = context.getString(R.string.hotspots_state_territory)
+            hotSpotTitle.value = hotSpot.replace("%@", it, false)
+        }
+    }
 }

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

@@ -0,0 +1,67 @@
+package au.gov.health.covidsafe.ui.home
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.recyclerview.widget.RecyclerView
+import au.gov.health.covidsafe.R
+
+
+class StateAdapter internal constructor(context: Context) :
+        RecyclerView.Adapter<StateAdapter.StateViewHolder>() {
+
+    private val inflater: LayoutInflater = LayoutInflater.from(context)
+    private var stateList = emptyList<String>()
+    private var selectedState: Int = 0
+    private var mListener: OnStateListClickListener? = null
+
+    interface OnStateListClickListener {
+        fun onStateClick(state: String)
+    }
+
+    inner class StateViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        val txtStateName: TextView = itemView.findViewById(R.id.state_name)
+        val imageStateSelect: ImageView = itemView.findViewById(R.id.img_state_select)
+        val endLine: View = itemView.findViewById(R.id.end_line)
+        val countryListLayout: ConstraintLayout = itemView.findViewById(R.id.country_list_item)
+    }
+
+    fun setOnStateListClickListener(actionListener: OnStateListClickListener) {
+        mListener = actionListener
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): StateAdapter.StateViewHolder {
+        val itemView = inflater.inflate(R.layout.view_list_item_state, parent, false)
+        return StateViewHolder(itemView)
+    }
+
+    override fun onBindViewHolder(holder: StateAdapter.StateViewHolder, position: Int) {
+        holder.txtStateName.text = stateList[position]
+        holder.imageStateSelect.visibility = View.GONE
+        holder.endLine.visibility = View.VISIBLE
+
+        if (position == selectedState) {
+            holder.imageStateSelect.visibility = View.VISIBLE
+        }
+        if (position == (this.stateList.size - 1)) {
+            holder.endLine.visibility = View.GONE
+        }
+        holder.countryListLayout.setOnClickListener {
+            setRecords(stateList, position)
+            mListener?.onStateClick(stateList[position])
+        }
+    }
+
+    fun setRecords(stateList: List<String>, selectedState: Int) {
+        this.stateList = stateList
+        this.selectedState = selectedState
+        notifyDataSetChanged()
+    }
+
+    override fun getItemCount() = stateList.size
+
+}

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

@@ -27,7 +27,7 @@ import java.util.regex.Pattern
 
 private const val TAG = "PersonalDetailsFragment"
 
-private val POST_CODE_REGEX = Pattern.compile("^(?:(?:[2-8]\\d|9[0-7]|0?[28]|0?9(?=09))(?:\\d{2}))$")
+val POST_CODE_REGEX = Pattern.compile("^(?:(?:[2-8]\\d|9[0-7]|0?[28]|0?9(?=09))(?:\\d{2}))$")
 private val NAME_REGEX = Pattern.compile("^[.A-Za-z0-9\\u00C0-\\u017F][.A-Za-z'0-9\\-\\u00C0-\\u017F ]{0,80}\$")
 
 class PersonalDetailsFragment : PagerChildFragment() {
@@ -75,7 +75,7 @@ class PersonalDetailsFragment : PagerChildFragment() {
                 R.array.age_range_array,
                 android.R.layout.simple_spinner_item
         ).also { adapter ->
-            // Specify the layout to use when the list of choices appears
+            // Specify the activity_change_postcode to use when the list of choices appears
             adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
 
             // Apply the adapter to the spinner

app/src/main/java/au/gov/health/covidsafe/ui/settings/ChangePostCodeActivity.kt

@@ -0,0 +1,61 @@
+package au.gov.health.covidsafe.ui.settings
+
+import android.os.Bundle
+import android.text.method.LinkMovementMethod
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.ViewModelProvider
+import au.gov.health.covidsafe.R
+import au.gov.health.covidsafe.databinding.ActivityChangePostcodeBinding
+import au.gov.health.covidsafe.links.LinkBuilder
+import au.gov.health.covidsafe.ui.onboarding.fragment.personal.POST_CODE_REGEX
+import kotlinx.android.synthetic.main.activity_change_postcode.*
+
+class ChanePostCodeActivity: AppCompatActivity() {
+
+    var viewModel: SettingsViewModel? = null
+    var postcode: String? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        // TO make sure scroll works with editTexts
+
+        val binding = DataBindingUtil.setContentView<ActivityChangePostcodeBinding>(this, R.layout.activity_change_postcode)
+        viewModel = ViewModelProvider(this).get(SettingsViewModel::class.java)
+        binding.lifecycleOwner = this
+        binding.viewModel = viewModel
+
+        val toolbar = findViewById<View>(com.atlassian.mobilekit.module.feedback.R.id.toolbar) as Toolbar
+        setSupportActionBar(toolbar)
+        val actionBar = supportActionBar
+        actionBar?.setDisplayHomeAsUpEnabled(true)
+        toolbar.setNavigationOnClickListener { finish() }
+
+        setupListener()
+
+        viewModel?.getCurrentPostCode()
+        postcode_content.text = LinkBuilder.getPostcodeContent(this)
+        postcode_content.movementMethod = LinkMovementMethod.getInstance()
+
+        postcode_updated.text = LinkBuilder.getPostcodeUpdatedSuccessfullyContent(this)
+        postcode_updated.movementMethod = LinkMovementMethod.getInstance()
+    }
+
+    private fun setupListener() {
+        btn_done.setOnClickListener {
+            this.finish()
+        }
+        btn_continue.setOnClickListener {
+            postcode = post_code.text.toString()
+            if (isValidPostcode() && postcode != null) {
+                viewModel?.changePostcode(postcode!!)
+                post_code_error.visibility = View.GONE
+            } else {
+                post_code_error.visibility = View.VISIBLE
+            }
+        }
+    }
+    private fun isValidPostcode() = postcode?.length == 4 && POST_CODE_REGEX.matcher(postcode).matches()
+}

app/src/main/java/au/gov/health/covidsafe/ui/settings/SettingsFragment.kt

@@ -71,6 +71,7 @@ class SettingsFragment : BaseFragment(), NetworkConnectionCheck.NetworkConnectio
         initializeSupportNavigation()
         initializeAppShareNavigation()
         setAppVersionNumber()
+        initializeChangePostCodeNavigation()
     }
 
     private fun initializeHelpTopicsNavigation() {
@@ -92,6 +93,12 @@ class SettingsFragment : BaseFragment(), NetworkConnectionCheck.NetworkConnectio
         }
     }
 
+    private fun initializeChangePostCodeNavigation() {
+        postcode_card_view.setOnClickListener {
+            startActivity(Intent(requireContext(), ChanePostCodeActivity::class.java))
+        }
+    }
+
     private fun setAppVersionNumber() {
         settings_version_number.text = context?.getAppVersionNumberDetails()
     }

app/src/main/java/au/gov/health/covidsafe/ui/settings/SettingsViewModel.kt

@@ -0,0 +1,59 @@
+package au.gov.health.covidsafe.ui.settings
+
+import android.app.Application
+import android.content.Context
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.MutableLiveData
+import au.gov.health.covidsafe.factory.RetrofitServiceGenerator
+import au.gov.health.covidsafe.networking.request.ChangePostcodeRequest
+import au.gov.health.covidsafe.networking.response.UploadPostcodeResponse
+import au.gov.health.covidsafe.networking.service.AwsClient
+import au.gov.health.covidsafe.preference.Preference
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class SettingsViewModel(application: Application): AndroidViewModel(application) {
+
+    val postcodeUpdated = MutableLiveData<Boolean>()
+    val showSpinner = MutableLiveData<Boolean>()
+    lateinit var context: Context
+
+    val awsClient: AwsClient by lazy {
+        RetrofitServiceGenerator.createService(AwsClient::class.java)
+    }
+
+    fun getCurrentPostCode() {
+        context = getApplication() as Context
+    }
+
+    init {
+        postcodeUpdated.value = false
+        showSpinner.value = false
+    }
+
+    fun changePostcode(postcode: String) {
+        showSpinner.value = true
+
+        val token = Preference.getEncrypterJWTToken(getApplication() as Context)
+        val changePstcode: Call<UploadPostcodeResponse> = awsClient.changePostcode("Bearer $token", ChangePostcodeRequest(postcode))
+        changePstcode.enqueue(object : Callback<UploadPostcodeResponse> {
+            override fun onFailure(call: Call<UploadPostcodeResponse>, t: Throwable) {
+                onError()
+                showSpinner.value = false
+            }
+
+            override fun onResponse(call: Call<UploadPostcodeResponse>, response: Response<UploadPostcodeResponse>) {
+                if (response.code() == 200) {
+                    postcodeUpdated.value = true
+                    showSpinner.value = false
+                    Preference.putPostCode(context, postcode)
+                }
+            }
+        })
+    }
+
+    private fun onError() {
+
+    }
+}

app/src/main/java/au/gov/health/covidsafe/ui/upload/presentation/VerifyUploadPinFragment.kt

@@ -88,10 +88,10 @@ class VerifyUploadPinFragment : PagerChildFragment() {
         enter_pin_error_label.visibility = View.GONE
     }
 
-    fun showGenericError() {
+    fun showGenericError(errorCode: String?) {
         dialog?.dismiss()
         activity?.let {
-            dialog = UploadingErrorDialog(it, object : OnUploadErrorInterface {
+            dialog = UploadingErrorDialog(it, errorCode, object : OnUploadErrorInterface {
                 override fun onPositiveClicked() {
                     presenter.uploadData(requireView().pin.text.toString())
                 }

app/src/main/java/au/gov/health/covidsafe/ui/upload/presentation/VerifyUploadPinPresenter.kt

@@ -49,15 +49,17 @@ class VerifyUploadPinPresenter(private val fragment: VerifyUploadPinFragment) :
                     fragment.navigateToNextPage()
                 },
                 onFailure = {
+
+                    val errorCode = it.message.toString()
                     when {
                         it is UploadDataException.UploadDataIncorrectPinException -> {
                             fragment.showInvalidOtp()
                         }
                         it is UploadDataException.UploadDataJwtExpiredException -> {
-                            fragment.navigateToRegister()
+                             fragment.navigateToRegister()
                         }
                         fragment.activity?.isInternetAvailable() == true -> {
-                            fragment.showGenericError()
+                            fragment.showGenericError(errorCode)
                         }
                         else -> {
                             fragment.showCheckInternetError()

app/src/main/java/au/gov/health/covidsafe/ui/view/UploadingErrorDialog.kt

@@ -7,9 +7,10 @@ import android.view.Window
 import android.view.WindowManager
 import au.gov.health.covidsafe.R
 import au.gov.health.covidsafe.ui.upload.presentation.VerifyUploadPinFragment
+import kotlinx.android.synthetic.main.activity_onboarding.view.*
 import kotlinx.android.synthetic.main.dialog_error_uploading.*
 
-class UploadingErrorDialog(context: Context, private val listener: VerifyUploadPinFragment.OnUploadErrorInterface) : Dialog(context) {
+class UploadingErrorDialog(context: Context, val errorCode: String?, private val listener: VerifyUploadPinFragment.OnUploadErrorInterface) : Dialog(context) {
 
     init {
         setCancelable(false)
@@ -20,6 +21,9 @@ class UploadingErrorDialog(context: Context, private val listener: VerifyUploadP
         super.onCreate(savedInstanceState)
         requestWindowFeature(Window.FEATURE_NO_TITLE)
         setContentView(R.layout.dialog_error_uploading)
+
+        val errorMessage = context.getString(R.string.dialog_error_uploading_message).replace("%@", errorCode.toString(), false)
+        home_data_uploaded_error_message.text = errorMessage
         val window: Window? = this.window
         window?.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT)
         dialog_error_positive.setOnClickListener {

app/src/main/res/drawable/circle.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="0dp"
+    android:shape="ring"
+    android:thickness="3dp"
+    android:useLevel="false">
+
+    <solid android:color="@color/black" />
+
+</shape>

app/src/main/res/drawable/ic_activity.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="20dp"
+    android:viewportWidth="22"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M21,10H17L14,19L8,1L5,10H1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+</vector>

app/src/main/res/drawable/ic_alert_triangle.xml

@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10.2898,3.86L1.8198,18C1.6451,18.3024 1.5527,18.6453 1.5518,18.9945C1.5508,19.3437 1.6413,19.6871 1.8142,19.9905C1.9871,20.2939 2.2365,20.5467 2.5375,20.7238C2.8385,20.9009 3.1806,20.9961 3.5298,21H20.4698C20.819,20.9961 21.1611,20.9009 21.4621,20.7238C21.7631,20.5467 22.0124,20.2939 22.1854,19.9905C22.3583,19.6871 22.4488,19.3437 22.4478,18.9945C22.4468,18.6453 22.3544,18.3024 22.1798,18L13.7098,3.86C13.5315,3.5661 13.2805,3.3231 12.981,3.1544C12.6814,2.9858 12.3435,2.8972 11.9998,2.8972C11.656,2.8972 11.3181,2.9858 11.0186,3.1544C10.7191,3.3231 10.468,3.5661 10.2898,3.86V3.86Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,9V13"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,17H12.01"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+</vector>

app/src/main/res/drawable/ic_check.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20,6L9,17L4,12"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#00661B"
+      android:strokeLineCap="round"/>
+</vector>

app/src/main/res/drawable/ic_external_link.xml

@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18,13V19C18,19.5304 17.7893,20.0391 17.4142,20.4142C17.0391,20.7893 16.5304,21 16,21H5C4.4696,21 3.9609,20.7893 3.5858,20.4142C3.2107,20.0391 3,19.5304 3,19V8C3,7.4696 3.2107,6.9609 3.5858,6.5858C3.9609,6.2107 4.4696,6 5,6H11"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M15,3H21V9"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M10,14L21,3"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+</vector>

app/src/main/res/drawable/ic_illustration.xml

@@ -0,0 +1,67 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="311dp"
+    android:height="188dp"
+    android:viewportWidth="311"
+    android:viewportHeight="188">
+  <path
+      android:pathData="M155.6,156.15C190.163,156.15 218.155,128.135 218.155,93.543C218.155,58.951 190.163,30.936 155.6,30.936C121.037,30.936 93.045,58.951 93.045,93.543C93.045,128.135 121.037,156.15 155.6,156.15Z"
+      android:fillColor="#C8FFB9"/>
+  <path
+      android:pathData="M236.917,107.35C236.917,108.555 237.92,109.509 239.074,109.509C240.278,109.509 241.231,108.505 241.231,107.35V103.835H244.843C245.997,103.835 246.95,102.882 246.95,101.727C246.95,100.572 245.997,99.618 244.843,99.618H241.231V96.104C241.231,94.899 240.228,93.945 239.074,93.945C237.87,93.945 236.917,94.949 236.917,96.104V99.618H233.305C232.151,99.618 231.198,100.572 231.198,101.727C231.198,102.882 232.151,103.835 233.305,103.835H236.917V107.35Z"
+      android:fillColor="#C8FFB9"/>
+  <path
+      android:pathData="M69.769,130.796C69.769,132.001 70.772,132.955 71.926,132.955C73.13,132.955 74.083,131.951 74.083,130.796V127.282H77.695C78.849,127.282 79.802,126.328 79.802,125.173C79.802,124.018 78.849,123.064 77.695,123.064H74.083V119.55C74.083,118.345 73.08,117.391 71.926,117.391C70.722,117.391 69.769,118.395 69.769,119.55V123.064H66.107C64.953,123.064 64,124.018 64,125.173C64,126.328 64.953,127.282 66.107,127.282H69.719V130.796H69.769Z"
+      android:fillColor="#00A129"/>
+  <path
+      android:pathData="M215.848,41.479C215.848,42.684 216.851,43.638 218.005,43.638C219.209,43.638 220.162,42.634 220.162,41.479V37.965H223.774C224.927,37.965 225.881,37.011 225.881,35.856C225.881,34.701 224.927,33.748 223.774,33.748H220.162V30.233C220.162,29.028 219.159,28.074 218.005,28.074C216.801,28.074 215.848,29.078 215.848,30.233V33.748H212.236C211.082,33.748 210.129,34.701 210.129,35.856C210.129,37.011 211.082,37.965 212.236,37.965H215.848V41.479Z"
+      android:fillColor="#00A129"/>
+  <path
+      android:pathData="M86.223,44.04C86.223,45.245 87.227,46.199 88.38,46.199C89.584,46.199 90.537,45.195 90.537,44.04V40.525H94.149C95.303,40.525 96.256,39.571 96.256,38.417C96.256,37.262 95.303,36.308 94.149,36.308H90.588V32.794C90.588,31.589 89.584,30.635 88.43,30.635C87.227,30.635 86.273,31.639 86.273,32.794V36.308H82.662C81.508,36.308 80.555,37.262 80.555,38.417C80.555,39.571 81.508,40.525 82.662,40.525H86.273V44.04H86.223Z"
+      android:fillColor="#C8FFB9"/>
+  <group>
+    <clip-path
+        android:pathData="M155.6,156.15C190.163,156.15 218.155,128.135 218.155,93.543C218.155,58.951 190.163,30.936 155.6,30.936C121.037,30.936 93.045,58.951 93.045,93.543C93.045,128.135 121.037,156.15 155.6,156.15Z"/>
+    <path
+        android:pathData="M186.2,90.28C186.2,90.28 187.655,84.807 191.417,82.749C195.179,80.69 200.497,80.49 197.487,87.217C194.477,93.945 193.173,109.458 191.367,116.789C189.561,124.119 180.03,140.737 175.766,148.318C171.502,155.899 167.79,185.872 167.79,185.872L128.561,180.902C128.561,180.902 134.28,147.967 132.624,145.758C130.969,143.498 131.119,140.637 129.765,134.16C128.461,127.683 126.454,120.956 126.454,120.956L186.2,90.28Z"
+        android:fillColor="#DDB88B"/>
+  </group>
+  <path
+      android:pathData="M130.618,58.801C130.618,58.801 128.863,47.956 129.615,42.082C130.368,36.208 135.936,36.911 137.541,40.375C139.146,43.839 140.752,56.943 140.752,56.943L134.732,89.376L127.057,89.276L130.618,58.801Z"
+      android:fillColor="#DDB88B"/>
+  <path
+      android:pathData="M171.903,138.076C171.552,138.076 171.151,138.076 170.8,138.026L134.581,133.407C129.765,132.805 126.304,128.386 126.956,123.516L138.494,32.091C139.046,27.673 142.808,24.359 147.222,24.359C147.574,24.359 147.975,24.359 148.326,24.409L184.545,29.028C189.361,29.631 192.822,34.049 192.17,38.919L180.582,130.395C180.08,134.763 176.318,138.076 171.903,138.076Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M147.223,25.263C147.574,25.263 147.875,25.263 148.226,25.313L184.445,29.932C186.552,30.183 188.408,31.288 189.712,32.944C191.016,34.601 191.568,36.71 191.317,38.818L179.729,130.294C179.228,134.26 175.867,137.223 171.853,137.223C171.502,137.223 171.201,137.223 170.85,137.172L134.631,132.553C132.525,132.302 130.668,131.198 129.364,129.541C128.06,127.884 127.508,125.776 127.759,123.667L139.347,32.191C139.849,28.225 143.26,25.263 147.223,25.263ZM147.223,23.455C142.407,23.455 138.243,27.02 137.591,31.94L126.003,123.416C125.351,128.738 129.113,133.608 134.431,134.26L170.65,138.879C171.051,138.93 171.452,138.98 171.904,138.98C176.719,138.98 180.883,135.415 181.535,130.495L193.123,39.019C193.775,33.697 190.013,28.827 184.696,28.175L148.477,23.556C148.025,23.506 147.624,23.455 147.223,23.455Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M137.692,41.68L136.237,41.479C136.086,41.479 136.036,41.329 136.036,41.228L136.488,37.613C136.488,37.463 136.638,37.413 136.738,37.413L138.193,37.613C138.344,37.613 138.394,37.764 138.394,37.864L137.942,41.479C137.942,41.58 137.842,41.68 137.692,41.68Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M136.287,52.776L134.832,52.575C134.682,52.575 134.632,52.424 134.632,52.324L135.535,45.144C135.535,44.994 135.685,44.944 135.786,44.944L137.24,45.144C137.391,45.144 137.441,45.295 137.441,45.396L136.538,52.575C136.538,52.675 136.438,52.776 136.287,52.776Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M135.083,62.365L133.628,62.164C133.478,62.164 133.428,62.014 133.428,61.913L134.331,54.734C134.331,54.583 134.481,54.533 134.582,54.533L136.036,54.734C136.187,54.734 136.237,54.884 136.237,54.985L135.334,62.164C135.334,62.315 135.183,62.365 135.083,62.365Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M189.712,66.733L188.257,66.532C188.107,66.532 188.057,66.382 188.057,66.281L189.562,54.483C189.562,54.332 189.712,54.282 189.812,54.282L191.267,54.483C191.418,54.483 191.468,54.633 191.468,54.734L189.963,66.532C189.963,66.683 189.812,66.783 189.712,66.733Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M159.513,99.367C169.542,99.367 177.673,91.23 177.673,81.192C177.673,71.155 169.542,63.018 159.513,63.018C149.484,63.018 141.354,71.155 141.354,81.192C141.354,91.23 149.484,99.367 159.513,99.367Z"
+      android:fillColor="#00A129"/>
+  <path
+      android:pathData="M122.592,94.447C122.592,94.447 118.378,81.494 120.184,75.318C121.94,69.143 132.224,71.201 136.137,71.754C140.049,72.306 145.216,76.925 137.391,79.586C133.929,80.741 131.722,80.741 131.722,80.741L130.669,88.02L122.592,94.447Z"
+      android:fillColor="#DDB88B"/>
+  <path
+      android:pathData="M126.455,120.956C126.455,120.956 121.388,105.944 121.538,98.112C121.689,90.28 134.33,86.063 137.691,86.063C141.103,86.063 141.604,91.786 135.233,96.053C128.913,100.321 128.411,105.342 128.411,105.342L126.455,120.956Z"
+      android:fillColor="#DDB88B"/>
+  <path
+      android:pathData="M121.137,73.41C121.137,73.41 120.083,64.373 122.642,61.411C125.25,58.449 136.638,54.232 138.945,55.387C141.253,56.541 143.51,60.106 137.089,64.524C130.768,68.942 129.815,73.009 121.137,73.41Z"
+      android:fillColor="#DDB88B"/>
+  <path
+      android:pathData="M156.955,87.669C156.403,87.619 155.902,87.317 155.55,86.866L152.591,83.05C151.888,82.146 152.039,80.791 152.992,80.088C153.895,79.385 155.249,79.535 155.952,80.49L157.607,82.648L166.286,75.971C167.239,75.268 168.543,75.419 169.245,76.373C169.948,77.326 169.797,78.632 168.844,79.335L158.46,87.267C158.059,87.568 157.507,87.719 156.955,87.669Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M221.617,155.699C221.617,156.903 222.62,157.857 223.774,157.857C224.978,157.857 225.931,156.853 225.931,155.699V152.184H229.543C230.697,152.184 231.65,151.23 231.65,150.075C231.65,148.921 230.697,147.967 229.543,147.967H225.931V144.452C225.931,143.247 224.928,142.293 223.774,142.293C222.57,142.293 221.617,143.298 221.617,144.452V147.967H218.005C216.852,147.967 215.898,148.921 215.898,150.075C215.898,151.23 216.852,152.184 218.005,152.184H221.617V155.699Z"
+      android:fillColor="#00A129"/>
+</vector>

app/src/main/res/drawable/ic_map_pin.xml

@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21,10C21,17 12,23 12,23C12,23 3,17 3,10C3,7.613 3.9482,5.3239 5.636,3.636C7.3239,1.9482 9.6131,1 12,1C14.3869,1 16.6761,1.9482 18.364,3.636C20.0518,5.3239 21,7.613 21,10Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#00661B"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,13C13.6569,13 15,11.6569 15,10C15,8.3432 13.6569,7 12,7C10.3431,7 9,8.3432 9,10C9,11.6569 10.3431,13 12,13Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#00661B"
+      android:strokeLineCap="round"/>
+</vector>

app/src/main/res/drawable/ic_postcode.xml

@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3,9L12,2L21,9V20C21,20.5304 20.7893,21.0391 20.4142,21.4142C20.0391,21.7893 19.5304,22 19,22H5C4.4696,22 3.9609,21.7893 3.5858,21.4142C3.2107,21.0391 3,20.5304 3,20V9Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M9,22V12H15V22"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+</vector>

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

@@ -0,0 +1,203 @@
+<?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:tools="http://schemas.android.com/tools">
+
+    <data>
+        <variable
+            name="viewModel"
+            type="au.gov.health.covidsafe.ui.settings.SettingsViewModel" />
+    </data>
+
+<androidx.constraintlayout.widget.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/toolbar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/lighter_green"
+            app:title="Change Postcode"
+            app:popupTheme="@style/MobileKit.FeedbackTheme.PopupOverlay" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_marginTop="?attr/actionBarSize"
+        android:layout_marginBottom="100dp"
+        android:fillViewport="true"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar_layout"
+        app:layout_constraintBottom_toTopOf="@+id/btn_continue">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/space_32"
+            android:layout_marginEnd="@dimen/space_32"
+            android:layout_margin="@dimen/space_16"
+            android:orientation="vertical"
+            visibility="@{!viewModel.postcodeUpdated}">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/space_16"
+            style="?textAppearanceBody1"
+            android:textSize="26sp"
+            android:textStyle="bold"
+            android:gravity="center_horizontal"
+            android:text="@string/change_postcode_heading" />
+
+        <TextView
+            android:id="@+id/postcode_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/space_24"
+            style="?textAppearanceBody1"
+            android:textSize="16sp"
+            android:lineHeight="@dimen/space_24"
+            android:text="@string/change_postcode_intro"
+            android:layout_alignBottom="@+id/title" />
+
+            <TextView
+                android:id="@+id/txt_postcode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/space_40"
+                style="?textAppearanceBody1"
+                android:textSize="18sp"
+                android:lineHeight="@dimen/space_24"
+                android:text="@string/postcode_change_label" />
+
+            <EditText
+                android:id="@+id/post_code"
+                android:layout_width="match_parent"
+                android:layout_marginTop="@dimen/space_8"
+                style="@style/otpStyle"
+                android:layout_height="50dp"
+                android:contentDescription="@string/personal_details_post_code_content_description"
+                android:textCursorDrawable="@null"
+                android:maxLength="4"
+                android:inputType="number"
+                android:digits="0123456789"
+                android:imeOptions="actionDone" />
+
+            <TextView
+                android:id="@+id/post_code_error"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/keyline_1"
+                android:text="@string/personal_details_post_code_error_prompt"
+                android:textColor="@color/error_red"
+                android:visibility="invisible"/>
+
+        </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/space_32"
+                android:layout_marginEnd="@dimen/space_32"
+                android:layout_margin="@dimen/space_16"
+                android:orientation="vertical"
+                visibility="@{viewModel.postcodeUpdated}">
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_illustration"/>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/space_16"
+                    style="?textAppearanceBody1"
+                    android:textSize="28sp"
+                    android:textStyle="bold"
+                    android:text="@string/postcode_success" />
+
+                <TextView
+                    android:id="@+id/postcode_updated"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/space_16"
+                    style="?textAppearanceBody1"
+                    android:textSize="14sp"
+                    android:lineHeight="@dimen/space_24"
+                    android:text="@string/permission_success_content" />
+
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+
+    <Button
+        android:id="@+id/btn_continue"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/space_16"
+        android:layout_marginEnd="@dimen/space_16"
+        android:layout_marginTop="@dimen/space_24"
+        android:layout_marginBottom="@dimen/space_24"
+        android:text="@string/action_continue"
+        app:layout_constraintBottom_toBottomOf="parent"
+        visibility = "@{!viewModel.postcodeUpdated}" />
+
+    <Button
+        android:id="@+id/btn_done"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/space_16"
+        android:layout_marginEnd="@dimen/space_16"
+        android:layout_marginTop="@dimen/space_24"
+        android:layout_marginBottom="@dimen/space_24"
+        android:text ="@string/action_upload_done"
+        app:layout_constraintBottom_toBottomOf="parent"
+        visibility ="@{viewModel.postcodeUpdated}"/>
+
+
+    <FrameLayout
+        android:id="@+id/case_loading_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:orientation="vertical"
+        android:gravity="center"
+        visibility = "@{viewModel.showSpinner}">
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/black"
+           android:alpha="0.6"/>
+
+        <com.airbnb.lottie.LottieAnimationView
+            android:id="@+id/loading_animation_view"
+            android:layout_width="@dimen/covidsafe_loading_animation_size"
+            android:layout_height="@dimen/covidsafe_loading_animation_size"
+            android:layout_centerHorizontal="true"
+            app:lottie_autoPlay="true"
+            app:lottie_fileName="loading_upload.json"
+            app:lottie_loop="true"
+            app:lottie_speed="1"
+            android:layout_gravity="center"/>
+
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

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

@@ -16,6 +16,22 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="spread" />
 
+    <TextView
+        android:id="@+id/home_data_uploaded_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/keyline_7"
+        android:layout_marginEnd="@dimen/keyline_7"
+        android:text="@string/upload_fail_heading"
+        android:gravity="center_horizontal"
+        android:textAppearance="?textAppearanceHeadline1"
+        android:textSize="28sp"
+        app:layout_constraintBottom_toTopOf="@+id/home_data_uploaded_error_message"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/data_uploaded_error_progress_bar"
+        app:layout_constraintVertical_chainStyle="spread" />
+
     <TextView
         android:id="@+id/home_data_uploaded_error_message"
         style="?textAppearanceBody1"
@@ -28,7 +44,7 @@
         app:layout_constraintBottom_toTopOf="@+id/dialog_error_positive"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/data_uploaded_error_progress_bar"
+        app:layout_constraintTop_toBottomOf="@+id/home_data_uploaded_title"
         app:layout_constraintVertical_chainStyle="spread" />
 
     <Button

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

@@ -114,7 +114,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/black"
-            android:alpha="@{viewModel.collectionMessageVisible ? 0.7f : 0.0f}" />
+            android:alpha="@{(viewModel.collectionMessageVisible || viewModel.visibleSelectStateLayout) ? 0.7f : 0.0f}" />
 
         <FrameLayout
             android:id="@+id/layout_collection_message"
@@ -179,7 +179,7 @@
                 </FrameLayout>
             </LinearLayout>
         </FrameLayout>
-            <FrameLayout
+        <FrameLayout
                 android:id="@+id/layout_herald_upgrade"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -257,7 +257,76 @@
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
                 </ScrollView>
-            </FrameLayout>
+        </FrameLayout>
+        <FrameLayout
+            android:id="@+id/select_state_layout"
+            android:layout_width="290dp"
+            android:layout_height="wrap_content"
+            app:layout_anchor="@+id/swipeRefreshLayout"
+            android:paddingTop="@dimen/space_16"
+            app:layout_anchorGravity="center"
+            android:background="@color/white"
+            android:elevation="12dp"
+            android:visibility="gone">
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:animateLayoutChanges="true">
+
+                <TextView
+                    android:id="@+id/title_select_state"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:textStyle="bold"
+                    android:textSize="18sp"
+                    android:text="@string/select_state_territory_heading" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/select_state"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/space_24" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/grey4"
+                    android:layout_marginTop="@dimen/space_12"/>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="44dp"
+                    android:orientation="horizontal"
+                    android:gravity="center"
+                    android:layout_gravity="center_vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:gravity="center_vertical"
+                        android:textSize="16sp"
+                        android:paddingEnd="50dp"
+                        android:text="Cancel"
+                        android:textStyle="bold"
+                        android:onClick="@{() -> viewModel.showSelectSate(false)}"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:gravity="center_vertical"
+                        android:paddingStart="50dp"
+                        android:textSize="16sp"
+                        android:textStyle="bold"
+                        android:text="Select"
+                        android:onClick="@{() -> viewModel.selectState()}"/>
+
+                </LinearLayout>
+
+            </LinearLayout>
+        </FrameLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>

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

@@ -1,18 +1,15 @@
 <?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:tools="http://schemas.android.com/tools"
     xmlns:card_view="http://schemas.android.com/tools">
-
     <data>
-
         <variable
             name="viewModel"
             type="au.gov.health.covidsafe.ui.home.HomeFragmentViewModel" />
 
         <import type="au.gov.health.covidsafe.ui.home.CaseNumbersState" />
-
     </data>
-
     <merge>
 
         <androidx.cardview.widget.CardView
@@ -77,7 +74,7 @@
                         android:layout_height="match_parent"
                         android:layout_marginStart="@dimen/space_16"
                         android:gravity="center_vertical"
-                        android:text="@string/national_numbers"
+                        android:text="@{viewModel.titleOfNumber}"
                         android:textSize="20sp"
                         android:textAppearance="@style/fontRobotoRegular28"
                         android:textColor="@color/slate_black_1"
@@ -114,7 +111,33 @@
                             android:onClick="@{() -> viewModel.turnCaseNumber(false)}"/>
 
                     </RelativeLayout>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/space_16"
+                        android:layout_marginBottom="@dimen/space_16"
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical"
+                        visibility="@{viewModel.isV2Available}"
+                        android:onClick="@{() -> viewModel.showSelectSate(true)}">
 
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:src="@drawable/ic_map_pin"
+                            android:layout_alignParentEnd="true"
+                            android:layout_below="@+id/txt_show_number"
+                            android:foregroundGravity="left"/>
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="@color/dark_green"
+                            android:layout_marginStart="@dimen/space_8"
+                            android:text="@string/select_state_territory_heading"
+                            style="@style/fontRobotoRegular16"/>
+
+                    </LinearLayout>
                     <FrameLayout
                         android:id="@+id/show_error_message"
                         visibility="@{viewModel.caseNumberDataState == CaseNumbersState.ERROR_NO_NETWORK || viewModel.caseNumberDataState == CaseNumbersState.ERROR_UNKNOWN}"

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

@@ -13,37 +13,41 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <RelativeLayout
-        android:id="@+id/home_header_settings"
+        android:layout_width="match_parent"
-        android:layout_width="wrap_content"
+        android:layout_height="@dimen/home_screen_header_top_height"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="@id/header_background"
-        app:layout_constraintEnd_toEndOf="parent"
         android:layout_marginEnd="@dimen/space_16"
         android:clickable="true"
         android:focusable="true"
         app:layout_constraintTop_toTopOf="parent">
 
-        <ImageView
+        <LinearLayout
-            android:id="@+id/settings_image_view"
+            android:id="@+id/home_header_settings"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
-            android:layout_centerHorizontal="true"
+            android:layout_alignParentEnd="true"
-            android:src="@drawable/ic_settings_outline_black"/>
+            android:orientation="vertical"
+            android:gravity="center">
+            <ImageView
+                android:id="@+id/settings_image_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:src="@drawable/ic_settings_outline_black"/>
 
-        <TextView
+            <TextView
-            android:layout_width="wrap_content"
+                android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+                android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/space_16"
+                android:background="@color/transparent"
-            android:background="@color/transparent"
+                android:layout_below="@+id/settings_image_view"
-            android:layout_below="@+id/settings_image_view"
+                android:layout_marginTop="@dimen/space_6"
-            android:layout_marginTop="@dimen/space_6"
+                android:textAppearance="@style/fontRobotoRegular16"
-            android:textAppearance="@style/fontRobotoRegular16"
+                android:layout_centerHorizontal="true"
-            android:layout_centerHorizontal="true"
+                android:includeFontPadding="false"
-            android:includeFontPadding="false"
+                android:text="@string/settings"
-            android:text="@string/settings"
+                android:textAlignment="center"
-            android:textAlignment="center"
+                android:textAllCaps="false"
-            android:textAllCaps="false"
+                android:textColor="@color/slate_black_1" />
-            android:textColor="@color/slate_black_1" />
+        </LinearLayout>
 
     </RelativeLayout>
 

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

@@ -31,12 +31,42 @@
 
     </androidx.cardview.widget.CardView>
 
+    <androidx.cardview.widget.CardView
+        android:id="@+id/activity_card_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/space_24"
+        app:cardBackgroundColor="@color/white"
+        app:layout_constraintTop_toBottomOf="@+id/notification_status_card"
+        card_view:cardBackgroundColor="@color/white"
+        card_view:cardCornerRadius="0dp"
+        card_view:cardMaxElevation="@dimen/card_elevation_10dp"
+        card_view:cardUseCompatPadding="false"
+        card_view:contentPadding="0dp"
+        android:visibility="gone">
+
+        <au.gov.health.covidsafe.ui.home.view.ExternalLinkCard
+            android:id="@+id/app_activity"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:minHeight="@dimen/external_link_height"
+            android:paddingTop="@dimen/space_4"
+            android:paddingBottom="@dimen/space_4"
+            app:external_linkCard_content="@string/activity_button_description"
+            app:external_linkCard_start_icon="@drawable/ic_activity"
+            app:external_linkCard_start_icon_background="@drawable/background_circular_green"
+            app:external_linkCard_start_icon_padding="@dimen/space_8"
+            app:external_linkCard_title="@string/activity_button" />
+
+    </androidx.cardview.widget.CardView>
+
     <androidx.cardview.widget.CardView
         android:id="@+id/help_topics_card"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/space_24"
-        app:layout_constraintTop_toBottomOf="@+id/notification_status_card"
+        app:layout_constraintTop_toBottomOf="@+id/activity_card_view"
         card_view:cardBackgroundColor="@color/white"
         card_view:cardCornerRadius="0dp"
         card_view:cardMaxElevation="@dimen/card_elevation_10dp"
@@ -48,7 +78,7 @@
     </androidx.cardview.widget.CardView>
 
     <androidx.cardview.widget.CardView
-        android:id="@+id/support_card_view"
+        android:id="@+id/postcode_card_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/space_24"
@@ -60,6 +90,35 @@
         card_view:cardUseCompatPadding="false"
         card_view:contentPadding="0dp">
 
+        <au.gov.health.covidsafe.ui.home.view.ExternalLinkCard
+            android:id="@+id/settings_postcode_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:minHeight="@dimen/external_link_height"
+            android:paddingTop="@dimen/space_4"
+            android:paddingBottom="@dimen/space_4"
+            app:external_linkCard_content="@string/change_postcode_description"
+            app:external_linkCard_start_icon="@drawable/ic_postcode"
+            app:external_linkCard_start_icon_background="@drawable/background_circular_green"
+            app:external_linkCard_start_icon_padding="@dimen/space_8"
+            app:external_linkCard_title="@string/change_postcode_heading" />
+
+    </androidx.cardview.widget.CardView>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/support_card_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/space_24"
+        app:cardBackgroundColor="@color/white"
+        app:layout_constraintTop_toBottomOf="@+id/postcode_card_view"
+        card_view:cardBackgroundColor="@color/white"
+        card_view:cardCornerRadius="0dp"
+        card_view:cardMaxElevation="@dimen/card_elevation_10dp"
+        card_view:cardUseCompatPadding="false"
+        card_view:contentPadding="0dp">
+
         <au.gov.health.covidsafe.ui.home.view.ExternalLinkCard
             android:id="@+id/settings_support_view"
             android:layout_width="match_parent"

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

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    android:id="@+id/country_list_item"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/keyline_1"
+    android:paddingBottom="@dimen/keyline_1"
+    tools:ignore="RtlSymmetry">
+
+    <TextView
+        android:id="@+id/state_name"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/keyline_5"
+        android:paddingStart="@dimen/keyline_4"
+        android:layout_marginEnd="@dimen/space_24"
+        android:lines="1"
+        android:gravity="start"
+        android:text="@string/country_region_name_au"
+        android:textSize="16sp"
+        android:textAlignment="viewStart"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/state_code"
+        android:layout_width="wrap_content"
+        android:layout_height="21dp"
+        android:text="+61"
+        android:textSize="14sp"
+        android:textAlignment="viewStart"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/state_name"
+        android:visibility="gone"/>
+
+    <ImageView
+        android:id="@+id/img_state_select"
+        android:layout_width="20dp"
+        android:layout_height="19dp"
+        android:layout_marginTop="@dimen/keyline_1"
+        android:layout_marginEnd="@dimen/space_4"
+        android:src="@drawable/ic_check"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintLeft_toRightOf="@+id/state_name"
+        app:layout_constraintTop_toTopOf="@+id/state_name"
+        android:visibility="gone"/>
+
+    <View
+        android:id="@+id/end_line"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/grey4"
+        android:layout_marginTop="@dimen/space_12"
+        app:layout_constraintTop_toBottomOf="@+id/state_name"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -98,7 +98,6 @@
                 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" />
-
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </merge>

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

@@ -19,7 +19,8 @@
             android:layout_height="wrap_content"
             android:background="@color/white"
             android:orientation="vertical"
-            android:animateLayoutChanges="true">
+            android:animateLayoutChanges="true"
+            visibility="@{!viewModel.isV2Available()}">
 
             <View
                 android:id="@+id/top_case_line_divider"
@@ -438,6 +439,202 @@
 
         </LinearLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/state_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@+id/national_case_layout"
+            visibility="@{viewModel.isV2Available()}">
+
+            <View
+                android:id="@+id/top_case_line_divider_v2"
+                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_v2"
+                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_v2" />
+
+            <au.gov.health.covidsafe.ui.home.view.ExternalLinkCard
+                android:id="@+id/state_new_case_card"
+                externalCardTitle="@{viewModel.newCase}"
+                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_v2" />
+
+            <LinearLayout
+                android:id="@+id/new_case_state_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingStart="73dp"
+                app:layout_constraintTop_toBottomOf="@+id/state_new_case_card" >
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?textAppearanceBody2"
+                        android:textStyle="bold"
+                        android:text="@{viewModel.localCase}"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/space_4"
+                        android:textAppearance="?textAppearanceBody2"
+                        android:text="@{viewModel.locallyAquired}"/>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginTop="@dimen/space_4">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?textAppearanceBody2"
+                        android:textStyle="bold"
+                        android:text="@{viewModel.overseaCase}"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/space_4"
+                        android:textAppearance="?textAppearanceBody2"
+                        android:text="@{viewModel.aquiredOversea}"/>
+
+                </LinearLayout>
+            </LinearLayout>
+            <View
+                android:id="@+id/devider_new_case"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="@dimen/space_12"
+                android:layout_marginBottom="@dimen/space_4"
+                android:background="@color/divider_line_grey"
+                app:layout_constraintTop_toBottomOf="@+id/new_case_state_layout"/>
+
+            <au.gov.health.covidsafe.ui.home.view.ExternalLinkCard
+                android:id="@+id/state_total_deaths_card"
+                externalCardTitle="@{viewModel.activeCase}"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                app:external_linkCard_content="@string/active_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/devider_new_case" />
+
+            <LinearLayout
+                android:id="@+id/death_state_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingStart="73dp"
+                android:paddingBottom="@dimen/space_12"
+                app:layout_constraintTop_toBottomOf="@+id/state_total_deaths_card" >
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?textAppearanceBody2"
+                        android:textStyle="bold"
+                        android:text="@{viewModel.totalDeaths}"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/space_4"
+                        android:textAppearance="?textAppearanceBody2"
+                        android:text="@{viewModel.totalyDeathe}"/>
+
+                </LinearLayout>
+            </LinearLayout>
+            <View
+                android:id="@+id/devider_hotspot"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="@dimen/space_12"
+                android:layout_marginBottom="@dimen/space_12"
+                android:background="@color/divider_line_grey"
+                app:layout_constraintTop_toBottomOf="@+id/death_state_layout"
+                android:visibility="gone"/>
+<!--            visibility="@{viewModel.hotSpotLink != null}"-->
+                <RelativeLayout
+                    android:id="@+id/hotspot_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:layout_marginTop="@dimen/space_4"
+                    android:layout_marginEnd="@dimen/space_16"
+                    android:gravity="center_vertical"
+                    android:visibility="gone"
+                    app:layout_constraintTop_toBottomOf="@+id/devider_hotspot">
+
+                    <au.gov.health.covidsafe.ui.home.view.ExternalLinkCard
+                        android:id="@+id/hotspot_card"
+                        externalCardTitle=""
+                        android:layout_width="75dp"
+                        android:layout_height="match_parent"
+                        android:background="@color/white"
+                        app:external_linkCard_content=""
+                        app:external_linkCard_end_icon_visible="false"
+                        app:external_linkCard_start_icon="@drawable/ic_alert_triangle"
+                        app:external_linkCard_start_icon_background="@drawable/background_circular_green"
+                        app:external_linkCard_start_icon_padding="@dimen/space_8" />
+
+                    <TextView
+                        android:id="@+id/txt_hotspot"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:paddingBottom="@dimen/space_6"
+                        android:layout_gravity="center_vertical"
+                        android:gravity="center_vertical"
+                        android:text=""
+                        android:textAppearance="?textAppearanceBody2"
+                        android:textColorLink="?attr/colorPrimary"
+                        android:layout_toEndOf="@+id/hotspot_card"/>
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:gravity="center_vertical"
+                        android:src="@drawable/ic_external_link"
+                        android:layout_alignParentEnd="true"/>
+                </RelativeLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </merge>
 
 </layout>

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

@@ -5,9 +5,19 @@
   <string name="action_upload_done">تمّ</string>
   <string name="action_verify_invalid_pin">رقم التعريف الشخصي غير صالح، يرجى الطلب من موظف دائرة الصحة أن يرسل لك رقم تعريف شخصي آخر.</string>
   <string name="action_verify_upload_pin">تحميل معلوماتي</string>
+  <string name="active_cases">الحالات النشطة (على وجه التقريب)</string>
+  <string name="activity_button">تحقق من نشاط التطبيق</string>
+  <string name="activity_button_description">اعرض تفاعلات Bluetooth لتطبيقك مع مستخدمي COVIDSafe الآخرين.</string>
+  <string name="activity_heading">نشاط التطبيق</string>
+  <string name="activity_intro">في كل مرة يتواجد جهازك في نطاق مستخدمي تطبيق COVIDSafe الآخرين ، فإنه يسجل تفاعلات Bluetooth التي تسمى \"مصافحات Bluetooth\". \n\n تدل هذه المصافحات على ما إذا كان تطبيقك يعمل بشكل صحيح.</string>
   <string name="activity_self_isolation_button">تابع</string>
   <string name="australian_capital_territory">إقليم العاصمة الأسترالية</string>
   <string name="battery_optimisation_prompt">يجب عليك تعطيل وضع توفير الطاقة.</string>
+  <string name="ble_handshakes_yesterday_android">مصافحات \u200F Bluetooth ليوم أمس</string>
+  <string name="bluetooth_handshakes_android">مصافحات \u200F Bluetooth</string>
+  <string name="cancel_snooze">إلغاء الغفوة</string>
+  <string name="cases_28_days">الحالات الجديدة في ال 28 يومًا الماضية</string>
+  <string name="cases_7_days">الحالات الجديدة في آخر 7 أيام</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_default_device_name">%s</string>
@@ -19,6 +29,8 @@
   <string name="change_device_name_secondary_action">تخطى واتركها كما هي</string>
   <string name="change_language">تغيير اللغة</string>
   <string name="change_language_content">اقرأ الدليل حول استخدام تطبيق COVIDSafe بلغة مختلفة.</string>
+  <string name="change_postcode_description">قم بالتحديث إذا تغير الرمز البريدي الخاص بك منذ قيامك بتنزيل تطبيق COVIDSafe.</string>
+  <string name="change_postcode_heading">غيِّر الرمز البريدي الخاص بك</string>
   <string name="CodeHasExpired">انتهت صلاحية رقم التعريف الشخصي الخاص بك.</string>
   <string name="collection_message">يقوم تطبيق COVIDSafe الآن بجمع معلومات تشخيصية لمساعدتك على استكشاف المشكلات في تطبيقك وإصلاحها. *أعرف المزيد*</string>
   <string name="consent_button">أوافق</string>
@@ -236,18 +248,21 @@
   <string name="country_region_name_za">جنوب أفريقيا</string>
   <string name="country_region_name_zm">زامبيا</string>
   <string name="country_region_name_zw">زيمبابوي</string>
+  <string name="customise_days">تخصيص الأيام</string>
   <string name="data_privacy_button">التالي</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>
   <string name="data_privacy_headline_content_description">العنوان والتسجيل والخصوصية</string>
   <string name="deaths">الوفيات</string>
+  <string name="dialog_error_uploading_message">حاول تحميل بياناتك مرة أخرى. \n\n ارجع إلى رمز الخطأ هذا إذا طلب موظف دائرة الصحة في الولاية أو الإقليم ذلك: %@\n</string>
   <string name="dialog_error_uploading_negative">إلغاء</string>
   <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="edit_snooze_calendar">تعديل روزنامة الغفوة</string>
   <string name="enabled">ممكّنة</string>
   <string name="enter_number_button">احصل على رقم تعريف شخصي</string>
   <string name="enter_number_content">سنرسل لك رقم تعريف شخصي مكوناً من 6 أرقام للتحقق من رقم هاتفك المحمول.</string>
@@ -263,9 +278,19 @@
   <string name="enter_pin_wrong_number">هل رقم الهاتف المحمول هذا خاطئ؟</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="Enter_your_mobile_number_label">أدخل رقم هاتفك المحمول</string>
+  <string name="every_day">كل يوم</string>
+  <string name="factors_dotpoint1">عدد مستخدمي تطبيق COVIDSafe الموجودين من حولك</string>
+  <string name="factors_dotpoint2">طراز الجهاز وعمره</string>
+  <string name="factors_dotpoint3">إذا كنت في مركبة متحركة</string>
+  <string name="factors_enviro_item_1">الحواجز الحسًية مثل الجدران</string>
+  <string name="factors_enviro_item_2">المواد والتجهيزات التي تتداخل مع إشارات Bluetooth</string>
+  <string name="factors_handshakes_heading">العوامل التي تؤثر على نشاط التطبيق</string>
+  <string name="factors_intro">تشمل العوامل التي يمكن أن تؤثر على عدد المصافحات ما يلي:</string>
+  <string name="factors_intro_2">كما يمكن أن تتأثر المصافحات بالعوامل البيئية، بما في ذلك:</string>
   <!-- for production -->
   <string name="generic_error">الرجاء إعادة المحاولة لاحقًا </string>
   <string name="generic_internet_error">يرجى التحقق من اتصال جهازك بشبكة الانترنت</string>
+  <string name="global_OK">حسناً</string>
   <string name="heading">العنوان</string>
   <string name="hide">إخفاء</string>
   <string name="home_app_permission_push_notification_prompt">السماح لتطبيق COVIDSafe بدفع الإشعارات اللحظية.</string>
@@ -312,11 +337,13 @@
   <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>
   <string name="home_version_number">رقم الإصدار: %s</string>
+  <string name="hotspots_state_territory">المناطق التي تكثر فيها الحالات في %@</string>
+  <string name="hour">ساعة</string>
   <string name="how_it_works_button">التالي</string>
   <string name="how_it_works_consent">سيتم طلب موافقتك دائماً إذا كان التتبُّع الصحي مطلوباً.</string>
   <string name="how_it_works_content">تُستخدم إشارات Bluetooth® لتحديد متى تكون بالقرب من مستخدم آخر لتطبيق COVIDSafe . \n\n سيتم تدوين ملاحظة في كل مرة يحصل فيها اختلاط عن قرب بينك وبين مستخدمي تطبيق COVIDSafe الآخرين لجمع معلومات عن اختلاط الأشخاص. يتم تشفير المعلومات وتخزينها فقط في هاتفك. \n\n إذا جاءت نتيجة فحصك ﻟ COVID-19 إيجابية كمستخدم لتطبيق COVIDSafe، سوف يتصل بك أحد موظفي دائرة الصحة في الولاية أو الإقليم ويساعدك في القيام بتحميل اختياري لمعلومات الاتصال  بك إلى نظام تخزين معلومات آمن للغاية \nيمكن أيضًا لموظفي دائرة الصحة في الولاية أو الإقليم الاتصال بك إذا حصل اتصال وثيق بينك وبين مستخدم آخر لتطبيق COVIDSafe أظهرت نتائج الفحص أنه مصاب بالفيروس.\n\n لمزيد من المعلومات، يرجى الرجوع إلى صفحة *مواضيع المساعدة*.</string>
@@ -343,16 +370,31 @@
   <string name="invalid_phone_number">رقم الهاتف غير صحيح.</string>
   <string name="invalid_phone_number_digits_error_prompt" formatted="false">تتألف أرقام الهواتف المحمولة في %1s من %2s أرقام.</string>
   <string name="invalid_post_code">رمز بريدي غير صحيح</string>
+  <string name="is_snoozed_android">تطبيق \u200F COVIDSafe\n هو في غفوة حاليًا</string>
+  <string name="is_snoozed_description_android">تطبيق \u200F COVIDSafe لا يستخدم  Bluetooth ولا يقوم بتسجيل الأشخاص الذين يتم الاختلاط بهم.</string>
   <string name="IssueFooter">قد نتصل بك للحصول على مزيد من التفاصيل حول ملاحظاتك. لن يتم استخدام عنوان بريدك الإلكتروني لأي غرض آخر.</string>
   <string name="jwt_description">هناك مشكلة في تفاصيل التسجيل الخاصة بك.</string>
+  <string name="jwt_expired">انتهت صلاحية تسجيلك.</string>
+  <string name="jwt_expired_description">يجب عليك تأكيد رقم هاتفك المحمول كل 12 شهرًا للتأكد من صحة تفاصيل التسجيل الخاصة بك.</string>
   <string name="jwt_heading">يرجى التسجيل مرة أخرى</string>
+  <string name="jwt_success">تم تجديد التسجيل بنجاح</string>
+  <string name="last_7_days">آخر 7 أيام</string>
   <string name="loading_numbers">تحميل أحدث الأرقام</string>
+  <string name="locally_acquired">%@ تم التقاطه محلياً</string>
+  <string name="low_handshakes_description">جرّب هذه النصائح لتحسين أداء تطبيق COVIDSafe على هاتفك:</string>
+  <string name="low_handshakes_heading">ماذا تفعل إذا كان عدد المصافحات أقل مما تتوقع؟</string>
+  <string name="low_handshakes_item1">تحقق مما إذا كان تطبيق COVIDSafe يعمل عن طريق فتح التطبيق.</string>
+  <string name="low_handshakes_item2">قم بتحديث تطبيقك إلى أحدث إصدار من خلال متجر Google Play أو متجر Apple.</string>
+  <string name="low_handshakes_item3">أغلق هاتفك وقم بإعادة تشغيله وافتح التطبيق مجددًا.</string>
+  <string name="low_handshakes_link">اقرأ المزيد حول كيفية التحقق مما إذا كان تطبييق COVIDSafe يعمل بشكل صحيح</string>
   <!-- Splash Screen -->
   <string name="migration_in_progress">تحديث تطبيق COVIDSafe قيد الإنجاز. \n\nيُرجى التأكد من عدم إغلاق هاتفك إلى أن يتم اكتمال التحديث.</string>
+  <string name="minute">دقيقة</string>
   <string name="national_numbers">الأرقام على الصعيد الوطني</string>
   <string name="navigation_back_button_content_description">الصفحة السابقة</string>
   <string name="need_location_service">عليك تشغيل الموقع الجغرافي في الإعدادات لكي يتمكن تطبيق COVIDSafe من العمل.</string>
   <string name="new_cases">الحالات الجديدة في ال 24 ساعة الماضية</string>
+  <string name="new_cases_total">الحالات الجديدة منذ 1 شباط/فبراير 2020</string>
   <string name="new_south_wales">نيو ساوث ويلز</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="norfolk_hint">على سبيل المثال: 51234</string>
@@ -380,13 +422,14 @@
   <string name="numbers_no_internet">اتصل بالإنترنت لكي تحصل على آخر الأرقام.</string>
   <string name="numbers_refresh">قم بالتحديث الآن</string>
   <string name="options_for_australia">خيارات لأستراليا</string>
+  <string name="overseas_acquired">%@ تم التقاطه في الخارج</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 يحتاج Google إلى تشغيل الموقع الجغرافي لتتمكن تطبيقات أجهزة أندرويد من استخدام Bluetooth. لا يقوم تطبيق COVIDSafe بتخزين بيانات الموقع الجغرافي أو استخدامها. \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 تشغيل الموقع الجغرافي لتتمكن تطبيقات أجهزة Android من استخدام Bluetooth. \nلا يقوم تطبيق 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. يتطلب Google *تشغيل الموقع الجغرافي لتتمكن تطبيقات أجهزة 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>
@@ -411,6 +454,7 @@
   <string name="pin_number">رقم التعريف الشخصي pin</string>
   <string name="PINNumber_VO_Label">رقم التعريف الشخصي PIN</string>
   <string name="PN_MobileNumber_VOLabel">رقم الهاتف المحمول</string>
+  <string name="postcode_success">تم تحديث الرمز البريدي الخاص بك</string>
   <string name="queensland">ولاية كوينزلاند</string>
   <string name="ReceivePinIssue">مشكلات في تلقي رقم التعريف الشخصي الخاص بك؟</string>
   <string name="recovered">مجموع الحالات التي تعافت</string>
@@ -420,27 +464,52 @@
   <!-- Onboarding Registration Consent -->
   <string name="registration_consent_headline">الموافقة على التسجيل</string>
   <string name="registration_consent_second_paragraph">معلومات حول اختلاطي بمستخدمين آخرين لتطبيق COVIDSafe في حال أظهرت نتائج الفحص أن مستخدمًا آخر كنت على تواصل معه مصاب بفيروس COVID-19، وقام هذا المستخدم بتحميل بيانات الاتصال به.</string>
+  <string name="save">حفظ</string>
+  <string name="scheduled" formatted="false">قمت بتحديد مدة غفوة تطبيق COVIDSafe من %@ إلى %@.</string>
   <string name="search">ابحث</string>
   <!-- OnBoarding Enter Number -->
   <string name="select_country_or_region">اختر البلد أو المنطقة</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="Select_country_or_region_headline">اختر البلد أو المنطقة</string>
+  <string name="select_state_territory_button">اختر الولاية أو الإقليم</string>
+  <string name="select_state_territory_heading">اختر الولاية أو الإقليم</string>
   <string name="service_not_ok_action">تحقق من التطبيق الآن</string>
   <string name="service_not_ok_body">تأكد من أن تطبيق COVIDSafe يعمل قبل مغادرتك المنزل أو عند وجودك في الأماكن العامة.</string>
   <string name="service_not_ok_title">\u200F COVIDSafe لا يعمل</string>
   <string name="service_ok_body">تأكد من أن تطبيق COVIDSafe يعمل عند مغادرتك المنزل أو عند وجودك في الأماكن العامة.</string>
   <string name="service_ok_title">\u200F COVIDSafe يعمل</string>
+  <string name="set_snooze_time">حدّد وقت الغفوة</string>
   <string name="settings">الإعدادات</string>
+  <string name="seven_days">7 أيام</string>
   <string name="share_this_app_content">إنضم لي لنعمل على وقف انتشار COVID-19! قم بتنزيل COVIDSafe، وهو تطبيق من الحكومة الأسترالية. # COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
   <string name="show">اظهار</string>
+  <string name="snooze_button">غفوة</string>
+  <string name="snooze_calendar_button">روزنامة الغفوة</string>
+  <string name="snooze_calendar_description">حدد الأيام والأوقات التي تريد فيها وضع تطبيق COVIDSafe في غفوة.</string>
+  <string name="snooze_calendar_toggle">روزنامة الغفوة</string>
+  <string name="snooze_covidsafe_button">وضع تطبيق COVIDSafe في غفوة</string>
+  <string name="snooze_covidsafe_button_description">وضع تطبيق COVIDSafe في غفوة لفترة زمنية محددة.</string>
+  <string name="snooze_ended">انتهت مدة الغفوة.</string>
+  <string name="snooze_ends">تنتهي مدة الغفوة في</string>
+  <string name="snooze_from">في غفوة من</string>
+  <string name="snooze_heading">وضع تطبيق COVIDSafe في غفوة</string>
+  <string name="snooze_on">في وضع الغفوة %@</string>
+  <string name="snooze_timer_description">اضبط المؤقت لوضع تطبيق COVIDSafe في غفوة</string>
+  <string name="snooze_to">في غفوة حتى</string>
+  <string name="snoozed_calendar_description_android" formatted="false">تطبيق \u200F COVIDSafe لا يستخدم  Bluetooth ولا يقوم بتسجيل الأشخاص الذين يتم الاختلاط بهم.\nقمت بتحديد مدة غفوة تطبيق COVIDSafe من %@ إلى %@.</string>
   <string name="south_australia">ولاية جنوب أستراليا</string>
+  <string name="state_number_heading">%@ الأعداد</string>
   <string name="stepCounter" formatted="false">الخطوة %d من %d</string>
   <string name="support">الدعم</string>
   <string name="support_content">للحصول على مساعدة بشأن المشكلات التي لا تغطيها مواضيع المساعدة</string>
   <string name="tasmania">ولاية تسمانيا</string>
   <string name="title_help">مساعدة</string>
+  <string name="total">المجموع</string>
   <string name="total_confirmed_cases">مجموع الحالات المؤكدة</string>
+  <string name="total_deaths">%@ إجمالي الوفيات</string>
   <string name="total_per_state">مجموع الحالات المؤكدة في كل ولاية وإقليم</string>
+  <string name="twenty_eight_days">28 يومًا</string>
+  <string name="type_in_time">أدخل الوقت</string>
   <string name="under_sixteen_content">أؤكد موافقة أحد والدي أو الوصي علي على أن تعمل وكالة التحول الرقمي كمدير لتخزين البيانات، بموجب قرار قانوني من قبل أمين وزارة الصحة في الحكومة الأسترالية لجمع:</string>
   <string name="under_sixteen_first_paragraph">معلومات التسجيل الخاصة بي.</string>
   <!-- OnBoarding Under Sixteen -->
@@ -455,11 +524,14 @@
   <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="update_description_android">هذا التحديث يحسّن أداء Bluetooth المتعلق بـ COVIDSafe بطرق جديدة يمكن لتطبيق COVIDSafe من خلالها التقاط الأشخاص الذين اختلطت بهم عن قرب بشكل أفضل. <a href="https://www.covidsafe.gov.au/help-topics.html#herald"> اطلع على المزيد من المعلومات حول كيفية تحسين تطبيق COVIDSafe </a>\n\nيتطلب Google تشغيل الموقع الجغرافي لتتمكن تطبيقات أجهزة Android من استخدام Bluetooth.\n<a href="https://www.covidsafe.gov.au/help-topics.html#location-permissions">لا يقوم تطبيق COVIDSafe بجمع بيانات الموقع الجغرافي أو تخزينها أو استخدامها</a></string>
+  <string name="update_heading_android">أداء محسّن</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>
   <string name="upload_consent_button">أوافق</string>
+  <string name="upload_fail_heading">لم ينجح التحميل</string>
   <string name="upload_failed">فشل التحميل</string>
   <string name="upload_finished_header">شكراً لك على المساعدة في وقف انتشار COVID-19!</string>
   <string name="upload_finished_header_content_description">العنوان، شكراً لك على المساعدة في وقف انتشار COVID-19!</string>
@@ -478,4 +550,5 @@
   <string name="victoria">ولاية فيكتوريا</string>
   <string name="western_australia">ولاية أستراليا الغربية</string>
   <string name="wrong_ping_number">تم إدخال رقم تعريف شخصي خاطئ</string>
+  <string name="yesterday_activity">أمس</string>
 </resources>

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

@@ -3,11 +3,21 @@
   <string name="action_continue">Συνεχίστε</string>
   <string name="action_report_an_issue">Αναφέρετε το πρόβλημα</string>
   <string name="action_upload_done">Συνεχίστε</string>
-  <string name="action_verify_invalid_pin">Μη έγκυρο PIN, ζητήστε από τον υπεύθυνο υγείας να σας στείλει καινούριο PIN.</string>
+  <string name="action_verify_invalid_pin">Μη έγκυρο κωδικό, ζητήστε από τον υπεύθυνο υγείας να σας στείλει καινούριο κωδικό.</string>
   <string name="action_verify_upload_pin">Ανεβάστε τα στοιχεία μου</string>
+  <string name="active_cases">Ενεργές περιπτώσεις (εκτιμώμενες)</string>
+  <string name="activity_button">Ελέγξτε τη δραστηριότητα της εφαρμογής</string>
+  <string name="activity_button_description">Δείτε τις αλληλεπιδράσεις Bluetooth της εφαρμογής σας με άλλους χρήστες της COVIDSafe.</string>
+  <string name="activity_heading">Δραστηριότητα εφαρμογής</string>
+  <string name="activity_intro">Κάθε φορά που η συσκευή σας βρίσκεται εντός εμβέλειας άλλων χρηστών της εφαρμογής COVIDSafe, λαμβάνει υπόψη τις αλληλεπιδράσεις Bluetooth που ονομάζονται «χειραψίες Bluetooth».\n\nΑυτές οι χειραψίες δίνουν μια ένδειξη για το πόσο καλά λειτουργεί η εφαρμογή σας.</string>
   <string name="activity_self_isolation_button">Συνεχίστε</string>
   <string name="australian_capital_territory">Επικράτεια Αυστραλιανής Πρωτεύουσας</string>
   <string name="battery_optimisation_prompt">Πρέπει να απενεργοποιήσετε τη βελτιστοποίηση της μπαταρίας.</string>
+  <string name="ble_handshakes_yesterday_android">Χειραψίες Bluetooth χθες</string>
+  <string name="bluetooth_handshakes_android">Χειραψίες Bluetooth</string>
+  <string name="cancel_snooze">Ακύρωση αναβολής</string>
+  <string name="cases_28_days">Νέα κρούσματα τις τελευταίες 28 ημέρες</string>
+  <string name="cases_7_days">Νέα κρούσματα τις τελευταίες 7 ημέρες</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_default_device_name">%s</string>
@@ -18,7 +28,9 @@
   <string name="change_device_name_primary_action">Συνεχίστε</string>
   <string name="change_device_name_secondary_action">Παραλείψτε και κρατήστε όπως είναι</string>
   <string name="change_language">Αλλάξτε γλώσσα</string>
-  <string name="change_language_content">Διαβάστε τον οδηγό για τη χρήση του COVIDSafe σε διαφορετική γλώσσα.</string>
+  <string name="change_language_content">Διαβάστε τον οδηγό για τη χρήση του COVIDSafe σε άλλη γλώσσα.</string>
+  <string name="change_postcode_description">Ενημερώστε εάν ο ταχυδρομικός σας κώδικας έχει αλλάξει από τότε που κατεβάσατε την COVIDSafe.</string>
+  <string name="change_postcode_heading">Αλλαγή του ταχυδρομικού κώδικα</string>
   <string name="CodeHasExpired">Ο κωδικός σας έχει λήξει.</string>
   <string name="collection_message">Η COVIDSafe συλλέγει τώρα διαγνωστικές πληροφορίες για να σας βοηθήσει να αντιμετωπίσετε προβλήματα με την εφαρμογή σας. *Μάθετε περισσότερα*</string>
   <string name="consent_button">Συμφωνώ</string>
@@ -174,7 +186,7 @@
   <string name="country_region_name_np">Νεπάλ</string>
   <string name="country_region_name_nz">Νέα Ζηλανδία</string>
   <string name="country_region_name_om">Ομάν</string>
-  <string name="country_region_name_pa">Παναμά</string>
+  <string name="country_region_name_pa">Παναμάς</string>
   <string name="country_region_name_pe">Περού</string>
   <string name="country_region_name_pg">Παπούα Νέα Γουινέα</string>
   <string name="country_region_name_ph">Φιλιππίνες</string>
@@ -236,36 +248,49 @@
   <string name="country_region_name_za">Νότια Αφρική</string>
   <string name="country_region_name_zm">Ζάμπια</string>
   <string name="country_region_name_zw">Ζιμπάμπουε</string>
+  <string name="customise_days">Προσαρμογή ημερών</string>
   <string name="data_privacy_button">Επόμενο</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>
   <string name="data_privacy_headline_content_description">Επικεφαλίδα, Εγγραφή και προστασία του απορρήτου</string>
   <string name="deaths">Θάνατοι</string>
+  <string name="dialog_error_uploading_message">Προσπαθήστε να ανεβάσετε ξανά τα δεδομένα σας. \n\n Ανατρέξτε σε αυτόν τον κωδικό σφάλματος εάν σας το ζητήσει υπάλληλος υγείας της Πολιτείας ή της Επικρατείας σας: \n \n%@</string>
   <string name="dialog_error_uploading_negative">Ακύρωση</string>
   <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="edit_snooze_calendar">Επεξεργασία αναβολής ημερολογίου</string>
   <string name="enabled">Ενεργοποιημένη</string>
   <string name="enter_number_button">Αποκτήστε PIN</string>
-  <string name="enter_number_content">Θα σας στείλουμε ένα 6ψήφιο PIN για να επαληθεύσετε τον αριθμό του κινητού σας.</string>
+  <string name="enter_number_content">Θα σας στείλουμε έναν 6ψήφιο κωδικό για να επαληθεύσετε τον αριθμό του κινητού σας.</string>
   <string name="enter_number_for_example">Για παράδειγμα,</string>
   <string name="enter_number_headline">Εισάγετε τον αριθμό του κινητού σας</string>
   <string name="enter_number_prefix">+61</string>
   <string name="enter_number_relative">Προσπαθείτε να εγγραφείτε εκ μέρους φίλου ή συγγενή; \n\nΗ εγγραφή θα πρέπει να γίνει χρησιμοποιώντας τη δική τους συσκευή και τον αριθμό τηλεφώνου τους, για να λειτουργήσει η COVIDSafe για αυτούς.</string>
   <string name="enter_pin_button">Επιβεβαιώστε</string>
   <!-- OnBoarding Enter PIN -->
-  <string name="enter_pin_headline" formatted="false">Εισάγετε το PIN που στάλθηκε στο %s %s</string>
+  <string name="enter_pin_headline" formatted="false">Εισάγετε τον κωδικό που στάλθηκε στο %s %s</string>
-  <string name="enter_pin_resend_pin">Στείλτε ξανά το PIN</string>
+  <string name="enter_pin_resend_pin">Στείλτε ξανά τον κωδικό σας</string>
-  <string name="enter_pin_timer_expire">Το PIN σας θα λήξει σε</string>
+  <string name="enter_pin_timer_expire">Ο κωδικός σας θα λήξει σε</string>
   <string name="enter_pin_wrong_number">Είναι ο αριθμός κινητού λάθος;</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="Enter_your_mobile_number_label">Εισάγετε τον αριθμό του κινητού σας</string>
+  <string name="every_day">Κάθε μέρα</string>
+  <string name="factors_dotpoint1">αριθμός χρηστών της COVIDSafe στην περιοχή σας</string>
+  <string name="factors_dotpoint2">μοντέλο συσκευής και ηλικία</string>
+  <string name="factors_dotpoint3">αν βρίσκεστε σε κινούμενο όχημα</string>
+  <string name="factors_enviro_item_1">φυσικά εμπόδια όπως οι τοίχοι</string>
+  <string name="factors_enviro_item_2">υλικό και εξαρτήματα που παρεμβαίνουν στα σήματα Bluetooth</string>
+  <string name="factors_handshakes_heading">Παράγοντες που επηρεάζουν τη δραστηριότητα της εφαρμογής</string>
+  <string name="factors_intro">Οι παράγοντες που μπορούν να επηρεάσουν τον αριθμό των χειραψιών περιλαμβάνουν:</string>
+  <string name="factors_intro_2">Οι χειραψίες μπορούν επίσης να επηρεαστούν από περιβαλλοντικούς παράγοντες, όπως:</string>
   <!-- for production -->
   <string name="generic_error">Προσπαθήστε ξανά αργότερα.</string>
   <string name="generic_internet_error">Ελέγξτε τη σύνδεσή σας στο διαδίκτυο</string>
+  <string name="global_OK">OK</string>
   <string name="heading">Επικεφαλίδα</string>
   <string name="hide">Απόκρυψη</string>
   <string name="home_app_permission_push_notification_prompt">Επιτρέψτε στην COVIDSafe να προωθεί αυτόματες ειδοποιήσεις.</string>
@@ -274,7 +299,7 @@
   <string name="home_been_tested_title">Σας ζήτησε υπάλληλος υγείας να αναρτήσετε τα δεδομένα σας;</string>
   <string name="home_bluetooth_permission">Bluetooth®: %s</string>
   <string name="home_data_has_been_uploaded">Τα στοιχεία σας αναρτήθηκαν</string>
-  <string name="home_data_has_been_uploaded_message">Βοηθάτε να σταματήσει η εξάπλωση του COVID-19 αναρτώντας τα δεδομένα σας καθημερινά ενώ βρίσκεστε σε απομόνωση.</string>
+  <string name="home_data_has_been_uploaded_message">Βοηθήστε να σταματήσει η εξάπλωση του COVID-19 αναρτώντας τα δεδομένα σας καθημερινά ενώ βρίσκεστε σε απομόνωση.</string>
   <string name="home_data_uploaded">Εγγραφείτε για αυτοαπομόνωση</string>
   <string name="home_data_uploaded_button">Εγγραφή</string>
   <string name="home_data_uploaded_message">Βοηθήστε να σταματήσει η εξάπλωση του COVID-19 και παρακολουθείτε τα συμπτώματά σας.</string>
@@ -312,11 +337,13 @@
   <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">Η Google απαιτεί *Άδεια τοποθεσίας για εφαρμογές 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>
   <string name="home_version_number">Αριθμός εκδοχής %s</string>
+  <string name="hotspots_state_territory">Ενεργά σημεία σε % @</string>
+  <string name="hour">Ωρα</string>
   <string name="how_it_works_button">Επόμενο</string>
   <string name="how_it_works_consent">Η συναίνεσή σας θα ζητείται πάντα εάν απαιτείται ανίχνευση υγείας.</string>
   <string name="how_it_works_content">Τα σήματα Bluetooth® χρησιμοποιούνται για να προσδιορίσουν πότε βρίσκεστε κοντά σε άλλο χρήστη της COVIDSafe.\n\nΗ κάθε στενή επαφή σας με άλλους χρήστες της COVIDSafe σημειώνεται για να δημιουργεί στενά στοιχεία επικοινωνίας. Οι πληροφορίες είναι κρυπτογραφημένες και αποθηκεύονται μόνο στο τηλέφωνό σας.\n\nΕάν διαγνωστείτε θετικά στην COVID-19 ως χρήστης της COVIDSafe, υπεύθυνος υγείας της Πολιτείας ή της Επικράτειάς σας θα επικοινωνήσει μαζί σας. Θα βοηθήσει με την εθελοντική ανάρτηση των προσωπικών στοιχείων επικοινωνίας σας σε ένα εξαιρετικά ασφαλές σύστημα αποθήκευσης πληροφοριών. \n\nΟι υπεύθυνοι υγείας της Πολιτείας ή της Επικράτειάς σας μπορούν επίσης να επικοινωνήσουν μαζί σας εάν ήρθατε σε στενή επαφή με άλλο χρήστη της COVIDSafe που επίσης διαγνώσθηκε θετικά.\n\nΓια περισσότερες πληροφορίες, πηγαίνετε στη σελίδα *Θέματα Βοήθειας*.</string>
@@ -329,30 +356,45 @@
   <string name="internet_connection_heading">Δεν υπάρχει σύνδεση στο διαδίκτυο</string>
   <string name="internet_screen_content">Η COVIDSafe πρέπει να συνδέεται με το διακομιστή κατά καιρούς για να διασφαλίσει ότι μπορεί να εντοπίζει προβλήματα εφαρμογής. \n\n Η σύνδεση στο Διαδίκτυο διασφαλίζει ότι θα λαμβάνετε ειδοποιήσεις στο:</string>
   <string name="internet_screen_content_1">πώς να διορθώσετε προβλήματα και να ενεργοποιήσετε εκ νέου την COVIDSafe</string>
-  <string name="internet_screen_content_2">όταν  είναι διαθέσιμη η ενημερωμένη έκδοση</string>
+  <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\nΗ COVIDSafe θα σημειώσει με ασφάλεια την επαφή που έχετε με άλλους χρήστες της εφαρμογής. Αυτό θα επιτρέπει στους υπαλλήλους της Πολιτείας ή Επικράτειάς σας να επικοινωνήσουν μαζί σας, εάν έχετε στενή επαφή με κάποιον που έχει διαγνωστεί θετικά στον ιό.\n\nΜαζί μπορούμε να βοηθήσουμε να σταματήσουμε την εξάπλωση και να παραμείνουμε υγιείς.</string>
   <!-- OnBoarding Intro -->
   <string name="intro_headline">Μαζί μπορούμε να σταματήσουμε την εξάπλωση του COVID-19</string>
   <string name="intro_headline_content_description">Επικεφαλίδα, Μαζί μπορούμε να σταματήσουμε την εξάπλωση του COVID-19</string>
-  <string name="invalid_age">Η «Ηλικία» δεν μπορεί να είναι κενό</string>
+  <string name="invalid_age">Η «Ηλικία» δεν μπορεί να είναι κενή</string>
   <string name="invalid_australian_phone_number_error_prompt">Οι αριθμοί κινητής τηλεφωνίας της Αυστραλίας περιέχουν έως 10 ψηφία.</string>
   <string name="invalid_name">Μη έγκυρο όνομα</string>
   <string name="invalid_norfolk_island_phone_number_error_prompt">Οι αριθμοί κινητής τηλεφωνίας στο νησί Νόρφολκ περιέχουν 5 έως 6 ψηφία.</string>
   <string name="invalid_phone_number">Μη έγκυρος αριθμός τηλεφώνου.</string>
   <string name="invalid_phone_number_digits_error_prompt" formatted="false">Οι αριθμοί κινητών στο %1s περιέχουν %2s ψηφία.</string>
   <string name="invalid_post_code">Μη έγκυρος ταχυδρομικός κώδικας</string>
+  <string name="is_snoozed_android">Η COVIDSafe βρίσκεται σε αναβολή</string>
+  <string name="is_snoozed_description_android">Η COVIDSafe δεν χρησιμοποιεί Bluetooth και δεν καταγράφει επαφές.</string>
   <string name="IssueFooter">Μπορεί να επικοινωνήσουμε μαζί σας για περισσότερες λεπτομέρειες σχετικά με τα σχόλια σας. Η διεύθυνση email σας δε θα χρησιμοποιηθεί για κανέναν άλλο σκοπό.</string>
   <string name="jwt_description">Υπάρχει ένα πρόβλημα με τα στοιχεία εγγραφής σας.</string>
+  <string name="jwt_expired">Η εγγραφή σας έχει λήξει.</string>
+  <string name="jwt_expired_description">Πρέπει να επιβεβαιώνετε τον αριθμό του κινητού σας κάθε 12 μήνες για να βεβαιωθείτε ότι τα στοιχεία εγγραφής σας είναι σωστά.</string>
   <string name="jwt_heading">Παρακαλούμε εγγραφείτε ξανά</string>
+  <string name="jwt_success">Η εγγραφή ανανεώθηκε με επιτυχία</string>
+  <string name="last_7_days">Τις τελευταίες 7 ημέρες</string>
   <string name="loading_numbers">Φόρτωση τελευταίων αριθμών</string>
+  <string name="locally_acquired">%@ αποκτηθέν τοπικά</string>
+  <string name="low_handshakes_description">Δοκιμάστε αυτές τις συμβουλές για να βελτιώσετε την απόδοση της COVIDSafe στο τηλέφωνό σας:</string>
+  <string name="low_handshakes_heading">Τι να κάνετε αν οι αριθμοί χειραψιών σας είναι χαμηλότεροι από ό,τι περιμένετε;</string>
+  <string name="low_handshakes_item1">Ελέγξτε εάν η COVIDSafe είναι ενεργή ανοίγοντας την εφαρμογή.</string>
+  <string name="low_handshakes_item2">Ενημερώστε την εφαρμογή σας στην πιο πρόσφατη έκδοση μέσω του Google Play Store ή του Apple Store.</string>
+  <string name="low_handshakes_item3">Επανεκκινήστε το τηλέφωνό σας και ανοίξτε ξανά την εφαρμογή.</string>
+  <string name="low_handshakes_link">Διαβάστε περισσότερα για το πώς να ελέγξετε εάν η COVIDSafe λειτουργεί σωστά</string>
   <!-- Splash Screen -->
   <string name="migration_in_progress">Η ενημέρωση της COVIDSafe συνεχίζεται. \n\nΒεβαιωθείτε ότι το τηλέφωνό σας δεν είναι απενεργοποιημένο έως ότου ολοκληρωθεί η ενημέρωση.</string>
+  <string name="minute">Λεπτό</string>
   <string name="national_numbers">Στατιστικές για όλη την Αυστραλία</string>
   <string name="navigation_back_button_content_description">Προηγούμενη σελίδα</string>
   <string name="need_location_service">Για να λειτουργήσει η COVIDSafe, πρέπει να ενεργοποιήσετε την Τοποθεσία στις Ρυθμίσεις.</string>
   <string name="new_cases">Νέα κρούσματα κατά τις τελευταίες 24 ώρες</string>
+  <string name="new_cases_total">Νέα κρούσματα από την 1η Φεβρουαρίου 2020</string>
   <string name="new_south_wales">Νέα Νότια Ουαλία</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="norfolk_hint">Για παράδειγμα: 51234</string>
@@ -380,13 +422,14 @@
   <string name="numbers_no_internet">Συνδεθείτε στο Διαδίκτυο για να βεβαιωθείτε ότι λαμβάνετε ενημερωμένους αριθμούς.</string>
   <string name="numbers_refresh">Ανανεώστε τώρα</string>
   <string name="options_for_australia">Επιλογές για την Αυστραλία</string>
+  <string name="overseas_acquired">%@ αποκτηθέν στο εξωτερικό</string>
   <string name="permission_button">Προχωρήστε</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>
+  <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 δεν αποστέλλει αιτήματα ζεύξης. *Μάθετε περισσότερα*.\n\n5. Η Google απαιτεί *Άδεια τοποθεσίας για εφαρμογές Android* για πρόσβαση στο Bluetooth. Το 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>
@@ -411,60 +454,88 @@
   <string name="pin_number">κωδικός PIN</string>
   <string name="PINNumber_VO_Label">Κωδικός PΙΝ</string>
   <string name="PN_MobileNumber_VOLabel">Αριθμός κινητού</string>
+  <string name="postcode_success">Ο ταχυδρομικός σας κώδικας έχει ενημερωθεί</string>
   <string name="queensland">Κουίνσλαντ</string>
-  <string name="ReceivePinIssue">Προβλήματα με τη λήψη του PIN σας;</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>
   <string name="registration_consent_second_paragraph">Πληροφορίες σχετικά με την επαφή μου με άλλους χρήστες της COVIDSafe, εάν άλλος χρήστης με τον οποίο έχω έρθει σε επαφή διαγνωστεί θετικά για το COVID-19 και ανεβάζει τα δικά του στοιχεία επικοινωνίας.</string>
+  <string name="save">Αποθήκευση</string>
+  <string name="scheduled" formatted="false">Προγραμματίσατε την COVIDSafe για αναβολή από %@ έως %@ .</string>
   <string name="search">Αναζήτηση</string>
   <!-- OnBoarding Enter Number -->
   <string name="select_country_or_region">Επιλέξτε χώρα ή περιοχή</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="Select_country_or_region_headline">Επιλέξτε χώρα ή περιοχή</string>
+  <string name="select_state_territory_button">Επιλογή πολιτείας ή επικράτειας</string>
+  <string name="select_state_territory_heading">Επιλογή πολιτείας ή επικράτειας</string>
   <string name="service_not_ok_action">Ελέγξτε την εφαρμογή τώρα</string>
   <string name="service_not_ok_body">Βεβαιωθείτε ότι η COVIDSafe είναι ενεργή πριν βγείτε από το σπίτι ή όταν βρίσκεστε σε δημόσιους χώρους.</string>
   <string name="service_not_ok_title">Η COVIDSafe δεν είναι ενεργή</string>
-  <string name="service_ok_body">Να έχετε η COVIDSafe ενεργή όταν βγαίνετε από το σπίτι ή βρίσκεστε σε δημόσιους χώρους.</string>
+  <string name="service_ok_body">Να έχετε την COVIDSafe ενεργή όταν βγαίνετε από το σπίτι ή βρίσκεστε σε δημόσιους χώρους.</string>
   <string name="service_ok_title">Η COVIDSafe είναι ενεργή</string>
+  <string name="set_snooze_time">Ορίστε χρόνο αναβολής</string>
   <string name="settings">Ρυθμίσεις</string>
+  <string name="seven_days">7 ημέρες</string>
   <string name="share_this_app_content">Ελάτε μαζί μου να σταματήσουμε την εξάπλωση του COVID-19! Κατεβάστε την COVIDSafe, μια εφαρμογή της Αυστραλιανής Κυβέρνησης. # COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
   <string name="show">Εμφάνιση</string>
+  <string name="snooze_button">Αναβολή</string>
+  <string name="snooze_calendar_button">Αναβολή ημερολογίου</string>
+  <string name="snooze_calendar_description">Ορίστε ημέρες και ώρες που θέλετε να αναβάλετε την COVIDSafe.</string>
+  <string name="snooze_covidsafe_button">Αναβολή της COVIDSafe</string>
+  <string name="snooze_covidsafe_button_description">Αναβολή της COVIDSafe για συγκεκριμένο χρονικό διάστημα.</string>
+  <string name="snooze_ended">Η αναβολή τελείωσε.</string>
+  <string name="snooze_ends">Η αναβολή τελειώνει σε</string>
+  <string name="snooze_from">Αναβολή από</string>
+  <string name="snooze_heading">Αναβολή της COVIDSafe</string>
+  <string name="snooze_on">Αναβολή σε % @</string>
+  <string name="snooze_timer_description">Ρυθμίστε το χρονόμετρο για να αναβάλετε την COVIDSafe.</string>
+  <string name="snooze_to">Αναβολή έως</string>
+  <string name="snoozed_calendar_description_android" formatted="false">Η COVIDSafe δεν χρησιμοποιεί Bluetooth και δεν καταγράφει επαφές.\n\nΠρογραμματίστε την COVIDSafe για αναβολή από %@ σε %@.</string>
   <string name="south_australia">Νότια Αυστραλία</string>
+  <string name="state_number_heading">%@ αριθμοί</string>
   <string name="stepCounter" formatted="false">Βήμα %d του %d</string>
   <string name="support">Υποστήριξη</string>
   <string name="support_content">Για βοήθεια σε θέματα που δεν καλύπτονται από θέματα Βοήθειας</string>
   <string name="tasmania">Τασμανία</string>
   <string name="title_help">Βοήθεια</string>
+  <string name="total">Σύνολο</string>
   <string name="total_confirmed_cases">Σύνολο επιβεβαιωμένων κρουσμάτων</string>
+  <string name="total_deaths">%@ σύνολο θανάτων</string>
   <string name="total_per_state">Σύνολο επιβεβαιωμένων κρουσμάτων ανά πολιτεία και επικράτεια</string>
-  <string name="under_sixteen_content">Επιβεβαιώνω ότι ο γονέας ή ο κηδεμόνας μου συναινεί στον Οργανισμό Ψηφιακού Μετασχηματισμού ως διαχειριστή του χώρου αποθήκευσης δεδομένων, σύμφωνα με νόμιμο καθορισμό του Γενικού Γραμματέα του Υπουργείου Υγείας της Αυστραλιανής Κυβέρνησης που συλλέγει:</string>
+  <string name="twenty_eight_days">28 ημέρες</string>
+  <string name="type_in_time">Πληκτρολογήστε την ώρα</string>
+  <string name="under_sixteen_content">Επιβεβαιώνω ότι ο γονέας ή ο κηδεμόνας μου συναινεί να είναι ο Οργανισμός Ψηφιακού Μετασχηματισμού  διαχειριστής του χώρου αποθήκευσης δεδομένων, σύμφωνα με νόμιμο καθορισμό του Γενικού Γραμματέα του Υπουργείου Υγείας της Αυστραλιανής Κυβέρνησης που συλλέγει:</string>
   <string name="under_sixteen_first_paragraph">Τα στοιχεία εγγραφής μου.</string>
   <!-- OnBoarding Under Sixteen -->
   <string name="under_sixteen_headline">Χρειάζεστε τη συναίνεση του γονέα/κηδεμόνα σας για να συνεχίσετε</string>
   <string name="under_sixteen_headline_content_description">Επικεφαλίδα, Χρειάζεστε τη συγκατάθεση του γονέα/κηδεμόνα σας για να προχωρήσετε</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="under_sixteen_registration_consent_first_paragraph">Τα στοιχεία εγγραφής μου.</string>
-  <string name="under_sixteen_second_paragraph">Πληροφορίες για την επαφή μου με άλλους χρήστες της COVIDSafe, εάν ένας άλλος χρήστης με τον οποίο έχω έρθει σε επαφή έχει διαγνωστεί θετικά με COVID-19 και αναρτεί τα στοιχεία επικοινωνίας του.</string>
+  <string name="under_sixteen_second_paragraph">Πληροφορίες για την επαφή μου με άλλους χρήστες της COVIDSafe, εάν ένας άλλος χρήστης με τον οποίο έχω έρθει σε επαφή έχει διαγνωστεί θετικά με COVID-19 και αναρτήσει τα στοιχεία επικοινωνίας του.</string>
   <!-- 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. Ανανεώστε την έκδοσή σας μέσῳ του 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="update_description_android">Η παρούσα ενημέρωση βελτιώνει την απόδοση Bluetooth της COVIDSafe με νέους τρόπους ώστε η COVIDSafe να καταγράφει καλύτερα τις στενές επαφές σας. <a href="https://www.covidsafe.gov.au/help-topics.html#herald"> Μάθετε περισσότερα σχετικά με το πώς βελτιώσαμε την COVIDSafe </a> \n\n Η Google απαιτεί άδεια τοποθεσίας για τις εφαρμογές Android για πρόσβαση στο Bluetooth. <a href="https://www.covidsafe.gov.au/help-topics.html#location-permissions"> COVIDSafe ΔΕΝ συλλέγει, δεν αποθηκεύει ούτε χρησιμοποιεί τα δεδομένα τοποθεσίας σας </a></string>
+  <string name="update_heading_android">Βελτιωμένη απόδοση</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>
   <string name="upload_consent_button">Συμφωνώ</string>
+  <string name="upload_fail_heading">Η ανάρτησή σας απέτυχε</string>
   <string name="upload_failed">Η ανάρτηση απέτυχε</string>
   <string name="upload_finished_header">Σας ευχαριστούμε που βοηθήσατε να σταματήσει η εξάπλωση του COVID-19!</string>
   <string name="upload_finished_header_content_description">Επικεφαλίδα, Σας ευχαριστούμε που βοηθήσατε να σταματήσει η εξάπλωση του COVID-19!</string>
   <string name="upload_finished_sub_header">Έχετε ανεβάσει με επιτυχία τις πληροφορίες σας στο σύστημα αποθήκευσης υψηλής ασφάλειας COVIDSafe.\n\nΟι υγειονομικοί υπάλληλοι της Πολιτείας ή της Επικράτειάς σας θα ενημερώσουν άλλους χρήστες της COVIDSafe που έχουν καταγράψει στενή επαφή μαζί σας. Η ταυτότητά σας θα παραμείνει ανώνυμη σε άλλους χρήστες.</string>
-  <string name="upload_step_1_body">Υπάλληλος υγείας της Πολιτείας ή της Επικράτειάς σας θα επικοινωνήσει μαζί σας μόνο εάν διαγνωστείτε θετικά στο COVID-19, για να σας βοηθήσει με την εθελοντική ανάρτηση των πληροφοριών σας. \n\nΜόλις πατήσετε «Ναι», θα πρέπει να δώσετε τη συναίνεσή σας για να αναρτήσετε τα στοιχεία σας.</string>
+  <string name="upload_step_1_body">Ένας υπάλληλος υγείας της Πολιτείας ή της Επικράτειάς σας θα επικοινωνήσει μαζί σας μόνο εάν διαγνωστείτε θετικά στο COVID-19, για να σας βοηθήσει με την εθελοντική ανάρτηση των πληροφοριών σας. \n\nΜόλις πατήσετε «Ναι», θα πρέπει να δώσετε τη συναίνεσή σας για να αναρτήσετε τα στοιχεία σας.</string>
   <string name="upload_step_1_header">Σας ζητάει υπάλληλος υγείας σας να αναρτήσετε τα στοιχεία σας;</string>
   <string name="upload_step_1_header_content_description">Επικεφαλίδα, Σας ζητά υπάλληλος υγείας να αναρτήσετε τα στοιχεία σας;</string>
   <string name="upload_step_4_header">Αναρτήστε τη συναίνεσή σας</string>
@@ -472,10 +543,11 @@
   <string name="upload_step_4_sub_header">Εάν δε συναινείτε, τα στοιχεία επικοινωνίας σας δε θα αναρτηθούν.\n\nΕάν συναινείτε, τα στοιχεία στενής επαφής σας θα αναρτηθούν και θα κοινοποιηθούν σε υπαλλήλους υγείας της Πολιτείας ή της Επικράτειάς σας για σκοπούς ανίχνευσης επαφών.\n\nΟι υπάλληλοι υγείας δε θα μπορέσουν να έχουν πρόσβαση στις πληροφορίες για τις στενές σας επαφές.\n\nΓια περισσότερες λεπτομέρειες διαβάστε την *πολιτική προστασίας* προσωπικών δεδομένων της COVIDSafe.</string>
   <string name="upload_step_verify_pin_header">Αναρτήστε τα στοιχεία σας</string>
   <string name="upload_step_verify_pin_header_content_description">Επικεφαλίδα, Αναρτήστε τα στοιχεία σας</string>
-  <string name="upload_step_verify_pin_sub_header">Ένας υπάλληλος υγείας της Πολιτείας ή της Επικράτειάς σας θα στείλει ένα PIN στη συσκευή σας μέσω μηνύματος. Εισάγετέ το παρακάτω για να αναρτήσετε τα στοιχεία σας.</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">Εισήχθη λάθος PIN</string>
+  <string name="wrong_ping_number">Εισήχθη λάθος κωδικός</string>
+  <string name="yesterday_activity">Χθες</string>
 </resources>

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

@@ -3,13 +3,23 @@
   <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 d\'inviarti un altro PIN.</string>
+  <string name="action_verify_invalid_pin">PIN non valido, chiedi al funzionario sanitario d\'inviare un altro PIN.</string>
   <string name="action_verify_upload_pin">Carica i miei dati</string>
+  <string name="active_cases">Casi attivi (stimati)</string>
+  <string name="activity_button">Controlla l\'attività dell\'app</string>
+  <string name="activity_button_description">Visualizza le interazioni Bluetooth della tua app con altri utenti COVIDSafe.</string>
+  <string name="activity_heading">Attività dell\'app</string>
+  <string name="activity_intro">Ogni volta che il tuo dispositivo si trova nel raggio di altri utenti dell\'app COVIDSafe, prende nota delle interazioni Bluetooth chiamate \"strette di mano Bluetooth\". \n\n Queste strette di mano danno un\'indicazione del funzionamento della tua app.</string>
   <string name="activity_self_isolation_button">Continua</string>
   <string name="australian_capital_territory">Australian Capital Territory</string>
   <string name="battery_optimisation_prompt">Disabilita l\'ottimizzazione della batteria.</string>
+  <string name="ble_handshakes_yesterday_android">Strette di mano Bluetooth ieri</string>
+  <string name="bluetooth_handshakes_android">Strette di mano Bluetooth</string>
+  <string name="cancel_snooze">Annulla lo snooze</string>
+  <string name="cases_28_days">Nuovi casi negli ultimi 28 giorni</string>
+  <string name="cases_7_days">Nuovi casi negli ultimi 7 giorni</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">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_content_line_2">Gli altri dispositivi Bluetooth® intorno a tre sono in grado di vedere il nome del tuo dispositivo. Ti consigliamo di utilizzare un nome del tuo dispositivo che non includa i tuoi dati personali e che sia di uso comune, come ad esempio il modello del 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>
@@ -19,6 +29,8 @@
   <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 di COVIDSafe in un\'altra lingua.</string>
+  <string name="change_postcode_description">Aggiorna il codice postale, se è cambiato da quando hai scaricato COVIDSafe.</string>
+  <string name="change_postcode_heading">Cambia il codice postale</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>
@@ -100,7 +112,7 @@
   <string name="country_region_name_gl">Groenlandia</string>
   <string name="country_region_name_gm">Gambia</string>
   <string name="country_region_name_gn">Guinea</string>
-  <string name="country_region_name_gp">Guadalupa</string>
+  <string name="country_region_name_gp">Guadalupe</string>
   <string name="country_region_name_gq">Guinea Equatoriale</string>
   <string name="country_region_name_gr">Grecia</string>
   <string name="country_region_name_gt">Guatemala</string>
@@ -180,7 +192,7 @@
   <string name="country_region_name_ph">Filippine</string>
   <string name="country_region_name_pk">Pakistan</string>
   <string name="country_region_name_pl">Polonia</string>
-  <string name="country_region_name_pr">Puerto Rico</string>
+  <string name="country_region_name_pr">Portorico </string>
   <string name="country_region_name_ps">Territori palestinesi</string>
   <string name="country_region_name_pt">Portogallo</string>
   <string name="country_region_name_pw">Palau</string>
@@ -236,18 +248,21 @@
   <string name="country_region_name_za">Sudafrica</string>
   <string name="country_region_name_zm">Zambia</string>
   <string name="country_region_name_zw">Zimbabwe</string>
+  <string name="customise_days">Personalizza i giorni</string>
   <string name="data_privacy_button">Avanti</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">Decessi</string>
+  <string name="dialog_error_uploading_message">Prova a caricare di nuovo i tuoi dati. \n\nFai riferimento a questo codice di errore se un funzionario sanitario statale o territoriale lo richiede: \n%@</string>
   <string name="dialog_error_uploading_negative">Annulla</string>
   <string name="dialog_error_uploading_positive">Riprova</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="edit_snooze_calendar">Modifica il calendario di snooze</string>
   <string name="enabled">Abilitato</string>
   <string name="enter_number_button">Ottieni il PIN</string>
   <string name="enter_number_content">Invieremo un PIN di 6 cifre per verificare il numero di cellulare.</string>
@@ -263,9 +278,19 @@
   <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 numero di cellulare</string>
+  <string name="every_day">Ogni giorno</string>
+  <string name="factors_dotpoint1">numero di utenti COVIDSafe nel raggio d\'azione</string>
+  <string name="factors_dotpoint2">modello ed età del dispositivo</string>
+  <string name="factors_dotpoint3">se sei in un veicolo in movimento</string>
+  <string name="factors_enviro_item_1">barriere fisiche come muri</string>
+  <string name="factors_enviro_item_2">materiale e dispositivi che interferiscono con i segnali Bluetooth</string>
+  <string name="factors_handshakes_heading">Fattori che influiscono sull\'attività dell\'app</string>
+  <string name="factors_intro">I fattori che possono influenzare il numero di strette di mano comprendono:</string>
+  <string name="factors_intro_2">Anche le strette di mano possono essere influenzate da fattori ambientali:</string>
   <!-- for production -->
   <string name="generic_error">Riprova più tardi</string>
   <string name="generic_internet_error">Controlla la connessione internet</string>
+  <string name="global_OK">OK</string>
   <string name="heading">Titolo</string>
   <string name="hide">Nascondi</string>
   <string name="home_app_permission_push_notification_prompt">Autorizza COVIDSafe ad inviare notifiche.</string>
@@ -274,8 +299,8 @@
   <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_has_been_uploaded_message">Stai aiutando a fermare la diffusione del COVID-19 caricando i tuoi dati ogni giorno mentre sei in isolamento.</string>
-  <string name="home_data_uploaded">Registrati per l\'autoisolamento</string>
+  <string name="home_data_uploaded">Registrati per autoisolamento</string>
   <string name="home_data_uploaded_button">Registrati</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 sono necessarie ulteriori azioni.</string>
@@ -312,47 +337,64 @@
   <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 collaborare. Insieme, siamo più forti.</string>
   <string name="home_set_complete_external_link_share_title">Condividi COVIDSafe</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_set_location_why">Google richiede *l\'Autorizzazione di localizzazione per le app Android * per accedere al Bluetooth®. COVIDSafe non memorizza né utilizza i dati sulla tua posizione.</string>
   <string name="home_setup_help">Guida</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="hotspots_state_territory">Hotspot in %@</string>
+  <string name="hour">Ora</string>
   <string name="how_it_works_button">Avanti</string>
-  <string name="how_it_works_consent">Il vostro consenso sarà sempre richiesto se è richiesta la tracciabilità sanitaria.</string>
+  <string name="how_it_works_consent">Il tuo consenso sarà sempre richiesto se è richiesta la tracciabilità sanitaria.</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>
+  <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 te e gli altri utenti di COVIDSafe viene annotata per creare informazioni sui contatti. Queste informazioni sono crittografate e memorizzate solo sul tuo cellulare. \nSe risulti positivo al COVID-19, come utente di COVIDSafe sarai contattato da un funzionario sanitario statale o del territorio per assisterti 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 contattarti se sei entrato in stretto contatto con un altro utente di COVIDSafe risultato positivo. \nPer ulteriori informazioni, consulta 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">Come funziona COVIDSafe</string>
   <string name="how_it_works_headline_content_description">Titolo, Come funziona il COVIDSafe</string>
   <string name="improve">Migliora le prestazioni dell\'app</string>
   <string name="improve_heading">Migliora le prestazioni di COVIDSafe</string>
-  <string name="internet_connection_content">Connettersi a Internet per ricevere notifiche su problemi e aggiornamenti.</string>
+  <string name="internet_connection_content">Connettiti a Internet per ricevere notifiche su problemi e aggiornamenti.</string>
   <string name="internet_connection_heading">Nessuna connessione internet</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">COVIDSafe deve connettersi al server di tanto in tanto per poter identificare i problemi con l\'applicazione.\n\nLa connessione a internet garantisce la ricezione delle notifiche:deve</string>
-  <string name="internet_screen_content_1">come risolvere problemi e riattivare nuovamente COVIDSafe </string>
+  <string name="internet_screen_content_1">come risolvere problemi e riattivare COVIDSafe </string>
   <string name="internet_screen_content_2">quando sarà disponibile un nuovo aggiornamento della versione</string>
-  <string name="internet_screen_heading">Connettersi a Internet per migliorare le prestazioni di COVIDSafe</string>
+  <string name="internet_screen_heading">Connettiti a Internet per migliorare le prestazioni di COVIDSafe</string>
   <string name="intro_button">Voglio aiutare</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à 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_australian_phone_number_error_prompt">I numeri di cellulare australiani hanno 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="is_snoozed_android">COVIDSafe non è attiva</string>
+  <string name="is_snoozed_description_android">COVIDSafe non utilizza il Bluetooth e non registra i contatti.</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="jwt_expired">La tua registrazione è scaduta.</string>
+  <string name="jwt_expired_description">Conferma il numero di cellulare ogni 12 mesi per assicurarti che i dati di registrazione siano corretti.</string>
+  <string name="jwt_heading">Registrati di nuovo</string>
+  <string name="jwt_success">Registrazione rinnovata con successo</string>
+  <string name="last_7_days">Ultimi 7 giorni</string>
   <string name="loading_numbers">Caricamento degli ultimi numeri</string>
+  <string name="locally_acquired">%@ contratto localmente</string>
+  <string name="low_handshakes_description">Prova questi suggerimenti per migliorare le prestazioni di COVIDSafe sul tuo telefono:</string>
+  <string name="low_handshakes_heading">Cosa fare se i numeri delle strette di mano sono inferiori alle tue aspettative</string>
+  <string name="low_handshakes_item1">Verifica se COVIDSafe è attivo aprendo l\'app.</string>
+  <string name="low_handshakes_item2">Aggiorna la tua app all\'ultima versione tramite Google Play Store o Apple Store.</string>
+  <string name="low_handshakes_item3">Riavvia il telefono e apri di nuovo l\'app.</string>
+  <string name="low_handshakes_link">Per saperne di più su come controllare se COVIDSafe funziona correttamente</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="migration_in_progress">Aggiornamento COVIDSafe in corso. \n\nAssicurati che il cellulare non sia spento fino al completamento dell\'aggiornamento.</string>
+  <string name="minute">Minuto</string>
   <string name="national_numbers">Numeri nazionali</string>
   <string name="navigation_back_button_content_description">Pagina precedente</string>
   <string name="need_location_service">Per il funzionamento di COVIDSafe, attivare la Posizione nelle Impostazioni.</string>
   <string name="new_cases">Nuovi casi nelle ultime 24 ore</string>
+  <string name="new_cases_total">Nuovi casi dal 1° febbraio 2020</string>
   <string name="new_south_wales">New South Wales</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="norfolk_hint">Per esempio: 51234</string>
@@ -380,16 +422,17 @@
   <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="overseas_acquired">%@ contratto all\'estero</string>
   <string name="permission_button">Procedi</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>
+  <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 localizzazione\n\n 3. Disabilita l\'ottimizzazione della batteria \n\n\nGoogle richiede *l\'Autorizzazione di localizzazione per le app Android * per accedere al Bluetooth®. COVIDSafe non memorizza né utilizza i dati relativi alla tua 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 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, 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>
+  <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 di localizzazione per le app Android * per accedere al Bluetooth®. COVIDSafe non memorizza né utilizza i dati relativi alla tua posizione.</string>
   <!-- OnBoarding Permission Success -->
   <string name="permission_success_headline">Ti sei registrato con successo</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="permission_success_warning">Mantieni attive le notifiche push per 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 fascia d\'età.</string>
@@ -411,36 +454,62 @@
   <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="postcode_success">Il tuo codice postale è stato aggiornato</string>
   <string name="queensland">Queensland</string>
   <string name="ReceivePinIssue">Problemi nel ricevere il PIN?</string>
   <string name="recovered">Totale guarigioni</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_content">Acconsento alla raccolta di dati da parte della Digital Transformation Agency nel ruolo di amministratore 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">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="save">Salva</string>
+  <string name="scheduled" formatted="false">Hai programmato COVIDSafe su snooze da %@ a %@ </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="select_state_territory_button">Seleziona lo stato o il territorio</string>
+  <string name="select_state_territory_heading">Seleziona lo stato o il territorio</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">COVIDSafe non è attiva</string>
   <string name="service_ok_body">Mantieni attivo COVIDSafe quando esci di casa o sei in luoghi pubblici.</string>
   <string name="service_ok_title">COVIDSafe è attivo</string>
+  <string name="set_snooze_time">Imposta il tempo di snooze</string>
   <string name="settings">Impostazioni</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="seven_days">7 giorni</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="show">Visualizza</string>
+  <string name="snooze_button">Snooze</string>
+  <string name="snooze_calendar_button">Calendario snooze</string>
+  <string name="snooze_calendar_description">Imposta giorni e orari in cui vuoi attivare snooze COVIDSafe.</string>
+  <string name="snooze_calendar_toggle">Calendario snooze</string>
+  <string name="snooze_covidsafe_button">Snooze COVIDSafe.</string>
+  <string name="snooze_covidsafe_button_description">Snooze COVIDSafe per un determinato periodo di tempo.</string>
+  <string name="snooze_ended">Snooze è terminato.</string>
+  <string name="snooze_ends">Snooze termina tra</string>
+  <string name="snooze_from">Snooze da</string>
+  <string name="snooze_heading">Snooze COVIDSafe</string>
+  <string name="snooze_on">Snooze attivo</string>
+  <string name="snooze_timer_description">Imposta il timer di snooze COVIDSafe.</string>
+  <string name="snooze_to">Snooze fino a</string>
+  <string name="snoozed_calendar_description_android" formatted="false">COVIDSafe non utilizza il Bluetooth e non sta registrando i contatti. \n\n Hai programmato COVIDSafe su snooze da %@ a %@ .</string>
   <string name="south_australia">South Australia</string>
+  <string name="state_number_heading">numeri</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>
   <string name="tasmania">Tasmania</string>
   <string name="title_help">Guida</string>
+  <string name="total">Totale</string>
   <string name="total_confirmed_cases">Totale casi confermati</string>
+  <string name="total_deaths">%@ totale decessi</string>
   <string name="total_per_state">Totale casi confermati per stato e territorio</string>
+  <string name="twenty_eight_days">28 giorni</string>
+  <string name="type_in_time">Digita l\'ora</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 -->
@@ -455,21 +524,24 @@
   <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 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="update_description_android">Questo aggiornamento migliora le prestazioni Bluetooth di COVIDSafe con nuovi modi per catturare meglio i tuoi contatti più stretti. <a href="https://www.covidsafe.gov.au/help-topics.html#herald"> Ulteriori informazioni sui miglioramenti apportati a COVIDSafe </a> \n\nGoogle richiede l\'autorizzazione di localizzazione per consentire alle app Android di accedere al Bluetooth. <a href="https://www.covidsafe.gov.au/help-topics.html#location-permissions"> COVIDSafe NON raccoglie, archivia o utilizza i dati relativi alla tua posizione </a></string>
+  <string name="update_heading_android">Miglioramento delle prestazioni</string>
+  <string name="update_screen_location">Google richiede *l\'Autorizzazione di localizzazione per le app Android * per accedere al Bluetooth®. COVIDSafe non memorizza né utilizza i dati sulla tua posizione.</string>
   <string name="upload_answer_no">No</string>
   <!-- Upload flow -->
   <string name="upload_answer_yes">Sì</string>
   <string name="upload_consent_button">Sono d\'accordo</string>
+  <string name="upload_fail_heading">Caricamento non riuscito</string>
   <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">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_finished_sub_header">I tuoi 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 te. La tua identità rimarrà anonima per gli altri utenti.</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_body">Un funzionario sanitario statale o del territorio ti contatterà per aiutarvi con il caricamento volontario dei tuoi dati solo se sei risultato positivo al COVID-19.\n\nDopo aver premuto \'Sì\', bisogna fornire il proprio consenso per caricare i 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, 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">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_4_sub_header">I dati di stretto contatto non vengono caricati senza il tuo consenso.\n\nUna volta fornito il consenso, i tuoi 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\nLeggi *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>
@@ -478,4 +550,5 @@
   <string name="victoria">Victoria</string>
   <string name="western_australia">Western Australia</string>
   <string name="wrong_ping_number">PIN errato </string>
+  <string name="yesterday_activity">Ieri</string>
 </resources>

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

@@ -5,9 +5,19 @@
   <string name="action_upload_done">완료</string>
   <string name="action_verify_invalid_pin">잘못된 PIN입니다. 보건 담당자에게 다른 PIN을 보내달라고 요청하십시오.</string>
   <string name="action_verify_upload_pin">내 정보 업로드하기</string>
+  <string name="active_cases">미완치 환자 수(추정)</string>
+  <string name="activity_button">앱 활동 확인</string>
+  <string name="activity_button_description">다른 COVIDSafe 사용자와의 블루투스 상호 작용 보기</string>
+  <string name="activity_heading">앱 활동</string>
+  <string name="activity_intro">여러분의 기기가 다른 COVIDSafe 앱 사용자의 범위 안에 있을 때마다 \'블루투스 악수\'라는 블루투스 상호작용이 기록됩니다.\n\n이 악수는 여러분의 앱이 얼마나 잘 작동하는지를 나타냅니다.</string>
   <string name="activity_self_isolation_button">계속</string>
-  <string name="australian_capital_territory">호주 수도 영토</string>
+  <string name="australian_capital_territory">호주 수도 테리토리</string>
   <string name="battery_optimisation_prompt">배터리 최적화를 비활성화 해야합니다.</string>
+  <string name="ble_handshakes_yesterday_android">어제의 블루투스 악수</string>
+  <string name="bluetooth_handshakes_android">블루투스 악수</string>
+  <string name="cancel_snooze">일시 정지 취소</string>
+  <string name="cases_28_days">지난 28일간 신규 확진 건수</string>
+  <string name="cases_7_days">지난 7일간 신규 확진 건</string>
   <string name="change_device_name_content_line_1">당신의 장치 이름은 %s입니다.</string>
   <string name="change_device_name_content_line_2">주변의 다른 블루투스® 장치에서 여러분의 장치 이름을 볼 수 있습니다. 개인 정보가 포함되지 않은 장치 이름 (예: 장치의 모델명 등)을 사용할 것을 권장합니다.</string>
   <string name="change_device_name_default_device_name">%s</string>
@@ -19,6 +29,8 @@
   <string name="change_device_name_secondary_action">생략하고 그대로 유지하기</string>
   <string name="change_language">언어를 변경하십시오</string>
   <string name="change_language_content">다른 언어로 COVIDSafe 사용에 대한 안내서를 읽으십시오.</string>
+  <string name="change_postcode_description">COVIDSafe를 다운로드한 이후에 우편 번호가 변경되었다면 업데이트하십시오.</string>
+  <string name="change_postcode_heading">우편 번호 변경</string>
   <string name="CodeHasExpired">코드가 만료되었습니다.</string>
   <string name="collection_message">이제 COVIDSafe는 앱 문제를 해결하는 데 도움이 되는 진단 정보를 수집합니다. *더 알아보기*</string>
   <string name="consent_button">동의</string>
@@ -236,18 +248,21 @@
   <string name="country_region_name_za">남아공화국</string>
   <string name="country_region_name_zm">잠비아</string>
   <string name="country_region_name_zw">짐바브웨</string>
+  <string name="customise_days">요일 맞춤 설정</string>
   <string name="data_privacy_button">다음</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>
   <string name="data_privacy_headline_content_description">제목, 등록 및 개인정보 보호</string>
   <string name="deaths">사망자</string>
+  <string name="dialog_error_uploading_message">데이터 업로드를 다시 시도하십시오.\n\n주 또는 준주 보건 담당자의 요청이 있을 경우 이 에러 코드를 참조하십시오: \n%@</string>
   <string name="dialog_error_uploading_negative">취소</string>
   <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="edit_snooze_calendar">일시 정지 일정 수정</string>
   <string name="enabled">활성화 됨</string>
   <string name="enter_number_button">PIN 받기</string>
   <string name="enter_number_content">본 휴대폰 번호 확인을 위해 6자리 PIN을 보내겠습니다.</string>
@@ -263,9 +278,19 @@
   <string name="enter_pin_wrong_number">잘못된 휴대폰 번호입니까?</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="Enter_your_mobile_number_label">본인의 휴대폰 번호를 입력하세요</string>
+  <string name="every_day">매일</string>
+  <string name="factors_dotpoint1">근접 범위 내 COVIDSafe 사용자 수</string>
+  <string name="factors_dotpoint2">기기 모델 및 연식</string>
+  <string name="factors_dotpoint3">움직이는 차량 안에 있는 경우</string>
+  <string name="factors_enviro_item_1">벽 등의 물리적 장애물</string>
+  <string name="factors_enviro_item_2">블루투스 신호를 방해하는 물질 및 시설</string>
+  <string name="factors_handshakes_heading">앱 활동에 영향을 미치는 요인</string>
+  <string name="factors_intro">블루투스 악수 숫자에 영향을 줄 수 있는 요소는 다음과 같습니다.</string>
+  <string name="factors_intro_2">다음과 같은 환경 요인 역시 블루투스 악수에 영향을 미칠 수 있습니다.</string>
   <!-- for production -->
   <string name="generic_error">나중에 다시 시도하세요.</string>
   <string name="generic_internet_error">인터넷 연결상태를 확인하세요.</string>
+  <string name="global_OK">확인</string>
   <string name="heading">제목</string>
   <string name="hide">숨기기</string>
   <string name="home_app_permission_push_notification_prompt">COVIDSafe가 푸시 알림을 하도록 허용해 주세요.</string>
@@ -280,9 +305,9 @@
   <string name="home_data_uploaded_message">COVID-19의 확산방지에 협조하고 자신의 증상을 추적하세요.</string>
   <string name="home_header_active_no_action_required">추가 조치가 필요하지 않습니다.</string>
   <!-- Home -->
-  <string name="home_header_active_title">COVIDSafe가 활성화되어 있습니다.</string>
+  <string name="home_header_active_title">COVIDSafe가 활성화 되었습니다.</string>
   <!-- Home -->
-  <string name="home_header_active_title_thanks">감사합니다. 이제 COVIDSafe가 활성화되어 있습니다.</string>
+  <string name="home_header_active_title_thanks">감사합니다. 이제 COVIDSafe가 활성화 되었습니다.</string>
   <string name="home_header_inactive_check_your_permissions">설정을 확인하세요.</string>
   <string name="home_header_inactive_title">COVIDSafe가 활성화되어 있지 않습니다</string>
   <string name="home_header_no_pairing">COVIDSafe는 *페어링 요청*을 보내지 않습니다.</string>
@@ -312,11 +337,13 @@
   <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>
   <string name="home_version_number">버전 번호: %s</string>
+  <string name="hotspots_state_territory">%@ 내 집중 감염 지역</string>
+  <string name="hour">시</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\nCOVIDSafe 사용자로서 여러분이 COVID-19 양성 결과를 받으면, 주 또는 테리토리 보건 담당자가 여러분에게 연락할 것입니다. 그들은 여러분이 자신의 근거리 접촉 정보를 보안성 높은 정보 저장 시스템에 자발적으로 업로드할 수 있도록 도와줄 것입니다. \n\n또한 양성 결과가 나온 다른 COVIDSafe 사용자와 여러분이 가까이 접촉한 경우, 주 또는 테리토리 보건 담당자가 여러분에게 연락을 취할 수 있습니다. \n\n자세한 내용은 *도움말 항목* 페이지를 참조하세요.</string>
@@ -327,7 +354,7 @@
   <string name="improve_heading">COVIDSafe의 성능을 향상시키십시오</string>
   <string name="internet_connection_content">인터넷에 연결해서 문제 및 업데이트에 관한 알림을 받으십시오.</string>
   <string name="internet_connection_heading">인터넷에 연결되지 않음</string>
-  <string name="internet_screen_content">COVIDSafe는 앱과 관련된 문제들을 확인하기 위해 때때로 서버에 연결되어야 합니다. \n\n 인터넷에 연결하면 다음과 같은 알림들을 받을 수 있습니다:</string>
+  <string name="internet_screen_content">COVIDSafe는 앱과 관련된 문제들을 확인하기 위해 때때로 서버에 연결되어야 합니다. \n\n인터넷에 연결하면 다음과 같은 알림들을 받을 수 있습니다:</string>
   <string name="internet_screen_content_1">문제를 해결하고 COVIDSafe를 다시 활성화하는 방법</string>
   <string name="internet_screen_content_2">새 버전의 업데이트가 가능할 때</string>
   <string name="internet_screen_heading">COVIDSafe의 성능을 향상시키기 위해 인터넷에 연결하십시오</string>
@@ -343,16 +370,31 @@
   <string name="invalid_phone_number">유효하지 않은 전화번호.</string>
   <string name="invalid_phone_number_digits_error_prompt" formatted="false">%1s 휴대폰 번호에는 %2s자리가 있습니다.</string>
   <string name="invalid_post_code">잘못된 우편번호</string>
+  <string name="is_snoozed_android">COVIDSafe가 일시 정지되었습니다.</string>
+  <string name="is_snoozed_description_android">COVIDSafe가 블루투스를 사용하지 않으며 접촉자를 기록하고 있지 않습니다.</string>
   <string name="IssueFooter">여러분의 피드백에 대한 자세한 내용에 대해 연락을 드릴 수도 있습니다. 여러분의 이메일 주소는 다른 목적으로 사용되지 않습니다.</string>
   <string name="jwt_description">등록 세부 정보에 문제가 있습니다.</string>
+  <string name="jwt_expired">등록이 만료되었습니다.</string>
+  <string name="jwt_expired_description">등록 정보가 올바른지 확인하려면 12개월마다 휴대폰 번호를 확인해야 합니다.</string>
   <string name="jwt_heading">다시 등록하십시오</string>
+  <string name="jwt_success">등록 갱신 완료</string>
+  <string name="last_7_days">지난 7 일</string>
   <string name="loading_numbers">최신 번호 로드 중</string>
+  <string name="locally_acquired">%@ 지역 감염</string>
+  <string name="low_handshakes_description">휴대폰에서 COVIDSafe의 성능을 향상시키려면 다음 팁을 활용해보세요.</string>
+  <string name="low_handshakes_heading">블루투스 악수 숫자가 예상보다 적으면 어떻게 하나요</string>
+  <string name="low_handshakes_item1">앱을 열어 COVIDSafe가 활성화되어 있는지 확인하세요.</string>
+  <string name="low_handshakes_item2">Google Play Store 또는 Apple Store를 통해 앱을 최신 버전으로 업데이트하세요.</string>
+  <string name="low_handshakes_item3">휴대폰을 재시작하고 앱을 다시 실행하세요.</string>
+  <string name="low_handshakes_link">COVIDSafe가 올바르게 작동하는지 확인하는 방법에 대한 자세한 정보 보기</string>
   <!-- Splash Screen -->
   <string name="migration_in_progress">COVIDSafe 업데이트 진행 중. \n\n업데이트가 완료될 때까지 휴대폰이 꺼지지 않도록 해주세요.</string>
+  <string name="minute">분</string>
   <string name="national_numbers">전국 수</string>
   <string name="navigation_back_button_content_description">이전 페이지</string>
   <string name="need_location_service">COVIDSafe가 작동하려면 설정에서 위치서비스를 켜야 합니다.</string>
-  <string name="new_cases">지난 24 시간 동안의 새 확진자 수</string>
+  <string name="new_cases">지난 24시간 동안의 새 확진자 수</string>
+  <string name="new_cases_total">2020년 2월 1일 이후 신규 확진 건수</string>
   <string name="new_south_wales">뉴 사우스 웨일즈</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="norfolk_hint">예: 51234</string>
@@ -368,7 +410,7 @@
   <string name="notification_not_active_body">외출 시 혹은 공공 장소에 있을 때 COVIDSafe가 활성화되어 있도록 하세요.</string>
   <string name="notification_not_active_title">COVIDSafe가 활성화되어 있지 않습니다.</string>
   <string name="notification_settings">앱을 열어 여러분의 설정을 확인하십시오.</string>
-  <string name="notification_update_content">최신 개선 사항에 접근하려면 귀하의 앱을 업데이트하십시오.</string>
+  <string name="notification_update_content">최신 개선 사항에 접근하려면 앱을 업데이트 하십시오.</string>
   <string name="notification_update_heading">COVIDSafe 업데이트가 가능함</string>
   <!-- Figma page iOS Screens (05/06) -->
   <string name="NotificationsBlurbLink">알림 설정 변경</string>
@@ -380,13 +422,14 @@
   <string name="numbers_no_internet">업데이트된 번호를 얻으려면 인터넷에 연결하십시오.</string>
   <string name="numbers_refresh">지금 새로 고침</string>
   <string name="options_for_australia">호주 관련 옵션</string>
+  <string name="overseas_acquired">%@ 해외 유입</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>
+  <string name="permission_content">COVIDSafe는 블루투스® 및 알림 기능이 활성화되어야 작동합니다. \n\n\'진행\'을 선택하여 다음을 수행하십시오.\n\n1. 블루투스® 활성화 \n\n2. 위치 액세스 허용 \n\n3. 배터리 최적화 비활성화 \n\n안드로이드 앱이 블루투스®를 사용하기 위해서는 구글의 위치 서비스 사용을 허용해야 합니다. 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. 블루투스®가 켜져 있어야 합니다. \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>
@@ -411,6 +454,7 @@
   <string name="pin_number">핀 번호</string>
   <string name="PINNumber_VO_Label">핀 번호</string>
   <string name="PN_MobileNumber_VOLabel">휴대폰 번호</string>
+  <string name="postcode_success">우편 번호가 업데이트 되었습니다.</string>
   <string name="queensland">퀸즐랜드</string>
   <string name="ReceivePinIssue">PIN을 받는 데 문제가 있습니까?</string>
   <string name="recovered">회복된 총 확진자 수</string>
@@ -420,27 +464,52 @@
   <!-- Onboarding Registration Consent -->
   <string name="registration_consent_headline">등록 동의</string>
   <string name="registration_consent_second_paragraph">다른 COVIDSafe 사용자가 COVID-19 양성 결과를 받고 자신의 접촉 데이터를 업로드한 경우, 다른 COVIDSafe 사용자들과의 본인의 접촉 정보.</string>
+  <string name="save">저장</string>
+  <string name="scheduled" formatted="false">%@부터 %@까지 COVIDsafe를 일시 정지해놓았습니다.</string>
   <string name="search">검색</string>
   <!-- OnBoarding Enter Number -->
   <string name="select_country_or_region">국가 또는 지역을 선택하세요</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="Select_country_or_region_headline">국가 또는 지역을 선택하세요</string>
+  <string name="select_state_territory_button">주 또는 테리토리 선택</string>
+  <string name="select_state_territory_heading">주 또는 테리토리 선택</string>
   <string name="service_not_ok_action">지금 앱을 확인하세요</string>
   <string name="service_not_ok_body">외출 시 혹은 공공 장소에 있을 때 COVIDSafe가 활성화되어 있도록 하세요.</string>
   <string name="service_not_ok_title">COVIDSafe가 활성화되어 있지 않습니다</string>
   <string name="service_ok_body">외출 시 혹은 공공 장소에 있을 때 COVIDSafe가 활성화되어 있도록 하세요.</string>
   <string name="service_ok_title">COVIDSafe가 활성화되어 있습니다.</string>
+  <string name="set_snooze_time">일시 정지 시간 설정</string>
   <string name="settings">설정</string>
+  <string name="seven_days">7일</string>
   <string name="share_this_app_content">COVID-19의 확산을 막아주세요! 호주 정부의 앱인 COVIDSafe를 다운로드하세요. # COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
   <string name="show">보여주기</string>
+  <string name="snooze_button">일시 정지</string>
+  <string name="snooze_calendar_button">일시 정지 일정</string>
+  <string name="snooze_calendar_description">COVIDSafe를 일시 정지하고 싶은 요일과 시간을 설정하세요.</string>
+  <string name="snooze_calendar_toggle">일시 정지 일정</string>
+  <string name="snooze_covidsafe_button">COVIDSafe 일시 정지</string>
+  <string name="snooze_covidsafe_button_description">특정 시간 동안 COVIDSafe를 일시 정지합니다.</string>
+  <string name="snooze_ended">일시 정지 기능이 종료되었습니다.</string>
+  <string name="snooze_ends">일시 정지 종료까지 남은 시간</string>
+  <string name="snooze_from">일시 정지 시작 시간</string>
+  <string name="snooze_heading">COVIDSafe 일시 정지</string>
+  <string name="snooze_on">일시 정지 켬 %@</string>
+  <string name="snooze_timer_description">COVIDSafe 일시 정지 시간 설정하기</string>
+  <string name="snooze_to">일시 정지 종료 시간</string>
+  <string name="snoozed_calendar_description_android" formatted="false">COVIDSafe가 블루투스를 사용하지 않으며 접촉자를 기록하고 있지 않습니다.\n%@부터 %@까지 COVIDSafe를 일시 정지해놓았습니다.</string>
   <string name="south_australia">남호주</string>
+  <string name="state_number_heading">%@ 수치</string>
   <string name="stepCounter" formatted="false">%d 의 단계들 중 %d 단계</string>
   <string name="support">지원</string>
   <string name="support_content">도움말 항목에서 다루지 않는 문제에 대한 지원</string>
   <string name="tasmania">태즈매니아</string>
   <string name="title_help">도움</string>
+  <string name="total">총</string>
   <string name="total_confirmed_cases">총 확진자 수</string>
-  <string name="total_per_state">주 및 준주 별 총 확진자</string>
+  <string name="total_deaths">%@ 총 사망자 수</string>
+  <string name="total_per_state">주 및 테리토리 별 총 확진자</string>
+  <string name="twenty_eight_days">28일</string>
+  <string name="type_in_time">시간 입력</string>
   <string name="under_sixteen_content">본인은 호주 정부 보건부 장관의 법적 결정에 따라, 데이터 저장소 관리자로서 다음 정보를 수집하는 것에 대해 본인 부모 또는 보호자가 Digital Transformation Agency에 동의한다는 것을 확인합니다:</string>
   <string name="under_sixteen_first_paragraph">나의 등록 정보.</string>
   <!-- OnBoarding Under Sixteen -->
@@ -452,14 +521,17 @@
   <!-- 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의 기능들을 향상시키고 있습니다. 구글 플레이 스토어를 통해 업데이트하십시오.</string>
+  <string name="update_available_message_android">저희는 COVIDSafe의 기능을 향상시키고 있습니다. \n구글 플레이 스토어를 통해 업데이트하십시오.</string>
   <string name="update_available_play_store_btn">구글 플레이 스토어 가기</string>
   <string name="update_available_title">업데이트 가능!</string>
-  <string name="update_screen_location">안드로이드 앱에서 블루투스®에 접속하려면 위치 권한이 켜져 있어야 합니다. COVIDSafe는 위치 데이터를 저장하거나 사용하지 않습니다.</string>
+  <string name="update_description_android">COVIDSafe는 이번 업데이트와 함께 향상된 블루투스 성능을 통해, 새로운 방식으로 근거리 접촉자를 더 잘 포착하게 됩니다.<a href="https://www.covidsafe.gov.au/help-topics.html#herald">COVIDSafe가 어떻게 향상되었는지에 대해 더 자세히 알아보기</a> \n\n안드로이드 앱이 블루투스 기능을 사용하려면 구글의 위치 서비스가 허용되어야 합니다.<a href="https://www.covidsafe.gov.au/help-topics.html#location-permissions">COVIDSafe는 여러분의 위치 정보를 수집하거나 저장, 사용하지 않습니다</a></string>
+  <string name="update_heading_android">성능 향상</string>
+  <string name="update_screen_location">블루투스®기능을 사용하기 위해서는 구글의 *안드로이드 앱에 대한 위치 서비스 허용*이 필요합니다. COVIDSafe는 여러분의 위치 정보를 추적하거나 사용하지 않습니다.</string>
   <string name="upload_answer_no">아니요</string>
   <!-- Upload flow -->
   <string name="upload_answer_yes">예</string>
   <string name="upload_consent_button">동의합니다</string>
+  <string name="upload_fail_heading">업로드 실패</string>
   <string name="upload_failed">업로드 실패</string>
   <string name="upload_finished_header">COVID-19의 확산을 막는 데 협조해 주셔서 감사합니다!</string>
   <string name="upload_finished_header_content_description">제목, COVID-19의 확산을 막는 데 협조해 주셔서 감사합니다!</string>
@@ -469,7 +541,7 @@
   <string name="upload_step_1_header_content_description">제목, 보건 담당자가 당신의 정보를 업로드할 것을 당신에게 요청하고 있습니까?</string>
   <string name="upload_step_4_header">동의 확인을 업로드하세요</string>
   <string name="upload_step_4_header_content_description">제목, 동의 확인을 업로드하세요</string>
-  <string name="upload_step_4_sub_header">여러분이 동의하지 않는 한, 여러분의 접촉 데이타는 업로드되지 않습니다.\n\n동의하시면, 여러분의 접촉 데이타가 업로드되고, 주 또는 테리토리 보건 담당자와 공유되어 접촉 추적 목적으로 사용될 것입니다.\n\n자세한 내용은 COVIDSafe *개인 정보 보호 정책*을 참조하십시오.</string>
+  <string name="upload_step_4_sub_header">여러분이 동의하지 않는 한, 여러분의 접촉 데이타는 업로드되지 않습니다.\n\n동의하시면, 여러분의 접촉 정보가 업로드되고, 주 또는 테리토리 보건 담당자와 공유되어 접촉 추적 목적으로 사용될 것입니다.\n\n주 또는 테리토리 보건 담당자들만이 당신의 근거리 접촉자에 관한 정보를 사용할 수 있습니다. \n\n자세한 내용은 COVIDSafe *개인 정보 보호 정책*을 참조하십시오.</string>
   <string name="upload_step_verify_pin_header">본인의 정보를 업로드하세요</string>
   <string name="upload_step_verify_pin_header_content_description">제목, 본인의 정보를 업로드하세요</string>
   <string name="upload_step_verify_pin_sub_header">주 또는 테리토리 보건 담당자가 당신의 장치에 문자 메시지로 PIN을 보낼 것입니다. 본인의 정보를 업로드하려면 아래에 그 번호를 입력하십시오.</string>
@@ -478,4 +550,5 @@
   <string name="victoria">빅토리아</string>
   <string name="western_australia">서호주</string>
   <string name="wrong_ping_number">잘못된 PIN 입력</string>
+  <string name="yesterday_activity">어제</string>
 </resources>

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

@@ -5,9 +5,19 @@
   <string name="action_upload_done">ਕੀਤਾ</string>
   <string name="action_verify_invalid_pin">ਨਾਜਾਇਜ ਪਿੰਨ, ਕਿਰਪਾ ਕਰਕੇ ਸਿਹਤ ਅਧਿਕਾਰੀ ਨੂੰ ਤੁਹਾਨੂੰ ਇੱਕ ਹੋਰ  ਪਿੰਨ ਭੇਜਣ ਲਈ ਕਹੋ।</string>
   <string name="action_verify_upload_pin">ਮੇਰੀ ਜਾਣਕਾਰੀ ਅੱਪਲੋਡ ਕਰੋ</string>
+  <string name="active_cases">ਇਸ ਵਕਤ ਚੱਲ ਰਹੇ ਕੇਸ (ਅੰਦਾਜ਼ਨ)</string>
+  <string name="activity_button">ਐਪ ਗਤੀਵਿਧੀ ਦੀ ਜਾਂਚ ਕਰੋ</string>
+  <string name="activity_button_description">ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰਾਂ ਨਾਲ ਆਪਣੀ ਐਪ ਦੀਆਂ ਬਲੂਟੁੱਥ ਅੰਤਰਕਿਰਿਆਵਾਂ ਨੂੰ ਦੇਖੋ।</string>
+  <string name="activity_heading">ਐਪ ਦੀ ਗਤੀਵਿਧੀ</string>
+  <string name="activity_intro">ਹਰ ਵਾਰ ਜਦ ਵੀ ਤੁਹਾਡੀ ਡਿਵਾਈਸ ਹੋਰ COVIDSafe ਐਪ ਵਰਤੋਂਕਾਰਾਂ ਦੀ ਰੇਂਜ ਵਿੱਚ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਇਹ ਬਲੂਟੁੱਥ ਅੰਤਰਕਿਰਿਆਵਾਂ ਨੂੰ ਨੋਟ ਕਰ ਲੈਂਦੀ ਹੈ ਜਿਨ੍ਹਾਂ ਨੂੰ \'ਬਲੂਟੁੱਥ ਹੈਂਡਸ਼ੇਕਸ\' ਕਿਹਾ ਜਾਂਦਾ ਹੈ।\n\nਇਹ ਹੈਂਡਸ਼ੇਕ ਇਸ ਗੱਲ ਦਾ ਸੰਕੇਤ ਦਿੰਦੇ ਹਨ ਕਿ ਤੁਹਾਡੀ ਐਪ ਕਿੰਨੀ ਚੰਗੀ ਤਰ੍ਹਾਂ ਕੰਮ ਕਰ ਰਹੀ ਹੈ।</string>
   <string name="activity_self_isolation_button">ਜਾਰੀ ਰੱਖੋ</string>
   <string name="australian_capital_territory">ਆਸਟ੍ਰੇਲੀਅਨ ਕੈਪੀਟਲ ਟੈਰੀਟਰੀ</string>
   <string name="battery_optimisation_prompt">ਤੁਸੀਂ ਬੈਟਰੀ ਅਨੁਕੂਲਤਾ (ਆਪਟੀਮਾਈਜੇਸ਼ਨ) ਲਾਜ਼ਮੀ ਤੌਰ ਤੇ ਬੰਦ ਕਰੋ|</string>
+  <string name="ble_handshakes_yesterday_android">ਬੀਤੇ ਕੱਲ੍ਹ ਕੀਤੇ ਗਏ ਬਲੂਟੁੱਥ ਹੈਂਡਸ਼ੇਕ</string>
+  <string name="bluetooth_handshakes_android">ਬਲੂਟੁੱਥ ਦੇ ਹੈਂਡਸ਼ੇਕ</string>
+  <string name="cancel_snooze">ਸਨੂਜ਼ ਰੱਦ ਕਰੋ</string>
+  <string name="cases_28_days">ਪਿਛਲੇ 28 ਦਿਨਾਂ ਵਿੱਚ ਨਵੇਂ ਮਾਮਲੇ</string>
+  <string name="cases_7_days">ਪਿਛਲੇ 7 ਦਿਨਾਂ ਵਿੱਚ ਨਵੇਂ ਕੇਸ</string>
   <string name="change_device_name_content_line_1">ਤੁਹਾਡੀ ਡਿਵਾਈਸ ਦਾ ਮੌਜੂਦਾ ਨਾਂ %s ਹੈ।</string>
   <string name="change_device_name_content_line_2">ਤੁਹਾਡੇ ਆਸ-ਪਾਸ ਦੀਆਂ ਹੋਰ ਬਲੂਟੁੱਥ® ਡੀਵਾਈਸਾਂ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਦਾ ਨਾਮ ਦੇਖ ਸਕਣਗੀਆਂ। ਅਸੀਂ ਕਿਸੇ ਅਜਿਹੇ ਡਿਵਾਈਸ ਨਾਮ ਵਰਤਣ ਦੀ ਸਿਫਾਰਸ਼ ਕਰਦੇ ਹਾਂ ਜਿਸ ਵਿੱਚ ਤੁਹਾਡੇ ਨਿੱਜੀ ਵੇਰਵੇ ਨਹੀਂ ਹਨ ਅਤੇ ਇਸਨੂੰ ਆਮ ਤੌਰ \'ਤੇ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ, ਜਿਵੇਂ ਕਿ ਤੁਹਾਡਾ ਡਿਵਾਈਸ ਮਾਡਲ।</string>
   <string name="change_device_name_default_device_name">%s</string>
@@ -19,6 +29,8 @@
   <string name="change_device_name_secondary_action">ਛੱਡੋ ਅਤੇ ਜਿਂਵੇ ਦਾ ਤਿਵੇਂ ਰੱਖੋ</string>
   <string name="change_language">ਭਾਸ਼ਾ ਬਦਲੋ</string>
   <string name="change_language_content">COVIDSafe ਦੀ ਵਰਤੋਂ ਕਿਸੇ ਵੱਖਰੀ ਭਾਸ਼ਾ ਵਿੱਚ ਕਰਨ ਲਈ ਇਹ ਗਾਈਡ ਪੜ੍ਹੋ।</string>
+  <string name="change_postcode_description">ਜੇ COVIDSafe ਡਾਊਨਲੋਡ ਕਰਨ ਤੋਂ ਬਾਅਦ ਤੁਹਾਡਾ ਪੋਸਟਕੋਡ ਬਦਲ ਗਿਆ ਹੈ ਤਾਂ ਇਸ ਨੂੰ ਅੱਪਡੇਟ ਕਰੋ।</string>
+  <string name="change_postcode_heading">ਆਪਣਾ ਪੋਸਟਕੋਡ ਬਦਲੋ</string>
   <string name="CodeHasExpired">ਤੁਹਾਡਾ ਪਿੰਨ ਖਤਮ ਹੋ ਗਿਆ ਹੈ।</string>
   <string name="collection_message">COVIDSafe ਐਪ ਦੀ ਟ੍ਰਬਲਸ਼ੂਟ ਲਈ ਤੁਹਾਡੀ ਸਹਾਇਤਾ ਵਜੋਂ  ਹੁਣ ਤੁਹਾਡੀ ਡਾਇਗਨੌਸਟਿਕ ਜਾਣਕਾਰੀ ਇਕੱਤਰ ਕਰਦਾ ਹੈ। *ਵਧੇਰੇ ਜਾਣੋ*</string>
   <string name="consent_button">ਮੈਂ ਸਹਿਮਤ ਹਾਂ</string>
@@ -236,18 +248,21 @@
   <string name="country_region_name_za">ਦੱਖਣੀ ਅਫਰੀਕਾ</string>
   <string name="country_region_name_zm">ਜ਼ਾਂਬੀਆ</string>
   <string name="country_region_name_zw">ਜਿੰਮਬਾਬਵੇ</string>
+  <string name="customise_days">ਆਪਣੀ ਮਰਜ਼ੀ ਮੁਤਾਬਿਕ ਦਿਨ ਚੁਣੋ</string>
   <string name="data_privacy_button">ਅੱਗੇ</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>
   <string name="data_privacy_headline_content_description">ਸਿਰਲੇਖ, ਪੰਜੀਕਰਨ ਅਤੇ ਪ੍ਰਾਈਵੇਸੀ</string>
   <string name="deaths">ਮੌਤਾਂ</string>
+  <string name="dialog_error_uploading_message">ਆਪਣਾ ਡਾਟਾ ਦੁਬਾਰਾ ਤੋਂ ਅੱਪਲੋਡ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ।\n\nਜੇ ਕਿਸੇ ਸੂਬੇ ਜਾਂ ਖੇਤਰ ਦਾ ਸਿਹਤ ਅਧਿਕਾਰੀ ਇਸ ਦੀ ਮੰਗ ਕਰਦਾ ਹੈ ਤਾਂ ਇਹ ਗਲਤੀ ਦਾ ਕੋਡ ਵੇਖੋ: \n%@</string>
   <string name="dialog_error_uploading_negative">ਰੱਦ</string>
   <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="edit_snooze_calendar">ਸਨੂਜ਼ ਕੈਲੰਡਰ ਵਿੱਚ ਬਦਲਾਵ ਕਰੋ</string>
   <string name="enabled">ਚਾਲੂ ਹੈ  (ਅਨੇਬਲਡ)</string>
   <string name="enter_number_button">ਪਿੰਨ ਲਓ</string>
   <string name="enter_number_content">ਤੁਹਾਡੇ ਮੋਬਾਈਲ ਨੰਬਰ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਅਸੀਂ ਤੁਹਾਨੂੰ 6-ਅੰਕਾਂ ਦਾ ਪਿੰਨ ਭੇਜਾਂਗੇ।</string>
@@ -263,9 +278,19 @@
   <string name="enter_pin_wrong_number">ਕੀ ਇਹ ਮੋਬਾਈਲ ਨੰਬਰ ਗਲਤ ਹੈ?</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="Enter_your_mobile_number_label">ਆਪਣਾ ਮੋਬਾਈਲ ਨੰਬਰ ਭਰੋ</string>
+  <string name="every_day">ਹਰ ਰੋਜ਼</string>
+  <string name="factors_dotpoint1">COVIDSafe ਦੇ ਵਰਤੋਂਕਾਰਾਂ ਦੀ ਸੰਖਿਆ ਜੋ ਕਿ ਰੇਂਜ ਵਿੱਚ ਹਨ</string>
+  <string name="factors_dotpoint2">ਡਿਵਾਈਸ ਦਾ ਮਾਡਲ ਅਤੇ ਇਹ ਕਿੰਨਾ ਪੁਰਾਣਾ ਹੈ</string>
+  <string name="factors_dotpoint3">ਜੇ ਤੁਸੀਂ ਕਿਸੇ ਚੱਲਦੀ ਗੱਡੀ ਵਿੱਚ ਹੋ</string>
+  <string name="factors_enviro_item_1">ਭੌਤਿਕ ਰੁਕਾਵਟਾਂ ਜਿਵੇਂ ਕਿ ਕੰਧਾਂ</string>
+  <string name="factors_enviro_item_2">ਸਮੱਗਰੀਆਂ ਅਤੇ ਫਿਕਸਚਰ ਜੋ ਬਲੂਟੁੱਥ ਸਿਗਨਲਾਂ ਵਿੱਚ ਦਖਲ ਅੰਦਾਜ਼ੀ ਕਰਦੇ ਹਨ</string>
+  <string name="factors_handshakes_heading">ਉਹ ਕਾਰਕ ਜੋ ਐਪ ਦੀ ਗਤੀਵਿਧੀ ਨੂੰ ਪ੍ਰਭਾਵਿਤ ਕਰਦੇ ਹਨ</string>
+  <string name="factors_intro">ਉਹ ਕਾਰਕ ਜੋ ਕਿ \'ਹੈਂਡਸ਼ੇਕਾਂ\' ਦੀ ਸੰਖਿਆ ਨੂੰ ਪ੍ਰਭਾਵਿਤ ਕਰ ਸਕਦੇ ਹਨ, ਉਹਨਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਹਨ:</string>
+  <string name="factors_intro_2">ਹੈਂਡਸ਼ੇਕ ਵਾਤਾਵਰਣਕ ਕਾਰਕਾਂ ਦੁਆਰਾ ਵੀ ਪ੍ਰਭਾਵਿਤ ਹੋ ਸਕਦੇ ਹਨ, ਜਿੰਨ੍ਹਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਹਨ:</string>
   <!-- for production -->
   <string name="generic_error">ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।</string>
   <string name="generic_internet_error">ਕਿਰਪਾ ਕਰਕੇ ਅਪਣਾ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਚੈੱਕ ਕਰੋ</string>
+  <string name="global_OK">ਠੀਕ ਹੈ</string>
   <string name="heading">ਸਿਰਲੇਖ</string>
   <string name="hide">ਛੁਪਾਣਾ</string>
   <string name="home_app_permission_push_notification_prompt">COVIDSafe ਨੂੰ ਸੂਚਨਾਵਾਂ ਦੇਣ ਦਿਓ।</string>
@@ -317,6 +342,8 @@
   <string name="home_setup_incomplete_subtitle">COVIDSafe ਨੂੰ ਇਹਨਾਂ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੱਕ ਜਾਣ ਲਈ ਆਗਿਆ ਦੀ ਲੋੜ ਹੈ।</string>
   <string name="home_setup_incomplete_title">ਮਨਜ਼ੂਰੀਆਂ ਦੀ ਜਾਂਚ ਕਰੋ</string>
   <string name="home_version_number">ਵਰਜਨ ਨੰਬਰ:%s</string>
+  <string name="hotspots_state_territory">%@ ਵਿੱਚ ਹੌਟਸਪੌਟ </string>
+  <string name="hour">ਘੰਟਾ</string>
   <string name="how_it_works_button">ਅੱਗੇ</string>
   <string name="how_it_works_consent">ਜੇ ਸਿਹਤ ਟਰੇਸਿੰਗ ਦੀ ਲੋੜ ਪਈ ਤਾਂ ਤੁਹਾਡੀ ਸਹਿਮਤੀ  ਲਈ ਹਮੇਸ਼ਾ ਬੇਨਤੀ ਕੀਤੀ ਜਾਵੇਗੀ।</string>
   <string name="how_it_works_content">Bluetooth ਸਿਗਨਲਾਂ ਦੀ ਵਰਤੋਂ ਇਹ ਦੱਸਦੀ ਹੈ ਜਦੋਂ ਤੁਸੀਂ ਕਿਸੇ ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰ ਦੇ ਨੇੜੇ ਹੁੰਦੇ ਹੋ।\n\nਤੁਹਾਡੇ ਅਤੇ ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰਾਂ ਵਿਚਕਾਰ ਨਜ਼ਦੀਕੀ ਸੰਪਰਕ ਦੀ ਹਰੇਕ ਇਕਾਈ ਨੂੰ ਨਜ਼ਦੀਕੀ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਲਈ ਨੋਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਇਹ ਜਾਣਕਾਰੀ ਏਨਕ੍ਰਿਪਟਿਡ ਹੁੰਦੀ ਹੈ ਅਤੇ ਕੇਵਲ ਤੁਹਾਡੇ ਫ਼ੋਨ ਵਿੱਚ ਹੀ ਸਟੋਰ ਕੀਤੀ ਜਾਂਦੀ ਹੈ।\n\nਜੇ ਤੁਸੀਂ COVIDSafe ਵਰਤੋਂਕਾਰ ਵਜੋਂ  ਕੋਵਿਡ-19  ਪਾਜ਼ੇਟਿਵ  ਟੈਸਟ ਕਰਦੇ ਹੋ, ਤਾਂ ਕੋਈ ਪ੍ਰਾਂਤਿਕ ਜਾਂ ਹਲਕਾ ਸਿਹਤ ਅਧਿਕਾਰੀ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰੇਗਾ। ਉਹ ਤੁਹਾਡੀ ਨਜ਼ਦੀਕੀ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਨੂੰ ਇੱਕ ਬੇਹੱਦ ਸੁਰੱਖਿਅਤ ਜਾਣਕਾਰੀ ਸਟੋਰੇਜ ਸਿਸਟਮ ਵਿੱਚ ਅੱਪਲੋਡ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਨਗੇ।  \n\nਜੇ ਤੁਸੀਂ ਕਿਸੇ ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰ  ਜੋ ਪਾਜ਼ੇਟਿਵ ਟੈਸਟ ਹੋਇਆ ਸੀ ਦੇ ਸੰਪਰਕ ਵਿੱਚ ਆਏ ਤਾਂ ਭੀ ਪ੍ਰਾਂਤਿਕ ਜਾਂ ਹਲਕਾ ਸਿਹਤ ਅਧਿਕਾਰੀ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰ ਸਕਦੇ ਹਨ|\n\nਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ ਕਿਰਪਾ ਕਰਕੇ *ਸਹਾਇਤਾ ਵਿਸ਼ੇ* ਪੰਨਾ  ਦੇਖੋ।</string>
@@ -343,17 +370,31 @@
   <string name="invalid_phone_number">ਨਜਾਇਜ਼ (ਇੰਵੈਲਿਡ) ਫ਼ੋਨ ਨੰਬਰ।</string>
   <string name="invalid_phone_number_digits_error_prompt" formatted="false">%1s ਵਿੱਚ ਮੋਬਾਈਲ ਨੰਬਰਾਂ ਦੇ %2s ਅੰਕ ਹੁੰਦੇ ਹਨ।</string>
   <string name="invalid_post_code">ਗਲਤ ਪੋਸਟਕੋਡ</string>
+  <string name="is_snoozed_android">COVIDSafe ਇਸ ਵਕਤ ਅਸਥਾਈ ਤੌਰ ਤੇ ਬੰਦ ਹੈ (snoozed)</string>
+  <string name="is_snoozed_description_android">COVIDSafe ਬਲੂਟੁੱਥ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਰਿਹਾ ਹੈ ਅਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਰਿਕਾਰਡ ਨਹੀਂ ਕਰ ਰਿਹਾ ਹੈ।</string>
   <string name="IssueFooter">ਤੁਹਾਡੇ ਫੀਡਬੈਕ ਬਾਰੇ ਹੋਰ ਵਿਸਥਾਰਾਂ ਲਈ ਅਸੀਂ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰ ਸਕਦੇ ਹਾਂ| ਤੁਹਾਡੀ ਈਮੇਲ ਦੀ ਵਰਤੋਂ ਕਿਸੇ ਹੋਰ ਉਦੇਸ਼ ਲਈ ਨਹੀਂ ਕੀਤੀ ਜਾਵੇਗੀ|</string>
-  <string name="jwt_description">ਤੁਹਾਡੇ ਪੰਜੀਕਰਨ (ਰਜ਼ਿਸਟ੍ਰੇਸ਼ਨ) ਦੇ ਵਿਸਥਾਰਾਂ ਵਿੱਚ ਕੋਈ ਸਮੱਸਿਆ ਹੈ।</string>
+  <string name="jwt_description">ਤੁਹਾਡੇ ਪੰਜੀਕਰਨ (ਰਜ਼ਿਸਟ੍ਰੇਸ਼ਨ) ਦੇ ਵੇਰਵਿਆਂ ਵਿੱਚ ਕੋਈ ਸਮੱਸਿਆ ਹੈ।</string>
+  <string name="jwt_expired">ਤੁਹਾਡਾ ਪੰਜੀਕਰਣ ਖਤਮ ਹੋ ਗਿਆ ਹੈ।</string>
+  <string name="jwt_expired_description">ਇਹ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਕਿ ਤੁਹਾਡੇ ਪੰਜੀਕਰਨ ਦੇ ਵੇਰਵੇ ਸਹੀ ਹਨ, ਤੁਹਾਨੂੰ ਲਾਜ਼ਮੀ ਤੌਰ \'ਤੇ ਹਰ 12 ਮਹੀਨਿਆਂ ਬਾਅਦ ਆਪਣੇ ਮੋਬਾਈਲ ਨੰਬਰ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ।</string>
   <string name="jwt_heading">ਕਿਰਪਾ ਕਰਕੇ ਦੁਬਾਰਾ ਰਜਿਸਟਰ ਕਰੋ</string>
-  <string name="jwt_success">ਰਜਿਸਟਰੇਸ਼ਨ ਸਫਲਤਾਪੂਰਵਕ ਰਿਨਿਯੂ ਕੀਤਾ ਗਿਆ</string>
+  <string name="jwt_success">ਰਜਿਸਟਰੇਸ਼ਨ ਦਾ  ਸਫਲਤਾਪੂਰਵਕ ਨਵੀਨੀਕਰਨ ਕੀਤਾ ਗਿਆ ਹੈ </string>
+  <string name="last_7_days">ਪਿਛਲੇ 7 ਦਿਨ</string>
   <string name="loading_numbers">ਤਾਜ਼ਾ ਅੰਕੜੇ ਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ</string>
+  <string name="locally_acquired">%@ ਸਥਾਨਕ ਲੱਗੀ ਲਾਗ</string>
+  <string name="low_handshakes_description">ਤੁਹਾਡੇ ਫੋਨ ਉੱਤੇ COVIDSafe  ਦੇ ਪ੍ਰਦਰਸ਼ਨ (ਪਰਫਾਰਮੈਂਸ) ਵਿੱਚ ਸੁਧਾਰ ਕਰਨ ਦੇ ਲਈ ਇਨ੍ਹਾਂ ਨੁਕਤਿਆਂ ਨੂੰ ਅਜ਼ਮਾਉ:</string>
+  <string name="low_handshakes_heading">ਜੇ ਤੁਹਾਡੇ \'ਹੈਂਡਸ਼ੇਕ\' ਦੇ ਨੰਬਰ ਤੁਹਾਡੀ ਉਮੀਦ ਨਾਲੋਂ ਘੱਟ ਹਨ ਤਾਂ ਕੀ ਕਰਨਾ ਹੈ</string>
+  <string name="low_handshakes_item1">COVIDSafe ਐਕਟਿਵ ਹੈ ਜਾਂ ਨਹੀਂ, ਇਸ ਦੀ ਜਾਂਚ ਐਪ ਨੂੰ ਖੋਲ ਕੇ ਕਰੋ।</string>
+  <string name="low_handshakes_item2">Google Play Store ਜਾਂ Apple Store ਰਾਹੀਂ ਆਪਣੀ ਐਪ ਨੂੰ ਨਵੀਨਤਮ ਸੰਸਕਰਣ ਵਿੱਚ ਅੱਪਡੇਟ ਕਰੋ।</string>
+  <string name="low_handshakes_item3">ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਮੁੜ ਚਾਲੂ ਕਰੋ ਅਤੇ ਐਪ ਨੂੰ ਦੁਬਾਰਾ ਖੋਲ੍ਹੋ।</string>
+  <string name="low_handshakes_link">ਇਸ ਬਾਰੇ ਹੋਰ ਪੜ੍ਹੋ ਕਿ ਜਾਂਚ ਕਿਵੇਂ ਕਰਨੀ ਹੈ ਕਿ ਕੀ COVIDSafe ਸਹੀ ਤਰੀਕੇ ਨਾਲ ਕੰਮ ਕਰ ਰਿਹਾ ਹੈ</string>
   <!-- Splash Screen -->
   <string name="migration_in_progress">COVIDSafe ਅੱਪਡੇਟ ਚੱਲ ਰਿਹਾ ਹੈ। \n\nਕਿਰਪਾ ਕਰਕੇ ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਤੁਹਾਡਾ ਫ਼ੋਨ ਤਦ ਤੱਕ ਬੰਦ ਨਹੀਂ ਹੋਣਾ ਚਾਹੀਦਾ ਜਦ ਤੱਕ ਅੱਪਡੇਟ ਪੂਰਾ ਨਹੀਂ ਹੋ ਜਾਂਦਾ।</string>
+  <string name="minute">ਮਿੰਟ</string>
   <string name="national_numbers">ਰਾਸ਼ਟਰੀ ਅੰਕੜੇ</string>
   <string name="navigation_back_button_content_description">ਪਿਛਲਾ ਸਫ਼ਾ</string>
   <string name="need_location_service">COVIDSafe  ਨੂੰ  ਐਕਟਿਵ  ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਲੋਕੇਸ਼ਨ ਨੂੰ ਔਨ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।</string>
   <string name="new_cases">ਪਿਛਲੇ 24 ਘੰਟਿਆਂ ਦੌਰਾਨ ਨਵੇਂ ਕੇਸ</string>
+  <string name="new_cases_total">1 ਫਰਵਰੀ 2020 ਤੋਂ ਲੈਕੇ ਹੁਣ ਤੱਕ ਦੇ ਨਵੇਂ ਮਾਮਲੇ</string>
   <string name="new_south_wales">ਨਿਊ ਸਾਊਥ ਵੇਲਜ਼</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="norfolk_hint">ਉਦਾਹਰਣ ਵਜੋਂ: 51234</string>
@@ -381,13 +422,14 @@
   <string name="numbers_no_internet">ਇਹ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ  ਕਿ ਤੁਹਾਨੂੰ ਅੱਪਡੇਟਿਡ ਨੰਬਰ ਪ੍ਰਾਪਤ ਹੋਣ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ|</string>
   <string name="numbers_refresh">ਹੁਣ ਰਿਫਰੈਸ਼ ਕਰੋ</string>
   <string name="options_for_australia">ਆਸਟਰੇਲੀਆ ਲਈ ਵਿਕਲਪ</string>
+  <string name="overseas_acquired">%@ ਵਿਦੇਸ਼ ਵਿੱਚ ਲੱਗੀ ਲਾਗ</string>
   <string name="permission_button">ਅੱਗੇ ਵਧੋ</string>
-  <string name="permission_content">COVIDSafe ਨੂੰ ਕੰਮ ਕਰਣ ਲਈ Bluetooth® ਚਾਹੀਦਾ ਹੈ ਅਤੇ ਸੂਚਨਾਵਾਂ  ਇਨੇਬਲਡ ਹੋਣੀਆਂ ਚਾਹੀਦੀਆਂ ਹਨ\n\n\'ਅੱਗੇ ਵਧੋ\' ਲਈ ਚੁਣੋ:\n\n1. Bluetooth® ਇਨੇਬਲ ਕਰੋ\n\n2. ਲੋਕੇਸ਼ਨ ਆਗਿਆ ਦਿਓ\n\n3. ਬੈਟਰੀ ਅਨੁਕੂਲਣ (ਆਪਟੀਮਾਈਜੇਸ਼ਨ) ਬੰਦ ਕਰੋ\n\n Bluetooth® ਤੱਕ ਪਹੁੰਚਣ ਲਈ ਗੂਗਲ ਨੂੰ ਐਂਡਰਾਇਡ ਐਪਾਂ ਲਈ ਲੋਕੇਸ਼ਨ ਆਗਿਆ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। COVIDSafe ਲੋਕੇਸ਼ਨ ਡੇਟਾ ਸਟੋਰ ਜਾਂ ਵਰਤੋਂ ਨਹੀਂ ਕਰਦਾ।\n\nCOVIDSafe ਪੇਅਰਿੰਗ ਦੀਆਂ ਬੇਨਤੀਆਂ ਨਹੀਂ ਭੇਜਦੀ।</string>
+  <string name="permission_content">COVIDSafe ਨੂੰ ਕੰਮ ਕਰਣ ਲਈ Bluetooth® ਚਾਹੀਦਾ ਹੈ ਅਤੇ ਸੂਚਨਾਵਾਂ  ਇਨੇਬਲਡ ਹੋਣੀਆਂ ਚਾਹੀਦੀਆਂ ਹਨ\n\n\'Proceed\' (ਅੱਗੇ ਵਧੋ) ਦੀ ਚੋਣ ਕਰੋ:\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. Bluetooth® ਔਨ ਰੱਖਣਾ ਚਾਹੀਦਾ ਹੈ।\n\n3. ਬੈਟਰੀ ਅਨੁਕੂਲਨ (ਆਪਟੀਮਾਈਜੇਸ਼ਨ) ਔੱਫ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।\n\n4. COVIDSafe ਪੇਅਰਿੰਗ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਭੇਜਦਾ। *ਹੋਰ ਸਿੱਖੋ*।\n\n5. Bluetooth® ਤੱਕ ਪਹੁੰਚਣ ਲਈ ਗੂਗਲ ਨੂੰ *ਐਂਡਰਾਇਡ ਐਪਾਂ ਲਈ ਲੋਕੇਸ਼ਨ ਆਗਿਆ* ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। 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>
@@ -412,6 +454,7 @@
   <string name="pin_number">ਪਿੰਨ ਨੰਬਰ</string>
   <string name="PINNumber_VO_Label">ਪਿੰਨ ਨੰਬਰ</string>
   <string name="PN_MobileNumber_VOLabel">ਮੋਬਾਈਲ ਨੰਬਰ</string>
+  <string name="postcode_success">ਤੁਹਾਡੇ ਪੋਸਟਕੋਡ ਨੂੰ ਅੱਪਡੇਟ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ</string>
   <string name="queensland">ਕੁਈਨਜ਼ਲੈਂਡ</string>
   <string name="ReceivePinIssue">ਤੁਹਾਡੇ ਪਿੰਨ ਮਿਲਣ ਵਿੱਚ ਮੁੱਦੇ?</string>
   <string name="recovered">ਠੀਕ ਹੋਏ ਕੁੱਲ ਕੇਸ</string>
@@ -421,27 +464,52 @@
   <!-- Onboarding Registration Consent -->
   <string name="registration_consent_headline">ਰਜਿਸਟਰੇਸ਼ਨ ਸਹਿਮਤੀ</string>
   <string name="registration_consent_second_paragraph">ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰਾਂ ਨਾਲ ਮੇਰੇ ਸੰਪਰਕ ਬਾਰੇ ਜਾਣਕਾਰੀ: ਜੇ ਕੋਈ ਹੋਰ ਵਰਤੋਂਕਾਰ ਮੇਰੇ ਸੰਪਰਕ ਵਿੱਚ ਆਇਆ ਹੈ ਅਤੇ ਕੋਵਿਡ-19 ਪਾਜ਼ੇਟਿਵ ਟੈਸਟ ਹੁੰਦਾ ਹੈ ਅਤੇ ਅਪਣਾ ਸੰਪਰਕ ਡੇਟਾ ਅੱਪਲੋਡ ਕਰਦਾ ਹੈ|</string>
+  <string name="save">ਸੰਭਾਲੋ (ਸੇਵ ਕਰੋ)</string>
+  <string name="scheduled" formatted="false">ਤੁਸੀਂ %@ ਤੋਂ %@ ਤੱਕ COVIDSafe ਨੂੰ ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਬੰਦ ਕਰ (snooze) ਦਿੱਤਾ ਹੈ।</string>
   <string name="search">ਖੋਜੋ</string>
   <!-- OnBoarding Enter Number -->
   <string name="select_country_or_region">ਦੇਸ਼ ਜਾਂ ਖੇਤਰ ਚੁਣੋ</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="Select_country_or_region_headline">ਦੇਸ਼ ਜਾਂ ਖੇਤਰ ਚੁਣੋ</string>
+  <string name="select_state_territory_button">ਪ੍ਰਾਂਤ ਜਾਂ ਖੇਤਰ ਚੁਣੋ</string>
+  <string name="select_state_territory_heading">ਪ੍ਰਾਂਤ ਜਾਂ ਖੇਤਰ ਚੁਣੋ</string>
   <string name="service_not_ok_action">ਹੁਣ ਐਪ ਚੈੱਕ ਕਰੋ</string>
   <string name="service_not_ok_body">ਘਰੋਂ ਬਾਹਰ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਜਾਂ ਜਦੋਂ ਤੁਸੀਂ ਜਨਤਕ ਸਥਾਨਾਂ ਤੇ ਹੋ ਤਾਂ ਇਹ ਯਕੀਨੀ ਬਣਾਓ ਕਿ COVIDSafe ਐਕਟਿਵ ਹੈ|</string>
   <string name="service_not_ok_title">COVIDSafe ਐਕਟਿਵ ਨਹੀਂ ਹੈ|</string>
   <string name="service_ok_body">ਜਦ ਤੁਸੀਂ  ਘਰੋਂ ਬਾਹਰ ਜਾਂਦੇ ਹੋ ਜਾਂ ਜਨਤਕ ਸਥਾਨਾਂ \'ਤੇ ਹੁੰਦੇ ਹੋ ਤਾਂ COVIDSafe ਨੂੰ ਐਕਟਿਵ ਰੱਖੋ।</string>
   <string name="service_ok_title">COVIDSafe ਐਕਟਿਵ ਹੈ|</string>
+  <string name="set_snooze_time">ਸਨੂਜ਼ ਦਾ ਸਮਾਂ ਸੈੱਟ ਕਰੋ</string>
   <string name="settings">ਸੈਟਿੰਗਾਂ</string>
+  <string name="seven_days">7 ਦਿਨ</string>
   <string name="share_this_app_content">ਕੋਵਿਡ-19 ਦੇ ਫੈਲਾਅ ਨੂੰ ਰੋਕਣ ਲਈ ਮੇਰੇ ਨਾਲ ਜੁੜੋ!  COVIDSafe ਨੂੰ ਡਾਊਨਲੋਡ ਕਰੋ, ਜੋ ਕਿ ਆਸਟਰੇਲੀਆਈ ਸਰਕਾਰ ਦੀ ਐਪ ਹੈ। #COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
   <string name="show">ਦਿਖਾਓ</string>
+  <string name="snooze_button">ਸਨੂਜ਼</string>
+  <string name="snooze_calendar_button">ਸਨੂਜ਼ ਕੈਲੰਡਰ</string>
+  <string name="snooze_calendar_description">ਉਨ੍ਹਾਂ ਦਿਨਾਂ ਅਤੇ ਸਮਿਆਂ ਨੂੰ ਤੈਅ ਕਰੋ ਜਦੋਂ ਤੁਸੀਂ COVIDSafe ਨੂੰ ਸਨੂਜ਼ ਕਰਨਾ ਜ਼ਾਹੁੰਦੇ ਹੋ।</string>
+  <string name="snooze_calendar_toggle">ਸਨੂਜ਼ ਕੈਲੰਡਰ</string>
+  <string name="snooze_covidsafe_button">COVIDSafe ਨੂੰ ਸਨੂਜ਼ ਕਰੋ</string>
+  <string name="snooze_covidsafe_button_description">ਕਿਸੇ ਵਿਸ਼ੇਸ਼ ਅਵਧੀ ਦੇ ਲਈ COVIDSafe ਨੂੰ ਸਨੂਜ਼ ਕਰੋ।</string>
+  <string name="snooze_ended">ਸਨੂਜ਼ ਖਤਮ ਹੋ ਗਿਆ ਹੈ।</string>
+  <string name="snooze_ends">ਸਨੂਜ਼ ਇੰਨੇ ਸਮੇਂ ਵਿੱਚ ਖਤਮ ਹੋਣ ਜਾ ਰਿਹਾ ਹੈ</string>
+  <string name="snooze_from">ਸਨੂਜ਼ ਕਦੋਂ ਤੋਂ</string>
+  <string name="snooze_heading">COVIDSafe ਨੂੰ ਸਨੂਜ਼ ਕਰੋ</string>
+  <string name="snooze_on">ਸਨੂਜ਼ ਔਨ (ਸ਼ੁਰੂ) %@</string>
+  <string name="snooze_timer_description">COVIDSafe ਨੂੰ ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਰੋਕਣ (ਸਨੂਜ਼ ਕਰਨ) ਲਈ ਟਾਈਮਰ ਸੈੱਟ ਕਰੋ।</string>
+  <string name="snooze_to">ਸਨੂਜ਼ ਕਦੋਂ ਤੱਕ</string>
+  <string name="snoozed_calendar_description_android" formatted="false">COVIDSafe ਬਲੂਟੁੱਥ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਰਿਹਾ ਹੈ ਅਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਰਿਕਾਰਡ ਨਹੀਂ ਕਰ ਰਿਹਾ ਹੈ।\n\nਤੁਸੀਂ %@ ਤੋਂ %@ ਤੱਕ COVIDSafe ਨੂੰ ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਰੋਕ (snooze) ਦਿੱਤਾ ਹੈ।</string>
   <string name="south_australia">ਦੱਖਣੀ ਆਸਟਰੇਲੀਆ</string>
+  <string name="state_number_heading">%@ ਅੰਕੜੇ</string>
   <string name="stepCounter" formatted="false">ਸਟੈਪ %d ਦਾ%d</string>
   <string name="support">ਸਹਾਇਤਾ</string>
   <string name="support_content">ਜੋ ਮੁੱਦੇ ਸਹਾਇਤਾ ਵਿਸ਼ੇ ਦੁਆਰਾ ਕਵਰ ਨਹੀਂ ਹੁੰਦੇ ਉਨ੍ਹਾਂ ਲਈ ਸਹਾਇਤਾ</string>
   <string name="tasmania">ਤਸਮਾਨੀਆ</string>
   <string name="title_help">ਸਹਾਇਤਾ</string>
+  <string name="total">ਕੁੱਲ</string>
   <string name="total_confirmed_cases">ਕੁੱਲ ਪੁਸ਼ਟੀ ਕੀਤੇ ਕੇਸ</string>
+  <string name="total_deaths">%@ ਕੁੱਲ ਮੌਤਾਂ</string>
   <string name="total_per_state">ਪ੍ਰਾਂਤ ਅਤੇ ਹਲਕੇ ਅਨੁਸਾਰ ਕੁੱਲ ਪੁਸ਼ਟੀ ਕੀਤੇ ਕੇਸ</string>
+  <string name="twenty_eight_days">28 ਦਿਨ</string>
+  <string name="type_in_time">ਸਮਾਂ ਭਰੋ</string>
   <string name="under_sixteen_content">ਮੈਂ ਆਸਟਰੇਲੀਆਈ ਸਰਕਾਰ ਦੇ ਸਿਹਤ ਵਿਭਾਗ ਦੇ ਸਕੱਤਰ ਦੁਆਰਾ ਕੀਤੇ ਕਨੂੰਨੀ ਨਿਰਣੇ ਦੇ ਤਹਿਤ, ਡੇਟਾ ਸਟੋਰ ਪ੍ਰਸ਼ਾਸ਼ਕ ਵਜੋਂ ਡਿਜ਼ਿਟਲ ਤਬਦੀਲੀ ਏਜੰਸੀ ਨੂੰ ਮੇਰੇ ਮਾਪੇ ਜਾਂ ਸਰਪ੍ਰਸਤ ਦੀਆਂ ਸਹਿਮਤੀਆਂ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦਾ/ਕਰਦੀ ਹਾਂ:</string>
   <string name="under_sixteen_first_paragraph">ਮੇਰੀ ਪੰਜੀਕਰਨ ਜਾਣਕਾਰੀ।</string>
   <!-- OnBoarding Under Sixteen -->
@@ -456,11 +524,14 @@
   <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_description_android">ਇਹ ਅੱਪਡੇਟ COVIDSafe’s ਦੇ Bluetooth ਪ੍ਰਦਰਸ਼ਨ ਵਿੱਚ ਸੁਧਾਰ ਲਿਆਉਂਦੀ ਹੈ, ਨਵੇਂ ਤਰੀਕੇ, ਜਿਨ੍ਹਾਂ ਨਾਲ COVIDSafe ਤੁਹਾਡੇ ਨਜ਼ਦੀਕੀ ਸੰਪਰਕਾਂ ਦਾ ਬਿਹਤਰੀ ਨਾਲ ਪਤਾ ਲਗਾਉਂਦੀ (ਕੈਪਚਰ ਕਰਦੀ) ਹੈ। <a href="https://www.covidsafe.gov.au/help-topics.html#herald"> ਵਧੇਰੇ ਪਤਾ ਲਗਾਉ ਕਿ ਅਸੀਂ COVIDSafe ਵਿੱਚ ਕਿਵੇਂ ਸੁਧਾਰ ਲਿਆਂਦਾ ਹੈ </a>\n\nਗੂਗਲ ਨੂੰ ਸਥਾਨ ਆਗਿਆ ਚਾਹੀਦੀ ਹੁੰਦੀ ਹੈ ਜਿਸ ਦੇ ਨਾਲ ਐਂਡਰਾਇਡ ਐੱਪ Bluetooth ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕੇ <a href="https://www.covidsafe.gov.au/help-topics.html#location-permissions">COVIDSafe ਲੋਕੇਸ਼ਨ ਡੇਟਾ ਇਕੱਠਾ, ਸਟੋਰ ਜਾਂ ਇਸਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰਦਾ।</a></string>
+  <string name="update_heading_android">ਸੁਧਰੀ ਹੋਈ ਕਾਰਗੁਜ਼ਾਰੀ</string>
   <string name="update_screen_location">Bluetooth® ਤੱਕ ਪਹੁੰਚਣ ਲਈ ਗੂਗਲ ਨੂੰ *ਐਂਡਰਾਇਡ ਐਪਾਂ ਲਈ ਲੋਕੇਸ਼ਨ ਆਗਿਆ* ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। COVIDSafe ਲੋਕੇਸ਼ਨ ਡੇਟਾ ਸਟੋਰ ਜਾਂ ਵਰਤੋਂ ਨਹੀਂ ਕਰਦਾ।</string>
   <string name="upload_answer_no">ਨਹੀਂ</string>
   <!-- Upload flow -->
   <string name="upload_answer_yes">ਹਾਂ</string>
   <string name="upload_consent_button">ਮੈਂ ਸਹਿਮਤ ਹਾਂ</string>
+  <string name="upload_fail_heading">ਤੁਹਾਡਾ ਅੱਪਲੋਡ ਅਸਫਲ ਰਿਹਾ ਹੈ</string>
   <string name="upload_failed">ਅੱਪਲੋਡ ਅਸਫਲ</string>
   <string name="upload_finished_header">COVIDSafe ਦੇ ਫੈਲਾਅ ਨੂੰ ਰੋਕਣ ਵਿੱਚ ਸਹਾਇਤਾ ਲਈ ਤੁਹਾਡਾ ਧੰਨਵਾਦ!</string>
   <string name="upload_finished_header_content_description">ਸਿਰਲੇਖ, COVIDSafe ਦੇ ਫੈਲਾਅ ਨੂੰ ਰੋਕਣ ਵਿੱਚ ਸਹਾਇਤਾ ਲਈ ਤੁਹਾਡਾ ਧੰਨਵਾਦ!</string>
@@ -479,4 +550,5 @@
   <string name="victoria">ਵਿਕਟੋਰੀਆ</string>
   <string name="western_australia">ਪੱਛਮੀ ਆਸਟਰੇਲੀਆ</string>
   <string name="wrong_ping_number">ਗਲਤ ਪਿੰਨ ਭਰਿਆ</string>
+  <string name="yesterday_activity">ਬੀਤਿਆ ਕੱਲ</string>
 </resources>

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

@@ -5,9 +5,19 @@
   <string name="action_upload_done">Bitti</string>
   <string name="action_verify_invalid_pin">Geçersiz PIN, lütfen sağlık yetkilisinden size başka bir PIN göndermesini isteyiniz.</string>
   <string name="action_verify_upload_pin">Bilgilerimi sisteme yükle</string>
+  <string name="active_cases">Aktif vakalar (tahmini)</string>
+  <string name="activity_button">Uygulama etkinliğini kontrol edin</string>
+  <string name="activity_button_description">Uygulamanızın diğer COVIDSafe kullanıcılarıyla Bluetooth etkileşimlerini görüntüleyin.</string>
+  <string name="activity_heading">Uygulama etkinliği</string>
+  <string name="activity_intro">Cihazınızın diğer COVIDSafe uygulama kullanıcılarının alanına her girişinde \'Bluetooth el sıkışma\' adı verilen Bluetooth etkileşimlerini dikkate alır.\n\nBu el sıkışmalar, uygulamanızın ne kadar iyi çalıştığını gösterir.</string>
   <string name="activity_self_isolation_button">Devam</string>
   <string name="australian_capital_territory">Avustralya Başkent Bölgesi</string>
   <string name="battery_optimisation_prompt">Pil optimizasyonunu devre dışı bırakmalısınız.</string>
+  <string name="ble_handshakes_yesterday_android">Dünkü Bluetooth el sıkışmaları</string>
+  <string name="bluetooth_handshakes_android">Bluetooth el sıkışmaları</string>
+  <string name="cancel_snooze">Ertelemeyi iptal et</string>
+  <string name="cases_28_days">Son 28 gündeki yeni vakalar</string>
+  <string name="cases_7_days">Son 7 gündeki yeni vakalar</string>
   <string name="change_device_name_content_line_1">Cihazınızın geçerli adı %s.</string>
   <string name="change_device_name_content_line_2">Etrafınızdaki diğer Bluetooth® cihazları cihazınızın adını görebilecektir. Kişisel bilgilerinizi içermeyen ve cihaz modeliniz gibi yaygın olarak kullanılan bir cihaz adı kullanmanızı öneririz.</string>
   <string name="change_device_name_default_device_name">%s</string>
@@ -19,6 +29,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="change_postcode_description">COVIDSafe\'i indirdikten sonra posta kodunuz değişti ise güncelleme yapın.</string>
+  <string name="change_postcode_heading">Posta kodunuzu değiştirin</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>
@@ -236,18 +248,21 @@
   <string name="country_region_name_za">Güney Afrika</string>
   <string name="country_region_name_zm">Zambiya</string>
   <string name="country_region_name_zw">Zimbabve</string>
+  <string name="customise_days">Günleri isteğe göre uyarlayın</string>
   <string name="data_privacy_button">Sonraki</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>
   <string name="data_privacy_headline_content_description">Başlık, Kayıt ve gizlilik</string>
   <string name="deaths">Ölümler</string>
+  <string name="dialog_error_uploading_message">Verilerinizi karşıya yüklemeyi yeniden deneyin.\n\nBir eyalet veya bölge sağlık yetkilisi isterse bu hata koduna başvurun: \n%@</string>
   <string name="dialog_error_uploading_negative">İptal</string>
   <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="edit_snooze_calendar">Erteleme takvimini düzenleyin</string>
   <string name="enabled">Etkin</string>
   <string name="enter_number_button">PIN al</string>
   <string name="enter_number_content">Cep telefonu numaranızı doğrulamak için size 6 haneli bir PIN göndereceğiz.</string>
@@ -263,9 +278,19 @@
   <string name="enter_pin_wrong_number">Bu cep telefonu numarası yanlış mı?</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="Enter_your_mobile_number_label">Cep telefonu numaranızı giriniz</string>
+  <string name="every_day">Her gün</string>
+  <string name="factors_dotpoint1">alanda COVIDSafe kullanıcıları sayısı</string>
+  <string name="factors_dotpoint2">cihazın modeli ve yaşı</string>
+  <string name="factors_dotpoint3">hareket halindeki bir araçta iseniz</string>
+  <string name="factors_enviro_item_1">duvarlar gibi fiziksel engeller</string>
+  <string name="factors_enviro_item_2">Bluetooth sinyallerini engelleyen malzeme ve armatürler</string>
+  <string name="factors_handshakes_heading">Uygulama etkinliğini etkileyen faktörler</string>
+  <string name="factors_intro">El sıkışma sayısını etkileyebilecek faktörler şunları içerir:</string>
+  <string name="factors_intro_2">El sıkışmalar çevresel faktörlerden de etkilenebilir, örneğin:</string>
   <!-- for production -->
   <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="global_OK">Tamam</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>
@@ -312,11 +337,13 @@
   <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">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_set_location_why">Google’ın Bluetooth®’a erişmesi için Android uygulamaları için Konum izni gereklidir. COVIDSafe konum verilerinizi İZLEMEZ veya SAKLAMAZ.</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>
   <string name="home_version_number">Sürüm numarası: %s</string>
+  <string name="hotspots_state_territory">%@ konumundaki sıcak noktalar</string>
+  <string name="hour">Saat</string>
   <string name="how_it_works_button">Sonraki</string>
   <string name="how_it_works_consent">Sağlık takibi gerekirse her zaman onayınız istenecektir.</string>
   <string name="how_it_works_content">Bluetooth® sinyalleri başka bir COVIDSafe kullanıcısının yakınınızda olduğunuzu belirlemek için kullanılır. \n\nSizinle diğer COVIDSafe kullanıcıları arasındaki her yakın temas, yakın temas bilgileri oluşturmak için not edilir. Bu bilgiler şifrelenir ve yalnızca telefonunuzda saklanır. \n\nCOVIDSafe kullanıcısı olarak COVID-19 testinizin pozitif çıkması halinde bir eyalet veya bölge sağlık yetkilisi sizinle iletişime geçecektir. İletişim bilgilerinizin son derece güvenli bir bilgi depolama sistemine gönüllü olarak yüklemenize yardımcı olacaklardır.\n\nEyalet veya bölge sağlık yetkilileri testi pozitif çıkan başka bir COVIDSafe kullanıcısıyla yakın temas kurduğunuz hallerde sizinle iletişime geçebilir.\n\nDaha fazla bilgi için lütfen *Yardım Konuları* sayfasına bakınız.</string>
@@ -343,16 +370,31 @@
   <string name="invalid_phone_number">Geçersiz telefon numarası.</string>
   <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="is_snoozed_android">COVIDSafe ertelendi</string>
+  <string name="is_snoozed_description_android">COVIDSafe Bluetooth kullanmıyor ve temasları kaydetmiyor.</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="jwt_description">Kayıt bilgilerinizle ilgili bir sorun var.</string>
+  <string name="jwt_expired">Kayıt süreniz doldu.</string>
+  <string name="jwt_expired_description">Kayıt bilgilerinizin doğru olduğundan emin olabilmek için cep telefonunuzu her 12 ayda bir teyid etmelisiniz.</string>
   <string name="jwt_heading">Lütfen tekrar kayıt olun</string>
+  <string name="jwt_success">Kayıt başarıyla yenilendi</string>
+  <string name="last_7_days">Son 7 gün</string>
   <string name="loading_numbers">En son sayılar yükleniyor</string>
+  <string name="locally_acquired">%@ yerel olarak edinilen</string>
+  <string name="low_handshakes_description">Telefonunuzda COVIDSafe\'in performansını artırmak için şu ipuçlarını deneyin:</string>
+  <string name="low_handshakes_heading">El sıkışma sayılarınız beklediğinizin altında ise ne yapmalısınız</string>
+  <string name="low_handshakes_item1">Uygulamayı açarak COVIDSafe\'in etkin olup olmadığını kontrol edin.</string>
+  <string name="low_handshakes_item2">Uygulamanızı Google Play Store veya Apple Store üzerinden en son sürüme güncelleyin.</string>
+  <string name="low_handshakes_item3">Telefonunuzu yeniden başlatın ve uygulamayı tekrar açın.</string>
+  <string name="low_handshakes_link">COVIDSafe\'in doğru çalışıp çalışmadığının nasıl kontrol edileceği hakkında daha fazlasını okuyun</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="minute">Dakika</string>
   <string name="national_numbers">Ulusal sayılar</string>
   <string name="navigation_back_button_content_description">Önceki sayfa</string>
   <string name="need_location_service">COVIDSafe\'in çalışması için Ayarlar\'da Konum\'u açmanız gerekir.</string>
   <string name="new_cases">Son 24 saatte çıkan yeni vakalar</string>
+  <string name="new_cases_total">1 Şubat 2020\'den itibaren yeni vakalar</string>
   <string name="new_south_wales">Yeni Güney Galler</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="norfolk_hint">Örneğin: 51234</string>
@@ -380,13 +422,14 @@
   <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="overseas_acquired">%@ yurtdışında edinilen</string>
   <string name="permission_button">İlerle</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>
+  <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 izni 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 verilerinizi İZLEMEZ veya SAKLAMAZ. \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. Google\'ın Bluetooth®\'a erişmesi için *Android uygulamaları için konum izni* 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 verilerinizi İZLEMEZ veya SAKLAMAZ.</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>
@@ -411,6 +454,7 @@
   <string name="pin_number">pin numarası</string>
   <string name="PINNumber_VO_Label">PIN numarası</string>
   <string name="PN_MobileNumber_VOLabel">Cep telefonu numarası</string>
+  <string name="postcode_success">Posta kodunuz güncellendi</string>
   <string name="queensland">Queensland</string>
   <string name="ReceivePinIssue">PIN alma sorunu mu yaşıyorsunuz?</string>
   <string name="recovered">Toplam iyileşen vakalar</string>
@@ -420,27 +464,52 @@
   <!-- Onboarding Registration Consent -->
   <string name="registration_consent_headline">Kayıt onayı</string>
   <string name="registration_consent_second_paragraph">Başka bir kullanıcının COVID-19 testi pozitif çıkması ve temas verilerini sisteme yüklemesi halinde diğer COVIDSafe kullanıcıları ile paylaşılacak şahsıma ait temas bilgileri.</string>
+  <string name="save">Kaydet</string>
+  <string name="scheduled" formatted="false">COVIDSafe\'i %@ ile %@ arasında ertelemeye programladınız .</string>
   <string name="search">Ara</string>
   <!-- OnBoarding Enter Number -->
   <string name="select_country_or_region">Ülke veya bölge seçin</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="Select_country_or_region_headline">Ülke veya bölge seçiniz</string>
+  <string name="select_state_territory_button">Eyaleti veya bölgeyi seçin</string>
+  <string name="select_state_territory_heading">Eyaleti veya bölgeyi seçin</string>
   <string name="service_not_ok_action">Uygulamayı şimdi kontrol edin</string>
   <string name="service_not_ok_body">Evden çıkarken veya halka açık yerlerde COVIDSafe\'yi aktif tuttuğunuzdan emin olunuz.</string>
   <string name="service_not_ok_title">COVIDSafe aktif değil</string>
   <string name="service_ok_body">Evden çıkarken veya halka açık yerlerde COVIDSafe\'yi aktif tutunuz.</string>
   <string name="service_ok_title">COVIDSafe aktif durumdadır</string>
+  <string name="set_snooze_time">Erteleme süresini ayarlayın</string>
   <string name="settings">Ayarlar</string>
+  <string name="seven_days">7 gün</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="snooze_button">Ertele</string>
+  <string name="snooze_calendar_button">Erteleme takvimi</string>
+  <string name="snooze_calendar_description">COVIDSafe\'i ertelemek istediğiniz günleri ve saatleri ayarlayın.</string>
+  <string name="snooze_calendar_toggle">Erteleme takvimi</string>
+  <string name="snooze_covidsafe_button">COVIDSafe\'i erteleyin</string>
+  <string name="snooze_covidsafe_button_description">COVIDSafe\'i belirli bir süreliğine erteleyin.</string>
+  <string name="snooze_ended">Erteleme sona erdi.</string>
+  <string name="snooze_ends">Erteleme bitişi</string>
+  <string name="snooze_from">Erteleme başlangıcı</string>
+  <string name="snooze_heading">COVIDSafe\'i ertele</string>
+  <string name="snooze_on">Erteleme başlama: %@</string>
+  <string name="snooze_timer_description">COVIDSafe\'i ertelemek için zamanlayıcıyı ayarlayın.</string>
+  <string name="snooze_to">Erteleme sonu</string>
+  <string name="snoozed_calendar_description_android" formatted="false">COVIDSafe Bluetooth kullanmıyor ve temasları kaydetmiyor.\n\nCOVIDSafe\'i %@ ile %@ arasında ertelemeye programladınız .\n</string>
   <string name="south_australia">Güney Avustralya</string>
+  <string name="state_number_heading">%@ sayılar</string>
   <string name="stepCounter" formatted="false">Adım %d / %d</string>
   <string name="support">Destek</string>
   <string name="support_content">Yardım konuları bölümünde belirtilmemiş hususlarda destek  için</string>
   <string name="tasmania">Tazmanya</string>
   <string name="title_help">Yardım</string>
+  <string name="total">Toplam</string>
   <string name="total_confirmed_cases">Toplam doğrulanmış vakalar</string>
+  <string name="total_deaths">%@ toplam ölümler</string>
   <string name="total_per_state">Eyalet ve bölgelere göre toplam doğrulanmış vakalar</string>
+  <string name="twenty_eight_days">28 gün</string>
+  <string name="type_in_time">Zamanı yazın</string>
   <string name="under_sixteen_content">Ebeveynimin ya da vasimin aşağıdaki bilgileri toplayan Dijital Dönüşüm Ajansı\'na veri deposu yöneticisi olarak Avustralya Hükümeti Sağlık Bakanının yasal olarak belirlediğine uygun olarak rızası olduğunu onaylıyorum:</string>
   <string name="under_sixteen_first_paragraph">Kayıt bilgilerim.</string>
   <!-- OnBoarding Under Sixteen -->
@@ -455,11 +524,14 @@
   <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="update_description_android">Bu güncelleme, COVIDSafe’in yakın temaslarınızı daha iyi yakalaması için COVIDSafe’in Bluetooth performansını  yeni yollarla iyileştiriyor. <a href="https://www.covidsafe.gov.au/help-topics.html#herald">COVIDSafe’i nasıl iyileştirdiğimiz hakkında daha fazla bilgi edinin</a> \n\nGoogle, Android uygulamalarının Bluetooth’a erişmesi için Konum iznine ihtiyaç duyar. <a href="https://www.covidsafe.gov.au/help-topics.html#location-permissions">COVIDSafe konum verilerinizi TOPLAMAZ, SAKLAMAZ veya KULLANMAZ </a></string>
+  <string name="update_heading_android">Geliştirilmiş performans</string>
+  <string name="update_screen_location">Google’ın Bluetooth®’a erişmesi için *Android uygulamaları için konum izni* gereklidir. COVIDSafe, konum verilerinizi İZLEMEZ veya SAKLAMAZ.</string>
   <string name="upload_answer_no">Hayır</string>
   <!-- Upload flow -->
   <string name="upload_answer_yes">Evet</string>
   <string name="upload_consent_button">Kabul ediyorum</string>
+  <string name="upload_fail_heading">Karşıya yükleme başarısız</string>
   <string name="upload_failed">Karşıya yükleme başarısız</string>
   <string name="upload_finished_header">COVID-19\'un yayılmasını durdurmaya yardım ettiğiniz için teşekkür ederiz!</string>
   <string name="upload_finished_header_content_description">Başlık, COVID-19\'un yayılmasını durdurmaya yardım ettiğiniz için teşekkür ederiz!</string>
@@ -478,4 +550,5 @@
   <string name="victoria">Viktorya</string>
   <string name="western_australia">Batı Avustralya</string>
   <string name="wrong_ping_number"> Yanlış PIN girildi</string>
+  <string name="yesterday_activity">Dün</string>
 </resources>

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

@@ -5,9 +5,19 @@
   <string name="action_upload_done">Hoàn tất</string>
   <string name="action_verify_invalid_pin">MÃ PIN không hợp lệ, vui lòng yêu cầu nhân viên y tế gửi cho bạn một mã PIN khác.</string>
   <string name="action_verify_upload_pin">Đăng tải thông tin của tôi</string>
+  <string name="active_cases">Các ca nhiễm bệnh (ước tính)</string>
+  <string name="activity_button">Kiểm tra hoạt động của ứng dụng</string>
+  <string name="activity_button_description">Xem các tương tác Bluetooth của ứng dụng của bạn với những người dùng COVIDSafe khác.</string>
+  <string name="activity_heading">Hoạt động ứng dụng</string>
+  <string name="activity_intro">Mỗi khi thiết bị của bạn nằm trong phạm vi của những người dùng ứng dụng COVIDSafe khác, nó sẽ ghi nhận các tương tác Bluetooth được gọi là \'bắt tay Bluetooth\'. \n\n Những lần bắt tay này cho biết ứng dụng của bạn đang hoạt động tốt như thế nào.</string>
   <string name="activity_self_isolation_button">Tiếp tục</string>
   <string name="australian_capital_territory">Lãnh thổ Thủ đô Úc</string>
   <string name="battery_optimisation_prompt">Bạn phải tắt tính năng tối ưu hóa pin.</string>
+  <string name="ble_handshakes_yesterday_android">Bluetooth bắt tay ngày hôm qua</string>
+  <string name="bluetooth_handshakes_android">Bắt tay Bluetooth</string>
+  <string name="cancel_snooze">Hủy tạm ngưng hoạt động</string>
+  <string name="cases_28_days">Các ca nhiễm mới trong 28 ngày qua</string>
+  <string name="cases_7_days">Các ca nhiễm mới trong 7 ngày qua</string>
   <string name="change_device_name_content_line_1">Tên hiện tại của thiết bị của bạn là %s .</string>
   <string name="change_device_name_content_line_2">Các thiết bị Bluetooth® khác gần bạn sẽ có thể thấy tên thiết bị của bạn. Chúng tôi khuyên bạn nên sử dụng tên thiết bị không chứa thông tin cá nhân thường sử dụng của bạn, chẳng hạn như kiểu thiết bị.</string>
   <string name="change_device_name_default_device_name">%s</string>
@@ -19,6 +29,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="change_postcode_description">Cập nhật nếu mã bưu điện của bạn đã thay đổi sau khi tải xuống COVIDSafe.</string>
+  <string name="change_postcode_heading">Thay đổi mã bưu điện của bạ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>
@@ -236,18 +248,21 @@
   <string name="country_region_name_za">Nam Phi</string>
   <string name="country_region_name_zm">Zambia</string>
   <string name="country_region_name_zw">Zimbabwe</string>
+  <string name="customise_days">Tùy chỉnh ngày</string>
   <string name="data_privacy_button">Tiếp theo</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>
   <string name="data_privacy_headline_content_description">Tiêu đề, Đăng ký và bảo mật</string>
   <string name="deaths">Tử vong</string>
+  <string name="dialog_error_uploading_message">Hãy thử đăng tải lại dữ liệu của bạn. \n\n Tham khảo mã lỗi này nếu nhân viên y tế của tiểu bang hoặc vùng lãnh thổ yêu cầu: \n%@</string>
   <string name="dialog_error_uploading_negative">Hủy bỏ</string>
   <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="edit_snooze_calendar">Chỉnh sửa thời gian tạm ngưng hoạt động</string>
   <string name="enabled">Đã bật</string>
   <string name="enter_number_button">Nhận mã PIN</string>
   <string name="enter_number_content">Chúng tôi sẽ gửi cho bạn mã PIN gồm 6 chữ số để xác minh số điện thoại của bạn.</string>
@@ -263,9 +278,19 @@
   <string name="enter_pin_wrong_number">Số điện thoại này có sai không?</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="Enter_your_mobile_number_label">Nhập số điện thoại di động của bạn</string>
+  <string name="every_day">Hằng ngày</string>
+  <string name="factors_dotpoint1">số lượng người dùng COVIDSafe trong phạm vi</string>
+  <string name="factors_dotpoint2">kiểu thiết bị và độ tuổi</string>
+  <string name="factors_dotpoint3">nếu bạn đang ở trong một phương tiện đang di chuyển</string>
+  <string name="factors_enviro_item_1">rào cản vật lý như vách tường</string>
+  <string name="factors_enviro_item_2">vật liệu và đồ đạc gây nhiễu tín hiệu Bluetooth</string>
+  <string name="factors_handshakes_heading">Các yếu tố ảnh hưởng đến hoạt động của ứng dụng</string>
+  <string name="factors_intro">Các yếu tố có thể ảnh hưởng đến số lần bắt tay bao gồm:</string>
+  <string name="factors_intro_2">Chức năng bắt tay cũng có thể bị ảnh hưởng bởi các yếu tố môi trường, bao gồm:</string>
   <!-- for production -->
   <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="global_OK">Đồng ý</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>
@@ -312,11 +337,13 @@
   <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">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_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 theo dõi hoặc lưu trữ  dữ liệu vị trí của bạn.</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>
   <string name="home_version_number">Phiên bản số: %s</string>
+  <string name="hotspots_state_territory">Điểm nóng trong %@</string>
+  <string name="hour">Giờ</string>
   <string name="how_it_works_button">Tiếp theo</string>
   <string name="how_it_works_consent">Nếu cần theo dõi sức khỏe chúng tôi sẽ yêu cầu sự đồng ý của bạn.</string>
   <string name="how_it_works_content">Tín hiệu Bluetooth® được sử dụng để xác định khi bạn đang ở gần người dùng COVIDSafe khác. \n\nMọi trường hợp tiếp xúc gần giữa bạn và những người dùng COVIDSafe khác đều được ghi nhận để tạo dữ liệu tiếp xúc. Thông tin này được mã hóa và chỉ được lưu trữ trong điện thoại của bạn. \n\nNếu bạn xét nghiệm dương tính với COVID-19 và là người dùng COVIDSafe, nhân viên y tế của tiểu bang hoặc lãnh thổ sẽ liên hệ với bạn. Họ sẽ tự nguyện hỗ trợ đăng tải dữ liệu tiếp xúc của bạn lên hệ thống lưu trữ thông tin có độ an toàn cao.\n\nCác nhân viên y tế của tiểu bang hoặc lãnh thổ cũng có thể liên hệ với bạn nếu bạn đã tiếp xúc gần với một người dùng COVIDSafe khác có kết quả xét nghiệm dương tính. \n\nĐể biết thêm thông tin, vui lòng tham khảo trang *Chủ đề Trợ giúp*</string>
@@ -343,16 +370,31 @@
   <string name="invalid_phone_number">Số điện thoại không hợp lệ.</string>
   <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="is_snoozed_android">COVIDSafe đang tạm ngưng hoạt động</string>
+  <string name="is_snoozed_description_android">COVIDSafe không sử dụng Bluetooth và không ghi lại các tiếp xúc.</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_expired">Đăng ký của bạn đã hết hạn.</string>
+  <string name="jwt_expired_description">Bạn phải xác nhận số điện thoại di động của mình mỗi năm một lần để đảm bảo thông tin đăng ký của bạn chính xác.</string>
   <string name="jwt_heading">Vui lòng đăng ký lại</string>
+  <string name="jwt_success">Đăng ký gia hạn thành công</string>
+  <string name="last_7_days">7 ngày vừa qua</string>
   <string name="loading_numbers">Đang tải các số mới nhất</string>
+  <string name="locally_acquired">%@ ca nhiễm bệnh ở địa phương</string>
+  <string name="low_handshakes_description">Hãy thử các mẹo sau để cải thiện hiệu suất của COVIDSafe trên điện thoại của bạn:</string>
+  <string name="low_handshakes_heading">Phải làm gì nếu số lần bắt tay của bạn thấp hơn bạn mong đợi</string>
+  <string name="low_handshakes_item1">Kiểm tra xem COVIDSafe có đang hoạt động hay không bằng cách mở ứng dụng.</string>
+  <string name="low_handshakes_item2">Cập nhật ứng dụng của bạn lên phiên bản mới nhất thông qua Kho Google Play hoặc kho Apple Store.</string>
+  <string name="low_handshakes_item3">Khởi động lại điện thoại của bạn và mở lại ứng dụng.</string>
+  <string name="low_handshakes_link">Đọc thêm về cách kiểm tra xem COVIDSafe có hoạt động đúng cách không</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="minute">Phút</string>
   <string name="national_numbers">Số ca nhiễm trên toàn quốc</string>
   <string name="navigation_back_button_content_description">Trang trước</string>
   <string name="need_location_service">Để COVIDSafe hoạt động, bạn cần bật Vị trí trong Cài đặt.</string>
   <string name="new_cases">Các ca mới trong vòng 24 giờ qua</string>
+  <string name="new_cases_total">Các ca nhiễm mới kể từ ngày 1/2/2020</string>
   <string name="new_south_wales">New South Wales</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="norfolk_hint">Ví dụ: 51234</string>
@@ -380,13 +422,14 @@
   <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="overseas_acquired">%@ ca nhiễm bệnh từ nước ngoài</string>
   <string name="permission_button">Kích hoạt</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>
+  <string name="permission_content">Để COVIDSafe hoạt động cần bật Bluetooth® và thông báo. \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 theo dõi hoặc lưu trữ dữ liệu vị trí của bạn. \n\nCOVIDSafe 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. 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="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 theo dõi hoặc lưu trữ dữ liệu vị trí của bạn.</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>
@@ -411,6 +454,7 @@
   <string name="pin_number">mã số pin</string>
   <string name="PINNumber_VO_Label">Mã số PIN</string>
   <string name="PN_MobileNumber_VOLabel">Số điện thoại di động</string>
+  <string name="postcode_success">Mã bưu điện của bạn đã được cập nhật</string>
   <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>
@@ -420,27 +464,52 @@
   <!-- Onboarding Registration Consent -->
   <string name="registration_consent_headline">Đồng ý đăng ký</string>
   <string name="registration_consent_second_paragraph">Thông tin về việc tiếp xúc của tôi với những người dùng COVIDSafe khác, nếu một người dùng COVIDSafe khác mà tôi đã tiếp xúc xét nghiệm dương tính với COVID-19 và đăng tải dữ liệu tiếp xúc của họ.</string>
+  <string name="save">Lưu</string>
+  <string name="scheduled" formatted="false">Bạn đã lên lịch trình cho COVIDSafe tạm ngưng hoạt động từ %@ đến %@ .</string>
   <string name="search">Tìm kiếm</string>
   <!-- OnBoarding Enter Number -->
   <string name="select_country_or_region">Chọn quốc gia hoặc khu vực</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="Select_country_or_region_headline">Chọn quốc gia hoặc khu vực</string>
+  <string name="select_state_territory_button">Chọn tiểu bang hoặc lãnh thổ</string>
+  <string name="select_state_territory_heading">Chọn tiểu bang hoặc lãnh thổ</string>
   <string name="service_not_ok_action">Kiểm tra ứng dụng ngay</string>
   <string name="service_not_ok_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="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="set_snooze_time">Đặt thời gian tạm ngưng hoạt động</string>
   <string name="settings">Cài đặt</string>
+  <string name="seven_days">7 ngày</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="snooze_button">Tạm ngưng hoạt động</string>
+  <string name="snooze_calendar_button">Lịch trình tạm ngưng hoạt động</string>
+  <string name="snooze_calendar_description">Đặt ngày và giờ bạn muốn tạm ngưng hoạt động COVIDSafe.</string>
+  <string name="snooze_calendar_toggle">Lịch trình tạm ngưng hoạt động</string>
+  <string name="snooze_covidsafe_button">Tạm ngưng hoạt động COVIDSafe</string>
+  <string name="snooze_covidsafe_button_description">Tạm ngưng hoạt động của COVIDSafe trong một khoảng thời gian nhất định.</string>
+  <string name="snooze_ended">Kết thúc tạm ngưng hoạt động.</string>
+  <string name="snooze_ends">Tạm ngưng hoạt động kết thúc trong</string>
+  <string name="snooze_from">Tạm ngưng hoạt động từ</string>
+  <string name="snooze_heading">Tạm ngưng hoạt động COVIDSafe</string>
+  <string name="snooze_on">Tạm ngưng hoạt động vào %@</string>
+  <string name="snooze_timer_description">Đặt hẹn giờ để tạm ngưng hoạt động COVIDSafe.</string>
+  <string name="snooze_to">Tạm ngưng hoạt động đến</string>
+  <string name="snoozed_calendar_description_android" formatted="false">COVIDSafe không sử dụng Bluetooth và không ghi lại các tiếp xúc. \n\n Bạn đã lên lịch trình cho COVIDSafe tạm ngưng hoạt động từ %@ đến %@ .</string>
   <string name="south_australia">Nam Úc</string>
+  <string name="state_number_heading">%@ số</string>
   <string name="stepCounter" formatted="false">Bước %d của %d</string>
   <string name="support">Hỗ trợ</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">Tổng số</string>
   <string name="total_confirmed_cases">Tổng số ca nhiễm</string>
+  <string name="total_deaths">%@ tổng số tử vong</string>
   <string name="total_per_state">Tổng số ca nhiễm theo tiểu bang và lãnh thổ</string>
+  <string name="twenty_eight_days">28 ngày</string>
+  <string name="type_in_time">Nhập thời gian</string>
   <string name="under_sixteen_content">Tôi xác nhận cha mẹ hoặc người giám hộ của 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="under_sixteen_first_paragraph">Thông tin đăng ký của tôi.</string>
   <!-- OnBoarding Under Sixteen -->
@@ -455,11 +524,14 @@
   <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="update_description_android">Bản cập nhật này cải thiện hoạt động Bluetooth của COVIDSafe theo các cách mới để COVIDSafe nắm bắt các thông tin về  tiếp xúc gần của bạn tốt hơn. <a href="https://www.covidsafe.gov.au/help-topics.html#herald"> Tìm hiểu thêm về cách chúng tôi đã cải thiện COVIDSafe </a> \n\n Google yêu cầu quyền Vị trí để các ứng dụng Android truy cập Bluetooth. <a href="https://www.covidsafe.gov.au/help-topics.html#location-permissions"> COVIDSafe KHÔNG thu thập, lưu trữ hoặc sử dụng dữ liệu vị trí của bạn </a></string>
+  <string name="update_heading_android">Cải thiện hiệu năng</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 theo dõi hoặc  lưu trữ dữ liệu vị trí của bạn.</string>
   <string name="upload_answer_no">Không</string>
   <!-- Upload flow -->
   <string name="upload_answer_yes">Có</string>
   <string name="upload_consent_button">Tôi đồng ý</string>
+  <string name="upload_fail_heading">Đăng tải thất bại</string>
   <string name="upload_failed">Đăng tải thất bại</string>
   <string name="upload_finished_header">Cảm ơn bạn đã giúp ngăn chặn sự lây lan của COVID-19!</string>
   <string name="upload_finished_header_content_description">Tiêu đề, Cảm ơn bạn đã giúp ngăn chặn sự lây lan của COVID-19!</string>
@@ -478,4 +550,5 @@
   <string name="victoria">Victoria</string>
   <string name="western_australia">Tây Úc</string>
   <string name="wrong_ping_number">Nhập sai mã PIN</string>
+  <string name="yesterday_activity">Hôm qua</string>
 </resources>

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

@@ -5,9 +5,19 @@
   <string name="action_upload_done">完成</string>
   <string name="action_verify_invalid_pin">PIN码无效，请要求卫生官员向您再发送一个PIN码。</string>
   <string name="action_verify_upload_pin">上传个人信息</string>
+  <string name="active_cases">活跃病例（估计）</string>
+  <string name="activity_button">检查应用程序的活动</string>
+  <string name="activity_button_description">查看您的应用程序与其他COVIDSafe用户的蓝牙交互。</string>
+  <string name="activity_heading">应用活动</string>
+  <string name="activity_intro">每当您的设备在其他COVIDSafe应用程序用户的范围内时，它都会记录蓝牙交互，这称为“蓝牙握手”。 \n\n这些握手显示了您的应用程序的运行状况。</string>
   <string name="activity_self_isolation_button">继续</string>
   <string name="australian_capital_territory">澳大利亚首都领地</string>
   <string name="battery_optimisation_prompt">您不能使用电池优化功能。</string>
+  <string name="ble_handshakes_yesterday_android">昨日发生的蓝牙握手</string>
+  <string name="bluetooth_handshakes_android">蓝牙握手</string>
+  <string name="cancel_snooze">取消休眠</string>
+  <string name="cases_28_days">过去28天的新增病例</string>
+  <string name="cases_7_days">最近7天内的新增病例</string>
   <string name="change_device_name_content_line_1">您的设备当前名称为%s 。</string>
   <string name="change_device_name_content_line_2">您周围的其他蓝牙®设备将能够看到您的设备名称。我们建议使用不包含个人信息且常用的设备名称，比如您的设备型号。</string>
   <string name="change_device_name_default_device_name">%s</string>
@@ -19,6 +29,8 @@
   <string name="change_device_name_secondary_action">跳过并保留原设备名称</string>
   <string name="change_language">更改语言</string>
   <string name="change_language_content">阅读其他语言版本的COVIDSafe使用指南。</string>
+  <string name="change_postcode_description">如果下载 COVIDSafe 后您的邮政编码发生更改，请及时更新。</string>
+  <string name="change_postcode_heading">更改邮政编码</string>
   <string name="CodeHasExpired">您的PIN码已失效。</string>
   <string name="collection_message">COVIDSafe现在会收集诊断信息，以帮助您解决应用程序中的问题。*了解更多信息*</string>
   <string name="consent_button">我同意</string>
@@ -236,18 +248,21 @@
   <string name="country_region_name_za">南非</string>
   <string name="country_region_name_zm">赞比亚</string>
   <string name="country_region_name_zw">津巴布韦</string>
+  <string name="customise_days">自定义日子</string>
   <string name="data_privacy_button">下一步</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>
   <string name="data_privacy_headline_content_description">Heading，注册及隐私</string>
   <string name="deaths">死亡人数</string>
+  <string name="dialog_error_uploading_message">请尝试再次上传数据。\n\n如果州或领地卫生官员有要求，请提供此错误代码：\n %@</string>
   <string name="dialog_error_uploading_negative">取消</string>
   <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="edit_snooze_calendar">编辑休眠日历</string>
   <string name="enabled">已启用</string>
   <string name="enter_number_button">获取PIN码</string>
   <string name="enter_number_content">我们将向您发送一个6位数的PIN码以验证您的手机号码。</string>
@@ -263,9 +278,19 @@
   <string name="enter_pin_wrong_number">请确认手机号码是否正确</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="Enter_your_mobile_number_label">请输入您的手机号码</string>
+  <string name="every_day">每天</string>
+  <string name="factors_dotpoint1">范围内的COVIDSafe用户数量</string>
+  <string name="factors_dotpoint2">设备型号和机龄</string>
+  <string name="factors_dotpoint3">如果您位于正在行驶的车辆中</string>
+  <string name="factors_enviro_item_1">物理屏障，如墙壁</string>
+  <string name="factors_enviro_item_2">会干扰蓝牙信号的材料和固定装置</string>
+  <string name="factors_handshakes_heading">影响应用程序活动的因素</string>
+  <string name="factors_intro">可能影响握手次数的因素包括：</string>
+  <string name="factors_intro_2">蓝牙握手也会受到环境因素的影响，这些因素包括：</string>
   <!-- for production -->
   <string name="generic_error">请稍后再试</string>
   <string name="generic_internet_error">请检查您的互联网连接</string>
+  <string name="global_OK">确定</string>
   <string name="heading">标题</string>
   <string name="hide">隐藏</string>
   <string name="home_app_permission_push_notification_prompt">允许COVIDSafe推送通知。</string>
@@ -312,11 +337,13 @@
   <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>
   <string name="home_version_number">版本号： %s</string>
+  <string name="hotspots_state_territory">%@的热点地区</string>
+  <string name="hour">小时</string>
   <string name="how_it_works_button">下一步</string>
   <string name="how_it_works_consent">如需健康追踪，将事先征求您的同意。</string>
   <string name="how_it_works_content">COVIDSafe需要使用蓝牙®信号以确定您在何时靠近另一个COVIDSafe用户。 \n\n您与其他COVIDSafe用户之间的每一次密切接触都会被记录下来，以创建接触者数据。该信息经过加密，且仅储存在您的手机中。 \n\n如果您是COVIDSafe用户并且COVID-19检测呈阳性，则州或领地卫生官员将与您联系。他们会协助您自愿将密切接触者数据上传至高度安全的信息储存系统。\n\n如果您与检测结果呈阳性的其他COVIDSafe用户发生过密切接触，则州或领地卫生官员也会与您联系。 \n\n如需更多信息，请参阅*帮助主题*页。</string>
@@ -343,16 +370,31 @@
   <string name="invalid_phone_number">无效电话号码。</string>
   <string name="invalid_phone_number_digits_error_prompt" formatted="false">%1s中的手机号码包含 %2s 位数。</string>
   <string name="invalid_post_code">邮政编码无效</string>
+  <string name="is_snoozed_android">COVIDSafe已休眠</string>
+  <string name="is_snoozed_description_android">COVIDSafe未在使用蓝牙，也未在记录接触者。</string>
   <string name="IssueFooter">我们可能会与您联系以进一步了解反馈意见。您的电子邮件地址不会被用于其他目的。</string>
   <string name="jwt_description">您的注册信息存在问题。</string>
+  <string name="jwt_expired">您的注册已过期。</string>
+  <string name="jwt_expired_description">您必须每12个月确认一次您的手机号码，以确保您的注册信息正确无误。</string>
   <string name="jwt_heading">请重新注册</string>
+  <string name="jwt_success">已成功更新注册</string>
+  <string name="last_7_days">最近7天</string>
   <string name="loading_numbers">正在加载最新统计数字</string>
+  <string name="locally_acquired">%@本地感染</string>
+  <string name="low_handshakes_description">请尝试用以下方法提高您手机上 COVIDSafe的性能：</string>
+  <string name="low_handshakes_heading">如果您的蓝牙握手次数少于预期，该怎么办</string>
+  <string name="low_handshakes_item1">打开应用程序检查COVIDSafe是否处于激活状态。</string>
+  <string name="low_handshakes_item2">通过Google Play Store或Apple Store将您的应用更新到最新版本。</string>
+  <string name="low_handshakes_item3">重新启动手机并再次打开应用。</string>
+  <string name="low_handshakes_link">阅读更多有关如何检查COVIDSafe是否正常运行的信息</string>
   <!-- Splash Screen -->
   <string name="migration_in_progress">COVIDSafe正在更新。 \n\n请保持开机状态直至更新完成。</string>
+  <string name="minute">分钟</string>
   <string name="national_numbers">全国统计数字</string>
   <string name="navigation_back_button_content_description">上一页</string>
   <string name="need_location_service">为了使COVIDSafe运行，您需要在“设置”中打开“位置”。</string>
   <string name="new_cases">过去24小时内新增病例</string>
+  <string name="new_cases_total">自2020年2月1日以来的新增病例</string>
   <string name="new_south_wales">新南威尔士州</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="norfolk_hint">例如：51234</string>
@@ -380,13 +422,14 @@
   <string name="numbers_no_internet">请连接到互联网，以获取最新统计数字。</string>
   <string name="numbers_refresh">请刷新</string>
   <string name="options_for_australia">澳大利亚选项</string>
+  <string name="overseas_acquired">%@海外感染</string>
   <string name="permission_button">继续</string>
-  <string name="permission_content">COVIDSafe需要启用蓝牙®和通知功能才能运行。 \n\n选择“继续”以： \n\n 1.启用蓝牙® \n\n 2.允许获得位置权限\n\n 3.禁用电池优化功能\n \n 谷歌要求安卓应用程序需获得位置权限才能访问蓝牙®。COVIDSafe 不会存储或使用位置数据。\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>
@@ -411,6 +454,7 @@
   <string name="pin_number">pin码</string>
   <string name="PINNumber_VO_Label">PIN码</string>
   <string name="PN_MobileNumber_VOLabel">手机号码</string>
+  <string name="postcode_success">您的邮政编码已更新</string>
   <string name="queensland">昆士兰州</string>
   <string name="ReceivePinIssue">接收PIN码时遇到问题？</string>
   <string name="recovered">康复患者总数</string>
@@ -420,27 +464,52 @@
   <!-- Onboarding Registration Consent -->
   <string name="registration_consent_headline">注册同意书</string>
   <string name="registration_consent_second_paragraph">我与其他COVIDSafe用户的接触信息（如果与我发生过接触的其他用户COVID-19检测呈阳性并上传其接触者数据）。</string>
+  <string name="save">保存</string>
+  <string name="scheduled" formatted="false">您已将COVIDSafe设置为从%@休眠至%@ 。</string>
   <string name="search">搜索</string>
   <!-- OnBoarding Enter Number -->
   <string name="select_country_or_region">选择国家或地区</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="Select_country_or_region_headline">选择国家或地区</string>
+  <string name="select_state_territory_button">选择州或领地</string>
+  <string name="select_state_territory_heading">选择州或领地</string>
   <string name="service_not_ok_action">立即查看应用程序</string>
   <string name="service_not_ok_body">离家前和在公共场所时，确保COVIDSafe处于激活状态。</string>
   <string name="service_not_ok_title">COVIDSafe未激活</string>
   <string name="service_ok_body">离开家和在公共场所时，请确保COVIDSafe处于激活状态。</string>
   <string name="service_ok_title">COVIDSafe已激活。</string>
+  <string name="set_snooze_time">设置休眠时间</string>
   <string name="settings">设置</string>
+  <string name="seven_days">7天</string>
   <string name="share_this_app_content">让我们一起阻止COVID-19的传播！下载 COVIDSafe—澳大利亚政府开发的一款应用程序。 #COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
   <string name="show">显示</string>
+  <string name="snooze_button">休眠</string>
+  <string name="snooze_calendar_button">休眠日历</string>
+  <string name="snooze_calendar_description">设置COVIDSafe每周休眠的日子和时间。</string>
+  <string name="snooze_calendar_toggle">休眠日历</string>
+  <string name="snooze_covidsafe_button">让COVIDSafe休眠</string>
+  <string name="snooze_covidsafe_button_description">让COVIDSafe在特定时间段内休眠。</string>
+  <string name="snooze_ended">休眠已结束</string>
+  <string name="snooze_ends">离休眠结束还有</string>
+  <string name="snooze_from">休眠始于</string>
+  <string name="snooze_heading">将COVIDSafe休眠</string>
+  <string name="snooze_on">在%@调至休眠状态</string>
+  <string name="snooze_timer_description">为COVIDSafe设置定时休眠。</string>
+  <string name="snooze_to">休眠至</string>
+  <string name="snoozed_calendar_description_android" formatted="false">COVIDSafe未在使用蓝牙，也未在记录接触者。 \n\n您已将COVIDSafe设置为从%@休眠至%@ 。</string>
   <string name="south_australia">南澳大利亚州</string>
+  <string name="state_number_heading">%@数</string>
   <string name="stepCounter" formatted="false">第%d步，共%d步</string>
   <string name="support">支持</string>
   <string name="support_content">获取帮助，解决帮助主题未涵盖的问题</string>
   <string name="tasmania">塔斯马尼亚州</string>
   <string name="title_help">帮助</string>
+  <string name="total">总数</string>
   <string name="total_confirmed_cases">确诊病例总数</string>
+  <string name="total_deaths">%@ 总死亡人数</string>
   <string name="total_per_state">各州和领地确诊病例总数</string>
+  <string name="twenty_eight_days">28天</string>
+  <string name="type_in_time">输入时间</string>
   <string name="under_sixteen_content">我确认我的父母或监护人同意数字转换局作为数据存储管理方可以根据澳大利亚政府卫生部常务副部长依法作出的决议，收集以下信息：</string>
   <string name="under_sixteen_first_paragraph">我的注册信息。</string>
   <!-- OnBoarding Under Sixteen -->
@@ -455,11 +524,14 @@
   <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="update_description_android">此更新通过新的方法使COVIDSafe可以更好地识别您的密切接触者，提高了COVIDSafe的蓝牙性能。 <a href="https://www.covidsafe.gov.au/help-topics.html#herald">详细了解我们如何改进了COVIDSafe </a> \n\n 谷歌要求安卓应用程序需获得位置权限才能访问蓝牙。 <a href="https://www.covidsafe.gov.au/help-topics.html#location-permissions"> COVIDSafe不会收集、存储或使用您的位置数据</a></string>
+  <string name="update_heading_android">提升后的性能</string>
+  <string name="update_screen_location">谷歌要求*安卓应用程序获得位置权限*才能访问蓝牙®。COVIDSafe不会跟踪或存储位置数据。</string>
   <string name="upload_answer_no">否</string>
   <!-- Upload flow -->
   <string name="upload_answer_yes">是</string>
   <string name="upload_consent_button">我同意</string>
+  <string name="upload_fail_heading">上传失败</string>
   <string name="upload_failed">上传失败</string>
   <string name="upload_finished_header">感谢您协助阻止COVID-19的传播！</string>
   <string name="upload_finished_header_content_description">Heading，感谢您协助阻止COVID-19的传播！</string>
@@ -478,4 +550,5 @@
   <string name="victoria">维多利亚州</string>
   <string name="western_australia">西澳大利亚州</string>
   <string name="wrong_ping_number">错误的PIN码</string>
+  <string name="yesterday_activity">昨天</string>
 </resources>

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

@@ -5,9 +5,19 @@
   <string name="action_upload_done">完成</string>
   <string name="action_verify_invalid_pin">PIN 碼無效，請要求衛生部官員再傳送另一條 PIN 給你。</string>
   <string name="action_verify_upload_pin">上傳我的資料</string>
+  <string name="active_cases">活躍病例（估計）</string>
+  <string name="activity_button">檢查應用程式活動。</string>
+  <string name="activity_button_description">查看你應用程式與其他COVIDSafe用戶的藍牙互動。</string>
+  <string name="activity_heading">應用程式活動。</string>
+  <string name="activity_intro">每次你的裝置在其他COVIDSafe應用程式用戶的範圍內時，它都會記下藍牙互動，這叫作”藍牙握手”。\n\n這些握手可以顯示你的應用程式運作狀況。</string>
   <string name="activity_self_isolation_button">繼續</string>
   <string name="australian_capital_territory">澳大利亞首都領地</string>
   <string name="battery_optimisation_prompt">你必須關閉電池優化功能。</string>
+  <string name="ble_handshakes_yesterday_android">昨天發生的藍牙握手。</string>
+  <string name="bluetooth_handshakes_android">藍牙握手</string>
+  <string name="cancel_snooze">取消休眠。</string>
+  <string name="cases_28_days">過去28天的新增病例</string>
+  <string name="cases_7_days">過去7天的新增病例</string>
   <string name="change_device_name_content_line_1">你現在的設備名稱是%s 。</string>
   <string name="change_device_name_content_line_2">你周圍的其他藍牙®設備將能看到此設備名稱。我們建議使用一個不含你的個人資料並且常用的名字，例如你的設備型號。</string>
   <string name="change_device_name_default_device_name">%s</string>
@@ -19,6 +29,8 @@
   <string name="change_device_name_secondary_action">跳過並保留原設備名稱</string>
   <string name="change_language">更換語言</string>
   <string name="change_language_content">用其他語言閱讀COVIDSafe使用指南。</string>
+  <string name="change_postcode_description">如果下載COVIDSafe後你的郵編發生變更，請你進行更新。</string>
+  <string name="change_postcode_heading">更改你的郵編</string>
   <string name="CodeHasExpired">你的 PIN 碼已無效。</string>
   <string name="collection_message">COVIDSafe現在會收集診斷資訊，以幫助你解決應用程式中的問題。 *了解更多*</string>
   <string name="consent_button">我同意</string>
@@ -236,18 +248,21 @@
   <string name="country_region_name_za">南非</string>
   <string name="country_region_name_zm">贊比亞</string>
   <string name="country_region_name_zw">津巴布韋</string>
+  <string name="customise_days">自定義日子</string>
   <string name="data_privacy_button">下一步</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>
   <string name="data_privacy_headline_content_description">標題，註册及私隱權</string>
   <string name="deaths">死亡人數</string>
+  <string name="dialog_error_uploading_message">再次上傳你的數據。\n\n如果州或領地衛生官員有要求，請出示此錯誤代碼。\n%@</string>
   <string name="dialog_error_uploading_negative">取消</string>
   <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="edit_snooze_calendar">編輯休眠日曆</string>
   <string name="enabled">已啟用</string>
   <string name="enter_number_button">收取 PIN 碼</string>
   <string name="enter_number_content">我們將向你傳送一條 6 數位的 PIN 碼來驗證你的手機號碼。</string>
@@ -263,9 +278,19 @@
   <string name="enter_pin_wrong_number">請確認手機號碼是否正確</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="Enter_your_mobile_number_label">請輸入你的手機號碼</string>
+  <string name="every_day">每日</string>
+  <string name="factors_dotpoint1">在範圍內的COVIDSafe用戶數量</string>
+  <string name="factors_dotpoint2">裝置型號和機齡</string>
+  <string name="factors_dotpoint3">如果你在移動的車裡</string>
+  <string name="factors_enviro_item_1">實物屏障，如牆壁</string>
+  <string name="factors_enviro_item_2">會干擾藍牙信號的材料和固定裝置。</string>
+  <string name="factors_handshakes_heading">影響應用程式活動的因素</string>
+  <string name="factors_intro">可能影響握手次數的因素包括:</string>
+  <string name="factors_intro_2">藍牙握手也可以受到環境因素影響，包括:</string>
   <!-- for production -->
   <string name="generic_error">請稍後再試</string>
   <string name="generic_internet_error">請檢查你的互聯網連接</string>
+  <string name="global_OK">確定</string>
   <string name="heading">標題</string>
   <string name="hide">隱藏</string>
   <string name="home_app_permission_push_notification_prompt">允許 COVIDSafe 傳送通知。</string>
@@ -312,11 +337,13 @@
   <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">Google需要獲得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>
   <string name="home_version_number">版本號： %s</string>
+  <string name="hotspots_state_territory">在%@的熱點地區</string>
+  <string name="hour">小時</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用户並被驗出 COVID-19 陽性，州或領地衛生部官員將會與你聯絡。他們會協助你自願地將密切接觸者資料上傳到高度保密的資料儲存系統。\n\n如果你曾密切接觸過另一名被驗出 COVID-19 陽性的 COVIDSafe 用戶，則州或領地的衛生部官員亦會聯絡你。 \n\n欲知詳情，請參閱*求助主題*頁</string>
@@ -343,16 +370,31 @@
   <string name="invalid_phone_number">無效電話號碼。</string>
   <string name="invalid_phone_number_digits_error_prompt" formatted="false">%1s的手機號碼有 %2s 數位。</string>
   <string name="invalid_post_code">郵遞區號無效</string>
+  <string name="is_snoozed_android">COVIDSafe已休眠</string>
+  <string name="is_snoozed_description_android">COVIDSafe沒有在使用藍牙，也沒有在記錄接觸者。</string>
   <string name="IssueFooter">我們可能會聯絡你以進一步了解反饋的詳情。你的電郵地址不會被用於其他目的。</string>
   <string name="jwt_description">你的註冊詳情存在問題。</string>
+  <string name="jwt_expired">你的註冊已經過期。</string>
+  <string name="jwt_expired_description">你必須每隔12個月確認你的手機號碼，確保你的登記資料是正確的。</string>
   <string name="jwt_heading">請重新註冊。</string>
+  <string name="jwt_success">成功更新註冊。</string>
+  <string name="last_7_days">過去7天</string>
   <string name="loading_numbers">正在載入最新統計數字</string>
+  <string name="locally_acquired">%@本地感染</string>
+  <string name="low_handshakes_description">嘗試以下小貼士改善你手機上COVIDSafe的性能：</string>
+  <string name="low_handshakes_heading">如果你的藍牙握手次數比預期低，該怎麼辦</string>
+  <string name="low_handshakes_item1">打開應用程式檢查COVIDSafe是否處於啟用狀態。</string>
+  <string name="low_handshakes_item2">通過 Google Play Store 或者 Apple Store將你的應用程式更新到最新版本。</string>
+  <string name="low_handshakes_item3">重啟你的手機然後打開應用程式。</string>
+  <string name="low_handshakes_link">閱讀更多關於如何檢查COVIDSafe是否正常運作的資訊</string>
   <!-- Splash Screen -->
   <string name="migration_in_progress">正在更新 COVIDSafe。\n\n請保持開機狀態直至更新完成為止。</string>
+  <string name="minute">分鐘 </string>
   <string name="national_numbers">全國統計數字</string>
   <string name="navigation_back_button_content_description">上一頁</string>
   <string name="need_location_service">若要執行 COVIDSafe ，你需要開啓在 「設定」項下的 「定位」功能。 </string>
   <string name="new_cases">過去24小時內新增病例</string>
+  <string name="new_cases_total">自從2020年2月1日以來的新增病例</string>
   <string name="new_south_wales">新南威爾士州</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="norfolk_hint">例如：51234</string>
@@ -380,13 +422,14 @@
   <string name="numbers_no_internet">請連接到互聯網，以獲取最新統計數字。</string>
   <string name="numbers_refresh">現在刷新</string>
   <string name="options_for_australia">澳洲適用選項</string>
+  <string name="overseas_acquired">%@海外感染</string>
   <string name="permission_button">繼續</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>
+  <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. Google需要獲得 *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>
@@ -411,6 +454,7 @@
   <string name="pin_number">PIN 碼</string>
   <string name="PINNumber_VO_Label">PIN 碼</string>
   <string name="PN_MobileNumber_VOLabel">手機號碼</string>
+  <string name="postcode_success">你的郵編已經更新</string>
   <string name="queensland">昆士蘭州</string>
   <string name="ReceivePinIssue">接收 PIN 碼時遇到問題？</string>
   <string name="recovered">康復者總數</string>
@@ -420,27 +464,52 @@
   <!-- Onboarding Registration Consent -->
   <string name="registration_consent_headline">註册同意書</string>
   <string name="registration_consent_second_paragraph">我與其他COVIDSafe用戶的接觸資料，如果我接觸過的另一用戶COVID-19測試呈陽性並且上傳了其接觸者數據。</string>
+  <string name="save">保存</string>
+  <string name="scheduled" formatted="false">你已將COVIDSafe設置為從%@休眠到%@。</string>
   <string name="search">搜尋</string>
   <!-- OnBoarding Enter Number -->
   <string name="select_country_or_region">選擇國家或地區</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="Select_country_or_region_headline">選擇國家或地區</string>
+  <string name="select_state_territory_button">選擇州或者領地</string>
+  <string name="select_state_territory_heading">選擇州或者領地</string>
   <string name="service_not_ok_action">請立即檢查應用程式</string>
   <string name="service_not_ok_body">請確保 COVIDSafe 在你離家前及在公共場所時處於啟用狀態。</string>
   <string name="service_not_ok_title">COVIDSafe 未在啓用狀態</string>
   <string name="service_ok_body">在你離家及在公共場所時，請保持 COVIDSafe 在啟用狀態。</string>
   <string name="service_ok_title">COVIDSafe 已在啓用狀態</string>
+  <string name="set_snooze_time">設置休眠時間</string>
   <string name="settings">設置</string>
+  <string name="seven_days">7天</string>
   <string name="share_this_app_content">同我一齊遏止 COVID-19 的擴散！下載澳洲政府提供的 COVIDSafe 應用程式。 ＃COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
   <string name="show">顯示</string>
+  <string name="snooze_button">休眠</string>
+  <string name="snooze_calendar_button">休眠日曆</string>
+  <string name="snooze_calendar_description">設置你想讓COVIDSafe休眠的日子和時間。</string>
+  <string name="snooze_calendar_toggle">休眠日曆</string>
+  <string name="snooze_covidsafe_button">讓COVIDSafe休眠</string>
+  <string name="snooze_covidsafe_button_description">讓COVIDSafe在特定時間段內休眠。</string>
+  <string name="snooze_ended">休眠結束。</string>
+  <string name="snooze_ends">休眠會在 %@ 後結束</string>
+  <string name="snooze_from">休眠開始時間</string>
+  <string name="snooze_heading">讓COVIDSafe休眠</string>
+  <string name="snooze_on">在%@调至休眠状态</string>
+  <string name="snooze_timer_description">為COVIDSafe設置一個計時器以開始休眠。</string>
+  <string name="snooze_to">休眠至</string>
+  <string name="snoozed_calendar_description_android" formatted="false">COVIDSafe沒有在使用藍牙，也沒有在記錄接觸者。\n\n你已將COVIDSafe設置為從%@休眠到%@。</string>
   <string name="south_australia">南澳</string>
+  <string name="state_number_heading">%@數</string>
   <string name="stepCounter" formatted="false">第%d步，共%d步</string>
   <string name="support">支持</string>
   <string name="support_content">獲取幫助，解決求助主題未涵蓋的問題。</string>
   <string name="tasmania">塔斯曼尼亞州</string>
   <string name="title_help">求助</string>
+  <string name="total">總數</string>
   <string name="total_confirmed_cases">確診病例總數</string>
+  <string name="total_deaths">%@總死亡人數</string>
   <string name="total_per_state">各州和領地確診病例總數</string>
+  <string name="twenty_eight_days">28天</string>
+  <string name="type_in_time">輸入時間</string>
   <string name="under_sixteen_content">我確認我的父母或監護人同意數字化轉型局作為數據儲存管理者，根據澳大利亞政府衛生部常務副部長的合法決定，收集以下資訊：</string>
   <string name="under_sixteen_first_paragraph">我的註册資料。</string>
   <!-- OnBoarding Under Sixteen -->
@@ -455,11 +524,14 @@
   <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="update_description_android">這次更新改良了COVIDSafe的藍牙性能，用新方法讓COVIDSafe更好地識別你的緊密接觸者資訊。<a href="https://www.covidsafe.gov.au/help-topics.html#herald">了解更多關於我们如何改良了COVIDSafe。</a>\n\nGoogle要求android應用程式獲取位置許可權才能訪問藍牙。<a href="https://www.covidsafe.gov.au/help-topics.html#location-permissions">COVIDSafe不會收集、存儲或使用您的位置資料</a></string>
+  <string name="update_heading_android">已改良的性能</string>
+  <string name="update_screen_location">Google需要獲得*Android應用程式的位置許可權*才能訪問藍牙®。 COVIDSafe不會跟蹤或存儲位置資料。</string>
   <string name="upload_answer_no">否</string>
   <!-- Upload flow -->
   <string name="upload_answer_yes">是</string>
   <string name="upload_consent_button">我同意</string>
+  <string name="upload_fail_heading">你的上傳失敗</string>
   <string name="upload_failed">上傳失敗</string>
   <string name="upload_finished_header">感謝你協助遏止 COVID-19 的擴散！</string>
   <string name="upload_finished_header_content_description">標題，感謝你協助遏止 COVID-19 的擴散！</string>
@@ -478,4 +550,5 @@
   <string name="victoria">維多利亞州</string>
   <string name="western_australia">西澳</string>
   <string name="wrong_ping_number">輸入了錯誤的 PIN 碼</string>
+  <string name="yesterday_activity">昨天</string>
 </resources>

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

@@ -11,6 +11,7 @@
     <color name="dark_green">#00661B</color>
     <color name="light_green">#F6FCF4</color>
     <color name="grey">#E2E2E2</color>
+    <color name="grey4">#E1E5E5</color>
     <color name="lighter_green">#C8FFB9</color>
 
     <!-- Splash Screen -->

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

@@ -31,6 +31,7 @@
     <dimen name="text_size_12">12sp</dimen>
     <dimen name="text_size_14">14sp</dimen>
     <dimen name="text_size_16">16sp</dimen>
+    <dimen name="text_size_18">18sp</dimen>
     <dimen name="text_size_20">20sp</dimen>
     <dimen name="text_size_24">24sp</dimen>
     <dimen name="text_size_28">28sp</dimen>

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

@@ -5,9 +5,19 @@
   <string name="action_upload_done">Done</string>
   <string name="action_verify_invalid_pin">Invalid PIN, please ask the health official to send you another PIN.</string>
   <string name="action_verify_upload_pin">Upload my information</string>
+  <string name="active_cases">Active cases (estimated)</string>
+  <string name="activity_button">Check app activity</string>
+  <string name="activity_button_description">View your app\'s Bluetooth interactions with other COVIDSafe users.</string>
+  <string name="activity_heading">App activity</string>
+  <string name="activity_intro">Every time your device is in range of other COVIDSafe app users, it takes note of Bluetooth interactions called \'Bluetooth handshakes\'.\n\nThese handshakes give an indication of how well your app is working.</string>
   <string name="activity_self_isolation_button">Continue</string>
   <string name="australian_capital_territory">Australian Capital Territory</string>
   <string name="battery_optimisation_prompt">You must disable battery optimisation.</string>
+  <string name="ble_handshakes_yesterday_android">Bluetooth handshakes yesterday</string>
+  <string name="bluetooth_handshakes_android">Bluetooth handshakes</string>
+  <string name="cancel_snooze">Cancel snooze</string>
+  <string name="cases_28_days">New cases in the last 28 days</string>
+  <string name="cases_7_days">New cases in the last 7 days</string>
   <string name="change_device_name_content_line_1">The current name of your device is %s.</string>
   <string name="change_device_name_content_line_2">Other Bluetooth® devices around you will be able to see the name of your device. We recommend to use a device name that does not contain your personal details and is commonly used, such as your device model.</string>
   <string name="change_device_name_default_device_name">%s</string>
@@ -19,6 +29,9 @@
   <string name="change_device_name_secondary_action">Skip and keep as it is</string>
   <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="change_postcode_description">Update if your postcode has changed since downloading COVIDSafe.</string>
+  <string name="change_postcode_heading">Change your postcode</string>
+  <string name="change_postcode_intro">Have you moved to a different postcode area since you registered to use COVIDSafe? \n\nKeeping your postcode up to date can assist health officials to undertake contact tracing.  \n\nRead the *COVIDSafe privacy policy* and *collection notice* for further details about how your information is stored and shared.</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>
@@ -236,19 +249,21 @@
   <string name="country_region_name_za">South Africa</string>
   <string name="country_region_name_zm">Zambia</string>
   <string name="country_region_name_zw">Zimbabwe</string>
+  <string name="customise_days">Customise days</string>
   <string name="data_privacy_button">Next</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\nCOVIDSafe will collect, use or disclose your personal information only in accordance with this policy and the Privacy Act 1988.\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>
   <!-- OnBoarding Data Privacy -->
   <string name="data_privacy_headline">Registration and privacy</string>
   <string name="data_privacy_headline_content_description">Heading, Registration and privacy</string>
   <string name="deaths">Deaths</string>
-  <string name="dialog_error_uploading_message">Try uploading your data again.\n\nRefer to this error code if a state or territory health official asks for it: %@</string>
+  <string name="dialog_error_uploading_message">Try uploading your data again.\n\nRefer to this error code if a state or territory health official asks for it: \n%@</string>
   <string name="dialog_error_uploading_negative">Cancel</string>
   <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="edit_snooze_calendar">Edit snooze calendar</string>
   <string name="enabled">Enabled</string>
   <string name="enter_number_button">Get PIN</string>
   <string name="enter_number_content">We’ll send you a 6-digit PIN to verify your mobile number.</string>
@@ -264,9 +279,19 @@
   <string name="enter_pin_wrong_number">Is this mobile number wrong?</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="Enter_your_mobile_number_label">Enter your mobile number</string>
+  <string name="every_day">Every day</string>
+  <string name="factors_dotpoint1">number of COVIDSafe users in range</string>
+  <string name="factors_dotpoint2">device model and age</string>
+  <string name="factors_dotpoint3">if you’re in a moving vehicle</string>
+  <string name="factors_enviro_item_1">physical barriers like walls</string>
+  <string name="factors_enviro_item_2">material and fixtures that interfere with Bluetooth signals</string>
+  <string name="factors_handshakes_heading">Factors that impact app activity</string>
+  <string name="factors_intro">Factors that can affect the number of handshakes include:</string>
+  <string name="factors_intro_2">Handshakes can also be affected by environmental factors, including:</string>
   <!-- for production -->
   <string name="generic_error">Please try again later</string>
   <string name="generic_internet_error">Please check your internet connection</string>
+  <string name="global_OK">OK</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>
@@ -318,6 +343,16 @@
   <string name="home_setup_incomplete_subtitle">COVIDSafe needs permission to access these features.</string>
   <string name="home_setup_incomplete_title">Check\npermissions</string>
   <string name="home_version_number">Version number:%s</string>
+  <string name="hotspot_link_ACT">https://www.covid19.act.gov.au/community/travel</string>
+  <string name="hotspot_link_NSW">https://www.nsw.gov.au/covid-19/latest-news-and-updates</string>
+  <string name="hotspot_link_NT">https://coronavirus.nt.gov.au/travel/quarantine/hotspots-covid-19</string>
+  <string name="hotspot_link_QLD">https://www.qld.gov.au/health/conditions/health-alerts/coronavirus-covid-19/current-status/hotspots-covid-19</string>
+  <string name="hotspot_link_SA">https://sahealth.sa.gov.au/covidcontacttracing</string>
+  <string name="hotspot_link_TAS">https://coronavirus.tas.gov.au/</string>
+  <string name="hotspot_link_VIC">https://www.dhhs.vic.gov.au/case-locations-and-outbreaks</string>
+  <string name="hotspot_link_WA">https://www.wa.gov.au/government/covid-19-coronavirus</string>
+  <string name="hotspots_state_territory">Hotspots in %@</string>
+  <string name="hour">Hour</string>
   <string name="how_it_works_button">Next</string>
   <string name="how_it_works_consent">Your consent will always be requested if health tracing is required.</string>
   <string name="how_it_works_content">Bluetooth® signals are used to determine when you\'re near another COVIDSafe user.\n\nEvery instance of close contact between you and other COVIDSafe users is noted to create contact data. This information is encrypted and only stored in your phone.\n\nIf you test positive to COVID-19 as a COVIDSafe user, a state or territory health official will contact you. They will assist with voluntary upload of your contact data to a highly secure information storage system.\n\nState or territory health officials can also contact you if you came in close contact with another COVIDSafe user who tested positive.\n\nFor more information please refer to the *Help Topics* page.</string>
@@ -344,17 +379,32 @@
   <string name="invalid_phone_number">Invalid phone number.</string>
   <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="is_snoozed_android">COVIDSafe is snoozed</string>
+  <string name="is_snoozed_description_android">COVIDSafe is not using Bluetooth and is not recording contacts.</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_expired">Your registration has expired.</string>
+  <string name="jwt_expired_description">You must confirm your mobile number every 12 months  to ensure your registration details are correct.</string>
   <string name="jwt_heading">Please register again</string>
   <string name="jwt_success">Registration successfully renewed</string>
+  <string name="last_7_days">Last 7 days</string>
+  <string name="learn_more">Learn more</string>
   <string name="loading_numbers">Loading latest numbers</string>
+  <string name="locally_acquired">%@ locally acquired</string>
+  <string name="low_handshakes_description">Try these tips to improve the performance of COVIDSafe on your phone:</string>
+  <string name="low_handshakes_heading">What to do if your handshake numbers are lower than you expect</string>
+  <string name="low_handshakes_item1">Check if COVIDSafe is active by opening the app.</string>
+  <string name="low_handshakes_item2">Update your app to the latest version through the Google Play Store or Apple Store.</string>
+  <string name="low_handshakes_item3">Restart your phone and open the app again.</string>
+  <string name="low_handshakes_link">Read more on how to check if COVIDSafe is working correctly</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>
+  <string name="minute">Minute</string>
   <string name="national_numbers">National numbers</string>
   <string name="navigation_back_button_content_description">Previous page</string>
   <string name="need_location_service">For COVIDSafe to work you need to turn on Location in Settings.</string>
   <string name="new_cases">New cases in the last 24 hours</string>
+  <string name="new_cases_total">New cases since 1 Feb 2020</string>
   <string name="new_south_wales">New South Wales</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="norfolk_hint">For example: 51234</string>
@@ -382,6 +432,7 @@
   <string name="numbers_no_internet">Connect to the internet to ensure you get updated numbers.</string>
   <string name="numbers_refresh">Refresh now</string>
   <string name="options_for_australia">Options for Australia</string>
+  <string name="overseas_acquired">%@ acquired overseas</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 permission\n\n3. Disable Battery optimisation\n\nGoogle requires Location permission for Android apps to access Bluetooth. COVIDSafe does NOT track or store your location data.\n\nCOVIDSafe does not send pairing requests.</string>
   <!-- OnBoarding Permission -->
@@ -413,6 +464,9 @@
   <string name="pin_number">pin number</string>
   <string name="PINNumber_VO_Label">PIN number</string>
   <string name="PN_MobileNumber_VOLabel">Mobile number</string>
+  <string name="postcode_api_error">There was an error. Check your internet connection and try again.</string>
+  <string name="postcode_change_label">Current postcode in Australia </string>
+  <string name="postcode_success">Your postcode has been updated</string>
   <string name="queensland">Queensland</string>
   <string name="ReceivePinIssue">Issues receiving your PIN?</string>
   <string name="recovered">Total cases recovered</string>
@@ -422,27 +476,52 @@
   <!-- 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="save">Save</string>
+  <string name="scheduled" formatted="false">You scheduled COVIDSafe to snooze from %@ to %@.</string>
   <string name="search">Search</string>
   <!-- OnBoarding Enter Number -->
   <string name="select_country_or_region">Select country or region</string>
   <!-- Figma page Android Screens (05/06) -->
   <string name="Select_country_or_region_headline">Select country or region</string>
+  <string name="select_state_territory_button">Select state or territory</string>
+  <string name="select_state_territory_heading">Select state or territory</string>
   <string name="service_not_ok_action">Check app now</string>
   <string name="service_not_ok_body">Make sure COVIDSafe is active before you leave home or when in public places.</string>
   <string name="service_not_ok_title">COVIDSafe is not active</string>
   <string name="service_ok_body">Keep COVIDSafe active when you leave home or are in public places.</string>
   <string name="service_ok_title">COVIDSafe is active</string>
+  <string name="set_snooze_time">Set snooze time</string>
   <string name="settings">Settings</string>
+  <string name="seven_days">7 days</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="snooze_button">Snooze</string>
+  <string name="snooze_calendar_button">Snooze calendar</string>
+  <string name="snooze_calendar_description">Set days and times you want to snooze COVIDSafe.</string>
+  <string name="snooze_calendar_toggle">Snooze calendar</string>
+  <string name="snooze_covidsafe_button">Snooze COVIDSafe</string>
+  <string name="snooze_covidsafe_button_description">Snooze COVIDSafe for a specific length of time.</string>
+  <string name="snooze_ended">Snooze has ended.</string>
+  <string name="snooze_ends">Snooze ends in</string>
+  <string name="snooze_from">Snooze from</string>
+  <string name="snooze_heading">Snooze COVIDSafe</string>
+  <string name="snooze_on">Snooze on %@</string>
+  <string name="snooze_timer_description">Set a timer to snooze COVIDSafe.</string>
+  <string name="snooze_to">Snooze to</string>
+  <string name="snoozed_calendar_description_android" formatted="false">COVIDSafe is not using Bluetooth and is not recording contacts.\n\nYou scheduled COVIDSafe to snooze from %@ to %@.</string>
   <string name="south_australia">South Australia</string>
+  <string name="state_number_heading">%@ numbers</string>
   <string name="stepCounter" formatted="false">Step %d of %d</string>
   <string name="support">Support</string>
   <string name="support_content">For assistance on issues not covered by Help topics</string>
   <string name="tasmania">Tasmania</string>
   <string name="title_help">Help</string>
+  <string name="total">Total</string>
   <string name="total_confirmed_cases">Total confirmed cases</string>
+  <string name="total_deaths">%@ total deaths</string>
   <string name="total_per_state">Total confirmed cases by state and territory</string>
+  <string name="twenty_eight_days">28 days</string>
+  <string name="type_in_time">Type in time</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>
   <!-- OnBoarding Under Sixteen -->
@@ -483,4 +562,5 @@
   <string name="victoria">Victoria</string>
   <string name="western_australia">Western Australia</string>
   <string name="wrong_ping_number"> Wrong PIN entered</string>
+  <string name="yesterday_activity">Yesterday</string>
 </resources>

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

@@ -125,10 +125,18 @@
         <item name="android:fontFamily">@font/font_roboto_regular</item>
     </style>
 
+    <style name="fontRobotoRegular14" parent="fontRobotoRegular">
+        <item name="android:textSize">@dimen/text_size_14</item>
+    </style>
+
     <style name="fontRobotoRegular16" parent="fontRobotoRegular">
         <item name="android:textSize">@dimen/text_size_16</item>
     </style>
 
+    <style name="fontRobotoRegular18" parent="fontRobotoRegular">
+        <item name="android:textSize">@dimen/text_size_18</item>
+    </style>
+
     <style name="fontRobotoRegular20" parent="fontRobotoRegular">
         <item name="android:textSize">@dimen/text_size_20</item>
     </style>