COVIDSafe code from version 1.0.48 (#22)

README.md

@@ -1,5 +1,11 @@
 # COVIDSafe app
 
+Thank you for viewing the GitHub repository for the COVIDSafe app by the Australian Government.  
+If you need help with troubleshooting issues with the app, please use our support channels:  
+Email: support@covidsafe.gov.au  
+Phone: 1800 020 080  
+COVIDSafe online help [https://covidsafe.gov.au/help-topics.html](https://covidsafe.gov.au/help-topics.html)  
+
 # Please report any security vulnerabilities using the details from [https://covidsafe.gov.au/.well-known/security.txt](https://covidsafe.gov.au/.well-known/security.txt)  
 
 # [Terms and Conditions for access to COVIDSafe App code](https://github.com/AU-COVIDSafe/mobile-android/blob/master/LICENSE.md)

app/build.gradle

@@ -41,8 +41,8 @@ android {
         Before you increase the targetSdkVersion make sure that all its usage are still working
          */
         targetSdkVersion 28
-        versionCode 39
-        versionName "1.0.39"
+        versionCode 48
+        versionName "1.0.48"
         buildConfigField "String", "GITHASH", "\"${getGitHash()}\""
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/AndroidManifest.xml

@@ -52,7 +52,12 @@
         <activity
             android:name="au.gov.health.covidsafe.HomeActivity"
             android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan" >
+            <intent-filter>
+                <action android:name="au.gov.health.covidsafe.UPGRADE_APP" />
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
 
         <receiver android:name="au.gov.health.covidsafe.boot.StartOnBootReceiver">
             <intent-filter>

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

@@ -4,13 +4,13 @@ import android.os.Bundle
 import androidx.fragment.app.FragmentActivity
 import au.gov.health.covidsafe.logging.CentralLog
 import au.gov.health.covidsafe.scheduler.GetMessagesScheduler
+import au.gov.health.covidsafe.ui.home.HomeFragment
 import com.google.android.gms.tasks.OnCompleteListener
 import com.google.firebase.iid.FirebaseInstanceId
 
 private const val TAG = "HomeActivity"
 
 class HomeActivity : FragmentActivity() {
-
     /**
      * Provides notification support to inform users to update to the latest version of the app.
      * This feature will also allow for troubleshooting of the app in the future and allow for
@@ -38,6 +38,9 @@ class HomeActivity : FragmentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        CentralLog.d(TAG, "onCreate() intent.action = ${intent.action}")
+
         setContentView(R.layout.activity_home)
 
         Utils.startBluetoothMonitoringService(this)
@@ -47,4 +50,21 @@ class HomeActivity : FragmentActivity() {
 //        GetMessagesScheduler.getMessages()
         GetMessagesScheduler.scheduleGetMessagesJob()
     }
+
+    override fun onResume() {
+        super.onResume()
+
+        CentralLog.d(TAG, "onResume() intent.action = ${intent.action}")
+
+        if (intent.action == "au.gov.health.covidsafe.UPGRADE_APP"){
+            Utils.gotoPlayStore(this)
+        }
+    }
+
+    override fun onWindowFocusChanged(hasFocus: Boolean) {
+        CentralLog.d(TAG, "onWindowFocusChanged(hasFocus = $hasFocus)")
+        HomeFragment.instanceWeakRef?.get()?.refreshSetupCompleteOrIncompleteUi()
+
+        super.onWindowFocusChanged(hasFocus)
+    }
 }

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

@@ -9,6 +9,7 @@ import au.gov.health.covidsafe.security.crypto.AESEncryptionForPreAndroidM
 object Preference {
     private const val PREF_ID = "Tracer_pref"
     private const val IS_ONBOARDED = "IS_ONBOARDED"
+    private const val HAS_DEVICE_NAME_NOTIFICATION_DISPLAYED = "HAS_DEVICE_NAME_NOTIFICATION_DISPLAYED"
     private const val CALLING_CODE = "CALLING_CODE"
     private const val AUSTRALIA_CALLING_CODE = 61
     private const val COUNTRY_NAME_RES_ID = "COUNTRY_NAME"
@@ -122,6 +123,16 @@ object Preference {
                 .getBoolean(IS_ONBOARDED, false)
     }
 
+    fun putHasDeviceNameNotificationDisplayed(context: Context, value: Boolean) {
+        context.getSharedPreferences(PREF_ID, Context.MODE_PRIVATE)
+                .edit().putBoolean(HAS_DEVICE_NAME_NOTIFICATION_DISPLAYED, value).apply()
+    }
+
+    fun getHasDeviceNameNotificationDisplayed(context: Context): Boolean {
+        return context.getSharedPreferences(PREF_ID, Context.MODE_PRIVATE)
+                .getBoolean(HAS_DEVICE_NAME_NOTIFICATION_DISPLAYED, false)
+    }
+
     fun putPhoneNumber(context: Context, value: String) {
         context.getSharedPreferences(PREF_ID, Context.MODE_PRIVATE)
                 .edit().putString(PHONE_NUMBER, value).apply()

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

@@ -3,6 +3,7 @@ package au.gov.health.covidsafe
 import android.Manifest
 import android.bluetooth.BluetoothAdapter
 import android.bluetooth.BluetoothDevice
+import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -28,6 +29,8 @@ import java.io.File
 import java.text.SimpleDateFormat
 import java.util.*
 
+private const val APP_PACKAGE_NAME = "au.gov.health.covidsafe"
+
 object Utils {
 
     private const val TAG = "Utils"
@@ -272,4 +275,16 @@ object Utils {
             CentralLog.e(TAG, "announceForAccessibility throws exception.", e)
         }
     }
+
+    fun gotoPlayStore(context: Context) {
+        try {
+            context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=$APP_PACKAGE_NAME")).also {
+                it.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
+            })
+        } catch (anfe: ActivityNotFoundException) {
+            context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=$APP_PACKAGE_NAME")).also {
+                it.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
+            })
+        }
+    }
 }

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

@@ -24,7 +24,7 @@ const val LOCATION = 345
 const val BATTERY_OPTIMISER = 789
 
 fun Fragment.requestAllPermissions(onEndCallback: () -> Unit) {
-    if (isBlueToothEnabled() ?: true) {
+    if (requireContext().isBlueToothEnabled() ?: true) {
         requestFineLocationAndCheckBleSupportThenNextPermission(onEndCallback)
     } else {
         requestBlueToothPermissionThenNextPermission()
@@ -104,44 +104,36 @@ fun Fragment.gotoPushNotificationSettings() {
     context.startActivity(intent)
 }
 
-fun Fragment.isBlueToothEnabled(): Boolean? {
-    val bluetoothManager = activity?.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager?
+fun Context.isBlueToothEnabled(): Boolean? {
+    val bluetoothManager = this.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager?
     return bluetoothManager?.adapter?.isEnabled
 }
 
-fun Fragment.isPushNotificationEnabled(): Boolean? {
-    return activity?.let { activity ->
-        NotificationManagerCompat.from(activity).areNotificationsEnabled()
-    }
+fun Context.isPushNotificationEnabled(): Boolean? {
+    return NotificationManagerCompat.from(this).areNotificationsEnabled()
 }
 
-fun Fragment.isLocationPermissionAllowed(): Boolean? {
-    return activity?.let { activity ->
-        EasyPermissions.hasPermissions(activity, ACCESS_COARSE_LOCATION)
-    }
+fun Context.isLocationPermissionAllowed(): Boolean? {
+    return EasyPermissions.hasPermissions(this, ACCESS_COARSE_LOCATION)
 }
 
-fun Fragment.isLocationEnabledOnDevice(): Boolean {
-    val locationManager = context?.getSystemService(Context.LOCATION_SERVICE) as LocationManager?
+fun Context.isLocationEnabledOnDevice(): Boolean {
+    val locationManager = this.getSystemService(Context.LOCATION_SERVICE) as LocationManager?
     return locationManager?.let {
         it.isProviderEnabled(LocationManager.GPS_PROVIDER) ||
                 it.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
     } ?: false
 }
 
-fun Fragment.isBatteryOptimizationDisabled(): Boolean? {
-    return activity?.let { activity ->
-        val powerManager = activity.getSystemService(AppCompatActivity.POWER_SERVICE) as PowerManager?
-        val packageName = activity.packageName
+fun Context.isBatteryOptimizationDisabled(): Boolean? {
+    val powerManager = this.getSystemService(AppCompatActivity.POWER_SERVICE) as PowerManager?
+    val packageName = this.packageName
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            powerManager?.isIgnoringBatteryOptimizations(packageName) ?: true
-        } else {
-            null
-        }
-    } ?: run {
-        null
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        return powerManager?.isIgnoringBatteryOptimizations(packageName) ?: true
     }
+
+    return null
 }
 
 fun Fragment.askForLocationPermission() {
@@ -154,7 +146,7 @@ fun Fragment.askForLocationPermission() {
                                 .build())
             }
 
-            !isLocationEnabledOnDevice() -> {
+            !it.isLocationEnabledOnDevice() -> {
                 AlertDialog.Builder(it).apply {
                     setMessage(R.string.need_location_service)
                     setPositiveButton(android.R.string.ok) { _, _ ->

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

@@ -10,17 +10,19 @@ import au.gov.health.covidsafe.interactor.Either
 import au.gov.health.covidsafe.interactor.Failure
 import au.gov.health.covidsafe.interactor.Success
 import au.gov.health.covidsafe.interactor.UseCase
+import au.gov.health.covidsafe.logging.CentralLog
 import au.gov.health.covidsafe.networking.response.BroadcastMessageResponse
 import au.gov.health.covidsafe.networking.service.AwsClient
 import kotlin.math.pow
 
+private const val TAG = "UpdateBroadcastMessage"
+private const val RETRIES_LIMIT = 3
+private const val GET_TEMP_ID_API_VERSION = 2
+
 class UpdateBroadcastMessageAndPerformScanWithExponentialBackOff(private val awsClient: AwsClient,
                                                                  private val context: Context,
                                                                  lifecycle: Lifecycle) : UseCase<BroadcastMessageResponse, Void?>(lifecycle) {
 
-    private val TAG = this.javaClass.simpleName
-    private val RETRIES_LIMIT = 3
-
     override suspend fun run(params: Void?): Either<Exception, BroadcastMessageResponse> {
         val jwtToken = Preference.getEncrypterJWTToken(context)
         return jwtToken?.let { jwtToken ->
@@ -60,8 +62,12 @@ class UpdateBroadcastMessageAndPerformScanWithExponentialBackOff(private val aws
 
     private fun call(jwtToken: String): Response<BroadcastMessageResponse>? {
         return try {
-            awsClient.getTempId("Bearer $jwtToken").execute()
+            awsClient.getTempId(
+                    "Bearer $jwtToken",
+                    GET_TEMP_ID_API_VERSION
+            ).execute()
         } catch (e: Exception) {
+            CentralLog.e(TAG, " awsClient.getTempId() failed.", e)
             null
         }
     }

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

@@ -66,6 +66,9 @@ object LinkBuilder {
         return url
     }
 
+    fun getHelpTopicsUrlWithAnchor(anchor : String) =
+            getHelpTopicsUrl() + anchor
+
     private fun getBluetoothPairingRequestUrl() =
             getHelpTopicsUrl() + HELP_TOPICS_ANCHOR_BLUETOOTH_PAIRING_REQUEST
 

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

@@ -16,7 +16,10 @@ interface AwsClient {
     fun respondToAuthChallenge(@Body body: AuthChallengeRequest): Call<AuthChallengeResponse>
 
     @GET(BuildConfig.END_POINT_PREFIX + "/getTempId")
-    fun getTempId(@Header("Authorization") jwtToken: String?): Call<BroadcastMessageResponse>
+    fun getTempId(
+            @Header("Authorization") jwtToken: String?,
+            @Query("version") apiVersion: Int
+    ): Call<BroadcastMessageResponse>
 
     @GET(BuildConfig.END_POINT_PREFIX + "/initiateDataUpload")
     fun initiateUpload(
@@ -35,7 +38,9 @@ interface AwsClient {
             @Header("Authorization") jwtToken: String?,
             @Query("os") os: String,
             @Query("appversion") appversion: String,
-            @Query("token") token: String
+            @Query("token") token: String,
+            @Query("healthcheck") healthcheck: String,
+            @Query("preferredLanguages") preferredLanguages: String
     ): Call<MessagesResponse>
 
 }

app/src/main/java/au/gov/health/covidsafe/scheduler/GetMessagesScheduler.kt

@@ -9,35 +9,73 @@ import android.content.Context
 import au.gov.health.covidsafe.BuildConfig
 import au.gov.health.covidsafe.Preference
 import au.gov.health.covidsafe.TracerApp
+import au.gov.health.covidsafe.extensions.isBatteryOptimizationDisabled
+import au.gov.health.covidsafe.extensions.isBlueToothEnabled
+import au.gov.health.covidsafe.extensions.isLocationEnabledOnDevice
+import au.gov.health.covidsafe.extensions.isLocationPermissionAllowed
 import au.gov.health.covidsafe.factory.NetworkFactory.Companion.awsClient
 import au.gov.health.covidsafe.logging.CentralLog
 import au.gov.health.covidsafe.networking.response.MessagesResponse
+import au.gov.health.covidsafe.scheduler.GetMessagesScheduler.mostRecentRecordTimestamp
+import au.gov.health.covidsafe.streetpass.persistence.StreetPassRecord
+import au.gov.health.covidsafe.streetpass.persistence.StreetPassRecordDatabase
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import java.util.*
 
 
 private const val TAG = "GetMessagesScheduler"
 private const val GET_MESSAGES_JOB_ID = 1
 private const val TWENTY_FOUR_HOURS_IN_MILLIS = 24 * 60 * 60 * 1000L
+private const val SEVEN_DAYS_IN_MILLIS = 7 * TWENTY_FOUR_HOURS_IN_MILLIS
+
+private const val HEALTH_CHECK_RESULT_OK = "OK"
+private const val HEALTH_CHECK_RESULT_POSSIBLE_ERROR = "POSSIBLE_ERROR"
 
 // for testing only
 //private const val TWENTY_FOUR_HOURS_IN_MILLIS = 16 * 60 * 1000L
 
 class GetMessagesJobSchedulerService : JobService() {
+    private val mostRecentRecordLiveData = StreetPassRecordDatabase.getDatabase(TracerApp.AppContext).recordDao().getMostRecentRecord()
+
+    private val mostRecentRecordObserver = androidx.lifecycle.Observer<StreetPassRecord?> {
+        mostRecentRecordTimestamp = it?.timestamp ?: 0
+        CentralLog.d(TAG, "mostRecentRecordObserver updates mostRecentRecordTimestamp to $mostRecentRecordTimestamp")
+    }
+
     override fun onStartJob(params: JobParameters): Boolean {
         CentralLog.d(TAG, "onStartJob()")
-        GetMessagesScheduler.getMessages(this, params)
+
+        mostRecentRecordLiveData.observeForever(mostRecentRecordObserver)
+
+        GlobalScope.launch(Dispatchers.IO) {
+            delay(1000)
+
+            GlobalScope.launch(Dispatchers.Main) {
+                GetMessagesScheduler.getMessages(this@GetMessagesJobSchedulerService, params)
+            }
+        }
+
         return true
     }
 
     override fun onStopJob(params: JobParameters): Boolean {
         CentralLog.d(TAG, "onStopJob()")
+
+        mostRecentRecordLiveData.removeObserver(mostRecentRecordObserver)
+
         return true
     }
 }
 
 object GetMessagesScheduler {
+    var mostRecentRecordTimestamp: Long = 0
+
     fun scheduleGetMessagesJob() {
         CentralLog.d(TAG, "scheduleGetMessagesJob()")
 
@@ -66,11 +104,42 @@ object GetMessagesScheduler {
         val appVersion = "${BuildConfig.VERSION_CODE}"
         val token = Preference.getFirebaseInstanceID(context)
 
+        val isBlueToothEnabled = context.isBlueToothEnabled() != false
+        val isBatteryOptimizationDisabled = context.isBatteryOptimizationDisabled() != false
+        val isLocationPermissionAllowed = context.isLocationPermissionAllowed() != false
+        val isLocationEnabledOnDevice = context.isLocationEnabledOnDevice()
+        val isLastRecordWithinSevenDays =
+                (System.currentTimeMillis() - mostRecentRecordTimestamp) <= SEVEN_DAYS_IN_MILLIS
+
+        CentralLog.d(TAG, "isBlueToothEnabled = $isBlueToothEnabled")
+        CentralLog.d(TAG, "isBatteryOptimizationDisabled = $isBatteryOptimizationDisabled")
+        CentralLog.d(TAG, "isLocationPermissionAllowed = $isLocationPermissionAllowed")
+        CentralLog.d(TAG, "isLocationEnabledOnDevice = $isLocationEnabledOnDevice")
+        CentralLog.d(TAG, "isLastRecordWithinSevenDays = $isLastRecordWithinSevenDays (mostRecentRecordTimestamp = $mostRecentRecordTimestamp)")
+
+        val healthCheck = if (
+                isBlueToothEnabled &&
+                isBatteryOptimizationDisabled &&
+                isLocationPermissionAllowed &&
+                isLocationEnabledOnDevice &&
+                isLastRecordWithinSevenDays
+        ) {
+            HEALTH_CHECK_RESULT_OK
+        } else {
+            HEALTH_CHECK_RESULT_POSSIBLE_ERROR
+        }
+
+        CentralLog.d(TAG, "healthCheck = $healthCheck")
+
+        val preferredLanguages = Locale.getDefault().language
+
         val messagesCall: Call<MessagesResponse> = awsClient.getMessages(
                 "Bearer $jwtToken",
                 os,
                 appVersion,
-                token
+                token,
+                healthCheck,
+                preferredLanguages
         )
 
         CentralLog.d(TAG, "getMessages() to be called with InstanceID = $token")

app/src/main/java/au/gov/health/covidsafe/services/CovidFirebaseMessagingService.kt

@@ -1,6 +1,7 @@
 package au.gov.health.covidsafe.services
 
 import au.gov.health.covidsafe.*
+import au.gov.health.covidsafe.Utils.gotoPlayStore
 import au.gov.health.covidsafe.logging.CentralLog
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
@@ -28,8 +29,11 @@ class CovidFirebaseMessagingService : FirebaseMessagingService() {
 
         // log notification payload.
         remoteMessage.notification?.let {
-            CentralLog.d(TAG, "onMessageReceived() notification = ${it.title} ${it.body}")
+            CentralLog.d(TAG, "onMessageReceived() notification = ${it.title} ${it.body} ${it.clickAction}")
 
+            if (it.clickAction == "au.gov.health.covidsafe.UPGRADE_APP"){
+                gotoPlayStore(applicationContext)
+            }
         }
 
         // log data payload.

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

@@ -2,6 +2,7 @@ package au.gov.health.covidsafe.streetpass
 
 import android.bluetooth.BluetoothDevice
 import android.bluetooth.BluetoothGatt
+import android.bluetooth.BluetoothGattCallback
 import android.content.Context
 import android.os.Build
 import au.gov.health.covidsafe.logging.CentralLog
@@ -40,7 +41,27 @@ class Work constructor(
         gatt = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             device.connectGatt(context, false, gattCallback, BluetoothDevice.TRANSPORT_LE)
         } else {
-            device.connectGatt(context, false, gattCallback)
+            // use reflection to call connectGatt(Context context, boolean autoConnect, BluetoothGattCallback callback, int transport)
+            try {
+                device.javaClass.getMethod(
+                        "connectGatt",
+                        Context::class.java,
+                        Boolean::class.java,
+                        BluetoothGattCallback::class.java,
+                        Int::class.java
+                ).invoke(
+                        device,
+                        context,
+                        false,
+                        gattCallback,
+                        2 // BluetoothDevice.TRANSPORT_LE = 2
+                ) as BluetoothGatt
+            } catch (e: Exception) {
+                CentralLog.e(TAG, "Reflection call of connectGatt() failed.")
+
+                // reflection failed; call connectGatt(Context context, boolean autoConnect, BluetoothGattCallback callback) instead
+                device.connectGatt(context, false, gattCallback)
+            }
         }
 
         if (gatt == null) {

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

@@ -13,8 +13,8 @@ abstract class PagerChildFragment : BaseFragment() {
     }
 
     private fun updateProgressBar() {
-        (parentFragment?.parentFragment as? PagerContainer)?.updateProgressBar(stepProgress)
-        (activity as? PagerContainer)?.updateProgressBar(stepProgress)
+        (parentFragment?.parentFragment as? PagerContainer)?.updateSteps(step, totalSteps)
+        (activity as? PagerContainer)?.updateSteps(step, totalSteps)
     }
 
     private fun updateToolBar() {
@@ -37,6 +37,11 @@ abstract class PagerChildFragment : BaseFragment() {
         (activity as? PagerContainer)?.refreshButton(updateButtonLayout)
     }
 
+    fun disableNavigationButton(){
+        (parentFragment?.parentFragment as? PagerContainer)?.setNavigationIcon(null)
+        (activity as? PagerContainer)?.setNavigationIcon(null)
+    }
+
     fun enableContinueButton() {
         (parentFragment?.parentFragment as? PagerContainer)?.enableNextButton()
         (activity as? PagerContainer)?.enableNextButton()
@@ -59,7 +64,9 @@ abstract class PagerChildFragment : BaseFragment() {
 
     protected open var navigationIconResId: Int? = au.gov.health.covidsafe.R.drawable.ic_up
 
-    abstract var stepProgress: Int?
+    abstract var step: Int?
+    private val totalSteps = 4
+
     abstract fun getUploadButtonLayout(): UploadButtonLayout
     abstract fun updateButtonState()
 }

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

@@ -7,7 +7,7 @@ interface PagerContainer {
     fun disableNextButton()
     fun showLoading()
     fun hideLoading(@StringRes stringRes: Int?)
-    fun updateProgressBar(stepProgress: Int?)
+    fun updateSteps(step: Int?, totalSteps: Int)
     fun setNavigationIcon(navigationIcon: Int?)
     fun refreshButton(updateButtonLayout: UploadButtonLayout)
 }

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

@@ -12,19 +12,19 @@ import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.core.view.isVisible
 import androidx.navigation.fragment.findNavController
+import au.gov.health.covidsafe.R
+import au.gov.health.covidsafe.links.LinkBuilder
+import au.gov.health.covidsafe.ui.BaseFragment
 import com.atlassian.mobilekit.module.feedback.FeedbackModule
 import kotlinx.android.synthetic.main.fragment_help.*
 import kotlinx.android.synthetic.main.fragment_help.view.*
-import au.gov.health.covidsafe.R
-import au.gov.health.covidsafe.links.LinkBuilder
-import au.gov.health.covidsafe.logging.CentralLog
-import au.gov.health.covidsafe.ui.BaseFragment
-import kotlinx.android.synthetic.main.activity_country_code_selection.*
-import java.util.*
 
 private const val TAG = "HelpFragment"
 
 class HelpFragment : BaseFragment() {
+    companion object {
+        var anchor: String? = null
+    }
 
     override fun onCreateView(
             inflater: LayoutInflater,
@@ -37,7 +37,14 @@ class HelpFragment : BaseFragment() {
         val webView = view.helpWebView
         webView.settings.javaScriptEnabled = true
         webView.webViewClient = createWebVieClient(view)
-        webView.loadUrl(LinkBuilder.getHelpTopicsUrl())
+
+        val url = when (val anchorReadonly = anchor) {
+            null -> LinkBuilder.getHelpTopicsUrl()
+            else -> LinkBuilder.getHelpTopicsUrlWithAnchor(anchorReadonly)
+        }
+
+        webView.loadUrl(url)
+
         reportAnIssue.setOnClickListener {
             FeedbackModule.showFeedbackScreen()
         }
@@ -87,7 +94,6 @@ class HelpFragment : BaseFragment() {
             }
 
 
-
 }
 
 

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

@@ -31,6 +31,7 @@ import kotlinx.android.synthetic.main.fragment_home_setup_complete_header.*
 import kotlinx.android.synthetic.main.fragment_home_setup_incomplete_content.*
 import pub.devrel.easypermissions.AppSettingsDialog
 import pub.devrel.easypermissions.EasyPermissions
+import java.lang.ref.WeakReference
 import java.text.SimpleDateFormat
 import java.util.*
 
@@ -39,6 +40,10 @@ private const val FOURTEEN_DAYS_IN_MILLIS = 14 * ONE_DAY_IN_MILLIS
 
 class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks {
 
+    companion object{
+        var instanceWeakRef: WeakReference<HomeFragment>? = null
+    }
+
     private lateinit var presenter: HomePresenter
 
     private var mIsBroadcastListenerRegistered = false
@@ -78,8 +83,11 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
         view.home_header_help.setOnClickListener {
+            HelpFragment.anchor = null
             findNavController().navigate(HomeFragmentDirections.actionHomeFragmentToHelpFragment())
+
         }
         if (BuildConfig.ENABLE_DEBUG_SCREEN) {
             view.header_background.setOnClickListener {
@@ -96,6 +104,8 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks {
     override fun onResume() {
         super.onResume()
 
+        instanceWeakRef = WeakReference(this)
+
         // display app update reminder
 //        if (System.currentTimeMillis()
 //                -
@@ -125,18 +135,25 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks {
         home_setup_complete_app.setOnClickListener {
             goToCovidApp()
         }
+
         help_topics_link.setOnClickListener {
+            HelpFragment.anchor = null
             findNavController().navigate(HomeFragmentDirections.actionHomeFragmentToHelpFragment())
         }
 
-        go_to_play_store.setOnClickListener {
-            app_update_reminder.visibility = GONE
+        change_language_link.setOnClickListener {
+            HelpFragment.anchor = "#other-languages"
+            findNavController().navigate(HomeFragmentDirections.actionHomeFragmentToHelpFragment())
         }
 
-        remind_me_later.setOnClickListener {
-            Preference.putAppUpdateReminderDismissedTime(requireContext())
-            app_update_reminder.visibility = GONE
-        }
+//        go_to_play_store.setOnClickListener {
+//            app_update_reminder.visibility = GONE
+//        }
+//
+//        remind_me_later.setOnClickListener {
+//            Preference.putAppUpdateReminderDismissedTime(requireContext())
+//            app_update_reminder.visibility = GONE
+//        }
 
         if (!mIsBroadcastListenerRegistered) {
             registerBroadcast()
@@ -149,6 +166,9 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks {
 
     override fun onPause() {
         super.onPause()
+
+        instanceWeakRef = null
+
         bluetooth_card_view.setOnClickListener(null)
         location_card_view.setOnClickListener(null)
         battery_card_view.setOnClickListener(null)
@@ -189,7 +209,7 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks {
     }
 
     @SuppressLint("SetTextI18n")
-    private fun refreshSetupCompleteOrIncompleteUi() {
+    fun refreshSetupCompleteOrIncompleteUi() {
         context?.let {
             val isAllPermissionsEnabled = allPermissionsEnabled()
             val isDataUploadedInPast14Days = isDataUploadedInPast14Days(it)
@@ -270,16 +290,18 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks {
     }
 
     private fun allPermissionsEnabled(): Boolean {
-        val bluetoothEnabled = isBlueToothEnabled() ?: false
-        val pushNotificationEnabled = isPushNotificationEnabled() ?: true
-        val nonBatteryOptimizationAllowed = isBatteryOptimizationDisabled() ?: true
-        val locationStatusAllowed = isLocationPermissionAllowed() ?: true
+        val context = requireContext()
+
+        val bluetoothEnabled = context.isBlueToothEnabled() ?: false
+        val pushNotificationEnabled = context.isPushNotificationEnabled() ?: true
+        val nonBatteryOptimizationAllowed = context.isBatteryOptimizationDisabled() ?: true
+        val locationStatusAllowed = context.isLocationPermissionAllowed() ?: true
 
         return bluetoothEnabled &&
                 pushNotificationEnabled &&
                 nonBatteryOptimizationAllowed &&
                 locationStatusAllowed &&
-                isLocationEnabledOnDevice()
+                context.isLocationEnabledOnDevice()
     }
 
     private fun registerBroadcast() {
@@ -302,7 +324,7 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks {
     }
 
     private fun updateBlueToothStatus() {
-        isBlueToothEnabled()?.let {
+        requireContext().isBlueToothEnabled()?.let {
             bluetooth_card_view.visibility = VISIBLE
             bluetooth_card_view.render(formatBlueToothTitle(it), it)
         } ?: run {
@@ -311,7 +333,7 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks {
     }
 
     private fun updatePushNotificationStatus() {
-        isPushNotificationEnabled()?.let {
+        requireContext().isPushNotificationEnabled()?.let {
             push_card_view.visibility = VISIBLE
             push_card_view.render(
                     formatPushNotificationTitle(it),
@@ -324,7 +346,7 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks {
     }
 
     private fun updateBatteryOptimizationStatus() {
-        isBatteryOptimizationDisabled()?.let {
+        requireContext().isBatteryOptimizationDisabled()?.let {
             battery_card_view.visibility = VISIBLE
             battery_card_view.render(
                     formatNonBatteryOptimizationTitle(!it),
@@ -337,8 +359,8 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks {
     }
 
     private fun updateLocationStatus() {
-        isLocationPermissionAllowed()?.let {
-            val locationWorking = it && isLocationEnabledOnDevice()
+        requireContext().isLocationPermissionAllowed()?.let {
+            val locationWorking = it && requireContext().isLocationEnabledOnDevice()
 
             location_card_view.visibility = VISIBLE
             location_card_view.render(formatLocationTitle(locationWorking), locationWorking)

app/src/main/java/au/gov/health/covidsafe/ui/onboarding/OnboardingActivity.kt

@@ -9,6 +9,7 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import au.gov.health.covidsafe.HasBlockingState
+import au.gov.health.covidsafe.Preference
 import au.gov.health.covidsafe.R
 import au.gov.health.covidsafe.ui.PagerContainer
 import au.gov.health.covidsafe.ui.UploadButtonLayout
@@ -47,20 +48,35 @@ class OnboardingActivity : FragmentActivity(), HasBlockingState, PagerContainer
         }
     }
 
-    override fun updateProgressBar(stepProgress: Int?) {
-        stepProgress?.let { progress ->
-            onboarding_progress_bar.visibility = VISIBLE
-            onboarding_progress_bar.progress = progress
-        } ?: run {
-            onboarding_progress_bar.visibility = GONE
+    override fun onBackPressed() {
+        if (Preference.isOnBoarded(this)) {
+            finish()
+        } else {
+            super.onBackPressed()
+        }
+    }
+
+    override fun updateSteps(step: Int?, totalSteps: Int) {
+        when (step) {
+            null -> {
+                textViewSteps.visibility = GONE
+            }
+            else -> {
+                textViewSteps.visibility = VISIBLE
+                textViewSteps.text = String.format(getString(R.string.stepCounter), step, totalSteps)
+            }
         }
     }
 
     override fun setNavigationIcon(navigationIcon: Int?) {
         if (navigationIcon == null) {
             toolbar.navigationIcon = null
+            toolbar.visibility = GONE
+            toolbarReplacer.visibility = VISIBLE
         } else {
             toolbar.navigationIcon = ContextCompat.getDrawable(this, navigationIcon)
+            toolbar.visibility = VISIBLE
+            toolbarReplacer.visibility = GONE
         }
     }
 
@@ -118,5 +134,4 @@ class OnboardingActivity : FragmentActivity(), HasBlockingState, PagerContainer
             onboarding_next.hideProgress(newTextRes = stringRes)
         }
     }
-
 }

app/src/main/java/au/gov/health/covidsafe/ui/onboarding/fragment/dataprivacy/DataPrivacyFragment.kt

@@ -17,7 +17,7 @@ import kotlinx.android.synthetic.main.fragment_data_privacy.view.*
 
 class DataPrivacyFragment : PagerChildFragment() {
 
-    override var stepProgress: Int? = null
+    override var step: Int? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?)
             : View? = inflater.inflate(R.layout.fragment_data_privacy, container, false)

app/src/main/java/au/gov/health/covidsafe/ui/onboarding/fragment/enternumber/EnterNumberFragment.kt

@@ -38,7 +38,7 @@ class EnterNumberFragment : PagerChildFragment() {
         const val ENTER_NUMBER_PROGRESS = "progress"
     }
 
-    override var stepProgress: Int? = 2
+    override var step: Int? = 2
 
     private val enterNumberPresenter = EnterNumberPresenter(this)
     private var alertDialog: AlertDialog? = null
@@ -67,7 +67,7 @@ class EnterNumberFragment : PagerChildFragment() {
 
         arguments?.let {
             destinationId = it.getInt(ENTER_NUMBER_DESTINATION_ID)
-            stepProgress = if (it.containsKey(ENTER_NUMBER_PROGRESS)) it.getInt(ENTER_PIN_PROGRESS) else null
+            step = if (it.containsKey(ENTER_NUMBER_PROGRESS)) it.getInt(ENTER_PIN_PROGRESS) else null
         }
     }
 
@@ -166,7 +166,7 @@ class EnterNumberFragment : PagerChildFragment() {
                 ENTER_PIN_CALLING_CODE to callingCode,
                 ENTER_PIN_PHONE_NUMBER to phoneNumber,
                 ENTER_PIN_DESTINATION_ID to destinationId).also { bundle ->
-            stepProgress?.let {
+            step?.let {
                 bundle.putInt(ENTER_PIN_PROGRESS, it + 1)
             }
         }

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

@@ -34,7 +34,7 @@ class EnterPinFragment : PagerChildFragment() {
         const val ENTER_PIN_PROGRESS = "progress"
     }
 
-    override var stepProgress: Int? = 3
+    override var step: Int? = 3
 
     private val COUNTDOWN_DURATION = 5 * 60L  // OTP Code expiry
 
@@ -57,7 +57,7 @@ class EnterPinFragment : PagerChildFragment() {
             val phoneNumber = it.getString(ENTER_PIN_PHONE_NUMBER)!!
             destinationId = it.getInt(ENTER_PIN_DESTINATION_ID)
 
-            stepProgress = if (it.containsKey(ENTER_PIN_PROGRESS)) it.getInt(ENTER_PIN_PROGRESS) else null
+            step = if (it.containsKey(ENTER_PIN_PROGRESS)) it.getInt(ENTER_PIN_PROGRESS) else null
 
             enter_pin_headline.text = resources.getString(R.string.enter_pin_headline, "+$callingCode", phoneNumber)
 

app/src/main/java/au/gov/health/covidsafe/ui/onboarding/fragment/howitworks/HowItWorksFragment.kt

@@ -16,7 +16,7 @@ import kotlinx.android.synthetic.main.fragment_how_it_works.view.*
 
 class HowItWorksFragment : PagerChildFragment() {
 
-    override var stepProgress: Int? = null
+    override var step: Int? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?)
             : View? = inflater.inflate(R.layout.fragment_how_it_works, container, false)

app/src/main/java/au/gov/health/covidsafe/ui/onboarding/fragment/introduction/IntroductionFragment.kt

@@ -14,7 +14,7 @@ import kotlinx.android.synthetic.main.fragment_intro.*
 class IntroductionFragment : PagerChildFragment() {
 
     override var navigationIconResId: Int? = null
-    override var stepProgress: Int? = null
+    override var step: Int? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?)
             : View? = inflater.inflate(R.layout.fragment_intro, container, false)

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

@@ -2,7 +2,7 @@ package au.gov.health.covidsafe.ui.onboarding.fragment.permission
 
 import android.bluetooth.BluetoothAdapter
 import android.os.Bundle
-import android.text.Html
+import android.provider.Settings
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -16,7 +16,7 @@ import kotlinx.android.synthetic.main.fragment_permission_device_name.*
 
 class PermissionDeviceNameFragment : PagerChildFragment() {
 
-    override var stepProgress: Int? = 5
+    override var step: Int? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?)
             : View? = inflater.inflate(R.layout.fragment_permission_device_name, container, false)
@@ -25,44 +25,30 @@ class PermissionDeviceNameFragment : PagerChildFragment() {
         super.onResume()
 
         context?.let {
-            val deviceName = "<b>${BluetoothAdapter.getDefaultAdapter()?.name}</b>"
-
-            val paragraph1 = it.getString(R.string.change_device_name_content_line_1, deviceName)
-            val paragraph2 = "<br/><br/>" + it.getString(R.string.change_device_name_content_line_2)
-
-            val paragraphs = "$paragraph1$paragraph2"
-
-            change_device_name_content.text =
-                    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
-                        Html.fromHtml(paragraphs, Html.FROM_HTML_MODE_COMPACT)
-                    } else {
-                        Html.fromHtml(paragraphs)
-                    }
+            change_device_name_content.setText(R.string.change_device_name_content_line_2)
+            change_device_name_text_box.setText(Settings.Secure.getString(it.contentResolver, "bluetooth_name"))
         }
 
-
         change_device_name_headline.setHeading()
         change_device_name_headline.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
+
+        disableNavigationButton()
     }
 
     private fun navigateToNextPage() {
         navigateTo(R.id.action_permissionDeviceNameFragment_to_permissionSuccessFragment)
     }
 
-    override fun getUploadButtonLayout() = UploadButtonLayout.TwoChoiceContinueLayout(
-            R.string.change_device_name_primary_action,
-            {
-                BluetoothAdapter.getDefaultAdapter()?.name = change_device_name_text_box.text.toString()
-                navigateToNextPage()
-            },
-            R.string.change_device_name_secondary_action,
-            {
-                navigateToNextPage()
-            }
-    )
+    override fun getUploadButtonLayout() = UploadButtonLayout.ContinueLayout(
+            R.string.change_device_name_primary_action
+    ) {
+        BluetoothAdapter.getDefaultAdapter()?.name = change_device_name_text_box.text.toString()
+        navigateToNextPage()
+    }
 
     override fun updateButtonState() {
         enableContinueButton()
+        disableNavigationButton()
     }
 
     override fun onDestroyView() {

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

@@ -34,7 +34,7 @@ class PermissionFragment : PagerChildFragment(), EasyPermissions.PermissionCallb
         )
     }
 
-    override var stepProgress: Int? = 4
+    override var step: Int? = 4
 
     private var navigationStarted = false
 
@@ -48,6 +48,12 @@ class PermissionFragment : PagerChildFragment(), EasyPermissions.PermissionCallb
 
         permission_headline.setHeading()
         permission_headline.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
+
+        disableNavigationButton()
+
+        activity?.let {
+            Preference.putIsOnBoarded(it, true)
+        }
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -76,7 +82,7 @@ class PermissionFragment : PagerChildFragment(), EasyPermissions.PermissionCallb
 
     private fun hasAllPermissionsAndBluetoothOn(): Boolean {
         val context = TracerApp.AppContext
-        return isBlueToothEnabled() == true
+        return context.isBlueToothEnabled() == true
                 && requiredPermissions.all { ContextCompat.checkSelfPermission(context, it) == PackageManager.PERMISSION_GRANTED }
                 && ContextCompat.getSystemService(context, PowerManager::class.java)?.isIgnoringBatteryOptimizations(context.packageName) ?: true
     }
@@ -108,9 +114,6 @@ class PermissionFragment : PagerChildFragment(), EasyPermissions.PermissionCallb
     override fun getUploadButtonLayout() = UploadButtonLayout.ContinueLayout(R.string.permission_button) {
         disableContinueButton()
         navigationStarted = true
-        activity?.let {
-            Preference.putIsOnBoarded(it, true)
-        }
         requestAllPermissions {
             navigateToNextPage()
         }

app/src/main/java/au/gov/health/covidsafe/ui/onboarding/fragment/permissionsuccess/PermissionSuccessFragment.kt

@@ -17,7 +17,7 @@ import kotlinx.android.synthetic.main.fragment_permission_success.*
 
 class PermissionSuccessFragment : PagerChildFragment() {
 
-    override var stepProgress: Int? = null
+    override var step: Int? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?)
             : View? = inflater.inflate(R.layout.fragment_permission_success, container, false)
@@ -30,6 +30,8 @@ class PermissionSuccessFragment : PagerChildFragment() {
 
         permission_success_content.text = LinkBuilder.getHowPermissionSuccessContent(requireContext())
         permission_success_content.movementMethod = LinkMovementMethod.getInstance()
+
+        disableNavigationButton()
     }
 
     private fun navigateToNextPage() {

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

@@ -32,7 +32,7 @@ private val NAME_REGEX = Pattern.compile("^[A-Za-z0-9\\u00C0-\\u017F][A-Za-z'0-9
 class PersonalDetailsFragment : PagerChildFragment() {
 
     private var alertDialog: AlertDialog? = null
-    override var stepProgress: Int? = 1
+    override var step: Int? = 1
 
     private lateinit var name: String
     private lateinit var postcode: String

app/src/main/java/au/gov/health/covidsafe/ui/onboarding/fragment/registrationconsent/RegistrationConsentFragment.kt

@@ -14,7 +14,7 @@ import kotlinx.android.synthetic.main.fragment_registration_consent.*
 
 class RegistrationConsentFragment : PagerChildFragment() {
 
-    override var stepProgress: Int? = null
+    override var step: Int? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?)
             : View? = inflater.inflate(R.layout.fragment_registration_consent, container, false)

app/src/main/java/au/gov/health/covidsafe/ui/onboarding/fragment/undersixteen/UnderSixteenFragment.kt

@@ -15,7 +15,7 @@ import kotlinx.android.synthetic.main.fragment_under_sixteen.*
 
 class UnderSixteenFragment : PagerChildFragment() {
 
-    override var stepProgress: Int? = null
+    override var step: Int? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?)
             : View? = inflater.inflate(R.layout.fragment_under_sixteen, container, false)

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

@@ -13,7 +13,6 @@ import au.gov.health.covidsafe.ui.PagerContainer
 import au.gov.health.covidsafe.ui.UploadButtonLayout
 import com.github.razir.progressbutton.hideProgress
 import com.github.razir.progressbutton.showProgress
-import kotlinx.android.synthetic.main.fragment_help.*
 import kotlinx.android.synthetic.main.fragment_upload_master.*
 import kotlinx.android.synthetic.main.fragment_upload_master.toolbar
 
@@ -38,13 +37,8 @@ class UploadContainerFragment : Fragment(), PagerContainer {
         toolbar.setNavigationOnClickListener(null)
     }
 
-    override fun updateProgressBar(stepProgress: Int?) {
-        if (stepProgress == null) {
-            upload_progress.visibility = INVISIBLE
-        } else {
-            upload_progress.visibility = VISIBLE
-            upload_progress.progress = stepProgress
-        }
+    override fun updateSteps(step: Int?, totalSteps: Int) {
+        // do nothing
     }
 
     override fun setNavigationIcon(navigationIcon: Int?) {

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

@@ -14,7 +14,7 @@ import kotlinx.android.synthetic.main.fragment_upload_finished.*
 class UploadFinishedFragment : PagerChildFragment() {
 
     override var navigationIconResId: Int? = null
-    override var stepProgress: Int? = null
+    override var step: Int? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
             inflater.inflate(R.layout.fragment_upload_finished, container, false)

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

@@ -14,7 +14,7 @@ import kotlinx.android.synthetic.main.fragment_upload_page_4.root
 
 class UploadInitialFragment : PagerChildFragment() {
 
-    override var stepProgress: Int? = null
+    override var step: Int? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
             inflater.inflate(R.layout.fragment_upload_initial, container, false)

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

@@ -17,7 +17,7 @@ import kotlinx.android.synthetic.main.fragment_upload_page_4.*
 class UploadStepFourFragment : PagerChildFragment() {
 
     private var alertDialog: AlertDialog? = null
-    override var stepProgress: Int? = null
+    override var step: Int? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
             inflater.inflate(R.layout.fragment_upload_page_4, container, false)

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

@@ -38,7 +38,7 @@ class VerifyUploadPinFragment : PagerChildFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
             inflater.inflate(R.layout.fragment_verify_upload_pin, container, false)
 
-    override var stepProgress: Int? = null
+    override var step: Int? = null
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)

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

@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="38dp"
+    android:height="38dp"
+    android:viewportWidth="38"
+    android:viewportHeight="38">
+  <path
+      android:pathData="M19.0002,35.6667C28.2049,35.6667 35.6668,28.2048 35.6668,19C35.6668,9.7953 28.2049,2.3334 19.0002,2.3334C9.7954,2.3334 2.3335,9.7953 2.3335,19C2.3335,28.2048 9.7954,35.6667 19.0002,35.6667Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="3"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M2.3335,19H35.6668"
+      android:strokeLineJoin="round"
+      android:strokeWidth="3"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M19.0002,2.3334C23.169,6.8973 25.5381,12.8201 25.6668,19C25.5381,25.18 23.169,31.1028 19.0002,35.6667C14.8314,31.1028 12.4622,25.18 12.3335,19C12.4622,12.8201 14.8314,6.8973 19.0002,2.3334V2.3334Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="3"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+</vector>

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

@@ -15,8 +15,21 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_up"
-        app:navigationContentDescription="@string/navigation_back_button_content_description"/>
+        app:navigationContentDescription="@string/navigation_back_button_content_description"
+        app:navigationIcon="@drawable/ic_up" />
+
+    <View
+        android:id="@+id/toolbarReplacer"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/keyline_4"/>
+
+    <TextView
+        android:id="@+id/textViewSteps"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/keyline_5"
+        android:text="@string/stepCounter"
+        android:textAppearance="?textAppearanceBody1"/>
 
     <fragment
         android:id="@+id/fragment_nav_host"
@@ -51,17 +64,6 @@
             android:visibility="visible" />
     </FrameLayout>
 
-    <au.gov.health.covidsafe.ui.view.SegmentedProgressBar
-        android:id="@+id/onboarding_progress_bar"
-        android:layout_width="match_parent"
-        android:layout_height="4dp"
-        android:layout_marginStart="@dimen/keyline_7"
-        android:layout_marginTop="@dimen/keyline_4"
-        android:layout_marginEnd="@dimen/keyline_7"
-        android:visibility="gone"
-        app:progress_max_value="5"
-        app:progress_value="1" />
-
     <Button
         android:id="@+id/onboarding_next"
         style="?textAppearanceButton"
@@ -80,7 +82,6 @@
         android:layout_marginTop="@dimen/keyline_5"
         android:layout_marginEnd="@dimen/keyline_5"
         android:gravity="center_horizontal"
-        android:text="@string/change_device_name_new_device_name"
         android:textAppearance="?textAppearanceBody1"
         android:textColor="@color/dark_green"/>
 

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

@@ -9,7 +9,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/keyline_1">
 
         <TextView
             android:id="@+id/enter_number_page_headline"

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

@@ -10,6 +10,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/keyline_1"
         android:paddingStart="@dimen/keyline_5"
         android:paddingEnd="@dimen/keyline_5">
 
@@ -17,7 +18,6 @@
             android:id="@+id/enter_pin_headline"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/keyline_6"
             android:gravity="center_vertical|start"
             android:text="@string/enter_pin_headline"
             android:textAlignment="viewStart"

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

@@ -79,7 +79,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:barrierDirection="bottom"
-                app:constraint_referenced_ids="push_card_view, help_topics_card" />
+                app:constraint_referenced_ids="push_card_view, change_language_card" />
 
             <TextView
                 android:id="@+id/home_version_number"
@@ -116,48 +116,48 @@
             android:layout_height="@dimen/keyline_2"
             android:background="@color/error" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="@dimen/keyline_5"
-            android:layout_marginBottom="@dimen/keyline_1"
-            android:text="@string/update_available_title"
-            android:textSize="20sp"
-            android:textStyle="bold" />
+<!--        <TextView-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_gravity="center"-->
+<!--            android:layout_marginTop="@dimen/keyline_5"-->
+<!--            android:layout_marginBottom="@dimen/keyline_1"-->
+<!--            android:text="@string/update_available_title"-->
+<!--            android:textSize="20sp"-->
+<!--            android:textStyle="bold" />-->
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginHorizontal="@dimen/keyline_8"
-            android:layout_marginBottom="@dimen/keyline_5"
-            android:text="@string/update_available_message"
-            android:textAlignment="center"
-            android:textSize="16sp" />
+<!--        <TextView-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_gravity="center"-->
+<!--            android:layout_marginHorizontal="@dimen/keyline_8"-->
+<!--            android:layout_marginBottom="@dimen/keyline_5"-->
+<!--            android:text="@string/update_available_message"-->
+<!--            android:textAlignment="center"-->
+<!--            android:textSize="16sp" />-->
 
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/go_to_play_store"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/keyline_8"
-            android:layout_marginHorizontal="@dimen/keyline_5"
-            android:layout_marginBottom="@dimen/keyline_4"
-            android:background="@color/dark_green"
-            android:text="@string/update_available_play_store_btn"
-            android:textColor="@color/white"
-            android:textStyle="bold" />
+<!--        <androidx.appcompat.widget.AppCompatButton-->
+<!--            android:id="@+id/go_to_play_store"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="@dimen/keyline_8"-->
+<!--            android:layout_marginHorizontal="@dimen/keyline_5"-->
+<!--            android:layout_marginBottom="@dimen/keyline_4"-->
+<!--            android:background="@color/dark_green"-->
+<!--            android:text="@string/update_available_play_store_btn"-->
+<!--            android:textColor="@color/white"-->
+<!--            android:textStyle="bold" />-->
 
-        <TextView
-            android:id="@+id/remind_me_later"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:paddingHorizontal="@dimen/keyline_5"
-            android:paddingBottom="@dimen/keyline_5"
-            android:text="@string/update_available_dismiss_btn"
-            android:textAlignment="center"
-            android:textColor="@color/dark_green"
-            android:textSize="18sp" />
+<!--        <TextView-->
+<!--            android:id="@+id/remind_me_later"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_gravity="center"-->
+<!--            android:paddingHorizontal="@dimen/keyline_5"-->
+<!--            android:paddingBottom="@dimen/keyline_5"-->
+<!--            android:text="@string/update_available_dismiss_btn"-->
+<!--            android:textAlignment="center"-->
+<!--            android:textColor="@color/dark_green"-->
+<!--            android:textSize="18sp" />-->
 
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -142,5 +142,30 @@
             app:external_linkCard_icon="@drawable/ic_question_circle"
             app:external_linkCard_title="@string/home_set_complete_external_link_help_topics_title" />
     </androidx.cardview.widget.CardView>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/change_language_card"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/keyline_4"
+        app:layout_constraintTop_toBottomOf="@+id/help_topics_card"
+        card_view:cardBackgroundColor="@color/white"
+        card_view:cardCornerRadius="6dp"
+        card_view:cardMaxElevation="2dp"
+        card_view:cardUseCompatPadding="true"
+        card_view:contentPadding="0dp">
+
+        <au.gov.health.covidsafe.ui.home.view.ExternalLinkCard
+            android:id="@+id/change_language_link"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:minHeight="@dimen/external_link_height"
+            android:paddingTop="@dimen/keyline_0"
+            android:paddingBottom="@dimen/keyline_0"
+            app:external_linkCard_content="@string/change_language_content"
+            app:external_linkCard_icon="@drawable/ic_globe"
+            app:external_linkCard_title="@string/change_language" />
+    </androidx.cardview.widget.CardView>
 </merge>
 

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

@@ -68,12 +68,11 @@
             android:paddingStart="@dimen/keyline_1"
             android:paddingEnd="@dimen/keyline_1"
             android:singleLine="true"
+            android:textAlignment="viewStart"
             android:textColor="@color/slack_black"
             android:textColorHighlight="@color/dark_cerulean_3"
             android:textCursorDrawable="@null"
             android:textSize="@dimen/text_body_small"
-            android:textAlignment="viewStart"
-            android:text="@string/change_device_name_default_device_name"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/change_device_name_new_device_name" />

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

@@ -10,6 +10,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/keyline_1"
         android:paddingStart="@dimen/keyline_5"
         android:paddingEnd="@dimen/keyline_5"
         android:paddingBottom="@dimen/keyline_9">
@@ -18,7 +19,6 @@
             android:id="@+id/personal_details_headline"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/keyline_0"
             android:text="@string/personal_details_headline"
             android:textAlignment="viewStart"
             android:textAppearance="?textAppearanceHeadline2"

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

@@ -16,7 +16,6 @@
             android:id="@+id/registration_consent_headline"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/keyline_6"
             android:text="@string/registration_consent_headline"
             android:textAppearance="?textAppearanceHeadline2"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -27,16 +27,6 @@
         app:defaultNavHost="true"
         app:navGraph="@navigation/nav_upload" />
 
-    <au.gov.health.covidsafe.ui.view.SegmentedProgressBar
-        android:id="@+id/upload_progress"
-        android:layout_width="match_parent"
-        android:layout_height="4dp"
-        android:layout_marginStart="@dimen/keyline_5"
-        android:layout_marginTop="@dimen/keyline_4"
-        android:layout_marginEnd="@dimen/keyline_5"
-        app:progress_max_value="5"
-        app:progress_value="1" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

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

@@ -1,290 +1,431 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-  <string name="home_header_active_title">\u200F COVIDSafe نشط.</string>
-  <string name="service_not_ok_title">\u200F COVIDSafe غير نشط</string>
-  <string name="home_header_inactive_title">\u200F COVIDSafe غير نشط.</string>
-  <string name="service_ok_title">\u200F COVIDSafe نشط.</string>
-  <string name="data_privacy_content">من المهم أن تقرأ *سياسة خصوصية* COVIDSafe قبل التسجيل في COVIDSafe. \n\n إذا كان عمرك أقل من 16 عامًا، فيجب على والديك/ الوصي أيضًا قراءة *سياسة الخصوصية*. \n\n إنّ استخدام COVIDSafe هو أمر إختياري تمامًا. يمكنك تثبيت التطبيق أو حذفه في أي وقت. إذا قمت بحذف COVIDSafe، *يمكنك أيضًا طلب حذف معلوماتك* من نظام مقدم الخدمة الآمن. \n\n للتسجيل في COVIDSafe، ستحتاج إلى إدخال اسم ورقم هاتف محمول وفئة عمر ورمز بريدي. \n\n المعلومات التي ترسلها عند التسجيل، ومعلومات استخدامك لـ COVIDSafe سيتم جمعها وتخزينها في نظام مقدم الخدمة الآمن للغاية. \n\n لن يقوم COVIDSafe بجمع معلومات عن موقعك. \n\n سيدوّن COVIDSafe وقت الاتصال ورمز مجهول الهوية لمستخدمي COVIDSafe الآخرين الذين تتواصل معهم. \n\n سيتم تدوين مستخدمي COVIDSafe الآخرين الذين تتواصل معهم من خلال رمز مجهول الهوية ووقت الاتصال بك على أجهزتهم. \n\n إذا كانت نتائج اختبار مستخدم آخر إيجابية لـ COVID-19، فقد يقوم بتحميل معلومات الاتصال الخاصة به ويمكن أن يتصل بك مسؤول الصحة في الولاية أو الإقليم لأغراض تعقُّب جهات الاتصال. \n\n سيتم استخدام تفاصيل التسجيل الخاصة بك أو الكشف عنها فقط لتعقُّب جهات الاتصال وللأغراض المناسبة والقانونية لـ COVIDSafe. \n\n يتوفر المزيد من المعلومات على موقع *وزارة الصحة الأسترالية على الإنترنت*. \n\n راجع *سياسة خصوصية* COVIDSafe لمزيد من التفاصيل حول حقوقك المتعلقة بمعلوماتك وكيفية التعامل معها ومشاركتها.</string>
-  <string name="update_available_play_store_btn">انتقل إلى متجر Google Play</string>
-  <string name="heading">العنوان</string>
-  <string name="need_location_service">لكي يعمل COVIDSafe عليك تشغيل الموقع في الإعدادات.</string>
-  <string name="permission_success_content">1. عندما تغادر المنزل، احتفظ بهاتفك معك وتأكد من أن COVIDSafe نشط. \n\n2. يجب الاستمرار بتشغيل Bluetooth®. \n\n3. تأكد من تعطيل تحسين البطارية\n\n 4. لا يرسل COVIDSafe طلبات الاقتران *تعرّف على المزيد*.</string>
-  <string name="home_header_no_pairing">لا يرسل COVIDSafe  *طلبات الاقتران* .</string>
-  <string name="upload_step_4_sub_header">ما لم توافق، لن يتم تحميل معلومات اتصال الشخص القريب منك. \n\n إذا وافقت، فسيتم تحميل معلومات اتصال الشخص القريب منك ومشاركتها مع مسؤولي الصحة في الولاية أو الإقليم لأغراض تتبع جهات الاتصال. \n\n اقرأ *سياسة الخصوصية* لـ COVIDSafe لمزيد من التفاصيل.</string>
-  <string name="update_available_message">كنا نقوم بإدخال تحسينات على COVIDSafe.</string>
-  <string name="personal_details_name_characters_prompt">يرجى استخدام الأحرف الإنجليزية لاسمك الكامل. لا تستخدم لغات أو رموز أخرى مثل \"،\" أو \"؟\".</string>
-  <string name="pin_number">رقم التعريف الشخصي pin</string>
-  <string name="update_available_title">التحديث متوفر!</string>
-  <string name="update_available_dismiss_btn">ذكّرني لاحقا</string>
-  <string name="how_it_works_content">تُستخدم إشارات Bluetooth® لتحديد متى تكون بالقرب من مستخدم COVIDSafe آخر. \n\n سيتم تدوين ملاحظة في كل مرة حصل فيها إتصال عن قرب بينك وبين مستخدمي COVIDSafe الآخرين لإنشاء معلومات عن الاتصال عن قرب. يتم تشفير المعلومات وتخزينها فقط في هاتفك. \n\n إذا كانت نتيجة اختبارك إيجابية لـ COVID-19 كمستخدم COVIDSafe، فسوف يتصل بك مسؤول الصحة في الولاية أو الإقليم. سيساعدون في القيام بتحميل اختياري لمعلومات الاتصال عن قرب الخاصة بك إلى نظام تخزين معلومات آمن للغاية \n\n يمكن أيضًا لمسؤولي الصحة في الولاية أو الإقليم الاتصال بك إذا كنت على اتصال عن قرب بمستخدم COVIDSafe آخر وكانت نتيجته إيجابية. \n\n لمزيد من المعلومات، يرجى الرجوع إلى صفحة *مواضيع المساعدة*.</string>
-  <string name="intro_content">تم تطوير COVIDSafe من قبل الحكومة الأسترالية للمساعدة في الحفاظ على المجتمع في مأمن من انتشار فيروس كورونا. \n\n سوف يدوّن COVIDSafe بشكل آمن اتصالك مع مستخدمين آخرين للتطبيق. سيسمح ذلك لمسؤولي الصحة في الولاية أو الإقليم بالاتصال بك، إذا كنت على اتصال عن قرب مع شخص كانت نتيجة اختباره إيجابية بالفيروس. \n\n معاً يمكننا المساعدة في وقف الانتشار والبقاء في صحة جيدة.</string>
-  <string name="ReceivePinIssue">مشكلات في تلقي رقم التعريف الشخصي الخاص بك؟</string>
-  <string name="dialog_uploading_message">يتم الآن تحميل معلومات COVIDSafe الخاصة بك. \n\n الرجاء عدم إغلاق التطبيق.</string>
-  <string name="dialog_error_uploading_positive">حاول مرة أخرى</string>
-  <string name="dialog_error_uploading_negative">إلغاء</string>
-  <string name="service_not_ok_body">تأكد من أن COVIDSafe نشط قبل مغادرتك المنزل أو عندما تكون في الأماكن العامة.</string>
-  <string name="service_not_ok_action">تحقق من التطبيق الآن</string>
-  <string name="how_it_works_headline">كيف يعمل COVIDSafe</string>
-  <string name="how_it_works_button">التالى</string>
-  <string name="data_privacy_headline">التسجيل والخصوصية</string>
-  <string name="data_privacy_button">التالى</string>
-  <string name="consent_button">أوافق</string>
-  <string name="personal_details_name_title">الاسم الكامل</string>
-  <string name="personal_details_name_content_description">أدخل الاسم الكامل</string>
-  <string name="personal_details_post_code">الرمز البريدي في أستراليا</string>
-  <string name="personal_details_post_code_content_description">أدخل الرمز البريدي</string>
-  <string name="personal_details_post_code_error_prompt">يجب أن يحتوي رقم الرمز البريدي الأسترالي على 4 أرقام.</string>
-  <string name="navigation_back_button_content_description">الصفحة السابقة</string>
-  <string name="personal_details_button">استمر</string>
-  <string name="enter_number_headline">أدخل رقم هاتفك المحمول</string>
-  <string name="invalid_phone_number">رقم الهاتف غير صحيح.</string>
-  <string name="invalid_norfolk_island_phone_number_error_prompt">تحتوي أرقام الهواتف المحمولة في جزيرة نورفولك على 5 إلى 6 أرقام.</string>
-  <string name="enter_number_content">سنرسل لك رقم تعريف شخصي مكونًا من 6 أرقام للتحقق من رقم هاتفك المحمول.</string>
-  <string name="options_for_australia">خيارات لأستراليا</string>
-  <string name="country_region_name_la">لاوس</string>
-  <string name="country_region_name_lv">لاتفيا</string>
-  <string name="country_region_name_lb">لبنان</string>
-  <string name="country_region_name_li">ليختنشتاين</string>
-  <string name="country_region_name_lt">ليتوانيا</string>
-  <string name="country_region_name_mo">ماكاو</string>
-  <string name="country_region_name_mk">جمهورية مقدونيا اليوغوسلافية السابقة</string>
-  <string name="country_region_name_my">ماليزيا</string>
-  <string name="country_region_name_ml">مالي</string>
-  <string name="country_region_name_mt">مالطا</string>
-  <string name="country_region_name_mq">مارتينيك</string>
-  <string name="country_region_name_mu">موريشيوس</string>
-  <string name="country_region_name_mx">المكسيك</string>
-  <string name="country_region_name_md">مولدوفا</string>
-  <string name="country_region_name_ms">مونتسيرات</string>
-  <string name="country_region_name_ma">المغرب</string>
-  <string name="country_region_name_mz">موزمبيق</string>
-  <string name="country_region_name_mm">ميانمار</string>
-  <string name="country_region_name_na">ناميبيا</string>
-  <string name="country_region_name_np">نيبال</string>
-  <string name="country_region_name_nl">هولندا</string>
-  <string name="country_region_name_nz">نيوزيلندا</string>
-  <string name="country_region_name_ne">النيجر</string>
-  <string name="country_region_name_ng">نيجيريا</string>
-  <string name="country_region_name_no">النرويج</string>
-  <string name="country_region_name_om">سلطنة عمان</string>
-  <string name="country_region_name_pk">باكستان</string>
-  <string name="country_region_name_pa">بنما</string>
-  <string name="country_region_name_py">باراغواي</string>
-  <string name="country_region_name_pg">بابوا غينيا الجديدة</string>
-  <string name="country_region_name_pe">بيرو</string>
-  <string name="country_region_name_ph">الفلبين</string>
-  <string name="country_region_name_pl">بولندا</string>
-  <string name="country_region_name_pt">البرتغال</string>
-  <string name="country_region_name_pr">بورتوريكو</string>
-  <string name="country_region_name_qa">قطر</string>
-  <string name="country_region_name_ru">روسيا</string>
-  <string name="country_region_name_rw">رواندا</string>
-  <string name="country_region_name_kn">سانت كيتس ونيفيس</string>
-  <string name="country_region_name_lc">سانت لوسيا</string>
-  <string name="country_region_name_vc">سانت فنسنت وجزر غرينادين</string>
-  <string name="country_region_name_sn">السنغال</string>
-  <string name="country_region_name_rs">صربيا</string>
-  <string name="country_region_name_sg">سنغافورة</string>
-  <string name="country_region_name_sk">سلوفاكيا</string>
-  <string name="country_region_name_si">سلوفينيا</string>
-  <string name="country_region_name_sb">جزر سليمان</string>
-  <string name="country_region_name_za">جنوب أفريقيا</string>
-  <string name="country_region_name_kr">كوريا الجنوبية</string>
-  <string name="country_region_name_es">إسبانيا</string>
-  <string name="country_region_name_lk">سيريلانكا</string>
-  <string name="country_region_name_se">السويد</string>
-  <string name="country_region_name_ch">سويسرا</string>
-  <string name="country_region_name_tj">طاجيكستان</string>
-  <string name="country_region_name_tw">تايوان</string>
-  <string name="country_region_name_tz">تنزانيا</string>
-  <string name="country_region_name_th">تايلاند</string>
-  <string name="country_region_name_tn">تونس</string>
-  <string name="country_region_name_tr">تركيا</string>
-  <string name="country_region_name_tm">تركمانستان</string>
-  <string name="country_region_name_tc">جزر تركس وكايكوس</string>
-  <string name="country_region_name_ug">أوغندا</string>
-  <string name="country_region_name_ua">أوكرانيا</string>
-  <string name="country_region_name_ae">الإمارات العربية المتحدة</string>
-  <string name="country_region_name_gb">المملكة المتحدة</string>
-  <string name="country_region_name_us">الولايات المتحدة الأمريكية</string>
-  <string name="country_region_name_uz">أوزبكستان</string>
-  <string name="country_region_name_ve">فنزويلا</string>
-  <string name="country_region_name_vn">فيتنام</string>
-  <string name="country_region_name_vg">جزر فيرجن, البريطانية</string>
-  <string name="country_region_name_vi">جزر فيرجن، الولايات المتحدة الأمريكية</string>
-  <string name="country_region_name_ye">اليمن</string>
-  <string name="country_region_name_zm">زامبيا</string>
-  <string name="country_region_name_zw">زيمبابوي</string>
-  <string name="enter_pin_headline" formatted="false">أدخل رقم التعريف الشخصي المرسل إلى %s %s</string>
-  <string name="enter_pin_wrong_number">هل رقم الهاتف المحمول هذا خاطئ؟</string>
-  <string name="enter_pin_timer_expire">ستنتهي صلاحية رقم التعريف الشخصي الخاص بك في</string>
-  <string name="permission_button">استمر</string>
-  <string name="change_device_name_headline">اسم جهازك</string>
-  <string name="change_device_name_content_line_1">الاسم الحالي لجهازك هو %s .</string>
-  <string name="change_device_name_new_device_name">اسم الجهاز الجديد</string>
-  <string name="permission_success_button">استمر</string>
-  <string name="home_bluetooth_permission">Bluetooth®: %s</string>
-  <string name="home_set_complete_external_link_share_title">شارك COVIDSafe</string>
-  <string name="home_set_complete_external_link_app_url">https://www.health.gov.au/resources/apps-and-tools/coronavirus-australia-app</string>
-  <string name="upload_answer_no">لا</string>
   <string name="action_continue">استمر</string>
-  <string name="action_upload_done">استمر</string>
-  <string name="disabled">معطلة</string>
-  <string name="battery_optimisation_prompt">يجب عليك تعطيل تحسين البطارية.</string>
-  <string name="service_ok_body">حافظ على COVIDSafe نشطاً عند مغادرتك المنزل أو عندما تكون في أماكن عامة.</string>
-  <string name="enabled">ممكّنة</string>
-  <string name="action_verify_upload_pin">القيام بتحميل معلوماتي</string>
-  <string name="upload_step_1_body">فقط إذا كانت نتيجة اختبارك لـ COVID-19 إيجابية، فسيتصل بك مسؤول الصحة في الولاية أو الإقليم للمساعدة في التحميل الاختياري لمعلوماتك.\n\nبمجرد أن تضغط على \"نعم\"، ستحتاج إلى إعطاء الموافقة حتى يتم تحميل معلوماتك.</string>
-  <string name="home_permission_on">تشغيل</string>
-  <string name="change_device_name_content_line_2">ستتمكن أجهزة الـ Bluetooth® الأخرى من حولك من رؤية هذا الاسم. نوصي باستخدام اسم جهاز لا يتضمن تفاصيلك الشخصية.</string>
-  <string name="permission_content">يحتاج برنامج COVIDSafe إلى تمكين الـ Bluetooth® والإخطار حتى يعمل. \n\n اختر \"استمر\" من أجل: \n\n 1. تمكين Bluetooth® \n\n 2. السماح لأذونات الموقع \n\n 3. تعطيل تحسين البطارية \n\n\n يحتاج اندرويد إلى أذونات الموقع لكي يعمل الـ Bluetooth®. \n\n لا يرسل COVIDSafe طلبات الاقتران.</string>
-  <string name="enter_pin_resend_pin">إعادة إرسال رقم تعريف شخصي</string>
-  <string name="enter_number_button">احصل على رقم تعريف شخصي</string>
-  <string name="registration_consent_content">أوافق على أن تقوم وزارة الصحة الأسترالية بجمع:</string>
-  <string name="generic_internet_error">الرجاء تحقق من الربط بشبكة الانترنت الخاصة بك</string>
-  <string name="generic_error">الرجاء عاود المحاولة في وقت لاحق</string>
-  <string name="personal_details_age_error_prompt">يرجى اختيار فئتك العمرية.</string>
-  <string name="home_permission_off">متوقف</string>
-  <string name="search">ابحث</string>
-  <string name="under_sixteen_first_paragraph">معلومات التسجيل الخاصة بي للسماح بتعقُّب جهات الاتصال من قبل مسؤولي الصحة في الولاية أو الإقليم.</string>
-  <string name="personal_details_headline">أدخل تفاصيلك</string>
-  <string name="registration_consent_first_paragraph">معلومات التسجيل الخاصة بي للسماح بتعقُّب جهات الاتصال من قبل مسؤولي الصحة في الولاية أو الإقليم.</string>
-  <string name="registration_consent_headline">موافقة على التسجيل</string>
-  <string name="intro_button">أريد ان أساعد</string>
-  <string name="intro_headline">معاً يمكننا وقف انتشار COVID-19</string>
-  <string name="title_help">مساعدة</string>
-  <string name="wrong_ping_number">تم إدخال رقم تعريف شخصي خاطئ</string>
-  <string name="enter_pin_button">تحقق</string>
-  <string name="permission_headline">إعدادات التطبيق</string>
-  <string name="permission_location_rationale">يطلب اندرويد الوصول إلى الموقع حتى يمكن لوظائف Bluetooth® من العمل لأجل COVIDSafe. لا يمكن لـ COVIDSafe العمل بشكل صحيح بدونه</string>
-  <string name="change_device_name_default_device_name">هاتف اندرويد</string>
-  <string name="change_device_name_primary_action">غيِّر واستمر</string>
-  <string name="change_device_name_secondary_action">تخطى واتركها كما هي</string>
-  <string name="home_set_complete_external_link_share_content">قم بدعوة الآخرين للمساعدة. معًا، نحن أقوى.</string>
-  <string name="home_set_complete_external_link_app_title">احصل على تطبيق فيروس كورونا</string>
-  <string name="home_set_complete_external_link_been_contacted_content">لا يمكنك تحميل معلوماتك إلا إذا كانت نتيجة اختبارك إيجابية.</string>
   <string name="action_report_an_issue">بلِّغ عن مشكلة</string>
-  <string name="upload_finished_header">شكرًا لك على المساعدة في وقف انتشار COVID-19!</string>
-  <string name="dialog_error_uploading_message">حدث خطأ أثناء تحميل معلوماتك، يرجى المحاولة مرة أخرى.</string>
-  <string name="share_this_app_content">إنضم إلي في العمل على وقف انتشار COVID-19! قم بتنزيل COVIDSafe، وهو تطبيق من الحكومة الأسترالية. # COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
-  <string name="migration_in_progress">تحديث COVIDSafe قيد الإنجاز. \n\n يرجى التأكد من عدم إغلاق هاتفك حتى اكتمال التحديث.</string>
-  <string name="consent_call_for_action">اختر \"أوافق\" لتأكيد الموافقة.</string>
-  <string name="registration_consent_second_paragraph">معلومات الاتصال الخاصة بي من مستخدمي COVIDSafe الآخرين بعد أن جاءت نتيجة اختبارهم إيجابية لـ COVID-19.</string>
-  <string name="personal_details_age_title">الفئة العمرية (اختر)</string>
-  <string name="personal_details_age_content_description">اختر الفئة العمرية</string>
-  <string name="under_sixteen_headline">تحتاج إلى موافقة والديك / الوصي للمضي قدمًا</string>
-  <string name="under_sixteen_content">أؤكد موافقة والديّ أو الوصي على أن تقوم وزارة الصحة الأسترالية بجمع ما يلي:</string>
-  <string name="under_sixteen_second_paragraph">معلومات الاتصال الخاصة بي من مستخدمي COVIDSafe الآخرين بعد أن جاءت نتيجة اختبارهم إيجابية لـ COVID-19.</string>
-  <string name="select_country_or_region">اختر البلد أو المنطقة</string>
-  <string name="invalid_australian_phone_number_error_prompt">تحتوي أرقام الهواتف المحمولة الأسترالية على 10 أرقام كحد أقصى.</string>
-  <string name="enter_number_relative">هل تحاول التسجيل نيابة عن صديق أو قريب؟ \n\n سيحتاجون إلى التسجيل باستخدام أجهزتهم الخاصة ورقم هاتفهم حتى يتمكن COVIDSafe من العمل لديهم.</string>
-  <string name="country_region_name_bs">باهاماس</string>
-  <string name="country_region_name_by">بيلاروس</string>
-  <string name="country_region_name_gu">غوام</string>
-  <string name="country_region_name_gt">غواتيمالا</string>
-  <string name="country_region_name_hk">هونغ كونغ</string>
-  <string name="country_region_name_lu">لوكسمبورغ</string>
-  <string name="country_region_name_ni">نيكاراغوا</string>
-  <string name="country_region_name_tg">توغو</string>
-  <string name="country_region_name_tt">ترينيداد وتوباغو</string>
-  <string name="country_region_name_uy">اوروغواي</string>
-  <string name="permission_success_headline">لقد قمت بالتسجيل بنجاح</string>
-  <string name="home_header_active_no_action_required">لا يلزم اتخاذ أي إجراء آخر.</string>
-  <string name="home_header_inactive_check_your_permissions">تحقق من الإعدادات الخاصة بك.</string>
-  <string name="home_header_uploaded_on_date">تم تحميل معلوماتك على %s .</string>
-  <string name="home_non_battery_optimization_permission">تحسين البطارية: %s</string>
-  <string name="home_location_permission">الموقع: %s</string>
-  <string name="home_push_notification_permission">إخطار لحظي للرسائل: %s</string>
-  <string name="home_app_permission_status_title">تحقق من الإعدادات الخاصة بك</string>
-  <string name="home_app_permission_status_subtitle">لن يعمل COVIDSafe بدون الإعدادات الصحيحة.</string>
-  <string name="home_app_permission_push_notification_prompt">السماح لـ COVIDSafe بالإخطارات اللحظية للرسائل.</string>
-  <string name="home_set_complete_external_link_news_title">آخر الأخبار والتحديثات</string>
-  <string name="home_set_complete_external_link_news_url">https://www.australia.gov.au</string>
-  <string name="home_set_complete_external_link_news_content">توجه إلى aus.gov.au للحصول على أحدث أخبار فيروس كورونا.</string>
-  <string name="home_set_complete_external_link_app_content">قم بتنزيل التطبيق الحكومي للحصول على أحدث الأخبار والنصائح.</string>
-  <string name="home_set_complete_external_link_been_contacted_title">هل اتصل بك مسؤول صحي؟</string>
-  <string name="home_set_complete_external_link_help_topics_title">مواضيع المساعدة</string>
-  <string name="home_set_complete_external_link_help_topics_content">إذا كان لديك مشاكل أو أسئلة حول التطبيق.</string>
-  <string name="home_version_number">رقم الإصدار: %s</string>
-  <string name="upload_answer_yes">نعم</string>
-  <string name="upload_step_1_header">هل يطلب منك مسؤول الصحة تحميل معلوماتك؟</string>
-  <string name="upload_step_4_header">تحميل الموافقة</string>
-  <string name="upload_step_verify_pin_header">قم بتحميل معلوماتك</string>
-  <string name="upload_step_verify_pin_sub_header">سيرسل مسؤول الصحة في الولاية أو الإقليم رقم التعريف الشخصي (PIN) إلى جهازك عبر رسالة نصية. أدخله أدناه لتحميل معلوماتك.</string>
+  <string name="action_upload_done">تمّ</string>
   <string name="action_verify_invalid_pin">رقم التعريف الشخصي غير صالح، يرجى الطلب من مسؤول الصحة أن يرسل لك رقم تعريف شخصي آخر.</string>
-  <string name="upload_finished_sub_header">لقد قمت بتحميل معلوماتك بنجاح إلى نظام تخزين COVIDSafe العالي الأمان. \n\n سيقوم مسؤولو الصحة في الولاية أو الإقليم بإخطار مستخدمي COVIDS الآخرين الذين سجلوا حالات اتصال عن قرب معك. ستظل هويتك مجهولة للمستخدمين الآخرين.</string>
-  <string name="country_region_name_au2">جزيرة نورفولك</string>
-  <string name="country_region_name_sd">السودان</string>
-  <string name="country_region_name_ir">إيران</string>
-  <string name="country_region_name_cw">كوراساو</string>
-  <string name="country_region_name_cu">كوبا</string>
-  <string name="country_region_name_al">ألبانيا</string>
-  <string name="country_region_name_dz">الجزائر</string>
-  <string name="country_region_name_ao">أنغولا</string>
-  <string name="country_region_name_ai">أنغيلا</string>
+  <string name="action_verify_upload_pin">القيام بتحميل معلوماتي</string>
+  <string name="activity_self_isolation_button">استمر</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>
+  <!-- Onboarding Change Device Name -->
+  <string name="change_device_name_headline">اسم جهازك</string>
+  <string name="change_device_name_headline_content_description">العنوان، اسم جهازك</string>
+  <string name="change_device_name_new_device_name">صحّح اسم الجهاز</string>
+  <string name="change_device_name_primary_action">استمر</string>
+  <string name="change_device_name_secondary_action">تخطى واتركها كما هي</string>
+  <string name="consent_button">أوافق</string>
+  <!-- Shared Consent Actions -->
+  <string name="consent_call_for_action">اختر \"أوافق\" لتأكيد الموافقة.</string>
+  <string name="country_region_name_ad">أندورا</string>
+  <string name="country_region_name_ae">الإمارات العربية المتحدة</string>
+  <!-- Countries -->
+  <string name="country_region_name_af">أفغانستان</string>
   <string name="country_region_name_ag">أنتيغوا وبربودا</string>
-  <string name="country_region_name_ar">الأرجنتين</string>
+  <string name="country_region_name_ai">أنغيلا</string>
+  <string name="country_region_name_al">ألبانيا</string>
   <string name="country_region_name_am">أرمينيا</string>
-  <string name="country_region_name_aw">أروبا</string>
-  <string name="country_region_name_au">أستراليا</string>
+  <string name="country_region_name_an">جزر الأنتيل الهولندية</string>
+  <string name="country_region_name_ao">أنغولا</string>
+  <string name="country_region_name_ar">الأرجنتين</string>
   <string name="country_region_name_at">النمسا</string>
+  <string name="country_region_name_au">أستراليا</string>
+  <string name="country_region_name_aw">أروبا</string>
   <string name="country_region_name_az">أذربيجان</string>
-  <string name="country_region_name_bh">البحرين</string>
-  <string name="country_region_name_bd">بنغلاديش</string>
+  <string name="country_region_name_ba">البوسنة والهرسك</string>
   <string name="country_region_name_bb">بربادوس</string>
+  <string name="country_region_name_bd">بنغلاديش</string>
   <string name="country_region_name_be">بلجيكا</string>
-  <string name="country_region_name_dm">دومينيكا</string>
-  <string name="country_region_name_do">جمهورية الدومنيكان</string>
-  <string name="country_region_name_ec">إكوادور</string>
-  <string name="country_region_name_sv">السلفادور</string>
-  <string name="country_region_name_ee">إستونيا</string>
-  <string name="country_region_name_fj">فيجي</string>
-  <string name="country_region_name_fi">فنلندا</string>
-  <string name="country_region_name_fr">فرنسا</string>
-  <string name="country_region_name_ga">الغابون</string>
-  <string name="country_region_name_ge">جورجيا</string>
-  <string name="country_region_name_de">ألمانيا</string>
-  <string name="country_region_name_gh">غانا</string>
-  <string name="country_region_name_gr">اليونان</string>
-  <string name="country_region_name_gd">غرينادا</string>
-  <string name="country_region_name_gw">غينيا - بيساو</string>
-  <string name="country_region_name_ht">هايتي</string>
-  <string name="country_region_name_hn">هندوراس</string>
-  <string name="country_region_name_hu">المجر</string>
-  <string name="country_region_name_bz">بليز</string>
+  <string name="country_region_name_bf">بوركينا فاسو</string>
+  <string name="country_region_name_bg">بلغاريا</string>
+  <string name="country_region_name_bh">البحرين</string>
+  <string name="country_region_name_bi">بوروندي</string>
   <string name="country_region_name_bj">بنين</string>
   <string name="country_region_name_bm">برمودا</string>
+  <string name="country_region_name_bn">بروناي</string>
   <string name="country_region_name_bo">بوليفيا</string>
-  <string name="country_region_name_ba">البوسنة والهرسك</string>
-  <string name="country_region_name_bw">بوتسوانا</string>
   <string name="country_region_name_br">البرازيل</string>
-  <string name="country_region_name_bg">بلغاريا</string>
-  <string name="country_region_name_bf">بوركينا فاسو</string>
-  <string name="country_region_name_kh">كمبوديا</string>
-  <string name="country_region_name_cm">الكاميرون</string>
+  <string name="country_region_name_bs">باهاماس</string>
+  <string name="country_region_name_bt">بوتان</string>
+  <string name="country_region_name_bw">بوتسوانا</string>
+  <string name="country_region_name_by">بيلاروس</string>
+  <string name="country_region_name_bz">بليز</string>
   <string name="country_region_name_ca">كندا</string>
-  <string name="country_region_name_cv">الرأس الأخضر</string>
-  <string name="country_region_name_ky">جزر كايمان</string>
+  <string name="country_region_name_cd">جمهورية الكونغو الديموقراطية</string>
+  <string name="country_region_name_cf">جمهورية افريقيا الوسطى</string>
+  <string name="country_region_name_cg">جمهورية الكونغو</string>
+  <string name="country_region_name_ch">سويسرا</string>
+  <string name="country_region_name_ci">ساحل العاج</string>
+  <string name="country_region_name_ck">جزر كوك</string>
   <string name="country_region_name_cl">تشيلي</string>
+  <string name="country_region_name_cm">الكاميرون</string>
   <string name="country_region_name_cn">الصين</string>
   <string name="country_region_name_co">كولومبيا</string>
   <string name="country_region_name_cr">كوستاريكا</string>
-  <string name="country_region_name_hr">كرواتيا</string>
+  <string name="country_region_name_cv">الرأس الأخضر</string>
   <string name="country_region_name_cy">قبرص</string>
   <string name="country_region_name_cz">جمهورية التشيك</string>
+  <string name="country_region_name_de">ألمانيا</string>
+  <string name="country_region_name_dj">جيبوتي</string>
   <string name="country_region_name_dk">الدنمارك</string>
-  <string name="country_region_name_is">أيسلندا</string>
-  <string name="country_region_name_in">الهند</string>
+  <string name="country_region_name_dm">دومينيكا</string>
+  <string name="country_region_name_do">جمهورية الدومنيكان</string>
+  <string name="country_region_name_dz">الجزائر</string>
+  <string name="country_region_name_ec">إكوادور</string>
+  <string name="country_region_name_ee">إستونيا</string>
+  <string name="country_region_name_eg">مصر</string>
+  <string name="country_region_name_es">إسبانيا</string>
+  <string name="country_region_name_et">أثيوبيا</string>
+  <string name="country_region_name_fi">فنلندا</string>
+  <string name="country_region_name_fj">فيجي</string>
+  <string name="country_region_name_fo">جزر الفارو</string>
+  <string name="country_region_name_fr">فرنسا</string>
+  <string name="country_region_name_ga">الغابون</string>
+  <string name="country_region_name_gb">المملكة المتحدة</string>
+  <string name="country_region_name_gd">غرينادا</string>
+  <string name="country_region_name_ge">جورجيا</string>
+  <string name="country_region_name_gf">غيانا الفرنسية</string>
+  <string name="country_region_name_gh">غانا</string>
+  <string name="country_region_name_gi">جبل طارق</string>
+  <string name="country_region_name_gl">غرينلاند</string>
+  <string name="country_region_name_gm">غامبيا</string>
+  <string name="country_region_name_gn">غينيا</string>
+  <string name="country_region_name_gp">غواديلوب</string>
+  <string name="country_region_name_gq">غينيا الإستوائية</string>
+  <string name="country_region_name_gr">اليونان</string>
+  <string name="country_region_name_gt">غواتيمالا</string>
+  <string name="country_region_name_gu">غوام</string>
+  <string name="country_region_name_gw">غينيا - بيساو</string>
+  <string name="country_region_name_gy">غيانا</string>
+  <string name="country_region_name_hk">هونغ كونغ</string>
+  <string name="country_region_name_hn">هندوراس</string>
+  <string name="country_region_name_hr">كرواتيا</string>
+  <string name="country_region_name_ht">هايتي</string>
+  <string name="country_region_name_hu">المجر</string>
   <string name="country_region_name_id">إندونيسيا</string>
-  <string name="country_region_name_iq">العراق</string>
   <string name="country_region_name_ie">أيرلندا</string>
   <string name="country_region_name_il">إسرائيل</string>
-  <string name="country_region_name_ci">ساحل العاج</string>
+  <string name="country_region_name_in">الهند</string>
+  <string name="country_region_name_iq">العراق</string>
+  <string name="country_region_name_is">أيسلندا</string>
+  <string name="country_region_name_it">إيطاليا</string>
   <string name="country_region_name_jm">جامايكا</string>
-  <string name="country_region_name_jp">اليابان</string>
   <string name="country_region_name_jo">الأردن</string>
-  <string name="country_region_name_kz">كازاخستان</string>
+  <string name="country_region_name_jp">اليابان</string>
   <string name="country_region_name_ke">كينيا</string>
-  <string name="country_region_name_kw">الكويت</string>
   <string name="country_region_name_kg">قيرغيزستان</string>
+  <string name="country_region_name_kh">كمبوديا</string>
+  <string name="country_region_name_ki">كيريباتي</string>
+  <string name="country_region_name_km">جزر القمر</string>
+  <string name="country_region_name_kn">سانت كيتس ونيفيس</string>
+  <string name="country_region_name_kr">كوريا الجنوبية</string>
+  <string name="country_region_name_kw">الكويت</string>
+  <string name="country_region_name_ky">جزر كايمان</string>
+  <string name="country_region_name_kz">كازاخستان</string>
+  <string name="country_region_name_la">لاوس</string>
+  <string name="country_region_name_lb">لبنان</string>
+  <string name="country_region_name_lc">سانت لوسيا</string>
+  <string name="country_region_name_li">ليختنشتاين</string>
+  <string name="country_region_name_lk">سيريلانكا</string>
+  <string name="country_region_name_lr">ليبيريا</string>
+  <string name="country_region_name_ls">ليسوتو</string>
+  <string name="country_region_name_lt">ليتوانيا</string>
+  <string name="country_region_name_lu">لوكسمبورغ</string>
+  <string name="country_region_name_lv">لاتفيا</string>
+  <string name="country_region_name_ly">ليبيا</string>
+  <string name="country_region_name_ma">المغرب</string>
+  <string name="country_region_name_mc">موناكو</string>
+  <string name="country_region_name_md">مولدوفا</string>
+  <string name="country_region_name_me">الجبل الأسود</string>
+  <string name="country_region_name_mg">مدغشقر</string>
+  <string name="country_region_name_mk">جمهورية مقدونيا اليوغوسلافية السابقة</string>
+  <string name="country_region_name_ml">مالي</string>
+  <string name="country_region_name_mm">ميانمار</string>
+  <string name="country_region_name_mn">منغوليا</string>
+  <string name="country_region_name_mo">ماكاو</string>
+  <string name="country_region_name_mq">مارتينيك</string>
+  <string name="country_region_name_mr">موريتانيا</string>
+  <string name="country_region_name_ms">مونتسيرات</string>
+  <string name="country_region_name_mt">مالطا</string>
+  <string name="country_region_name_mu">موريشيوس</string>
+  <string name="country_region_name_mv">جزر المالديف</string>
+  <string name="country_region_name_mw">ملاوي</string>
+  <string name="country_region_name_mx">المكسيك</string>
+  <string name="country_region_name_my">ماليزيا</string>
+  <string name="country_region_name_mz">موزمبيق</string>
+  <string name="country_region_name_na">ناميبيا</string>
+  <string name="country_region_name_nc">كاليدونيا الجديدة</string>
+  <string name="country_region_name_ne">النيجر</string>
+  <string name="country_region_name_ng">نيجيريا</string>
+  <string name="country_region_name_ni">نيكاراغوا</string>
+  <string name="country_region_name_nl">هولندا</string>
+  <string name="country_region_name_no">النرويج</string>
+  <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_pe">بيرو</string>
+  <string name="country_region_name_pg">بابوا غينيا الجديدة</string>
+  <string name="country_region_name_ph">الفلبين</string>
+  <string name="country_region_name_pk">باكستان</string>
+  <string name="country_region_name_pl">بولندا</string>
+  <string name="country_region_name_pr">بورتوريكو</string>
+  <string name="country_region_name_ps">الاراضي الفلسطينية</string>
+  <string name="country_region_name_pt">البرتغال</string>
+  <string name="country_region_name_pw">بالاو</string>
+  <string name="country_region_name_py">باراغواي</string>
+  <string name="country_region_name_qa">قطر</string>
+  <string name="country_region_name_re">جزيرة ريونيون</string>
+  <string name="country_region_name_ro">رومانيا</string>
+  <string name="country_region_name_rs">صربيا</string>
+  <string name="country_region_name_ru">روسيا</string>
+  <string name="country_region_name_rw">رواندا</string>
+  <string name="country_region_name_sa">المملكة العربية السعودية</string>
+  <string name="country_region_name_sb">جزر سليمان</string>
+  <string name="country_region_name_sc">سيشيل</string>
+  <string name="country_region_name_se">السويد</string>
+  <string name="country_region_name_sg">سنغافورة</string>
+  <string name="country_region_name_si">سلوفينيا</string>
+  <string name="country_region_name_sk">سلوفاكيا</string>
+  <string name="country_region_name_sl">سيراليون</string>
+  <string name="country_region_name_sn">السنغال</string>
+  <string name="country_region_name_so">الصومال</string>
+  <string name="country_region_name_sr">سورينام</string>
+  <string name="country_region_name_ss">جنوب السودان</string>
+  <string name="country_region_name_st">ساو تومي وبرينسيبي</string>
+  <string name="country_region_name_sv">السلفادور</string>
+  <string name="country_region_name_sz">سوازيلاند</string>
+  <string name="country_region_name_tc">جزر تركس وكايكوس</string>
+  <string name="country_region_name_td">تشاد</string>
+  <string name="country_region_name_tg">توغو</string>
+  <string name="country_region_name_th">تايلاند</string>
+  <string name="country_region_name_tj">طاجيكستان</string>
+  <string name="country_region_name_tl">تيمور ليشتي</string>
+  <string name="country_region_name_tm">تركمانستان</string>
+  <string name="country_region_name_tn">تونس</string>
+  <string name="country_region_name_to">تونغا</string>
+  <string name="country_region_name_tr">تركيا</string>
+  <string name="country_region_name_tt">ترينيداد وتوباغو</string>
+  <string name="country_region_name_tw">تايوان</string>
+  <string name="country_region_name_tz">تنزانيا</string>
+  <string name="country_region_name_ua">أوكرانيا</string>
+  <string name="country_region_name_ug">أوغندا</string>
+  <string name="country_region_name_us">الولايات المتحدة الأمريكية</string>
+  <string name="country_region_name_uy">اوروغواي</string>
+  <string name="country_region_name_uz">أوزبكستان</string>
+  <string name="country_region_name_vc">سانت فنسنت وجزر غرينادين</string>
+  <string name="country_region_name_ve">فنزويلا</string>
+  <string name="country_region_name_vg">جزر فيرجن, البريطانية</string>
+  <string name="country_region_name_vi">جزر فيرجن، الولايات المتحدة الأمريكية</string>
+  <string name="country_region_name_vn">فيتنام</string>
+  <string name="country_region_name_vu">فانواتو</string>
+  <string name="country_region_name_ws">ساموا</string>
+  <string name="country_region_name_ye">اليمن</string>
+  <string name="country_region_name_za">جنوب أفريقيا</string>
+  <string name="country_region_name_zm">زامبيا</string>
+  <string name="country_region_name_zw">زيمبابوي</string>
+  <string name="data_privacy_button">التالى</string>
+  <string name="data_privacy_content">من المهم أن تقرأ *سياسة خصوصية* COVIDSafe قبل التسجيل في COVIDSafe. \n\n إذا كان عمرك أقل من 16 عاماً، فيجب على والديك/ الوصي أيضاً قراءة *سياسة الخصوصية*. \n\n إنّ استخدام COVIDSafe هو أمر إختياري تماماً. يمكنك تثبيت التطبيق أو حذفه في أي وقت. إذا قمت بحذف COVIDSafe، *يمكنك أيضاً طلب حذف معلوماتك* من الخادم الآمن. \n\n للتسجيل في COVIDSafe، ستحتاج إلى إدخال اسم (أو اسم مستعار) ورقم هاتف محمول وفئة عمرية ورمز بريدي. \n\n المعلومات التي ترسلها عند التسجيل، ومعلومات استخدامك لـ COVIDSafe سيتم جمعها وتخزينها في خادم آمن للغاية. \n\n لن يقوم COVIDSafe بجمع معلومات عن موقعك. \n\n سيدوّن COVIDSafe وقت الاتصال ورمز مجهول الهوية لمستخدمي COVIDSafe الآخرين الذين تتواصل معهم وقوة إشارة الـ 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="dialog_error_uploading_message">حدث خطأ أثناء تحميل معلوماتك، يرجى المحاولة مرة أخرى.</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="enter_number_button">احصل على رقم تعريف شخصي</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">أدخل رقم التعريف الشخصي المرسل إلى %s %s</string>
+  <string name="enter_pin_resend_pin">إعادة إرسال رقم تعريف شخصي</string>
+  <string name="enter_pin_timer_expire">ستنتهي صلاحية رقم التعريف الشخصي الخاص بك في</string>
+  <string name="enter_pin_wrong_number">هل رقم الهاتف المحمول هذا خاطئ؟</string>
+  <!-- for production -->
+  <string name="generic_error">الرجاء عاود المحاولة في وقت لاحق</string>
+  <string name="generic_internet_error">الرجاء تحقق من الاتصال بشبكة الانترنت الخاصة بك</string>
+  <string name="home_app_permission_push_notification_prompt">السماح لـ COVIDSafe بالإخطارات اللحظية للرسائل.</string>
+  <string name="home_app_permission_status_subtitle">لن يعمل COVIDSafe بدون الإعدادات الصحيحة.</string>
+  <string name="home_app_permission_status_title">تحقق من إعداداتك</string>
+  <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_uploaded">قم بالتسجيل من أجل العزل الذاتي</string>
+  <string name="home_data_uploaded_button">قم بالتسجيل</string>
+  <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>
+  <!-- Home -->
+  <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>
+  <string name="home_header_uploaded_on_date">تم تحميل معلوماتك على %s .</string>
+  <string name="home_location_permission">الموقع: %s</string>
+  <string name="home_non_battery_optimization_permission">تحسين البطارية: %s</string>
+  <string name="home_permission_off">متوقف</string>
+  <string name="home_permission_on">تشغيل</string>
+  <string name="home_push_notification_permission">إخطار لحظي للرسائل: %s</string>
+  <string name="home_set_complete_disclaimer_title">لنوقف انتشار COVID-19.</string>
+  <string name="home_set_complete_external_link_app_content">قم بتنزيل التطبيق الحكومي للحصول على أحدث الأخبار والنصائح.</string>
+  <string name="home_set_complete_external_link_app_title">احصل على تطبيق Coronavirus</string>
+  <string name="home_set_complete_external_link_app_url">https://www.health.gov.au/resources/apps-and-tools/coronavirus-australia-app</string>
+  <string name="home_set_complete_external_link_been_contacted_content">لا يمكنك تحميل معلوماتك إلا إذا كانت نتيجة اختبارك إيجابية.</string>
+  <string name="home_set_complete_external_link_been_contacted_title">هل اتصل بك مسؤول صحي؟</string>
+  <string name="home_set_complete_external_link_help_topics_content">إذا كان لديك مشاكل أو أسئلة حول التطبيق.</string>
+  <string name="home_set_complete_external_link_help_topics_title">مواضيع المساعدة</string>
+  <string name="home_set_complete_external_link_news_content">توجه إلى aus.gov.au للحصول على أحدث أخبار فيروس كورونا.</string>
+  <string name="home_set_complete_external_link_news_title">آخر الأخبار والتحديثات</string>
+  <string name="home_set_complete_external_link_news_url">https://www.australia.gov.au</string>
+  <string name="home_set_complete_external_link_self_isolation_register_url">https://covid-form.service.gov.au</string>
+  <string name="home_set_complete_external_link_share_content">قم بدعوة الآخرين للمساعدة. معاً، نحن أقوى.</string>
+  <string name="home_set_complete_external_link_share_title">شارك 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="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>
+  <!-- OnBoarding How it works -->
+  <string name="how_it_works_headline">كيف يعمل COVIDSafe</string>
+  <string name="how_it_works_headline_content_description">العنوان، كيف يعمل 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_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>
+  <!-- Splash Screen -->
+  <string name="migration_in_progress">تحديث COVIDSafe قيد الإنجاز. \n\n يرجى التأكد من عدم إغلاق هاتفك حتى اكتمال التحديث.</string>
+  <string name="navigation_back_button_content_description">الصفحة السابقة</string>
+  <string name="notification_active_body">حافظ على COVIDSafe نشطاً عند مغادرتك المنزل أو عندما تكون في الأماكن العامة.</string>
+  <!-- Notifications -->
+  <string name="notification_active_title">COVIDSafe نشط</string>
+  <string name="notification_not_active_body">تأكد من أن COVIDSafe نشط قبل مغادرتك المنزل أو عندما تكون في الأماكن العامة.</string>
+  <string name="notification_not_active_title">COVIDSafe غير نشط.</string>
+  <string name="options_for_australia">خيارات لأستراليا</string>
+  <string name="permission_button">استمر</string>
+  <string name="permission_content">يحتاج برنامج COVIDSafe إلى تمكين الـ Bluetooth® والإخطارات حتى يعمل. \n\n اختر \"استمر\" من أجل: \n\n 1. تمكين Bluetooth® \n\n 2. السماح لأذونات الموقع \n\n 3. تعطيل تحسين البطارية \n\n\n يحتاج اندرويد إلى أذونات الموقع لكي يعمل الـ Bluetooth®. \n\n لا يرسل COVIDSafe طلبات الاقتران.</string>
+  <!-- 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 طلبات الاقتران. *تعرّف على المزيد*.</string>
+  <!-- OnBoarding Permission Success -->
+  <string name="permission_success_headline">لقد قمت بالتسجيل بنجاح</string>
+  <string name="permission_success_warning">استمر في تشغيل الإخطارات اللحظية للرسائل لـ COVIDSafe حتى نتمكن من إخطارك بسرعة إذا كان التطبيق لا يعمل بشكل صحيح.</string>
+  <string name="personal_details_age_content_description">اختر الفئة العمرية</string>
+  <string name="personal_details_age_dialog_title">اختر عمرك</string>
+  <string name="personal_details_age_error_prompt">يرجى اختيار فـئـتك العمرية.</string>
+  <string name="personal_details_age_title">الفئة العمرية (اختر)</string>
+  <string name="personal_details_button">استمر</string>
+  <string name="personal_details_dialog_ok">اختر</string>
+  <!-- OnBoarding Personal details -->
+  <string name="personal_details_headline">أدخل تفاصيلك</string>
+  <string name="personal_details_headline_content_description">العنوان، أدخل تفاصيلك</string>
+  <string name="personal_details_name_content_description">أدخل الاسم الكامل</string>
+  <string name="personal_details_name_error_prompt">الرجاء أدخل اسمك الكامل.</string>
+  <string name="personal_details_name_title">الاسم الكامل (أو الاسم المستعار)</string>
+  <string name="personal_details_post_code">الرمز البريدي في أستراليا</string>
+  <string name="personal_details_post_code_content_description">أدخل الرمز البريدي</string>
+  <string name="personal_details_post_code_dialog_title">الرمز البريدي</string>
+  <string name="personal_details_post_code_error_prompt">يجب أن يحتوي رقم رمزك البريدي الأسترالي على 4 أرقام.</string>
+  <string name="personal_details_post_code_hint">على سبيل المثال 2000</string>
+  <string name="registration_consent_content">أوافق على أن تكون وكالة التحول الرقمي مسؤولة عن تخزين البيانات، بموجب قرار قانوني صادر عن أمين عام وزارة الصحة للحكومة الأسترالية لجمع:</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="search">ابحث</string>
+  <!-- OnBoarding Enter Number -->
+  <string name="select_country_or_region">اختر البلد أو المنطقة</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="share_this_app_content">إنضم لي لنعمل على وقف انتشار COVID-19! قم بتنزيل COVIDSafe، وهو تطبيق من الحكومة الأسترالية. # COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
+  <string name="title_help">مساعدة</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>
+  <string name="under_sixteen_second_paragraph">معلومات حول اتصالي مع مستخدمي COVIDSafe آخرين، في حال أنّ مستخدم آخر كنت على تواصل معه جاءت نتيجة اختباره إيجابية لـ COVID-19 وتحميل بيانات الاتصال الخاصة به.</string>
+  <string name="upload_answer_no">لا</string>
+  <!-- Upload flow -->
+  <string name="upload_answer_yes">نعم</string>
+  <string name="upload_consent_button">أوافق</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 سيقوم مسؤولو الصحة في الولاية أو الإقليم بإخطار مستخدمي COVIDS الآخرين الذين سجلوا حالات اتصال عن قرب معك. ستظل هويتك مجهولة للمستخدمين الآخرين.</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>
+  <string name="upload_step_4_header_content_description">العنوان، تحميل الموافقة</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>
+  <string name="us_consent_button">أوافق</string>
+  <string name="wrong_ping_number">تم إدخال رقم تعريف شخصي خاطئ</string>
+
+  <string name="battery_optimisation_prompt">يجب عليك تعطيل تحسين البطارية.</string>
+  <string name="change_language">تغيير اللغة</string>
+  <string name="change_language_content">اقرأ الدليل حول استخدام COVIDSafe بلغة مختلفة.</string>
+  <string name="country_region_name_au2">جزيرة نورفولك</string>
+  <string name="country_region_name_cu">كوبا</string>
+  <string name="country_region_name_cw">كوراساو</string>
+  <string name="country_region_name_ir">إيران</string>
+  <string name="country_region_name_sd">السودان</string>
+  <string name="disabled">معطلة</string>
+  <string name="done_success">تـمّ</string>
+  <string name="enabled">ممكّنة</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="Enter_your_mobile_number_label">أدخل رقم هاتفك المحمول</string>
+  <string name="heading">العنوان</string>
+  <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_1">كيفية إصلاح المشكلات وتفعيل COVIDSafe مرة أخرى</string>
+  <string name="internet_screen_content_2">عندما يتوفر تحديث إصدار جديد</string>
+  <string name="internet_screen_heading">اتصل بالإنترنت لتحسين أداء COVIDSafe</string>
+  <string name="need_location_service">لكي يعمل COVIDSafe عليك تشغيل الموقع في الإعدادات.</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="norfolk_hint">على سبيل المثال: 51234</string>
+  <string name="notification_update_content">قم بتحديث تطبيقك للوصول إلى أحدث التحسينات.</string>
+  <string name="notification_update_heading">تحديث COVIDSafe متوفر</string>
+  <string name="personal_details_name_characters_prompt">يرجى استخدام الأحرف الإنجليزية لاسمك الكامل. لا تستخدم لغات أو رموز أخرى مثل \"،\" أو \"؟\".</string>
+  <string name="pin_number">رقم التعريف الشخصي pin</string>
+  <string name="PINNumber_VO_Label">رقم التعريف الشخصي pin</string>
+  <string name="PN_MobileNumber_VOLabel">رقم الهاتف المحمول</string>
+  <string name="ReceivePinIssue">مشكلات في تلقي رقم التعريف الشخصي الخاص بك؟</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="Select_country_or_region_headline">اختر البلد أو المنطقة</string>
+  <string name="service_ok_body">حافظ على COVIDSafe نشطاً عند مغادرتك المنزل أو عندما تكون في أماكن عامة.</string>
+  <string name="service_ok_title">COVIDSafe نشط</string>
+  <string name="stepCounter" formatted="false">الخطوة%d من %d</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="under_sixteen_registration_consent_first_paragraph">معلومات التسجيل الخاصة بي.</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 .</string>
+  <string name="update_available_play_store_btn">انتقل إلى متجر Google Play</string>
+  <string name="update_available_title">التحديث متوفر!</string>
 </resources>

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

@@ -1,290 +1,432 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-  <string name="home_header_uploaded_on_date">Τα στοιχεία σας αναρτήθηκαν την %s</string>
-  <string name="home_version_number">Αριθμός εκδοχής %s</string>
-  <string name="home_header_active_title">Η COVIDSafe είναι ενεργή</string>
-  <string name="home_header_inactive_title">Η COVIDSafe δεν είναι ενεργή</string>
-  <string name="data_privacy_content">Συνίσταται να διαβάσετε την *πολιτική απορρήτου* της COVIDSafe πριν εγγραφείτε στην COVIDSafe. \n\nΕάν είστε κάτω των 16 ετών, ο γονέας/κηδεμόνας σας πρέπει επίσης να διαβάσει την *πολιτική απορρήτου*. \n\nΗ χρήση της COVIDSafe είναι εντελώς εθελοντική. Μπορείτε να εγκαταστήσετε ή να διαγράψετε την εφαρμογή ανά πάσα στιγμή. Εάν διαγράψετε την COVIDSafe, *μπορείτε επίσης να ζητήσετε τη διαγραφή των στοιχείων σας* από τον ασφαλή διακομιστή. \n\nΓια να εγγραφείτε στην COVIDSafe, θα πρέπει να εισάγετε όνομα, αριθμό κινητού τηλεφώνου, ηλικιακή ομάδα και ταχυδρομικό κώδικα. \n\nΟι πληροφορίες που υποβάλετε κατά την εγγραφή σας και οι πληροφορίες για τη χρήση της COVIDSafe από εσάς θα συλλέγονται και θα αποθηκεύονται σε έναν εξαιρετικά ασφαλή διακομιστή. \n\nΗ COVIDSafe δε θα συλλέξει τις πληροφορίες τοποθεσίας σας. \n\nΗ COVIDSafe θα σημειώσει την ώρα της επικοινωνίας και έναν ανώνυμο κωδικό ταυτότητας άλλων χρηστών COVIDSafe με τους οποίους έρχεστε σε επαφή. \n\nΆλλοι χρήστες της COVIDSafe με τους οποίους έρχεστε σε επαφή θα σημειώσουν έναν ανώνυμο κωδικό ταυτότητας και την ώρα επαφής μαζί σας στη συσκευή τους. \n\nΕάν ένας άλλος χρήστης διαγνωστεί θετικά με COVID-19, μπορεί να αναρτήσει τα στοιχεία επικοινωνίας του και ένας υπάλληλος υγείας της Πολιτείας ή της Επικράτειάς σας μπορεί να επικοινωνήσει μαζί σας για λόγους ανίχνευσης επαφών. \n\nΤα στοιχεία εγγραφής σας θα χρησιμοποιηθούν ή θα αποκαλυφθούν μόνο για τον εντοπισμό επαφών και για την ορθή και νόμιμη λειτουργία της COVIDSafe. \n\nΠερισσότερες πληροφορίες διατίθενται στον ιστότοπο *Υπουργείο Υγείας της Αυστραλιανής Κυβέρνησης*. \n\nΔιαβάστε την *πολιτική απορρήτου* της COVIDSafe για περισσότερες λεπτομέρειες σχετικά με τα δικαιώματά σας σχετικά με τις πληροφορίες σας και τον τρόπο χειρισμού και κοινοποίησής τους.</string>
-  <string name="dialog_error_uploading_negative">Ακύρωση</string>
-  <string name="permission_content">Η COVIDSafe χρειάζεται Bluetooth® και ενεργοποιημένες ειδοποιήσεις για να λειτουργήσει.\n\nΕπιλέξτε «Προχωρώ» για να:\n\n1. Ενεργοποιήσετε το Bluetooth®\n\n2. Επιτραπεί η άδεια Τοποθεσίας\n\n3. Απενεργοποιηθεί η Βελτιστοποίηση Μπαταρίας\n\n\nΤο Android χρειάζεται άδεια Τοποθεσίας για να λειτουργήσει το Bluetooth®\n\nΗ COVIDSafe δε στέλνει αιτήματα σύζευξης.</string>
-  <string name="home_header_active_no_action_required">Δε χρειάζονται περαιτέρω ενέργειες.</string>
-  <string name="country_region_name_dm">Δομινίκα</string>
-  <string name="enter_number_relative">Προσπαθείτε να εγγραφείτε εκ μέρους φίλου ή συγγενή; \n\nΗ εγγραφή θα πρέπει να γίνει χρησιμοποιώντας τη δική τους συσκευή και τον αριθμό τηλεφώνου τους, για να λειτουργήσει η COVIDSafe για αυτούς.</string>
-  <string name="change_device_name_content_line_1">Το τρέχον όνομα της συσκευής σας είναι %s.</string>
-  <string name="upload_step_verify_pin_sub_header">Ένας υπάλληλος υγείας της Πολιτείας ή της Επικράτειάς σας θα στείλει ένα PIN στη συσκευή σας μέσω μηνύματος. Εισάγετέ το παρακάτω για να αναρτήσετε τα στοιχεία σας.</string>
-  <string name="upload_step_4_sub_header">Εάν δε συναινέσετε, τα στοιχεία επικοινωνίας σας δε θα αναρτηθούν.\n\nΕάν συναινείτε, τα στοιχεία στενής επαφής σας θα αναρτηθούν και θα κοινοποιηθούν σε υπαλλήλους υγείας της Πολιτείας ή της Επικράτειάς σας για σκοπούς ανίχνευσης επαφών.\n\nΓια περισσότερες λεπτομέρειες διαβάστε την πολιτική προστασίας προσωπικών δεδομένων της COVIDSafe *.</string>
-  <string name="personal_details_headline">Εισάγετε τα στοιχεία σας</string>
-  <string name="enter_pin_headline" formatted="false">Εισάγετε το PIN που στάλθηκε στο %s %s</string>
-  <string name="home_set_complete_external_link_share_content">Ζητήστε τη βοήθεια και άλλων. Μαζί, είμαστε πιο δυνατοί.</string>
-  <string name="home_set_complete_external_link_news_content">Επισκεφτείτε τη σελίδα aus.gov.au για τις τελευταίες ειδήσεις για τον Κορωνοϊό.</string>
-  <string name="intro_content">Η COVIDSafe έχει αναπτυχθεί από την Αυστραλιανή Κυβέρνηση για την ασφάλεια της κοινότητας από την εξάπλωση του κορωνοϊού. \n\nΗ COVIDSafe θα σημειώσει με ασφάλεια την επαφή που έχετε με άλλους χρήστες της εφαρμογής. Αυτό θα επιτρέπει στους υπαλλήλους της Πολιτείας ή Επικράτειάς σας να επικοινωνήσουν μαζί σας, εάν έχετε στενή επαφή με κάποιον που έχει διαγνωστεί θετικά στον ιό.\n\nΜαζί μπορούμε να βοηθήσουμε να σταματήσουμε την εξάπλωση και να παραμείνουμε υγιείς.</string>
-  <string name="enter_number_headline">Εισάγετε τον αριθμό του κινητού σας</string>
-  <string name="country_region_name_tt">Τρίνινταντ και Τομπάγκο</string>
-  <string name="country_region_name_tc">Νήσοι Τερκς και Κάικος</string>
-  <string name="country_region_name_kg">Κιργιζιστάν</string>
-  <string name="country_region_name_ht">Αϊτή</string>
-  <string name="country_region_name_ky">Νησιά Κέιμαν</string>
-  <string name="country_region_name_ai">Ανγκουίλα</string>
-  <string name="permission_button">Προχωρήστε</string>
-  <string name="upload_step_4_header">Αναρτήστε τη συναίνεσή σας</string>
-  <string name="upload_step_1_body">Υπάλληλος υγείας της Πολιτείας ή της Επικράτειάς σας θα επικοινωνήσει μαζί σας μόνο εάν διαγνωστείτε θετικά στο COVID-19, για να σας βοηθήσει με την εθελοντική ανάρτηση των πληροφοριών σας. \n\nΜόλις πατήσετε «Ναι», θα πρέπει να δώσετε τη συναίνεσή σας για να αναρτήσετε τα στοιχεία σας.</string>
-  <string name="under_sixteen_first_paragraph">Τα στοιχεία μου εγγραφής επιτρέπουν την ανίχνευση επαφών από υπαλλήλους υγείας των Πολιτειών και Επικρατειών.</string>
-  <string name="registration_consent_headline">Συναίνεση εγγραφής</string>
-  <string name="registration_consent_first_paragraph">Τα στοιχεία εγγραφής μου για να επιτραπεί η ανίχνευση επαφών από υπαλλήλους υγείας των Πολιτειών ή Επικρατειών.</string>
-  <string name="pin_number">κωδικός PIN</string>
-  <string name="personal_details_name_characters_prompt">Χρησιμοποιήστε Λατινικούς χαρακτήρες για το ονοματεπώνυμό σας. Μη χρησιμοποιείτε άλλες γλώσσες ή σύμβολα όπως \',\' ή \'?\'.</string>
-  <string name="personal_details_age_error_prompt">Επιλέξτε την ηλικιακή ομάδα.</string>
-  <string name="permission_success_headline">Έχετε εγγραφεί επιτυχώς</string>
-  <string name="permission_success_button">Συνεχίστε</string>
-  <string name="permission_location_rationale">Το Android απαιτεί πρόσβαση τοποθεσίας για την ενεργοποίηση των λειτουργιών Bluetooth® για την COVIDSafe. Η COVIDSafe δεν μπορεί να λειτουργήσει σωστά χωρίς αυτό</string>
-  <string name="permission_headline">Ρυθμίσεις εφαρμογής</string>
-  <string name="home_app_permission_status_title">Ελέγξτε τις ρυθμίσεις σας</string>
-  <string name="enter_pin_wrong_number">Είναι ο αριθμός κινητού λάθος;</string>
-  <string name="enter_pin_timer_expire">Το PIN σας θα λήξει σε</string>
-  <string name="enter_pin_resend_pin">Στείλτε ξανά το PIN</string>
-  <string name="country_region_name_au2">Νήσος Νόρφολκ</string>
-  <string name="home_app_permission_status_subtitle">Η COVIDSafe δε θα λειτουργήσει χωρίς τις σωστές ρυθμίσεις.</string>
-  <string name="home_app_permission_push_notification_prompt">Επιτρέψτε στην COVIDSafe να προωθεί αυτόματες ειδοποιήσεις.</string>
-  <string name="home_header_inactive_check_your_permissions">Ελέγξτε τις ρυθμίσεις σας</string>
-  <string name="home_bluetooth_permission">Bluetooth®: %s</string>
-  <string name="home_location_permission">Τοποθεσία: %s</string>
-  <string name="home_push_notification_permission">Αυτόματη γνωστοποίηση:%s</string>
-  <string name="home_permission_on">Ανοιχτό</string>
-  <string name="home_permission_off">Κλειστό</string>
-  <string name="home_set_complete_external_link_share_title">Μοιραστείτε την COVIDSafe</string>
-  <string name="home_set_complete_external_link_news_title">Τελευταίες ειδήσεις και ενημερώσεις</string>
-  <string name="home_set_complete_external_link_news_url">https://www.australia.gov.au</string>
-  <string name="home_set_complete_external_link_app_title">Αποκτήστε την εφαρμογή για τον Κορωνοϊό</string>
-  <string name="home_set_complete_external_link_app_content">Κατεβάστε την εφαρμογή της κυβέρνησης για τις τελευταίες ειδήσεις και συμβουλές.</string>
-  <string name="home_set_complete_external_link_been_contacted_title">Έχει επικοινωνήσει μαζί σας υπάλληλος υγείας;</string>
-  <string name="home_set_complete_external_link_been_contacted_content">Μπορείτε να αναρτήσετε τα στοιχεία σας μόνο εάν έχετε διαγνωστεί θετικά.</string>
-  <string name="home_set_complete_external_link_app_url">https://www.health.gov.au/resources/apps-and-tools/coronavirus-australia-app</string>
-  <string name="home_set_complete_external_link_help_topics_title">Θέματα βοήθειας</string>
-  <string name="home_set_complete_external_link_help_topics_content">Εάν έχετε προβλήματα ή απορίες για την εφαρμογή.</string>
-  <string name="upload_answer_yes">Ναι</string>
-  <string name="upload_answer_no">Όχι</string>
-  <string name="upload_step_1_header">Σας ζητάει υπάλληλος υγείας σας να αναρτήσετε τα στοιχεία σας;</string>
-  <string name="upload_step_verify_pin_header">Αναρτήστε τα στοιχεία σας</string>
-  <string name="upload_finished_header">Σας ευχαριστούμε που βοηθήσατε να σταματήσει η εξάπλωση του COVID-19!</string>
-  <string name="upload_finished_sub_header">Έχετε ανεβάσει με επιτυχία τις πληροφορίες σας στο σύστημα αποθήκευσης υψηλής ασφάλειας COVIDSafe.\n\nΟι υγειονομικοί υπάλληλοι της Πολιτείας ή της Επικράτειάς σας θα ενημερώσουν άλλους χρήστες της COVIDSafe που έχουν καταγράψει στενή επαφή μαζί σας. Η ταυτότητά σας θα παραμείνει ανώνυμη σε άλλους χρήστες.</string>
-  <string name="permission_success_content">1. Όταν φεύγετε από το σπίτι, κρατήστε το τηλέφωνό σας μαζί σας και βεβαιωθείτε ότι η COVIDSafe είναι ενεργή. \n\n2. Το Bluetooth® πρέπει να παραμείνει ενεργοποιημένο. \n\n3. Η βελτιστοποίηση της μπαταρίας πρέπει να είναι απενεργοποιημένη. \n\n4. Η COVIDSafe δεν αποστέλλει αιτήματα σύζευξης. *Μάθετε περισσότερα*.</string>
-  <string name="home_header_no_pairing">Η COVIDSafe δεν αποστέλλει αιτήματα σύζευξης.</string>
-  <string name="update_available_play_store_btn">Μεταβείτε στο Google Play Store</string>
-  <string name="enter_pin_button">Επιβεβαιώστε</string>
-  <string name="how_it_works_content">Τα σήματα Bluetooth χρησιμοποιούνται για να προσδιορίσουν πότε βρίσκεστε κοντά σε άλλο χρήστη της COVIDSafe.\n\nΗ κάθε στενή επαφή σας με άλλους χρήστες της COVIDSafe σημειώνεται για να δημιουργεί στενά στοιχεία επικοινωνίας. Οι πληροφορίες είναι κρυπτογραφημένες και αποθηκεύονται μόνο στο τηλέφωνό σας.\n\nΕάν έχετε διαγνωστεί θετικά στην COVID-19 κατόπιν χρήσης της COVIDSafe, ένας υπεύθυνος υγείας της Πολιτείας ή της Επικράτειάς σας θα επικοινωνήσει μαζί σας. Θα βοηθήσει με την εθελοντική ανάρτηση των προσωπικών στοιχείων επικοινωνίας σας σε ένα εξαιρετικά ασφαλές σύστημα αποθήκευσης πληροφοριών. \n\nΟι υπεύθυνοι υγείας της Πολιτείας ή της Επικράτειάς σας μπορούν επίσης να επικοινωνήσουν μαζί σας εάν ήρθατε σε στενή επαφή με άλλο χρήστη της COVIDSafe που επίσης διαγνώσθηκε θετικά.\n\nΓια περισσότερες πληροφορίες, πηγαίνετε στη σελίδα *Θέματα Βοήθειας*.</string>
-  <string name="generic_error">Προσπαθήστε ξανά αργότερα.</string>
-  <string name="generic_internet_error">Ελέγξτε τη σύνδεσή σας στο διαδίκτυο</string>
-  <string name="dialog_uploading_message">Τα στοιχεία σας αναρτίζονται στην COVIDSafe αυτή τη στιγμή. \n\nΜην κλείσετε την εφαρμογή.</string>
-  <string name="dialog_error_uploading_message">Παρουσιάστηκε πρόβλημα κατά την ανάρτηση των στοιχείων σας. Δοκιμάστε ξανά.</string>
-  <string name="title_help">Βοήθεια</string>
-  <string name="share_this_app_content">Ελάτε μαζί μου να σταματήσουμε την εξάπλωση του COVID-19! Κατεβάστε την COVIDSafe, μια εφαρμογή της Αυστραλιανής Κυβέρνησης. # COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
-  <string name="service_not_ok_body">Βεβαιωθείτε ότι η COVIDSafe είναι ενεργή πριν βγείτε από το σπίτι ή όταν βρίσκεστε σε δημόσιους χώρους.</string>
-  <string name="service_not_ok_title">Η COVIDSafe δεν είναι ενεργή</string>
-  <string name="service_not_ok_action">Ελέγξτε την εφαρμογή τώρα</string>
-  <string name="migration_in_progress">Η ενημέρωση της COVIDSafe συνεχίζεται. \n\nΒεβαιωθείτε ότι το τηλέφωνό σας δεν είναι απενεργοποιημένο έως ότου ολοκληρωθεί η ενημέρωση.</string>
-  <string name="intro_headline">Μαζί μπορούμε να σταματήσουμε την εξάπλωση του COVID-19</string>
-  <string name="intro_button">Θέλω να βοηθήσω</string>
-  <string name="how_it_works_headline">Πώς λειτουργεί η COVIDSafe</string>
-  <string name="how_it_works_button">Επόμενο</string>
-  <string name="consent_call_for_action">Επιλέξτε «Συμφωνώ» για επιβεβαίωση της συγκατάθεσης.</string>
-  <string name="consent_button">Συμφωνώ</string>
-  <string name="data_privacy_button">Επόμενο</string>
-  <string name="registration_consent_content">Συναινώ να συλλέγει το Αυστραλιανό Υπουργείο Υγείας:</string>
-  <string name="registration_consent_second_paragraph">Τα στοιχεία επικοινωνίας μου από άλλους χρήστες της COVIDSafe αφού διαγνώστηκαν θετικά για το COVID-19.</string>
-  <string name="personal_details_name_title">Ονοματεπώνυμο</string>
-  <string name="personal_details_name_content_description">Εισαγάγετε το ονοματεπώνυμο</string>
-  <string name="personal_details_age_title">Ηλικιακή ομάδα (επιλέξτε)</string>
-  <string name="personal_details_post_code">Ταχυδρομικός κώδικας στην Αυστραλία</string>
-  <string name="personal_details_post_code_content_description">Εισάγετε τον ταχυδρομικό σας κώδικα</string>
-  <string name="personal_details_age_content_description">Επιλέξτε την ηλικιακή ομάδα</string>
-  <string name="personal_details_post_code_error_prompt">Ο Αυστραλιανός ταχυδρομικός σας κώδικας πρέπει να περιέχει 4 ψηφία.</string>
-  <string name="navigation_back_button_content_description">Προηγούμενη σελίδα</string>
-  <string name="personal_details_button">Συνεχίστε</string>
-  <string name="under_sixteen_headline">Χρειάζεστε τη συναίνεση του γονέα/κηδεμόνα σας για να συνεχίσετε</string>
-  <string name="under_sixteen_content">Επιβεβαιώνω ότι ως γονέας ή κηδεμόνας συναινώ με το Υπουργείο Υγείας της Αυστραλίας στη συλλογή:</string>
-  <string name="under_sixteen_second_paragraph">Τα στοιχεία επικοινωνίας μου από άλλους χρήστες της COVIDSafe αφού διαγνώστηκαν θετικά για το COVID-19.</string>
-  <string name="select_country_or_region">Επιλέξτε χώρα ή περιοχή</string>
-  <string name="invalid_phone_number">Μη έγκυρος αριθμός τηλεφώνου.</string>
-  <string name="invalid_australian_phone_number_error_prompt">Οι αριθμοί κινητής τηλεφωνίας της Αυστραλίας περιέχουν έως 10 ψηφία.</string>
-  <string name="invalid_norfolk_island_phone_number_error_prompt">Οι αριθμοί κινητής τηλεφωνίας στο νησί Νόρφολκ περιέχουν 5 έως 6 ψηφία.</string>
-  <string name="enter_number_content">Θα σας στείλουμε ένα 6ψήφιο PIN για να επαληθεύσετε τον αριθμό του κινητού σας.</string>
-  <string name="enter_number_button">Αποκτήστε PIN</string>
-  <string name="dialog_error_uploading_positive">Προσπαθήστε ξανά</string>
-  <string name="data_privacy_headline">Εγγραφή και προστασία του απορρήτου</string>
-  <string name="country_region_name_zw">Ζιμπάμπουε</string>
-  <string name="country_region_name_zm">Ζάμπια</string>
-  <string name="country_region_name_za">Νότια Αφρική</string>
-  <string name="country_region_name_ye">Υεμένη</string>
-  <string name="country_region_name_vi">Παρθένες Νήσοι, ΗΠΑ</string>
-  <string name="country_region_name_vg">Βρετανικές Παρθένες Νήσοι</string>
-  <string name="country_region_name_vn">Βιετνάμ</string>
-  <string name="country_region_name_ve">Βενεζουέλα</string>
-  <string name="country_region_name_vc">Άγιος Βικέντιος και Γρεναδίνες</string>
-  <string name="country_region_name_uz">Ουζμπεκιστάν</string>
-  <string name="country_region_name_uy">Ουρουγουάη</string>
-  <string name="country_region_name_us">Ηνωμένες Πολιτείες</string>
-  <string name="country_region_name_ug">Ουγκάντα</string>
-  <string name="country_region_name_ua">Ουκρανία</string>
-  <string name="country_region_name_tz">Τανζανία</string>
-  <string name="country_region_name_tw">Ταϊβάν</string>
-  <string name="country_region_name_tr">Τουρκία</string>
-  <string name="country_region_name_tn">Τυνησία</string>
-  <string name="country_region_name_tm">Τουρκμενιστάν</string>
-  <string name="country_region_name_tj">Τατζικιστάν</string>
-  <string name="country_region_name_th">Ταϊλάνδη</string>
-  <string name="country_region_name_tg">Τόγκο</string>
-  <string name="country_region_name_sn">Σενεγάλη</string>
-  <string name="country_region_name_si">Σλοβενία</string>
-  <string name="country_region_name_sk">Σλοβακία</string>
-  <string name="country_region_name_sg">Σιγκαπούρη</string>
-  <string name="country_region_name_se">Σουηδία</string>
-  <string name="country_region_name_sd">Σουδάν</string>
-  <string name="country_region_name_sb">Νησιά Σολομώντα</string>
-  <string name="country_region_name_rw">Ρουάντα</string>
-  <string name="country_region_name_ru">Ρωσία</string>
-  <string name="country_region_name_rs">Σερβία</string>
-  <string name="country_region_name_qa">Κατάρ</string>
-  <string name="country_region_name_py">Παραγουάη</string>
-  <string name="country_region_name_pt">Πορτογαλία</string>
-  <string name="country_region_name_pr">Πουέρτο Ρίκο</string>
-  <string name="country_region_name_pl">Πολωνία</string>
-  <string name="country_region_name_pk">Πακιστάν</string>
-  <string name="country_region_name_ph">Φιλιππίνες</string>
-  <string name="country_region_name_pg">Παπούα Νέα Γουινέα</string>
-  <string name="country_region_name_pe">Περού</string>
-  <string name="country_region_name_pa">Παναμά</string>
-  <string name="country_region_name_om">Ομάν</string>
-  <string name="country_region_name_nz">Νέα Ζηλανδία</string>
-  <string name="country_region_name_np">Νεπάλ</string>
-  <string name="country_region_name_no">Νορβηγία</string>
-  <string name="country_region_name_nl">Κάτω Χώρες</string>
-  <string name="country_region_name_ni">Νικαράγουα</string>
-  <string name="country_region_name_ng">Νιγηρία</string>
-  <string name="country_region_name_ne">Νίγηρα</string>
-  <string name="country_region_name_na">Ναμίμπια</string>
-  <string name="country_region_name_mz">Μοζαμβίκη</string>
-  <string name="country_region_name_my">Μαλαισία</string>
-  <string name="country_region_name_mx">Μεξικό</string>
-  <string name="country_region_name_mu">Μαυρίκιος</string>
-  <string name="country_region_name_mt">Μάλτα</string>
-  <string name="country_region_name_ms">Μοντσερράτ</string>
-  <string name="country_region_name_mq">Μαρτινίκα</string>
-  <string name="country_region_name_mo">Μακάο</string>
-  <string name="country_region_name_mm">Μιανμάρ</string>
-  <string name="country_region_name_ml">Μάλι</string>
-  <string name="country_region_name_mk">Βόρεια Μακεδονία</string>
-  <string name="country_region_name_md">Μολδαβία</string>
-  <string name="country_region_name_ma">Μαρόκο</string>
-  <string name="country_region_name_lu">Λουξεμβούργο</string>
-  <string name="country_region_name_lt">Λιθουανία</string>
-  <string name="country_region_name_lk">Σρι Λάνκα</string>
-  <string name="country_region_name_li">Λιχτενστάιν</string>
-  <string name="country_region_name_lc">Αγία Λουκία</string>
-  <string name="country_region_name_kr">Νότια Κορέα</string>
-  <string name="country_region_name_kn">Άγιος Κιτς και Νέβις</string>
-  <string name="country_region_name_ir">Ιράν</string>
-  <string name="country_region_name_gb">Ηνωμένο Βασίλειο</string>
-  <string name="country_region_name_es">Ισπανία</string>
-  <string name="country_region_name_cw">Κουρασάο</string>
-  <string name="country_region_name_cu">Κούβα</string>
-  <string name="country_region_name_ch">Ελβετία</string>
-  <string name="country_region_name_ae">Ηνωμένα Αραβικά Εμιράτα</string>
-  <string name="change_device_name_secondary_action">Παραλείψτε και κρατήστε όπως είναι</string>
-  <string name="change_device_name_primary_action">Αλλάξετε και συνεχίστε</string>
-  <string name="change_device_name_new_device_name">Νέο όνομα συσκευής</string>
-  <string name="change_device_name_headline">Το όνομα της συσκευής σας</string>
-  <string name="change_device_name_default_device_name">Τηλέφωνο Android</string>
-  <string name="change_device_name_content_line_2">Άλλες συσκευές Bluetooth® γύρω σας θα μπορούν να δουν αυτό το όνομα. Σας συνιστούμε να χρησιμοποιήσετε ένα όνομα συσκευής που δεν περιλαμβάνει τα προσωπικά σας στοιχεία.</string>
-  <string name="action_verify_upload_pin">Ανεβάστε τα στοιχεία μου</string>
+  <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_report_an_issue">Αναφέρετε το πρόβλημα</string>
-  <string name="action_continue">Συνεχίστε</string>
-  <string name="wrong_ping_number">Εισήχθη λάθος PIN</string>
-  <string name="need_location_service">Για να λειτουργήσει η COVIDSafe, πρέπει να ενεργοποιήσετε την Τοποθεσία στις Ρυθμίσεις.</string>
-  <string name="home_non_battery_optimization_permission">Βελτιστοποίηση μπαταρίας: %s</string>
-  <string name="country_region_name_lb">Λίβανος</string>
-  <string name="country_region_name_lv">Λετονία</string>
-  <string name="country_region_name_la">Λάος</string>
-  <string name="country_region_name_kw">Κουβέιτ</string>
-  <string name="country_region_name_ke">Κένυα</string>
-  <string name="country_region_name_kz">Καζακστάν</string>
-  <string name="country_region_name_jo">Ιορδανία</string>
-  <string name="country_region_name_jp">Ιαπωνία</string>
-  <string name="country_region_name_jm">Ιαμαϊκή</string>
-  <string name="country_region_name_ci">Ακτή Ελεφαντοστού</string>
-  <string name="country_region_name_il">Ισραήλ</string>
-  <string name="country_region_name_ie">Ιρλανδία</string>
-  <string name="country_region_name_iq">Ιράκ</string>
-  <string name="country_region_name_id">Ινδονησία</string>
-  <string name="country_region_name_in">Ινδία</string>
-  <string name="country_region_name_is">Ισλανδία</string>
-  <string name="country_region_name_hu">Ουγγαρία</string>
-  <string name="country_region_name_hk">Χονγκ Κονγκ</string>
-  <string name="country_region_name_hn">Ονδούρα</string>
-  <string name="country_region_name_gw">Γουινέα-Μπισσάου</string>
-  <string name="country_region_name_gt">Γουατεμάλα</string>
-  <string name="country_region_name_gu">Γκουάμ</string>
-  <string name="country_region_name_gd">Γρενάδα</string>
-  <string name="country_region_name_gr">Ελλάδα</string>
-  <string name="country_region_name_gh">Γκάνα</string>
-  <string name="country_region_name_de">Γερμανία</string>
-  <string name="country_region_name_ge">Γεωργία</string>
-  <string name="country_region_name_ga">Γκαμπόν</string>
-  <string name="country_region_name_fr">Γαλλία</string>
-  <string name="country_region_name_fi">Φινλανδία</string>
-  <string name="country_region_name_fj">Φίτζι</string>
-  <string name="country_region_name_ee">Εσθονία</string>
-  <string name="country_region_name_sv">Ελ Σαλβαδόρ</string>
-  <string name="country_region_name_ec">Ισημερινός</string>
-  <string name="country_region_name_do">Δομινικανή Δημοκρατία</string>
-  <string name="country_region_name_dk">Δανία</string>
-  <string name="country_region_name_cz">Τσεχία</string>
-  <string name="country_region_name_cy">Κύπρος</string>
-  <string name="country_region_name_hr">Κροατία</string>
-  <string name="country_region_name_cr">Κόστα Ρίκα</string>
-  <string name="country_region_name_co">Κολομβία</string>
-  <string name="country_region_name_cn">Κίνα</string>
-  <string name="country_region_name_cl">Χιλή</string>
-  <string name="country_region_name_cv">Πράσινο Ακρωτήριο</string>
-  <string name="country_region_name_ca">Καναδάς</string>
-  <string name="country_region_name_cm">Καμερούν</string>
-  <string name="country_region_name_kh">Καμπότζη</string>
-  <string name="country_region_name_bf">Μπουρκίνα Φάσο</string>
-  <string name="country_region_name_bg">Βουλγαρία</string>
-  <string name="country_region_name_br">Βραζιλία</string>
-  <string name="country_region_name_bw">Μποτσουάνα</string>
-  <string name="country_region_name_ba">Βοσνία και Ερζεγοβίνη</string>
-  <string name="country_region_name_bo">Βολιβία</string>
-  <string name="country_region_name_bm">Βερμούδα</string>
-  <string name="country_region_name_bj">Μπενίν</string>
-  <string name="country_region_name_bz">Μπελίζ</string>
-  <string name="country_region_name_be">Βέλγιο</string>
-  <string name="country_region_name_by">Λευκορωσία</string>
-  <string name="country_region_name_bb">Μπαρμπάντος</string>
-  <string name="country_region_name_bd">Μπαγκλαντές</string>
-  <string name="country_region_name_bh">Μπαχρέιν</string>
-  <string name="country_region_name_bs">Μπαχάμες</string>
+  <string name="action_verify_upload_pin">Ανεβάστε τα στοιχεία μου</string>
+  <string name="activity_self_isolation_button">Συνεχίστε</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>
+  <!-- Onboarding Change Device Name -->
+  <string name="change_device_name_headline">Το όνομα της συσκευής σας</string>
+  <string name="change_device_name_headline_content_description">Επικεφαλίδα, το όνομα της συσκευής σας</string>
+  <string name="change_device_name_new_device_name">Επεξεργασία ονόματος συσκευής</string>
+  <string name="change_device_name_primary_action">Συνεχίστε</string>
+  <string name="change_device_name_secondary_action">Παραλείψτε και κρατήστε όπως είναι</string>
+  <string name="consent_button">Συμφωνώ</string>
+  <!-- Shared Consent Actions -->
+  <string name="consent_call_for_action">Επιλέξτε «Συμφωνώ» για επιβεβαίωση της συγκατάθεσης.</string>
+  <string name="country_region_name_ad">Ανδόρρα</string>
+  <string name="country_region_name_ae">Ηνωμένα Αραβικά Εμιράτα</string>
+  <!-- Countries -->
+  <string name="country_region_name_af">Αφγανιστάν</string>
+  <string name="country_region_name_ag">Αντίγκουα και Μπαρμπούντα</string>
+  <string name="country_region_name_ai">Ανγκουίλα</string>
+  <string name="country_region_name_al">Αλβανία</string>
+  <string name="country_region_name_am">Αρμενία</string>
+  <string name="country_region_name_an">Ολλανδικές Αντίλλες</string>
+  <string name="country_region_name_ao">Αγκόλα</string>
+  <string name="country_region_name_ar">Αργεντινή</string>
+  <string name="country_region_name_at">Αυστρία</string>
   <string name="country_region_name_au">Αυστραλία</string>
   <string name="country_region_name_aw">Αρούμπα</string>
-  <string name="country_region_name_am">Αρμενία</string>
-  <string name="country_region_name_ar">Αργεντινή</string>
-  <string name="country_region_name_ag">Αντίγκουα και Μπαρμπούντα</string>
-  <string name="country_region_name_ao">Αγκόλα</string>
-  <string name="country_region_name_dz">Αλγερία</string>
-  <string name="country_region_name_al">Αλβανία</string>
   <string name="country_region_name_az">Αζερμπαϊτζάν</string>
-  <string name="country_region_name_at">Αυστρία</string>
-  <string name="search">Αναζήτηση</string>
+  <string name="country_region_name_ba">Βοσνία και Ερζεγοβίνη</string>
+  <string name="country_region_name_bb">Μπαρμπάντος</string>
+  <string name="country_region_name_bd">Μπαγκλαντές</string>
+  <string name="country_region_name_be">Βέλγιο</string>
+  <string name="country_region_name_bf">Μπουρκίνα Φάσο</string>
+  <string name="country_region_name_bg">Βουλγαρία</string>
+  <string name="country_region_name_bh">Μπαχρέιν</string>
+  <string name="country_region_name_bi">Μπουρούντι</string>
+  <string name="country_region_name_bj">Μπενίν</string>
+  <string name="country_region_name_bm">Βερμούδα</string>
+  <string name="country_region_name_bn">Μπρουνέι</string>
+  <string name="country_region_name_bo">Βολιβία</string>
+  <string name="country_region_name_br">Βραζιλία</string>
+  <string name="country_region_name_bs">Μπαχάμες</string>
+  <string name="country_region_name_bt">Μπουτάν</string>
+  <string name="country_region_name_bw">Μποτσουάνα</string>
+  <string name="country_region_name_by">Λευκορωσία</string>
+  <string name="country_region_name_bz">Μπελίζ</string>
+  <string name="country_region_name_ca">Καναδάς</string>
+  <string name="country_region_name_cd">Λαϊκή Δημοκρατία του Κονγκό</string>
+  <string name="country_region_name_cf">Δημοκρατία Κεντρικής Αφρικής</string>
+  <string name="country_region_name_cg">Δημοκρατία του Κονγκό</string>
+  <string name="country_region_name_ch">Ελβετία</string>
+  <string name="country_region_name_ci">Ακτή Ελεφαντοστού</string>
+  <string name="country_region_name_ck">Νήσοι Κουκ</string>
+  <string name="country_region_name_cl">Χιλή</string>
+  <string name="country_region_name_cm">Καμερούν</string>
+  <string name="country_region_name_cn">Κίνα</string>
+  <string name="country_region_name_co">Κολομβία</string>
+  <string name="country_region_name_cr">Κόστα Ρίκα</string>
+  <string name="country_region_name_cv">Πράσινο Ακρωτήριο</string>
+  <string name="country_region_name_cy">Κύπρος</string>
+  <string name="country_region_name_cz">Τσεχία</string>
+  <string name="country_region_name_de">Γερμανία</string>
+  <string name="country_region_name_dj">Τζιμπουτί</string>
+  <string name="country_region_name_dk">Δανία</string>
+  <string name="country_region_name_dm">Δομινίκα</string>
+  <string name="country_region_name_do">Δομινικανή Δημοκρατία</string>
+  <string name="country_region_name_dz">Αλγερία</string>
+  <string name="country_region_name_ec">Ισημερινός</string>
+  <string name="country_region_name_ee">Εσθονία</string>
+  <string name="country_region_name_eg">Αίγυπτος</string>
+  <string name="country_region_name_es">Ισπανία</string>
+  <string name="country_region_name_et">Αιθιοπία</string>
+  <string name="country_region_name_fi">Φινλανδία</string>
+  <string name="country_region_name_fj">Φίτζι</string>
+  <string name="country_region_name_fo">Νήσοι Φερόες</string>
+  <string name="country_region_name_fr">Γαλλία</string>
+  <string name="country_region_name_ga">Γκαμπόν</string>
+  <string name="country_region_name_gb">Ηνωμένο Βασίλειο</string>
+  <string name="country_region_name_gd">Γρενάδα</string>
+  <string name="country_region_name_ge">Γεωργία</string>
+  <string name="country_region_name_gf">Γαλλική Γουιάνα</string>
+  <string name="country_region_name_gh">Γκάνα</string>
+  <string name="country_region_name_gi">Γιβραλτάρ</string>
+  <string name="country_region_name_gl">Γροιλανδία</string>
+  <string name="country_region_name_gm">Γκάμπια</string>
+  <string name="country_region_name_gn">Παπούα Νέα Γουινέα</string>
+  <string name="country_region_name_gp">Γουαδελούπη</string>
+  <string name="country_region_name_gq">Ισημερινή Γουινέα</string>
+  <string name="country_region_name_gr">Ελλάδα</string>
+  <string name="country_region_name_gt">Γουατεμάλα</string>
+  <string name="country_region_name_gu">Γκουάμ</string>
+  <string name="country_region_name_gw">Γουινέα-Μπισσάου</string>
+  <string name="country_region_name_gy">Γουιάνα</string>
+  <string name="country_region_name_hk">Χονγκ Κονγκ</string>
+  <string name="country_region_name_hn">Ονδούρα</string>
+  <string name="country_region_name_hr">Κροατία</string>
+  <string name="country_region_name_ht">Αϊτή</string>
+  <string name="country_region_name_hu">Ουγγαρία</string>
+  <string name="country_region_name_id">Ινδονησία</string>
+  <string name="country_region_name_ie">Ιρλανδία</string>
+  <string name="country_region_name_il">Ισραήλ</string>
+  <string name="country_region_name_in">Ινδία</string>
+  <string name="country_region_name_iq">Ιράκ</string>
+  <string name="country_region_name_is">Ισλανδία</string>
+  <string name="country_region_name_it">Ιταλία</string>
+  <string name="country_region_name_jm">Ιαμαϊκή</string>
+  <string name="country_region_name_jo">Ιορδανία</string>
+  <string name="country_region_name_jp">Ιαπωνία</string>
+  <string name="country_region_name_ke">Κένυα</string>
+  <string name="country_region_name_kg">Κιργιζιστάν</string>
+  <string name="country_region_name_kh">Καμπότζη</string>
+  <string name="country_region_name_ki">Κιριμπάτι</string>
+  <string name="country_region_name_km">Κομόρος</string>
+  <string name="country_region_name_kn">Άγιος Κιτς και Νέβις</string>
+  <string name="country_region_name_kr">Νότια Κορέα</string>
+  <string name="country_region_name_kw">Κουβέιτ</string>
+  <string name="country_region_name_ky">Νησιά Κέιμαν</string>
+  <string name="country_region_name_kz">Καζακστάν</string>
+  <string name="country_region_name_la">Λάος</string>
+  <string name="country_region_name_lb">Λίβανος</string>
+  <string name="country_region_name_lc">Αγία Λουκία</string>
+  <string name="country_region_name_li">Λιχτενστάιν</string>
+  <string name="country_region_name_lk">Σρι Λάνκα</string>
+  <string name="country_region_name_lr">Λιβερία</string>
+  <string name="country_region_name_ls">Λεσόθο</string>
+  <string name="country_region_name_lt">Λιθουανία</string>
+  <string name="country_region_name_lu">Λουξεμβούργο</string>
+  <string name="country_region_name_lv">Λετονία</string>
+  <string name="country_region_name_ly">Λιβύη</string>
+  <string name="country_region_name_ma">Μαρόκο</string>
+  <string name="country_region_name_mc">Μονακό</string>
+  <string name="country_region_name_md">Μολδαβία</string>
+  <string name="country_region_name_me">Μαυροβούνι</string>
+  <string name="country_region_name_mg">Μαδαγασκάρη</string>
+  <string name="country_region_name_mk">Βόρεια Μακεδονία</string>
+  <string name="country_region_name_ml">Μάλι</string>
+  <string name="country_region_name_mm">Μιανμάρ</string>
+  <string name="country_region_name_mn">Μογγολία</string>
+  <string name="country_region_name_mo">Μακάο</string>
+  <string name="country_region_name_mq">Μαρτινίκα</string>
+  <string name="country_region_name_mr">Μαυριτανία</string>
+  <string name="country_region_name_ms">Μοντσερράτ</string>
+  <string name="country_region_name_mt">Μάλτα</string>
+  <string name="country_region_name_mu">Μαυρίκιος</string>
+  <string name="country_region_name_mv">Μαλδίβες</string>
+  <string name="country_region_name_mw">Μαλάουι</string>
+  <string name="country_region_name_mx">Μεξικό</string>
+  <string name="country_region_name_my">Μαλαισία</string>
+  <string name="country_region_name_mz">Μοζαμβίκη</string>
+  <string name="country_region_name_na">Ναμίμπια</string>
+  <string name="country_region_name_nc">Νέα Καληδονία</string>
+  <string name="country_region_name_ne">Νίγηρα</string>
+  <string name="country_region_name_ng">Νιγηρία</string>
+  <string name="country_region_name_ni">Νικαράγουα</string>
+  <string name="country_region_name_nl">Κάτω Χώρες</string>
+  <string name="country_region_name_no">Νορβηγία</string>
+  <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_pe">Περού</string>
+  <string name="country_region_name_pg">Παπούα Νέα Γουινέα</string>
+  <string name="country_region_name_ph">Φιλιππίνες</string>
+  <string name="country_region_name_pk">Πακιστάν</string>
+  <string name="country_region_name_pl">Πολωνία</string>
+  <string name="country_region_name_pr">Πουέρτο Ρίκο</string>
+  <string name="country_region_name_ps">Παλαιστινιακά Εδάφη</string>
+  <string name="country_region_name_pt">Πορτογαλία</string>
+  <string name="country_region_name_pw">Παλάου</string>
+  <string name="country_region_name_py">Παραγουάη</string>
+  <string name="country_region_name_qa">Κατάρ</string>
+  <string name="country_region_name_re">Νήσος Ρεϋνιόν</string>
+  <string name="country_region_name_ro">Ρουμανία</string>
+  <string name="country_region_name_rs">Σερβία</string>
+  <string name="country_region_name_ru">Ρωσία</string>
+  <string name="country_region_name_rw">Ρουάντα</string>
+  <string name="country_region_name_sa">Σαουδική Αραβία</string>
+  <string name="country_region_name_sb">Νησιά Σολομώντα</string>
+  <string name="country_region_name_sc">Σεϋχέλλες</string>
+  <string name="country_region_name_se">Σουηδία</string>
+  <string name="country_region_name_sg">Σιγκαπούρη</string>
+  <string name="country_region_name_si">Σλοβενία</string>
+  <string name="country_region_name_sk">Σλοβακία</string>
+  <string name="country_region_name_sl">Σιέρρα Λεόνε</string>
+  <string name="country_region_name_sn">Σενεγάλη</string>
+  <string name="country_region_name_so">Σομαλία</string>
+  <string name="country_region_name_sr">Σουρινάμ</string>
+  <string name="country_region_name_ss">Νότιο Σουδάν</string>
+  <string name="country_region_name_st">Σάο Τομέ και Πρίνσιπε</string>
+  <string name="country_region_name_sv">Ελ Σαλβαδόρ</string>
+  <string name="country_region_name_sz">Εσουατίνη</string>
+  <string name="country_region_name_tc">Νήσοι Τερκς και Κάικος</string>
+  <string name="country_region_name_td">Τσαντ</string>
+  <string name="country_region_name_tg">Τόγκο</string>
+  <string name="country_region_name_th">Ταϊλάνδη</string>
+  <string name="country_region_name_tj">Τατζικιστάν</string>
+  <string name="country_region_name_tl">Τιμόρ-Λέστε</string>
+  <string name="country_region_name_tm">Τουρκμενιστάν</string>
+  <string name="country_region_name_tn">Τυνησία</string>
+  <string name="country_region_name_to">Τόνγκα</string>
+  <string name="country_region_name_tr">Τουρκία</string>
+  <string name="country_region_name_tt">Τρίνινταντ και Τομπάγκο</string>
+  <string name="country_region_name_tw">Ταϊβάν</string>
+  <string name="country_region_name_tz">Τανζανία</string>
+  <string name="country_region_name_ua">Ουκρανία</string>
+  <string name="country_region_name_ug">Ουγκάντα</string>
+  <string name="country_region_name_us">Ηνωμένες Πολιτείες</string>
+  <string name="country_region_name_uy">Ουρουγουάη</string>
+  <string name="country_region_name_uz">Ουζμπεκιστάν</string>
+  <string name="country_region_name_vc">Άγιος Βικέντιος και Γρεναδίνες</string>
+  <string name="country_region_name_ve">Βενεζουέλα</string>
+  <string name="country_region_name_vg">Βρετανικές Παρθένες Νήσοι</string>
+  <string name="country_region_name_vi">Παρθένες Νήσοι, ΗΠΑ</string>
+  <string name="country_region_name_vn">Βιετνάμ</string>
+  <string name="country_region_name_vu">Βανουάτου</string>
+  <string name="country_region_name_ws">Σαμόα</string>
+  <string name="country_region_name_ye">Υεμένη</string>
+  <string name="country_region_name_za">Νότια Αφρική</string>
+  <string name="country_region_name_zm">Ζάμπια</string>
+  <string name="country_region_name_zw">Ζιμπάμπουε</string>
+  <string name="data_privacy_button">Επόμενο</string>
+  <string name="data_privacy_content">Συνίσταται να διαβάσετε την *πολιτική απορρήτου* της COVIDSafe πριν εγγραφείτε στην COVIDSafe. \n\nΕάν είστε κάτω των 16 ετών, ο γονέας/κηδεμόνας σας πρέπει επίσης να διαβάσει την *πολιτική απορρήτου*. \n\nΗ χρήση της COVIDSafe είναι εντελώς εθελοντική. Μπορείτε να εγκαταστήσετε ή να διαγράψετε την εφαρμογή ανά πάσα στιγμή. Εάν διαγράψετε την COVIDSafe, *μπορείτε επίσης να ζητήσετε τη διαγραφή των στοιχείων σας* από τον ασφαλή διακομιστή. \n\nΓια να εγγραφείτε στην COVIDSafe, θα πρέπει να εισάγετε όνομα (ή ψευδώνυμο), αριθμό κινητού τηλεφώνου, ηλικιακή ομάδα και ταχυδρομικό κώδικα. \n\nΟι πληροφορίες που εισάγετε κατά την εγγραφή σας και οι πληροφορίες από τη χρήση σας της COVIDSafe θα συλλέγονται και θα αποθηκεύονται σε έναν εξαιρετικά ασφαλή διακομιστή. \n\nΗ COVIDSafe δε θα συλλέξει τις πληροφορίες τοποθεσίας σας. \n\nΗ COVIDSafe θα καταγράφει την ώρα της επικοινωνίας και έναν ανώνυμο κωδικό ταυτότητας άλλων χρηστών COVIDSafe με τους οποίους έρχεστε σε επαφή. \n\nΆλλοι χρήστες της COVIDSafe με τους οποίους έρχεστε σε επαφή θα σημειώσουν έναν ανώνυμο κωδικό ταυτότητας και την ώρα επαφής μαζί σας στη συσκευή τους. \n\nΕάν ένας άλλος χρήστης διαγνωστεί θετικά με COVID-19, μπορεί να αναρτήσει τα στοιχεία επικοινωνίας του και ο υπάλληλος υγείας της Πολιτείας ή της Επικράτειάς σας μπορεί να επικοινωνήσει μαζί σας για λόγους ανίχνευσης επαφών. \n\nΤα στοιχεία εγγραφής σας θα χρησιμοποιηθούν ή θα αποκαλυφθούν μόνο για τον εντοπισμό επαφών και για την ορθή και νόμιμη λειτουργία της COVIDSafe. \n\nΠερισσότερες πληροφορίες διατίθενται στον ιστότοπο *Υπουργείο Υγείας της Αυστραλιανής Κυβέρνησης*. \n\nΔιαβάστε την *πολιτική απορρήτου* της COVIDSafe για περισσότερες λεπτομέρειες για τα δικαιώματά σας σχετικά με τις πληροφορίες σας και τον τρόπο χειρισμού και κοινοποίησής τους.</string>
+  <!-- OnBoarding Data Privacy -->
+  <string name="data_privacy_headline">Εγγραφή και προστασία του απορρήτου</string>
+  <string name="data_privacy_headline_content_description">Επικεφαλίδα, Εγγραφή και προστασία του απορρήτου</string>
+  <string name="dialog_error_uploading_message">Παρουσιάστηκε πρόβλημα κατά την ανάρτηση των στοιχείων σας. Δοκιμάστε ξανά.</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="enter_number_button">Αποκτήστε PIN</string>
+  <string name="enter_number_content">Θα σας στείλουμε ένα 6ψήφιο PIN για να επαληθεύσετε τον αριθμό του κινητού σας.</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_resend_pin">Στείλτε ξανά το PIN</string>
+  <string name="enter_pin_timer_expire">Το PIN σας θα λήξει σε</string>
+  <string name="enter_pin_wrong_number">Είναι ο αριθμός κινητού λάθος;</string>
+  <!-- for production -->
+  <string name="generic_error">Προσπαθήστε ξανά αργότερα.</string>
+  <string name="generic_internet_error">Ελέγξτε τη σύνδεσή σας στο διαδίκτυο</string>
+  <string name="home_app_permission_push_notification_prompt">Επιτρέψτε στην COVIDSafe να προωθεί αυτόματες ειδοποιήσεις.</string>
+  <string name="home_app_permission_status_subtitle">Η COVIDSafe δε θα λειτουργήσει χωρίς τις σωστές ρυθμίσεις.</string>
+  <string name="home_app_permission_status_title">Ελέγξτε τις ρυθμίσεις σας</string>
+  <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_uploaded">Εγγραφείτε για αυτοαπομόνωση</string>
+  <string name="home_data_uploaded_button">Εγγραφή</string>
+  <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>
+  <!-- Home -->
+  <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>
+  <string name="home_header_uploaded_on_date">Τα στοιχεία σας αναρτήθηκαν την %s</string>
+  <string name="home_location_permission">Τοποθεσία: %s</string>
+  <string name="home_non_battery_optimization_permission">Βελτιστοποίηση μπαταρίας: %s</string>
+  <string name="home_permission_off">Κλειστό</string>
+  <string name="home_permission_on">Ανοιχτό</string>
+  <string name="home_push_notification_permission">Αυτόματη γνωστοποίηση:%s</string>
+  <string name="home_set_complete_disclaimer_title">Ας σταματήσουμε την εξάπλωση του COVID-19.</string>
+  <string name="home_set_complete_external_link_app_content">Κατεβάστε την εφαρμογή της κυβέρνησης για τις τελευταίες ειδήσεις και συμβουλές.</string>
+  <string name="home_set_complete_external_link_app_title">Αποκτήστε την εφαρμογή για τον Κορωνοϊό</string>
+  <string name="home_set_complete_external_link_app_url">https://www.health.gov.au/resources/apps-and-tools/coronavirus-australia-app</string>
+  <string name="home_set_complete_external_link_been_contacted_content">Μπορείτε να αναρτήσετε τα στοιχεία σας μόνο εάν έχετε διαγνωστεί θετικά.</string>
+  <string name="home_set_complete_external_link_been_contacted_title">Έχει επικοινωνήσει μαζί σας υπάλληλος υγείας;</string>
+  <string name="home_set_complete_external_link_help_topics_content">Εάν έχετε προβλήματα ή απορίες για την εφαρμογή.</string>
+  <string name="home_set_complete_external_link_help_topics_title">Θέματα βοήθειας</string>
+  <string name="home_set_complete_external_link_news_content">Επισκεφτείτε τη σελίδα aus.gov.au για τις τελευταίες ειδήσεις για τον Κορωνοϊό.</string>
+  <string name="home_set_complete_external_link_news_title">Τελευταίες ειδήσεις και ενημερώσεις</string>
+  <string name="home_set_complete_external_link_news_url">https://www.australia.gov.au</string>
+  <string name="home_set_complete_external_link_self_isolation_register_url">https://covid-form.service.gov.au</string>
+  <string name="home_set_complete_external_link_share_content">Ζητήστε τη βοήθεια και άλλων. Μαζί, είμαστε πιο δυνατοί.</string>
+  <string name="home_set_complete_external_link_share_title">Μοιραστείτε την 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="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>
+  <!-- OnBoarding How it works -->
+  <string name="how_it_works_headline">Πώς λειτουργεί η COVIDSafe</string>
+  <string name="how_it_works_headline_content_description">Επικεφαλίδα, Πώς λειτουργεί η 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_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>
+  <!-- Splash Screen -->
+  <string name="migration_in_progress">Η ενημέρωση της COVIDSafe συνεχίζεται. \n\nΒεβαιωθείτε ότι το τηλέφωνό σας δεν είναι απενεργοποιημένο έως ότου ολοκληρωθεί η ενημέρωση.</string>
+  <string name="navigation_back_button_content_description">Προηγούμενη σελίδα</string>
+  <string name="notification_active_body">Να έχετε την COVIDSafe ενεργή όταν βγαίνετε από το σπίτι ή βρίσκεστε σε δημόσιους χώρους.</string>
+  <!-- Notifications -->
+  <string name="notification_active_title">Η COVIDSafe είναι ενεργή</string>
+  <string name="notification_not_active_body">Βεβαιωθείτε ότι η COVIDSafe είναι ενεργή πριν βγείτε από το σπίτι και όταν βρίσκεστε σε δημόσιους χώρους.</string>
+  <string name="notification_not_active_title">Η COVIDSafe δεν είναι ενεργή</string>
   <string name="options_for_australia">Επιλογές για την Αυστραλία</string>
-  <string name="service_ok_body">Να έχετε η COVIDSafe ενεργή όταν βγαίνετε από το σπίτι ή βρίσκεστε σε δημόσιους χώρους.</string>
-  <string name="enabled">Ενεργοποιημένη</string>
-  <string name="disabled">Απενεργοποιημένη</string>
-  <string name="service_ok_title">Η COVIDSafe είναι ενεργή</string>
-  <string name="update_available_message">Έχουμε βελτιώσει την COVIDSafe.</string>
-  <string name="ReceivePinIssue">Προβλήματα με τη λήψη του PIN σας;</string>
-  <string name="battery_optimisation_prompt">Πρέπει να απενεργοποιήσετε τη βελτιστοποίηση της μπαταρίας.</string>
-  <string name="update_available_title">Η ενημερωμένη έκδοση είναι διαθέσιμη!</string>
-  <string name="update_available_dismiss_btn">Θύμισέ μου αργότερα</string>
-  <string name="heading">Επικεφαλίδα</string>
-</resources>
+  <string name="permission_button">Προχωρήστε</string>
+  <string name="permission_content">Η COVIDSafe χρειάζεται Bluetooth® και ενεργοποιημένες ειδοποιήσεις για να λειτουργήσει.\n\nΕπιλέξτε «Προχωρώ» για να:\n\n1. Ενεργοποιήσετε το Bluetooth®\n\n2. Επιτραπεί η άδεια Τοποθεσίας\n\n3. Απενεργοποιηθεί η Βελτιστοποίηση Μπαταρίας\n\n\nΤο Android χρειάζεται άδεια Τοποθεσίας για να λειτουργήσει το Bluetooth®\n\nΗ COVIDSafe δε στέλνει αιτήματα σύζευξης.</string>
+  <!-- OnBoarding Permission -->
+  <string name="permission_headline">Ρυθμίσεις εφαρμογής</string>
+  <string name="permission_location_rationale">Το Android απαιτεί πρόσβαση τοποθεσίας για την ενεργοποίηση των λειτουργιών Bluetooth® για την COVIDSafe. Η COVIDSafe δεν μπορεί να λειτουργήσει σωστά χωρίς αυτό</string>
+  <string name="permission_success_button">Ολοκληρώθηκε</string>
+  <string name="permission_success_content">1. Όταν φεύγετε από το σπίτι, κρατήστε το τηλέφωνό σας μαζί σας και βεβαιωθείτε ότι η COVIDSafe είναι ενεργή. \n\n2. Το Bluetooth® πρέπει να παραμείνει ενεργοποιημένο. \n\n3. Η βελτιστοποίηση της μπαταρίας πρέπει να είναι απενεργοποιημένη. \n\n4. Η COVIDSafe δεν αποστέλλει αιτήματα σύζευξης. *Μάθετε περισσότερα*.</string>
+  <!-- OnBoarding Permission Success -->
+  <string name="permission_success_headline">Έχετε εγγραφεί επιτυχώς</string>
+  <string name="permission_success_warning">Να έχετε τις αυτόματες γνωστοποιήσεις ανοιχτές για την COVIDSafe, ώστε να μπορούμε να σας ειδοποιήσουμε γρήγορα εάν η εφαρμογή δε λειτουργεί σωστά.</string>
+  <string name="personal_details_age_content_description">Επιλέξτε την ηλικιακή ομάδα</string>
+  <string name="personal_details_age_dialog_title">Επιλέξτε την ηλικία σας</string>
+  <string name="personal_details_age_error_prompt">Επιλέξτε την ηλικιακή ομάδα.</string>
+  <string name="personal_details_age_title">Ηλικιακή ομάδα (επιλέξτε)</string>
+  <string name="personal_details_button">Συνεχίστε</string>
+  <string name="personal_details_dialog_ok">Επιλέξτε</string>
+  <!-- OnBoarding Personal details -->
+  <string name="personal_details_headline">Εισάγετε τα στοιχεία σας</string>
+  <string name="personal_details_headline_content_description">Επικεφαλίδα, Εισάγετε τα στοιχεία σας</string>
+  <string name="personal_details_name_content_description">Εισαγάγετε το ονοματεπώνυμο</string>
+  <string name="personal_details_name_error_prompt">Παρακαλώ εισάγετε το ονοματεπώνυμό σας.</string>
+  <string name="personal_details_name_title">Ονοματεπώνυμο (ή ψευδώνυμο)</string>
+  <string name="personal_details_post_code">Ταχυδρομικός κώδικας στην Αυστραλία</string>
+  <string name="personal_details_post_code_content_description">Εισάγετε τον ταχυδρομικό σας κώδικα</string>
+  <string name="personal_details_post_code_dialog_title">Ταχυδρομικός κώδικας</string>
+  <string name="personal_details_post_code_error_prompt">Ο Αυστραλιανός ταχυδρομικός σας κώδικας πρέπει να περιέχει 4 ψηφία.</string>
+  <string name="personal_details_post_code_hint">π.χ. 2000</string>
+  <string name="registration_consent_content">Συναινώ στον Οργανισμό Ψηφιακού Μετασχηματισμού ως διαχειριστή της αποθήκευσης δεδομένων, σύμφωνα με τη νομική απόφαση του Γενικού Γραμματέα Υγείας της Αυστραλίας που συλλέγει:</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="search">Αναζήτηση</string>
+  <!-- OnBoarding Enter Number -->
+  <string name="select_country_or_region">Επιλέξτε χώρα ή περιοχή</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="share_this_app_content">Ελάτε μαζί μου να σταματήσουμε την εξάπλωση του COVID-19! Κατεβάστε την COVIDSafe, μια εφαρμογή της Αυστραλιανής Κυβέρνησης. # COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
+  <string name="title_help">Βοήθεια</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>
+  <string name="under_sixteen_second_paragraph">Πληροφορίες για την επαφή μου με άλλους χρήστες της COVIDSafe, εάν ένας άλλος χρήστης με τον οποίο έχω έρθει σε επαφή έχει διαγνωστεί θετικά με COVID-19 και αναρτεί τα στοιχεία επικοινωνίας του.</string>
+  <string name="upload_answer_no">Όχι</string>
+  <!-- Upload flow -->
+  <string name="upload_answer_yes">Ναι</string>
+  <string name="upload_consent_button">Συμφωνώ</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_header">Σας ζητάει υπάλληλος υγείας σας να αναρτήσετε τα στοιχεία σας;</string>
+  <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Οι υπάλληλοι υγείας δε θα μπορέσουν να έχουν πρόσβαση στις πληροφορίες για τις στενές σας επαφές.\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="us_consent_button">Συμφωνώ</string>
+  <string name="wrong_ping_number">Εισήχθη λάθος PIN</string>
+
+    <string name="battery_optimisation_prompt">Πρέπει να απενεργοποιήσετε τη βελτιστοποίηση της μπαταρίας.</string>
+    <string name="change_language">Αλλάξτε γλώσσα</string>
+    <string name="change_language_content">Διαβάστε τον οδηγό για τη χρήση του COVIDSafe σε διαφορετική γλώσσα.</string>
+    <string name="country_region_name_au2">Νήσος Νόρφολκ</string>
+    <string name="country_region_name_cu">Κούβα</string>
+    <string name="country_region_name_cw">Κουρασάο</string>
+    <string name="country_region_name_ir">Ιράν</string>
+    <string name="country_region_name_sd">Σουδάν</string>
+    <string name="disabled">Απενεργοποιημένη</string>
+    <string name="done_success">Ολοκλήρωση</string>
+    <string name="enabled">Ενεργοποιημένη</string>
+    <!-- Figma page Android Screens (05/06) -->
+    <string name="Enter_your_mobile_number_label">Εισάγετε τον αριθμό του κινητού σας</string>
+    <string name="heading">Επικεφαλίδα</string>
+    <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_1">πώς να διορθώσετε προβλήματα και να ενεργοποιήσετε εκ νέου την COVIDSafe</string>
+    <string name="internet_screen_content_2">όταν  είναι διαθέσιμη η ενημερωμένη έκδοση</string>
+    <string name="internet_screen_heading">Συνδεθείτε στο Διαδίκτυο για να βελτιώσετε την απόδοση της COVIDSafe</string>
+    <string name="need_location_service">Για να λειτουργήσει η COVIDSafe, πρέπει να ενεργοποιήσετε την Τοποθεσία στις Ρυθμίσεις.</string>
+    <!-- Figma page Android Screens (05/06) -->
+    <string name="norfolk_hint">Για παράδειγμα: 51234</string>
+    <string name="notification_update_content">Ανανεώστε την εφαρμογή σας για πρόσβαση στις πιο πρόσφατες βελτιώσεις.</string>
+    <string name="notification_update_heading">Η ενημερωμένη έκδοση είναι διαθέσιμη!</string>
+    <string name="personal_details_name_characters_prompt">Χρησιμοποιήστε Λατινικούς χαρακτήρες για το ονοματεπώνυμό σας. Μη χρησιμοποιείτε άλλες γλώσσες ή σύμβολα όπως \',\' ή \'?\'.</string>
+    <string name="pin_number">κωδικός PIN</string>
+    <string name="PINNumber_VO_Label">Κωδικός PΙΝ</string>
+    <string name="PN_MobileNumber_VOLabel">Αριθμός κινητού</string>
+    <string name="ReceivePinIssue">Προβλήματα με τη λήψη του PIN σας;</string>
+    <!-- Figma page Android Screens (05/06) -->
+    <string name="Select_country_or_region_headline">Επιλέξτε χώρα ή περιοχή</string>
+    <string name="service_ok_body">Να έχετε η COVIDSafe ενεργή όταν βγαίνετε από το σπίτι ή βρίσκεστε σε δημόσιους χώρους.</string>
+    <string name="service_ok_title">Η COVIDSafe είναι ενεργή</string>
+    <string name="stepCounter" formatted="false">Βήμα %d του %d</string>
+    <!-- Figma page Android Screens (05/06) -->
+    <string name="under_sixteen_registration_consent_first_paragraph">Τα στοιχεία εγγραφής μου.</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>
+  </resources>
+

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

@@ -1,290 +1,431 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-  <string name="dialog_uploading_message">I tuoi dati COVIDSafe sono attualmente in fase di caricamento. \n\nSi prega di non chiudere l\'app.</string>
-  <string name="wrong_ping_number">PIN errato inserito</string>
-  <string name="home_header_active_title">Il COVIDSafe è attivo</string>
-  <string name="home_header_inactive_title">Il COVIDSafe non è attivo</string>
-  <string name="country_region_name_pr">Puerto Rico</string>
-  <string name="how_it_works_content">I segnali Bluetooth® vengono utilizzati per determinare quando sei vicino a un altro utente COVIDSafe.\n\nOgni istanza di stretto contatto tra l\'utente e gli altri utenti COVIDSafe viene notata per creare informazioni sui contatti ravvicinati. Queste informazioni sono crittografate e memorizzate solo nel tuo cellulare.\n\nSe risulti positivo al COVID-19 come utente COVIDSafe, sarai contattato da un funzionario sanitario statale o del territorio. Essi ti aiuteranno con il caricamento volontario delle tue informazioni di stretto contatto ad un sistema altamente sicuro di archiviazione delle informazioni.\n\nI funzionari sanitari statali o del territorio possono anche contattarti se sei entrato in stretto contatto con un altro utente COVIDSafe che è risultato positivo.\n\nPer ulteriori informazioni, consultare la pagina Argomenti della Guida.</string>
-  <string name="enter_pin_headline" formatted="false">Inserisci il PIN inviato a %s %s</string>
-  <string name="enter_pin_timer_expire">Il tuo codice PIN scadrà tra</string>
-  <string name="enter_pin_button">Verifica</string>
-  <string name="permission_content">Il COVIDSafe necessita del Bluetooth® e delle notifiche abilitate per funzionare. \n\n Seleziona \'Procedi\' per: \n\n 1. Abilitare il Bluetooth® \n\n 2. Consentire le autorizzazioni di posizione \n\n 3. Disabilitare l\'ottimizzazione della batteria \n\n\nIl sistema Android ha bisogno delle autorizzazioni della Posizione per il funzionamento del Bluetooth®. \n\nIl COVIDSafe non invia richieste di accoppiamento.</string>
-  <string name="change_device_name_primary_action">Modifica e continua</string>
-  <string name="permission_success_content">1. Quando esci di casa, porti il cellulare con te e assicurati che il COVIDSafe sia attivo. \n\n2. Bluetooth® dovrà rimanere ON. \n\n3. L\'ottimizzazione della batteria dovrebbe essere OFF. \n\n4. Il COVIDSafe non invia richieste di accoppiamento. *Per saperne di più*.</string>
-  <string name="home_header_no_pairing">Il COVIDSafe non invia *richieste di accoppiamento*.</string>
-  <string name="home_version_number">Numero di versione: %s</string>
-  <string name="upload_step_4_sub_header">Senza il tuo consenso, i tuoi dati di stretto contatto non verranno caricati.\n\nSe dai il tuo consenso, i tuoi dati di stretto contatto verranno caricati e condivisi con funzionari sanitari statali o del territorio a scopo di tracciamento di contatti.\n\nLeggi *l\'informativa sulla privacy* di COVIDSafe per ulteriori informazioni.</string>
-  <string name="service_ok_title">Il COVIDSafe è attivo</string>
-  <string name="data_privacy_content">È importante leggere *l\'informativa sulla privacy* del COVIDSafe prima di eseguire la registrazione per il COVIDSafe. \n\nSe hai meno di 16 anni, anche i tuoi genitori / tutori dovranno leggere la *politica 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 le tue informazioni vengano cancellate* dal server sicuro. \n\nPer registrarti a COVIDSafe, dovrai inserire un nome, un numero di cellulare, una fascia di età e un codice postale. \n\nLe informazioni inviate al momento della registrazione e le informazioni sul tuo utilizzo del COVIDSafe verranno raccolte e archiviate su un server altamente sicuro. \n\nIl COVIDSafe non raccoglierà le informazioni sulla tua posizione. \n\nIl COVIDSafe annota l\'ora del contatto e un codice ID anonimo degli altri utenti COVIDSafe con cui entri in contatto. \n\nGli altri utenti COVIDSafe con cui entri in contatto noteranno un codice ID anonimo e l\'ora del contatto con te sul loro dispositivo. \n\nSe un altro utente risulta positivo al COVID-19, può caricare le proprie informazioni 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 del governo australiano della salute*. \n\nVedi *l\'informativa sulla privacy* del COVIDSafe per ulteriori dettagli sui tuoi diritti sui tuoi dati e su come verranno gestiti e condivisi.</string>
-  <string name="under_sixteen_content">Confermo che il mio genitore o tutore acconsente alla raccolta da parte del Dipartimento australiano della salute di:</string>
+  <string name="action_continue">Continua</string>
+  <string name="action_report_an_issue">Segnala un problema</string>
+  <string name="action_upload_done">Eseguito</string>
+  <string name="action_verify_invalid_pin">PIN non valido, chiedi al funzionario sanitario di inviarti un altro PIN.</string>
+  <string name="action_verify_upload_pin">Carica i miei dati</string>
+  <string name="activity_self_isolation_button">Continua</string>
+  <string name="change_device_name_content_line_1">Il nome attuale del tuo dispositivo è %s.</string>
+  <string name="change_device_name_content_line_2">Altri dispositivi Bluetooth® intorno a te saranno in grado di vedere il nome del tuo dispositivo. Ti consigliamo di utilizzare un nome di dispositivo che non include i tuoi dati personali e che sia di uso comune, come ad esempio il nome del modello del tuo dispositivo.</string>
+  <string name="change_device_name_default_device_name">%s</string>
+  <!-- Onboarding Change Device Name -->
+  <string name="change_device_name_headline">Il nome del tuo dispositivo</string>
+  <string name="change_device_name_headline_content_description">Titolo, Il nome del tuo dispositivo</string>
+  <string name="change_device_name_new_device_name">Modifica il nome del dispositivo</string>
+  <string name="change_device_name_primary_action">Continua</string>
+  <string name="change_device_name_secondary_action">Salta e continua così com\'è</string>
+  <string name="consent_button">Sono d\'accordo</string>
+  <!-- Shared Consent Actions -->
   <string name="consent_call_for_action">Seleziona \"Sono d\'accordo\" per confermare il consenso.</string>
-  <string name="personal_details_name_content_description">Inserisci il nome completo</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="migration_in_progress">Aggiornamento COVIDSafe in corso. \n\nAssicurarsi che il cellulare non sia spento fino al completamento dell\'aggiornamento.</string>
-  <string name="intro_content">Il COVIDSafe è stato sviluppato dal Governo australiano per aiutare a proteggere la comunità dalla diffusione del coronavirus. \n\nIl COVIDSafe noterà in modo sicuro i contatti che hai con altri utenti dell\'app. Ciò consentirà ai funzionari sanitari statali e del territorio di contattarti, se sei stato in stretto contatto con qualcuno che è risultato positivo al virus. \n\nInsieme possiamo aiutare a fermare la diffusione e rimanere sani.</string>
-  <string name="registration_consent_content">Acconsento alla raccolta da parte del Ministero della sanità australiano di:</string>
-  <string name="personal_details_button">Continua</string>
-  <string name="battery_optimisation_prompt">È necessario disabilitare l\'ottimizzazione della batteria.</string>
-  <string name="need_location_service">Per far sì che il COVIDSafe App funzioni occorre attivare la Posizione nelle Impostazioni.</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="enter_number_relative">Cerchi di registrare per conto di un amico o un parente? \n\nDovranno registrarsi utilizzando il proprio dispositivo e numero di cellulare in modo che il COVIDSafe possa funzionare per loro.</string>
+  <string name="country_region_name_ad">Andorra</string>
+  <string name="country_region_name_ae">Emirati Arabi Uniti</string>
+  <!-- Countries -->
+  <string name="country_region_name_af">Afghanistan</string>
+  <string name="country_region_name_ag">Antigua e Barbuda</string>
+  <string name="country_region_name_ai">Anguilla</string>
+  <string name="country_region_name_al">Albania</string>
+  <string name="country_region_name_am">Armenia</string>
+  <string name="country_region_name_an">Antille olandesi</string>
+  <string name="country_region_name_ao">Angola</string>
+  <string name="country_region_name_ar">Argentina</string>
+  <string name="country_region_name_at">Austria</string>
+  <string name="country_region_name_au">Australia</string>
+  <string name="country_region_name_aw">Aruba</string>
   <string name="country_region_name_az">Azerbaigian</string>
   <string name="country_region_name_ba">Bosnia ed Erzegovina</string>
-  <string name="country_region_name_cv">Capo Verde</string>
-  <string name="country_region_name_ke">Kenya</string>
-  <string name="country_region_name_kg">Kirghizistan</string>
-  <string name="country_region_name_mo">Macao</string>
-  <string name="country_region_name_mk">Ex Repubblica Jugoslava di Macedonia</string>
-  <string name="country_region_name_md">Moldavia</string>
-  <string name="country_region_name_tj">Tagikistan</string>
-  <string name="country_region_name_th">Tailandia</string>
-  <string name="country_region_name_vi">Isole Vergini Americane</string>
-  <string name="country_region_name_ye">Yemen</string>
-  <string name="permission_button">Proceda</string>
-  <string name="permission_location_rationale">Il sistema Android richiede l\'accesso alla posizione per abilitare le funzioni Bluetooth® per il COVIDSafe. Il COVIDSafe non può funzionare correttamente senza.</string>
-  <string name="change_device_name_content_line_1">Il nome attuale del tuo dispositivo è %s.</string>
-  <string name="permission_success_button">Continua</string>
-  <string name="home_location_permission">Posizione: %s</string>
-  <string name="home_non_battery_optimization_permission">Ottimizzazione della batteria: %s</string>
-  <string name="home_push_notification_permission">Notifica push: %s</string>
-  <string name="home_permission_on">On</string>
-  <string name="home_permission_off">Off</string>
-  <string name="home_set_complete_external_link_app_content">Scarica l\'app governativa per le ultime notizie e consigli.</string>
-  <string name="upload_step_1_body">Un funzionario sanitario statale o del territorio ti contatterà per aiutarti con il caricamento volontario dei tuoi dati solo nel caso tu risulti positivo al COVID-19.\n\nDopo aver premuto \'Sì\', dovrai fornire il consenso per caricare i tuoi dati.</string>
-  <string name="action_continue">Continua</string>
-  <string name="action_upload_done">Continua</string>
-  <string name="ReceivePinIssue">Problemi a ricevere il PIN?</string>
-  <string name="personal_details_name_characters_prompt">Si prega di utilizzare caratteri inglesi per il nome completo. Non utilizzare altre lingue o simboli come \',\' o \'?\'.</string>
-  <string name="generic_error">Si prega di riprovare più tardi</string>
-  <string name="generic_internet_error">Si prega di controllare la connessione internet</string>
-  <string name="dialog_error_uploading_message">Si è verificato un errore durante il caricamento delle informazioni. Riprova.</string>
-  <string name="dialog_error_uploading_positive">Riprova</string>
-  <string name="dialog_error_uploading_negative">Annulla</string>
-  <string name="title_help">Guida</string>
-  <string name="service_not_ok_title">Il COVIDSafe non è attivo</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_action">Controlla l\'app ora</string>
-  <string name="intro_headline">Insieme possiamo fermare la diffusione del COVID-19</string>
-  <string name="intro_button">Voglio aiutare</string>
-  <string name="how_it_works_headline">Come funziona il COVIDSafe</string>
-  <string name="how_it_works_button">Avanti</string>
-  <string name="data_privacy_headline">Registrazione e privacy</string>
-  <string name="data_privacy_button">Avanti</string>
-  <string name="consent_button">Sono d\'accordo</string>
-  <string name="registration_consent_headline">Consenso alla registrazione</string>
-  <string name="registration_consent_first_paragraph">I miei dati di registrazione per consentire il tracciamento dei contatti da parte dei funzionari sanitari statali o del territorio.</string>
-  <string name="registration_consent_second_paragraph">I miei dati di contatto da parte di altri utenti COVIDSafe dopo che essi risultano positivi per il COVID-19.</string>
-  <string name="personal_details_headline">Inserisci i tuoi dati</string>
-  <string name="personal_details_name_title">Nome e cognome</string>
-  <string name="personal_details_age_title">Fascia d\'età (seleziona)</string>
-  <string name="personal_details_age_content_description">Seleziona la fascia d\'età</string>
-  <string name="personal_details_age_error_prompt">Seleziona la tua fascia d\'età.</string>
-  <string name="personal_details_post_code">CAP in Australia</string>
-  <string name="personal_details_post_code_content_description">Inserire il codice postale</string>
-  <string name="personal_details_post_code_error_prompt">Il tuo codice postale australiano deve contenere 4 cifre.</string>
-  <string name="navigation_back_button_content_description">Pagina precedente</string>
-  <string name="under_sixteen_headline">È necessario il consenso di un genitore o di un tutore per procedere</string>
-  <string name="under_sixteen_first_paragraph">Le mie informazioni di registrazione per consentire il tracciamento dei contatti da parte dei funzionari sanitari statali o del territorio.</string>
-  <string name="under_sixteen_second_paragraph">Le mie informazioni di contatto da altri utenti COVIDSafe dopo che essi risultano positivi per il COVID-19.</string>
-  <string name="select_country_or_region">Seleziona il paese o la regione</string>
-  <string name="enter_number_headline">Inserisci il tuo numero di cellulare</string>
-  <string name="invalid_phone_number">Numero di cellulare non valido.</string>
-  <string name="invalid_australian_phone_number_error_prompt">I numeri di cellulare australiani contengono un massimo di 10 cifre.</string>
-  <string name="enter_number_content">Ti invieremo un PIN di 6 cifre per verificare il tuo numero di cellulare.</string>
-  <string name="enter_number_button">Ottenere il PIN</string>
-  <string name="search">Ricerca</string>
-  <string name="options_for_australia">Opzioni per l\'Australia</string>
-  <string name="country_region_name_al">Albania</string>
-  <string name="country_region_name_dz">Algeria</string>
-  <string name="country_region_name_ai">Anguilla</string>
-  <string name="country_region_name_ao">Angola</string>
-  <string name="country_region_name_ag">Antigua e Barbuda</string>
-  <string name="country_region_name_ar">Argentina</string>
-  <string name="country_region_name_am">Armenia</string>
-  <string name="country_region_name_aw">Aruba</string>
-  <string name="country_region_name_au">Australia</string>
-  <string name="country_region_name_at">Austria</string>
-  <string name="country_region_name_bs">Bahamas</string>
-  <string name="country_region_name_bh">Bahrain</string>
-  <string name="country_region_name_bd">Bangladesh</string>
   <string name="country_region_name_bb">Barbados</string>
-  <string name="country_region_name_by">Bielorussia</string>
+  <string name="country_region_name_bd">Bangladesh</string>
   <string name="country_region_name_be">Belgio</string>
-  <string name="country_region_name_bz">Belize</string>
-  <string name="country_region_name_bm">Bermuda</string>
-  <string name="country_region_name_bj">Benin</string>
-  <string name="country_region_name_bo">Bolivia</string>
-  <string name="update_available_play_store_btn">Vai su Google Play Store</string>
-  <string name="country_region_name_bw">Botswana</string>
-  <string name="country_region_name_br">Brasile</string>
-  <string name="country_region_name_bg">Bulgaria</string>
   <string name="country_region_name_bf">Burkina Faso</string>
-  <string name="country_region_name_kh">Cambogia</string>
+  <string name="country_region_name_bg">Bulgaria</string>
+  <string name="country_region_name_bh">Bahrain</string>
+  <string name="country_region_name_bi">Burundi</string>
+  <string name="country_region_name_bj">Benin</string>
+  <string name="country_region_name_bm">Bermuda</string>
+  <string name="country_region_name_bn">Brunei</string>
+  <string name="country_region_name_bo">Bolivia</string>
+  <string name="country_region_name_br">Brasile</string>
+  <string name="country_region_name_bs">Bahamas</string>
+  <string name="country_region_name_bt">Bhutan</string>
+  <string name="country_region_name_bw">Botswana</string>
+  <string name="country_region_name_by">Bielorussia</string>
+  <string name="country_region_name_bz">Belize</string>
   <string name="country_region_name_ca">Canada</string>
-  <string name="country_region_name_cm">Camerun</string>
-  <string name="country_region_name_ky">Isole Cayman</string>
+  <string name="country_region_name_cd">Repubblica Democratica del Congo</string>
+  <string name="country_region_name_cf">Repubblica Centrafricana</string>
+  <string name="country_region_name_cg">Repubblica del Congo</string>
+  <string name="country_region_name_ch">Svizzera</string>
+  <string name="country_region_name_ci">Costa d\'Avorio</string>
+  <string name="country_region_name_ck">Isole Cook</string>
   <string name="country_region_name_cl">Cile</string>
+  <string name="country_region_name_cm">Camerun</string>
   <string name="country_region_name_cn">Cina</string>
   <string name="country_region_name_co">Colombia</string>
   <string name="country_region_name_cr">Costa Rica</string>
+  <string name="country_region_name_cv">Capo Verde</string>
   <string name="country_region_name_cy">Cipro</string>
-  <string name="country_region_name_hr">Croazia</string>
   <string name="country_region_name_cz">Repubblica Ceca</string>
+  <string name="country_region_name_de">Germania</string>
+  <string name="country_region_name_dj">Gibuti</string>
   <string name="country_region_name_dk">Danimarca</string>
   <string name="country_region_name_dm">Dominica</string>
   <string name="country_region_name_do">Repubblica Dominicana</string>
+  <string name="country_region_name_dz">Algeria</string>
   <string name="country_region_name_ec">Ecuador</string>
-  <string name="country_region_name_sv">El Salvador</string>
   <string name="country_region_name_ee">Estonia</string>
-  <string name="country_region_name_fj">Figi</string>
+  <string name="country_region_name_eg">Egitto</string>
+  <string name="country_region_name_es">Spagna</string>
+  <string name="country_region_name_et">Etiopia</string>
   <string name="country_region_name_fi">Finlandia</string>
+  <string name="country_region_name_fj">Figi</string>
+  <string name="country_region_name_fo">Isole Faroe</string>
   <string name="country_region_name_fr">Francia</string>
-  <string name="country_region_name_ge">Georgia</string>
   <string name="country_region_name_ga">Gabon</string>
-  <string name="country_region_name_de">Germania</string>
-  <string name="country_region_name_gh">Ghana</string>
-  <string name="country_region_name_gr">Grecia</string>
+  <string name="country_region_name_gb">Regno Unito</string>
   <string name="country_region_name_gd">Grenada</string>
-  <string name="country_region_name_gu">Guam</string>
+  <string name="country_region_name_ge">Georgia</string>
+  <string name="country_region_name_gf">Guiana francese</string>
+  <string name="country_region_name_gh">Ghana</string>
+  <string name="country_region_name_gi">Gibilterra</string>
+  <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_gq">Guinea Equatoriale</string>
+  <string name="country_region_name_gr">Grecia</string>
   <string name="country_region_name_gt">Guatemala</string>
+  <string name="country_region_name_gu">Guam</string>
   <string name="country_region_name_gw">Guinea-Bissau</string>
-  <string name="country_region_name_ht">Haiti</string>
-  <string name="country_region_name_hn">Honduras</string>
+  <string name="country_region_name_gy">Guyana</string>
   <string name="country_region_name_hk">Hong Kong</string>
+  <string name="country_region_name_hn">Honduras</string>
+  <string name="country_region_name_hr">Croazia</string>
+  <string name="country_region_name_ht">Haiti</string>
   <string name="country_region_name_hu">Ungheria</string>
-  <string name="country_region_name_is">Islanda</string>
-  <string name="country_region_name_in">India</string>
   <string name="country_region_name_id">Indonesia</string>
-  <string name="country_region_name_iq">Iraq</string>
   <string name="country_region_name_ie">Irlanda</string>
   <string name="country_region_name_il">Israele</string>
-  <string name="country_region_name_ci">Costa d\'Avorio</string>
+  <string name="country_region_name_in">India</string>
+  <string name="country_region_name_iq">Iraq</string>
+  <string name="country_region_name_is">Islanda</string>
+  <string name="country_region_name_it">Italia</string>
   <string name="country_region_name_jm">Giamaica</string>
-  <string name="country_region_name_jp">Giappone</string>
   <string name="country_region_name_jo">Giordania</string>
-  <string name="country_region_name_kz">Kazakistan</string>
+  <string name="country_region_name_jp">Giappone</string>
+  <string name="country_region_name_ke">Kenya</string>
+  <string name="country_region_name_kg">Kirghizistan</string>
+  <string name="country_region_name_kh">Cambogia</string>
+  <string name="country_region_name_ki">Kiribati</string>
+  <string name="country_region_name_km">Comore</string>
+  <string name="country_region_name_kn">Saint Kitts e Nevis</string>
+  <string name="country_region_name_kr">Corea del Sud</string>
   <string name="country_region_name_kw">Kuwait</string>
+  <string name="country_region_name_ky">Isole Cayman</string>
+  <string name="country_region_name_kz">Kazakistan</string>
   <string name="country_region_name_la">Laos</string>
-  <string name="country_region_name_lv">Lettonia</string>
   <string name="country_region_name_lb">Libano</string>
+  <string name="country_region_name_lc">Santa Lucia</string>
   <string name="country_region_name_li">Liechtenstein</string>
+  <string name="country_region_name_lk">Sri Lanka</string>
+  <string name="country_region_name_lr">Liberia</string>
+  <string name="country_region_name_ls">Lesotho</string>
   <string name="country_region_name_lt">Lituania</string>
   <string name="country_region_name_lu">Lussemburgo</string>
-  <string name="country_region_name_my">Malesia</string>
-  <string name="country_region_name_ml">Mali</string>
-  <string name="country_region_name_mt">Malta</string>
-  <string name="country_region_name_mq">Martinica</string>
-  <string name="country_region_name_mu">Mauritius</string>
-  <string name="country_region_name_mx">Messico</string>
-  <string name="country_region_name_ms">Montserrat</string>
+  <string name="country_region_name_lv">Lettonia</string>
+  <string name="country_region_name_ly">Libia</string>
   <string name="country_region_name_ma">Marocco</string>
-  <string name="country_region_name_mz">Mozambico</string>
+  <string name="country_region_name_mc">Monaco</string>
+  <string name="country_region_name_md">Moldavia</string>
+  <string name="country_region_name_me">Montenegro</string>
+  <string name="country_region_name_mg">Madagascar</string>
+  <string name="country_region_name_mk">Ex Repubblica Jugoslava di Macedonia</string>
+  <string name="country_region_name_ml">Mali</string>
   <string name="country_region_name_mm">Myanmar</string>
+  <string name="country_region_name_mn">Mongolia</string>
+  <string name="country_region_name_mo">Macao</string>
+  <string name="country_region_name_mq">Martinica</string>
+  <string name="country_region_name_mr">Mauritania</string>
+  <string name="country_region_name_ms">Montserrat</string>
+  <string name="country_region_name_mt">Malta</string>
+  <string name="country_region_name_mu">Mauritius</string>
+  <string name="country_region_name_mv">Maldive</string>
+  <string name="country_region_name_mw">Malawi</string>
+  <string name="country_region_name_mx">Messico</string>
+  <string name="country_region_name_my">Malesia</string>
+  <string name="country_region_name_mz">Mozambico</string>
   <string name="country_region_name_na">Namibia</string>
-  <string name="country_region_name_np">Nepal</string>
-  <string name="country_region_name_nl">Paesi Bassi</string>
-  <string name="country_region_name_ni">Nicaragua</string>
-  <string name="country_region_name_nz">Nuova Zelanda</string>
+  <string name="country_region_name_nc">Nuova Caledonia</string>
   <string name="country_region_name_ne">Niger</string>
   <string name="country_region_name_ng">Nigeria</string>
+  <string name="country_region_name_ni">Nicaragua</string>
+  <string name="country_region_name_nl">Paesi Bassi</string>
   <string name="country_region_name_no">Norvegia</string>
+  <string name="country_region_name_np">Nepal</string>
+  <string name="country_region_name_nz">Nuova Zelanda</string>
   <string name="country_region_name_om">Oman</string>
-  <string name="country_region_name_pk">Pakistan</string>
   <string name="country_region_name_pa">Panama</string>
-  <string name="country_region_name_pg">Papua Nuova Guinea</string>
-  <string name="country_region_name_py">Paraguay</string>
   <string name="country_region_name_pe">Perù</string>
+  <string name="country_region_name_pg">Papua Nuova Guinea</string>
   <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_qa">Qatar</string>
+  <string name="country_region_name_pr">Puerto Rico</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>
+  <string name="country_region_name_py">Paraguay</string>
+  <string name="country_region_name_qa">Qatar</string>
+  <string name="country_region_name_re">Isola della Reunion</string>
+  <string name="country_region_name_ro">Romania</string>
+  <string name="country_region_name_rs">Serbia</string>
   <string name="country_region_name_ru">Russia</string>
   <string name="country_region_name_rw">Ruanda</string>
-  <string name="country_region_name_kn">Saint Kitts e Nevis</string>
-  <string name="country_region_name_lc">Santa Lucia</string>
-  <string name="country_region_name_vc">Saint Vincent e Grenadine</string>
-  <string name="country_region_name_sn">Senegal</string>
-  <string name="country_region_name_rs">Serbia</string>
+  <string name="country_region_name_sa">Arabia Saudita</string>
+  <string name="country_region_name_sb">Isole Salomone</string>
+  <string name="country_region_name_sc">Seychelles</string>
+  <string name="country_region_name_se">Svezia</string>
   <string name="country_region_name_sg">Singapore</string>
   <string name="country_region_name_si">Slovenia</string>
   <string name="country_region_name_sk">Slovacchia</string>
-  <string name="country_region_name_sb">Isole Salomone</string>
-  <string name="country_region_name_za">Sudafrica</string>
-  <string name="country_region_name_kr">Corea del Sud</string>
-  <string name="country_region_name_es">Spagna</string>
-  <string name="country_region_name_lk">Sri Lanka</string>
-  <string name="country_region_name_se">Svezia</string>
-  <string name="country_region_name_ch">Svizzera</string>
+  <string name="country_region_name_sl">Sierra Leone</string>
+  <string name="country_region_name_sn">Senegal</string>
+  <string name="country_region_name_so">Somalia</string>
+  <string name="country_region_name_sr">Suriname</string>
+  <string name="country_region_name_ss">Sud Sudan</string>
+  <string name="country_region_name_st">São Tomé e Príncipe</string>
+  <string name="country_region_name_sv">El Salvador</string>
+  <string name="country_region_name_sz">Swaziland</string>
+  <string name="country_region_name_tc">Isole Turks e Caicos</string>
+  <string name="country_region_name_td">Ciad</string>
+  <string name="country_region_name_tg">Togo</string>
+  <string name="country_region_name_th">Tailandia</string>
+  <string name="country_region_name_tj">Tagikistan</string>
+  <string name="country_region_name_tl">Timor Est</string>
+  <string name="country_region_name_tm">Turkmenistan</string>
+  <string name="country_region_name_tn">Tunisia</string>
+  <string name="country_region_name_to">Tonga</string>
+  <string name="country_region_name_tr">Turchia</string>
+  <string name="country_region_name_tt">Trinidad e Tobago</string>
   <string name="country_region_name_tw">Taiwan</string>
   <string name="country_region_name_tz">Tanzania</string>
-  <string name="country_region_name_tg">Togo</string>
-  <string name="country_region_name_tt">Trinidad e Tobago</string>
-  <string name="country_region_name_tn">Tunisia</string>
-  <string name="country_region_name_tr">Turchia</string>
-  <string name="country_region_name_tm">Turkmenistan</string>
-  <string name="country_region_name_tc">Isole Turks e Caicos</string>
-  <string name="country_region_name_ug">Uganda</string>
   <string name="country_region_name_ua">Ucraina</string>
-  <string name="country_region_name_ae">Emirati Arabi Uniti</string>
+  <string name="country_region_name_ug">Uganda</string>
+  <string name="country_region_name_us">Stati Uniti</string>
   <string name="country_region_name_uy">Uruguay</string>
   <string name="country_region_name_uz">Uzbekistan</string>
-  <string name="country_region_name_gb">Regno Unito</string>
-  <string name="country_region_name_us">Stati Uniti</string>
+  <string name="country_region_name_vc">Saint Vincent e Grenadine</string>
   <string name="country_region_name_ve">Venezuela</string>
-  <string name="country_region_name_vn">Vietnam</string>
   <string name="country_region_name_vg">Isole Vergini Britanniche</string>
+  <string name="country_region_name_vi">Isole Vergini Americane</string>
+  <string name="country_region_name_vn">Vietnam</string>
+  <string name="country_region_name_vu">Vanuatu</string>
+  <string name="country_region_name_ws">Samoa</string>
+  <string name="country_region_name_ye">Yemen</string>
+  <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="enter_pin_wrong_number">Questo numero di cellulare è sbagliato?</string>
+  <string name="data_privacy_button">Avanti</string>
+  <string name="data_privacy_content">È importante leggere *l\'informativa sulla privacy* del COVIDSafe prima di eseguire la registrazione per il COVIDSafe. \n\nSe hai meno di 16 anni, anche il tuo genitore / tutore dovrà leggere *l\'informativa sulla privacy*. \n\nL\'uso del COVIDSafe è completamente volontario. È possibile installare o eliminare l\'applicazione in qualsiasi momento. Se elimini il COVIDSafe, *puoi anche chiedere che i tuoi dati vengano eliminati* dal server sicuro. \n\nPer registrarti al COVIDSafe, dovrai inserire un nome (o pseudonimo), un numero di cellulare, una fascia di età e un codice postale. \n\nI dati trasmessi al momento della registrazione e i dati sul tuo utilizzo del COVIDSafe verranno raccolti e archiviati su un server altamente sicuro. \n\nIl COVIDSafe non raccoglierà dati sulla tua posizione. \n\nIl COVIDSafe annoterà l\'ora del contatto e un codice ID anonimo degli altri utenti COVIDSafe con cui tu entri in contatto, l\'intensità del segnale Bluetooth® e il modello di cellulare degli altri utenti, sul tuo dispositivo. \n\nAnche gli altri utenti COVIDSafe con cui entri in contatto noteranno il tuo codice ID anonimo, la data e l\'ora del contatto con te, l\'intensità del segnale Bluetooth® e il modello del tuo cellulare, sul loro dispositivo. \n\nSe un altro utente risulta positivo al COVID-19, può caricare i propri dati di contatto e un funzionario sanitario statale o del territorio può contattarti a scopi di ricerca dei contatti. \n\nI tuoi dettagli di registrazione verranno utilizzati o divulgati esclusivamente per l\'esecuzione di traccia dei contatti e per il corretto e legittimo funzionamento del COVIDSafe. \n\nMaggiori informazioni sono disponibili sul sito web del *Dipartimento della sanità del governo australiano*. \n\nVedi *l\'informativa sulla privacy* del COVIDSafe per ulteriori dettagli sui tuoi diritti ai tuoi dati e su come verranno gestiti e condivisi.</string>
+  <!-- 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="dialog_error_uploading_message">Si è verificato un errore durante il caricamento delle informazioni. Riprova.</string>
+  <string name="dialog_error_uploading_negative">Annulla</string>
+  <string name="dialog_error_uploading_positive">Riprova</string>
+  <string name="dialog_uploading_message">I tuoi dati COVIDSafe sono attualmente in fase di caricamento. \n\nSi prega di non chiudere l\'app.</string>
+  <string name="enter_number_button">Ottenere il PIN</string>
+  <string name="enter_number_content">Ti invieremo un PIN di 6 cifre per verificare il tuo numero di cellulare.</string>
+  <string name="enter_number_for_example">Per esempio:</string>
+  <string name="enter_number_headline">Inserisci il tuo numero di cellulare</string>
+  <string name="enter_number_prefix">+61</string>
+  <string name="enter_number_relative">Cerchi di registrare per conto di un amico o un parente? \n\nDovranno registrarsi utilizzando il proprio dispositivo e numero di cellulare in modo che il COVIDSafe possa funzionare per loro.</string>
+  <string name="enter_pin_button">Verifica</string>
+  <!-- OnBoarding Enter PIN -->
+  <string name="enter_pin_headline" formatted="false">Inserisci il PIN inviato a %s %s</string>
   <string name="enter_pin_resend_pin">Invia di nuovo il PIN</string>
-  <string name="permission_headline">Impostazioni dell\'app</string>
-  <string name="change_device_name_headline">Il nome del tuo dispositivo</string>
-  <string name="change_device_name_content_line_2">Altri dispositivi Bluetooth® intorno a te saranno in grado di vedere questo nome. Ti consigliamo di utilizzare un nome di dispositivo che non include i tuoi dati personali.</string>
-  <string name="change_device_name_new_device_name">Nome del nuovo dispositivo</string>
-  <string name="change_device_name_default_device_name">Cellulare Android</string>
-  <string name="change_device_name_secondary_action">Salta e continua così com\'è</string>
-  <string name="permission_success_headline">Ti sei registrato con successo</string>
-  <string name="home_header_active_no_action_required">Non è richiesta alcuna ulteriore azione.</string>
-  <string name="home_header_inactive_check_your_permissions">Controlla le tue impostazioni</string>
-  <string name="home_header_uploaded_on_date">I tuoi dati sono stati caricati su %s.</string>
-  <string name="home_bluetooth_permission">Bluetooth®: %s</string>
-  <string name="home_app_permission_status_title">Controlla le tue impostazioni</string>
-  <string name="home_app_permission_status_subtitle">Il COVIDSafe non funzionerà senza le impostazioni corrette. </string>
+  <string name="enter_pin_timer_expire">Il tuo codice PIN scadrà tra</string>
+  <string name="enter_pin_wrong_number">Questo numero di cellulare è sbagliato?</string>
+  <!-- for production -->
+  <string name="generic_error">Si prega di riprovare più tardi</string>
+  <string name="generic_internet_error">Si prega di controllare la connessione internet</string>
   <string name="home_app_permission_push_notification_prompt">Consentire al COVIDSafe di inviare notifiche.</string>
-  <string name="home_set_complete_external_link_share_title">Condividi il COVIDSafe</string>
-  <string name="home_set_complete_external_link_share_content">Invita altri ad aiutare. Insieme, siamo più forti.</string>
+  <string name="home_app_permission_status_subtitle">Il COVIDSafe non funzionerà senza le impostazioni corrette. </string>
+  <string name="home_app_permission_status_title">Controlla le tue impostazioni</string>
+  <string name="home_been_tested_title">Un funzionario sanitario ti ha chiesto di caricare i tuoi dati?</string>
+  <string name="home_bluetooth_permission">Bluetooth®: %s</string>
+  <string name="home_data_has_been_uploaded">I tuoi dati sono stati caricati</string>
+  <string name="home_data_has_been_uploaded_message">Stai aiutando a fermare la diffusione del COVID-19 caricando i tuoi dati ogni giorno mentre sei in autoisolamento.</string>
+  <string name="home_data_uploaded">Registrati per autoisolamento</string>
+  <string name="home_data_uploaded_button">Registrati</string>
+  <string name="home_data_uploaded_message">Aiuta a fermare la diffusione del COVID-19 e tenere traccia dei tuoi sintomi.</string>
+  <string name="home_header_active_no_action_required">Non è richiesta alcuna ulteriore azione.</string>
+  <!-- Home -->
+  <string name="home_header_active_title">Il COVIDSafe è attivo</string>
+  <!-- Home -->
+  <string name="home_header_active_title_thanks">Grazie, il COVIDSafe ora è attivo.</string>
+  <string name="home_header_inactive_check_your_permissions">Controlla le tue impostazioni</string>
+  <string name="home_header_inactive_title">Il COVIDSafe non è attivo</string>
+  <string name="home_header_no_pairing">Il COVIDSafe non invia *richieste di accoppiamento*.</string>
+  <string name="home_header_uploaded_on_date">I tuoi dati sono stati caricati su %s.</string>
+  <string name="home_location_permission">Posizione: %s</string>
+  <string name="home_non_battery_optimization_permission">Ottimizzazione della batteria: %s</string>
+  <string name="home_permission_off">Off</string>
+  <string name="home_permission_on">On</string>
+  <string name="home_push_notification_permission">Notifica push: %s</string>
+  <string name="home_set_complete_disclaimer_title">Fermiamo la diffusione del COVID-19.</string>
+  <string name="home_set_complete_external_link_app_content">Scarica l\'app governativa per le ultime notizie e consigli.</string>
+  <string name="home_set_complete_external_link_app_title">Scarica l\'app Coronavirus</string>
+  <string name="home_set_complete_external_link_app_url">https://www.health.gov.au/resources/apps-and-tools/coronavirus-australia-app</string>
+  <string name="home_set_complete_external_link_been_contacted_content">Puoi caricare i tuoi dati solo se sei risultato positivo.</string>
+  <string name="home_set_complete_external_link_been_contacted_title">Un funzionario sanitario ti ha contattato?</string>
+  <string name="home_set_complete_external_link_help_topics_content">In caso di problemi o domande sull\'app.</string>
+  <string name="home_set_complete_external_link_help_topics_title">Argomenti della Guida</string>
+  <string name="home_set_complete_external_link_news_content">Vai su aus.gov.au per le ultime notizie sul Coronavirus.</string>
   <string name="home_set_complete_external_link_news_title">Ultime notizie e aggiornamenti</string>
   <string name="home_set_complete_external_link_news_url">https://www.australia.gov.au</string>
-  <string name="home_set_complete_external_link_news_content">Vai su aus.gov.au per le ultime notizie sul Coronavirus.</string>
-  <string name="home_set_complete_external_link_app_title">Scarica l\'app Coronavirus</string>
-  <string name="home_set_complete_external_link_been_contacted_title">Un funzionario sanitario ti ha contattato?</string>
-  <string name="home_set_complete_external_link_been_contacted_content">Puoi caricare i tuoi dati solo se sei risultato positivo.</string>
-  <string name="home_set_complete_external_link_app_url">https://www.health.gov.au/resources/apps-and-tools/coronavirus-australia-app</string>
-  <string name="home_set_complete_external_link_help_topics_title">Argomenti della Guida</string>
-  <string name="home_set_complete_external_link_help_topics_content">In caso di problemi o domande sull\'app.</string>
-  <string name="action_report_an_issue">Segnala un problema</string>
-  <string name="upload_answer_yes">Sì</string>
+  <string name="home_set_complete_external_link_self_isolation_register_url">https://covid-form.service.gov.au</string>
+  <string name="home_set_complete_external_link_share_content">Invita altri ad aiutare. Insieme, siamo più forti.</string>
+  <string name="home_set_complete_external_link_share_title">Condividi il COVIDSafe</string>
+  <string name="home_setup_help">Guida</string>
+  <string name="home_setup_incomplete_subtitle">Il COVIDSafe necessita di un\'autorizzazione per accedere a queste funzioni.</string>
+  <string name="home_setup_incomplete_title">Verifica le autorizzazioni</string>
+  <string name="home_version_number">Numero di versione: %s</string>
+  <string name="how_it_works_button">Avanti</string>
+  <string name="how_it_works_consent">Il tuo consenso sarà sempre richiesto del caso di richiesta di tracciabilità sanitaria.</string>
+  <string name="how_it_works_content">I segnali Bluetooth® vengono utilizzati per determinare quando sei vicino a un altro utente COVIDSafe.\n\nOgni istanza di stretto contatto tra te e gli altri utenti COVIDSafe viene notata per creare informazioni sui contatti ravvicinati. Queste informazioni sono crittografate e memorizzate solo nel tuo cellulare.\n\nQualora risulti positivo al COVID-19 come utente COVIDSafe, sarai contattato da un funzionario sanitario statale o del territorio. Loro ti aiuteranno con il caricamento volontario dei tuoi dati di stretto contatto su un sistema altamente sicuro di archiviazione delle informazioni.\n\nI funzionari sanitari statali o del territorio possono anche contattarti se sei entrato in stretto contatto con un altro utente COVIDSafe che è risultato positivo.\n\nPer ulteriori informazioni, consultare la pagina *Argomenti della Guida*.</string>
+  <!-- OnBoarding How it works -->
+  <string name="how_it_works_headline">Come funziona il COVIDSafe</string>
+  <string name="how_it_works_headline_content_description">Titolo, Come funziona il COVIDSafe</string>
+  <string name="intro_button">Voglio aiutare</string>
+  <string name="intro_content">Il COVIDSafe è stato sviluppato dal Governo australiano per aiutare a proteggere la comunità dalla diffusione del coronavirus. \n\nIl COVIDSafe noterà in modo sicuro i contatti che hai con altri utenti dell\'app. Ciò consentirà ai funzionari sanitari statali e del territorio di contattarti, se sei stato in stretto contatto con qualcuno che è risultato positivo al virus. \n\nInsieme possiamo aiutare a fermare la diffusione e rimanere sani.</string>
+  <!-- OnBoarding Intro -->
+  <string name="intro_headline">Insieme possiamo fermare la diffusione del COVID-19</string>
+  <string name="intro_headline_content_description">Titolo, Insieme possiamo fermare la diffusione del COVID-19</string>
+  <string name="invalid_age">L\'età non può essere vuota</string>
+  <string name="invalid_australian_phone_number_error_prompt">I numeri di cellulare australiani contengono un massimo di 10 cifre.</string>
+  <string name="invalid_name">Nome non valido</string>
+  <string name="invalid_norfolk_island_phone_number_error_prompt">I numeri di cellulare nell\'Isola di Norfolk contengono da 5 a 6 cifre.</string>
+  <string name="invalid_phone_number">Numero di cellulare non valido.</string>
+  <string name="invalid_phone_number_digits_error_prompt" formatted="false">I numeri di cellulare in %1s contengono %2s cifre.</string>
+  <string name="invalid_post_code">Codice postale non valido</string>
+  <!-- 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="navigation_back_button_content_description">Pagina precedente</string>
+  <string name="notification_active_body">Mantieni il COVIDSafe attivo quando esci di casa o sei in luoghi pubblici.</string>
+  <!-- Notifications -->
+  <string name="notification_active_title">Il COVIDSafe è attivo</string>
+  <string name="notification_not_active_body">Assicurati che il COVIDSafe sia attivo prima di uscire di casa o quando sei in luoghi pubblici.</string>
+  <string name="notification_not_active_title">Il COVIDSafe non è attivo</string>
+  <string name="options_for_australia">Opzioni per l\'Australia</string>
+  <string name="permission_button">Proceda</string>
+  <string name="permission_content">Il COVIDSafe necessita del Bluetooth® e delle notifiche abilitate per funzionare. \n\n Seleziona \'Procedi\' per: \n\n 1. Abilitare il Bluetooth® \n\n 2. Consentire le autorizzazioni di posizione \n\n 3. Disabilitare l\'ottimizzazione della batteria \n\n\nIl sistema Android ha bisogno delle autorizzazioni della Posizione per il funzionamento del Bluetooth®. \n\nIl COVIDSafe non invia richieste di accoppiamento.</string>
+  <!-- OnBoarding Permission -->
+  <string name="permission_headline">Impostazioni dell\'app</string>
+  <string name="permission_location_rationale">Il sistema Android richiede l\'accesso alla posizione per abilitare le funzioni Bluetooth® per il COVIDSafe. Il COVIDSafe non può funzionare correttamente senza.</string>
+  <string name="permission_success_button">Eseguito</string>
+  <string name="permission_success_content">1. Quando esci di casa, porti il cellulare con te e assicurati che il COVIDSafe sia attivo. \n\n2. Bluetooth® dovrà rimanere ON. \n\n3. L\'ottimizzazione della batteria dovrebbe essere OFF. \n\n4. Il COVIDSafe non invia richieste di accoppiamento. *Per saperne di più*.</string>
+  <!-- OnBoarding Permission Success -->
+  <string name="permission_success_headline">Ti sei registrato con successo</string>
+  <string name="permission_success_warning">Tieni attive le notifiche push per il COVIDSafe in modo che possiamo informarti rapidamente se l\'app non funziona correttamente.</string>
+  <string name="personal_details_age_content_description">Seleziona la fascia d\'età</string>
+  <string name="personal_details_age_dialog_title">Seleziona la tua età</string>
+  <string name="personal_details_age_error_prompt">Seleziona la tua fascia d\'età.</string>
+  <string name="personal_details_age_title">Fascia d\'età (seleziona)</string>
+  <string name="personal_details_button">Continua</string>
+  <string name="personal_details_dialog_ok">Selezionare</string>
+  <!-- OnBoarding Personal details -->
+  <string name="personal_details_headline">Inserisci i tuoi dati</string>
+  <string name="personal_details_headline_content_description">Titolo, Inserisci i tuoi dati</string>
+  <string name="personal_details_name_content_description">Inserisci il nome completo</string>
+  <string name="personal_details_name_error_prompt">Inserisci il tuo nome e cognome.</string>
+  <string name="personal_details_name_title">Nome e cognome (o pseudonimo)</string>
+  <string name="personal_details_post_code">CAP in Australia</string>
+  <string name="personal_details_post_code_content_description">Inserire il codice postale</string>
+  <string name="personal_details_post_code_dialog_title">Codice postale</string>
+  <string name="personal_details_post_code_error_prompt">Il tuo codice postale australiano deve contenere 4 cifre.</string>
+  <string name="personal_details_post_code_hint">ad es. 2000</string>
+  <string name="registration_consent_content">Acconsento alla raccolta da parte dell\'Agenzia di trasformazione digitale, secondo la decisione legale presa dal Segretario del Dipartimento della sanità del governo australiano per:</string>
+  <string name="registration_consent_first_paragraph">I miei dati di registrazione.</string>
+  <!-- Onboarding Registration Consent -->
+  <string name="registration_consent_headline">Consenso alla registrazione</string>
+  <string name="registration_consent_second_paragraph">I dati sui miei contatti con altri utenti COVIDSafe, se un altro utente con il quale io sono entrato in contatto risultasse positivo al COVID-19 e carica i propri dati di contatti.</string>
+  <string name="search">Ricerca</string>
+  <!-- OnBoarding Enter Number -->
+  <string name="select_country_or_region">Seleziona il paese o la regione</string>
+  <string name="service_not_ok_action">Controlla l\'app ora</string>
+  <string name="service_not_ok_body">Assicurati che il COVIDSafe sia attivo prima di uscire di casa o quando sei in luoghi pubblici.</string>
+  <string name="service_not_ok_title">Il COVIDSafe non è attivo</string>
+  <string name="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="title_help">Guida</string>
+  <string name="under_sixteen_content">Confermo il consenso da parte del mio genitore o tutore perché l\'Agenzia di trasformazione digitale come amministratrice dell\'archivio dati, in base alla decisione legale presa dal Segretario del Dipartimento della sanità del governo australiano possa raccogliere:</string>
+  <string name="under_sixteen_first_paragraph">I miei dati di registrazione.</string>
+  <!-- OnBoarding Under Sixteen -->
+  <string name="under_sixteen_headline">È necessario il consenso di un genitore o di un tutore per procedere</string>
+  <string name="under_sixteen_headline_content_description">Titolo, Hai bisogno del consenso del genitore/tutore per procedere</string>
+  <string name="under_sixteen_second_paragraph">I dati sui miei contatti con altri utenti COVIDSafe, se un altro utente con il quale io sono entrato in contatto risultasse positivo al COVID-19 e carica i propri dati di contatti.</string>
   <string name="upload_answer_no">No</string>
-  <string name="upload_step_1_header">Un funzionario sanitario ti sta chiedendo di caricare i tuoi dati?</string>
-  <string name="upload_step_4_header">Consenso al caricamento</string>
-  <string name="upload_step_verify_pin_header">Carica i tuoi dati</string>
-  <string name="upload_step_verify_pin_sub_header">Un funzionario sanitario statale o del territorio invierà un PIN al tuo dispositivo tramite messaggio di testo. Inseriscilo qui sotto per caricare i tuoi dati.</string>
-  <string name="action_verify_upload_pin">Carica i miei dati</string>
-  <string name="action_verify_invalid_pin">PIN non valido, chiedi al funzionario sanitario di inviarti un altro PIN.</string>
+  <!-- Upload flow -->
+  <string name="upload_answer_yes">Sì</string>
+  <string name="upload_consent_button">Sono d\'accordo</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">Hai caricato con successo i tuoi dati sul sistema altamente sicuro di archiviazione COVIDSafe. \n\nI funzionari sanitari statali o del territorio informeranno gli altri utenti COVIDSafe che hanno registrato casi di stretto contatto con te. La tua identità rimarrà anonima per gli altri utenti.</string>
+  <string name="upload_step_1_body">Un funzionario sanitario statale o del territorio ti contatterà per aiutarti con il caricamento volontario dei tuoi dati solo nel caso tu risulti positivo al COVID-19.\n\nDopo aver premuto \'Sì\', dovrai fornire il consenso per caricare i tuoi dati.</string>
+  <string name="upload_step_1_header">Un funzionario sanitario ti sta chiedendo di caricare i tuoi dati?</string>
+  <string name="upload_step_1_header_content_description">Titolo, Un funzionario sanitario ti sta chiedendo di caricare i tuoi dati?</string>
+  <string name="upload_step_4_header">Consenso al caricamento</string>
+  <string name="upload_step_4_header_content_description">Titolo, Consenso al caricamento</string>
+  <string name="upload_step_4_sub_header">Senza il tuo consenso, i tuoi dati di stretto contatto non verranno caricati.\n\nSe dai il tuo consenso, i tuoi dati di stretto contatto verranno caricati e condivisi con funzionari sanitari statali o del territorio a scopo di tracciamento di contatti.\n\nI funzionari sanitari statali e del territorio solo potranno accedere alle informazioni sui tuoi contatti stretti.\n\nLeggi *l\'informativa sulla privacy* del COVIDSafe per ulteriori informazioni.</string>
+  <string name="upload_step_verify_pin_header">Carica i tuoi dati</string>
+  <string name="upload_step_verify_pin_header_content_description">Titolo, Carica i tuoi dati</string>
+  <string name="upload_step_verify_pin_sub_header">Un funzionario sanitario statale o del territorio invierà un PIN al tuo dispositivo tramite messaggio di testo. Inseriscilo qui sotto per caricare i tuoi dati.</string>
+  <string name="us_consent_button">Sono d\'accordo</string>
+  <string name="wrong_ping_number">PIN errato inserito</string>
+
+  <string name="battery_optimisation_prompt">È necessario disabilitare l\'ottimizzazione della batteria.</string>
+  <string name="change_language">Cambia lingua</string>
+  <string name="change_language_content">Leggi la guida sull\'uso del COVIDSafe in un\'altra lingua.</string>
   <string name="country_region_name_au2">Isola di Norfolk</string>
   <string name="country_region_name_cu">Cuba</string>
   <string name="country_region_name_cw">Curaçao</string>
   <string name="country_region_name_ir">Iran</string>
   <string name="country_region_name_sd">Sudan</string>
-  <string name="enabled">Abilitato</string>
   <string name="disabled">Disabilitato</string>
-  <string name="service_ok_body">Mantieni il COVIDSafe attivo quando esci di casa o sei in luoghi pubblici.</string>
-  <string name="pin_number">codice PIN</string>
-  <string name="update_available_title">Aggiornamento disponibile!</string>
-  <string name="update_available_message">Abbiamo apportato miglioramenti a COVIDSafe.</string>
-  <string name="update_available_dismiss_btn">Ricordamelo più tardi</string>
+  <string name="done_success">Fatto</string>
+  <string name="enabled">Abilitato</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="Enter_your_mobile_number_label">Inserisci il tuo numero di cellulare</string>
   <string name="heading">Titolo</string>
+  <string name="improve_heading">Migliora le prestazioni del COVIDSafe</string>
+  <string name="internet_connection_content">Connettiti a Internet per assicurarti di ricevere notifiche su problemi e aggiornamenti.</string>
+  <string name="internet_connection_heading">Si prega di controllare la connessione internet</string>
+  <string name="internet_screen_content">Il COVIDSafe deve connettersi al server di volta in volta per garantire di poter identificare eventuali problemi dell\'app. \n\n La connessione a Internet ti garantisce di ricevere notifiche su:</string>
+  <string name="internet_screen_content_1">come risolvere problemi e riattivare il COVIDSafe di nuovo</string>
+  <string name="internet_screen_content_2">quando sarà disponibile un nuovo aggiornamento della versione</string>
+  <string name="internet_screen_heading">Connettiti a Internet per migliorare le prestazioni del COVIDSafe</string>
+  <string name="need_location_service">Per far sì che il COVIDSafe App funzioni occorre attivare la Posizione nelle Impostazioni.</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="norfolk_hint">Per esempio: 51234</string>
+  <string name="notification_update_content">Aggiorna la tua app per accedere agli ultimi miglioramenti.</string>
+  <string name="notification_update_heading">Aggiornamento COVIDSafe disponibile</string>
+  <string name="personal_details_name_characters_prompt">Si prega di utilizzare caratteri inglesi per il nome completo. Non utilizzare altre lingue o simboli come \',\' o \'?\'.</string>
+  <string name="pin_number">codice PIN</string>
+  <string name="PINNumber_VO_Label">Codice PIN</string>
+  <string name="PN_MobileNumber_VOLabel">Numero di cellulare</string>
+  <string name="ReceivePinIssue">Problemi a ricevere il PIN?</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="Select_country_or_region_headline">Seleziona il paese o la regione</string>
+  <string name="service_ok_body">Mantieni il COVIDSafe attivo quando esci di casa o sei in luoghi pubblici.</string>
+  <string name="service_ok_title">Il COVIDSafe è attivo</string>
+  <string name="stepCounter" formatted="false">Passo %d di %d</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="under_sixteen_registration_consent_first_paragraph">I miei dati di registrazione.</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="under_sixteen_consent_call_for_action">Seleziona \"Sono d\'accordo\" per confermare il consenso.</string>
+  <string name="update_available_dismiss_btn">Ricordamelo più tardi</string>
+  <string name="update_available_message_android">Abbiamo apportato dei miglioramenti al COVIDSafe.  Aggiornamento tramite Google Play Store.</string>
+  <string name="update_available_play_store_btn">Vai su Google Play Store</string>
+  <string name="update_available_title">Aggiornamento disponibile!</string>
 </resources>

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

@@ -1,290 +1,431 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-  <string name="home_header_active_title">COVIDSafe가 활성화되어 있습니다.</string>
-  <string name="home_header_inactive_title">COVIDSafe가 활성화되어 있지 않습니다.</string>
-  <string name="how_it_works_content">블루투스® 신호는 당신이 언제 다른 COVIDSafe 사용자 근처에 있었는지를 확인하는 데 사용됩니다. \n\n당신과 다른 COVIDSafe 사용자들 사이의 모든 근거리 접촉상황들은 근거리 접촉정보로 기록됩니다. 이 정보는 암호화되어 당신의 휴대폰에만 저장됩니다. \n\nCOVIDSafe 사용자로서 당신이 COVID-19에 양성 결과가 나오면, 주 또는 테리토리 보건 담당자가 당신에게 연락할 것입니다. 당신이 자신의 근거리 접촉정보를 보안성 높은 정보 저장 체계에 자발적으로 업로드할 수 있도록 도와줄 것입니다. \n\n또한 양성 결과가 나온 다른 COVIDSafe 사용자와 당신이 가까이 접촉한 경우, 주 또는 테리토리 보건 담당자가 당신에게 연락을 취할 수 있습니다. \n\n자세한 내용은 * 도움말 항목 * 페이지를 참조하세요</string>
-  <string name="need_location_service">COVIDSafe가 작동하려면 설정에서 위치서비스를 켜야 합니다.</string>
-  <string name="update_available_play_store_btn">구글 플레이 스토어 가기</string>
-  <string name="update_available_dismiss_btn">나중에 다시 알려 주세요</string>
-  <string name="personal_details_name_characters_prompt">성명에는 영어 알파벳을 사용하십시오. 다른 언어, 혹은 \',\' 또는 \'?\'와 같은 기호를 사용하지 마십시오.</string>
-  <string name="pin_number">핀 번호</string>
-  <string name="update_available_title">업데이트 가능!</string>
-  <string name="update_available_message">COVIDSafe를 개선하고 있습니다.</string>
-  <string name="heading">제목</string>
-  <string name="data_privacy_content">COVIDSafe에 등록하기 전에 COVIDSafe *개인정보 보호 정책을* 읽는 것이 중요합니다. \n\n당신이 16세 미만이라면, 부모 또는 보호자도 반드시 *개인정보 보호 정책을* 읽어야합니다. \n\nCOVIDSafe의 사용은 전적으로 자발적입니다. 언제든지 앱을 설치 또는 삭제할 수 있습니다. COVIDSafe를 삭제하면, 당신은 보안 서버에 있는 자신의 정보 삭제 또한 요청할 수 있습니다. \n\nCOVIDSafe에 등록하려면, 성명, 휴대폰 번호, 연령대 및 우편번호를 입력해야 합니다. \n\n등록 시 제출한 정보 및 당신의 COVIDSafe 사용정보는 보안성 높은 서버에 수집 및 저장됩니다. \n\nCOVIDSafe는 당신의 위치정보를 수집하지 않습니다. \n\nCOVIDSafe는 접촉 시각 및 당신과 접촉한 다른 COVIDSafe 사용자의 익명 ID 코드를 기록합니다. \n\n다른 COVIDSafe 사용자의 장치에 당신의 익명 ID 코드 및 당신과의 접촉 시각이 기록될 것입니다. \n\n다른 사용자가 COVID-19 양성 결과가 나오면, 그들이 자신의 접촉정보를 업로드 할 수 있으며, 주 또는 테리토리 보건 담당자가 접촉추적 목적으로 당신에게 연락을 취할 수 있습니다. \n\n당신의 등록 정보는 접촉추적 및 COVIDSafe의 적절하고 합법적인 기능을 위해서만 사용 또는 공개됩니다. \n\n자세한 정보는 호주 정부 보건부 웹사이트에서 확인할 수 있습니다. \n\n자신의 정보에 대한 권리와 개인정보의 취급 및 공유 방법에 대한 자세한 내용은 COVIDSafe *개인정보 보호 정책을* 참조하십시오.</string>
-  <string name="permission_success_content">1. 외출 시 휴대폰을 소지하고, COVIDSafe가 활성화되어 있도록 하십시오. \n\n2. 블루투스®는 ON 상태여야 합니다. \n\n3. 배터리 최적화는 OFF 상태여야 합니다.\n\n4. COVIDSafe는 페어링 요청을 보내지 않습니다. *더 자세히 알아보세요*.</string>
-  <string name="home_header_no_pairing">COVIDSafe는 * 페어링 요청 *을 보내지 않습니다.</string>
-  <string name="intro_headline">함께 할 때 우리는 COVID-19의 확산을 막을 수 있습니다</string>
-  <string name="registration_consent_content">본인은 호주 보건부 (Department of Health)의 다음과 같은 정보 수집에 동의합니다.</string>
-  <string name="under_sixteen_second_paragraph">다른 COVIDSafe 사용자가 COVID-19 양성 결과를 받은 후 그 사용자와 나 사이의 접촉정보.</string>
-  <string name="permission_success_headline">등록에 성공했습니다.</string>
-  <string name="home_app_permission_status_subtitle">COVIDSafe는 올바른 설정없이는 작동되지 않습니다.</string>
-  <string name="upload_step_4_sub_header">당신이 동의하지 않는 한, 당신과의 가까운 접촉정보는 업로드되지 않습니다.\n\n동의하시면, 당신과의 가까운 접촉정보가 업로드되고, 주 또는 테리토리 보건 담당자와 공유되어 접촉추적 목적으로 사용될 것입니다.\n\n자세한 내용은 COVIDSafe *개인 정보 보호 정책* 을 참조하세요.</string>
-  <string name="upload_finished_header">COVID-19의 확산을 막는 데 협조해 주셔서 감사합니다!</string>
-  <string name="service_ok_title">COVIDSafe가 활성화되어 있습니다.</string>
-  <string name="service_not_ok_body">외출 시 혹은 공공 장소에 있을 때 COVIDSafe가 활성화되어 있도록 하세요.</string>
-  <string name="service_ok_body">외출 시 혹은 공공 장소에 있을 때 COVIDSafe가 활성화되어 있도록 하세요.</string>
-  <string name="ReceivePinIssue">PIN을 받는 데 문제가 있습니까?</string>
-  <string name="enabled">활성화 됨</string>
-  <string name="disabled">비활성화 됨</string>
-  <string name="battery_optimisation_prompt">배터리 최적화를 비활성화 해야합니다.</string>
-  <string name="home_set_complete_external_link_app_url">https://www.health.gov.au/resources/apps-and-tools/coronavirus-australia-app</string>
-  <string name="personal_details_headline">본인의 정보 입력</string>
-  <string name="personal_details_age_content_description">연령대 선택</string>
-  <string name="personal_details_age_error_prompt">본인의 연령대를 선택하세요.</string>
-  <string name="upload_step_4_header">동의 확인을 업로드하세요</string>
-  <string name="enter_number_content">본 휴대폰 번호 확인을 위해 6자리 PIN을 보내겠습니다.</string>
-  <string name="intro_content">COVIDSafe는 코로나 바이러스 확산으로부터 지역사회를 보호하기 위해 호주 정부에 의해 개발되었습니다. \n\nCOVIDSafe는 당신과 다른 앱 사용자와의 접촉을 안전하게 기록합니다. 바이러스 양성 결과가 나온 사람과 당신이 근거리 접촉을 한 경우 주 및 테리토리 보건 담당자가 당신에게 연락을 취할 수 있습니다. \n\n다함께 바이러스 확산을 막고 건강을 유지할 수 있습니다.</string>
-  <string name="upload_finished_sub_header">보안성이 높은 COVIDSafe의 저장 체계에 당신의 정보를 성공적으로 업로드하였습니다. \n\n당신과 가까운 접촉기록이 있는 다른 COVIDSafe 사용자에게 주 또는 테리토리 보건 담당자가 통보할 것입니다. 다른 사용자들에게 당신의 신원은 익명으로 유지됩니다.</string>
-  <string name="generic_internet_error">인터넷 연결상태를 확인하세요.</string>
-  <string name="dialog_uploading_message">당신의 COVIDSafe 정보가 현재 업로드 중입니다. \n\n앱을 닫지 마세요.</string>
-  <string name="service_not_ok_action">지금 앱을 확인하세요</string>
-  <string name="migration_in_progress">COVIDSafe 업데이트 진행 중. \n\n업데이트가 완료될 때까지 휴대폰이 꺼지지 않도록 해주세요.</string>
-  <string name="data_privacy_headline">등록 및 개인정보 보호</string>
-  <string name="consent_button">동의</string>
-  <string name="consent_call_for_action">동의 확인을 위해 \'동의\'를 선택하세요. </string>
-  <string name="registration_consent_first_paragraph">주 또는 테리토리 보건 담당자의 접촉 추적을 허용하기 위한 나의 등록 정보.</string>
-  <string name="registration_consent_second_paragraph">다른 COVIDSafe 사용자가 COVID-19 양성 결과를 받은 후 그 사용자와 나 사이의 접촉 정보.</string>
-  <string name="personal_details_post_code">호주의 우편번호</string>
-  <string name="personal_details_post_code_content_description">우편번호 입력</string>
-  <string name="personal_details_post_code_error_prompt">호주 우편번호는 반드시 4자리 숫자여야 합니다.</string>
-  <string name="invalid_phone_number">유효하지 않은 전화번호.</string>
-  <string name="personal_details_button">계속</string>
-  <string name="under_sixteen_headline">계속 진행하려면 부모 혹은 보호자의 동의가 필요합니다</string>
-  <string name="under_sixteen_content">본인의 부모 또는 보호자가 호주 보건부 (Department of Health)의 다음과 같은 정보 수집에 동의함을 확인합니다:</string>
-  <string name="under_sixteen_first_paragraph">주 또는 테리토리 보건 담당자의 접촉 추적을 허용하기 위한 나의 등록 정보.</string>
-  <string name="enter_number_headline">본인의 휴대폰 번호를 입력하세요</string>
-  <string name="invalid_norfolk_island_phone_number_error_prompt">노퍽 섬의 휴대폰 번호는 5-6자리입니다.</string>
-  <string name="enter_number_relative">친구나 친척을 대신해 등록하고 계십니까? \n\nCOVIDSafe가 작동하려면, 자신의 장치와 전화번호를 사용하여 등록해야 합니다.</string>
-  <string name="options_for_australia">호주 관련 옵션</string>
-  <string name="country_region_name_bf">부르키나 파소</string>
-  <string name="country_region_name_mk">구 유고슬라비아 마케도니아 공화국</string>
-  <string name="country_region_name_au2">노퍽 섬</string>
-  <string name="country_region_name_zw">짐바브웨</string>
-  <string name="enter_pin_wrong_number">잘못된 휴대폰 번호입니까?</string>
-  <string name="enter_pin_timer_expire">후에 PIN이 만료됩니다</string>
-  <string name="wrong_ping_number">잘못된 PIN 입력</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="change_device_name_primary_action">변경하고 계속하기</string>
-  <string name="change_device_name_secondary_action">생략하고 그대로 유지하기</string>
-  <string name="change_device_name_new_device_name">새 장치 이름</string>
-  <string name="change_device_name_default_device_name">안드로이드 폰</string>
+  <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_upload_pin">내 정보 업로드하기</string>
+  <string name="activity_self_isolation_button">계속</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_content_line_2">주변의 다른 블루투스® 장치에서 여러분의 장치 이름을 볼 수 있습니다. 개인 정보가 포함되지 않은 장치 이름 (예: 장치의 모델명 등)을 사용할 것을 권장합니다.</string>
+  <string name="change_device_name_default_device_name">%s</string>
+  <!-- Onboarding Change Device Name -->
   <string name="change_device_name_headline">자신의 장치 이름</string>
-  <string name="permission_location_rationale">안드로이드 상 COVIDSafe 관련 블루투스® 기능을 사용하려면 위치 액세스 권한이 필요합니다. 그 권한 없이는 COVIDSafe가 제대로 작동하지 않습니다</string>
-  <string name="permission_button">진행</string>
-  <string name="home_set_complete_external_link_share_title">COVIDSafe 공유하기</string>
-  <string name="home_set_complete_external_link_news_title">최신 뉴스 및 업데이트</string>
-  <string name="home_set_complete_external_link_share_content">다른 이들에게 참여를 권유하세요. 우리는 함께할 때 더 강해집니다.</string>
-  <string name="home_set_complete_external_link_news_url">https://www.australia.gov.au</string>
-  <string name="home_set_complete_external_link_news_content">최신 코로나 바이러스 뉴스를 보려면, aus.gov.au을 방문하세요.</string>
-  <string name="home_set_complete_external_link_app_title">코로나 바이러스 앱 받기</string>
+  <string name="change_device_name_headline_content_description">제목, 자신의 장치 이름</string>
+  <string name="change_device_name_new_device_name">장치 이름 편집하기</string>
+  <string name="change_device_name_primary_action">계속</string>
+  <string name="change_device_name_secondary_action">생략하고 그대로 유지하기</string>
+  <string name="consent_button">동의</string>
+  <!-- Shared Consent Actions -->
+  <string name="consent_call_for_action">동의 확인을 위해 \'동의\'를 선택하세요. </string>
+  <string name="country_region_name_ad">안도라</string>
+  <string name="country_region_name_ae">아랍 에미리트</string>
+  <!-- Countries -->
+  <string name="country_region_name_af">아프가니스탄</string>
+  <string name="country_region_name_ag">앤티가 바부다</string>
+  <string name="country_region_name_ai">앵귈라</string>
+  <string name="country_region_name_al">알바니아</string>
+  <string name="country_region_name_am">아르메니아</string>
+  <string name="country_region_name_an">네덜란드령 안틸레스</string>
+  <string name="country_region_name_ao">앙골라</string>
+  <string name="country_region_name_ar">아르헨티나</string>
+  <string name="country_region_name_at">오스트리아</string>
+  <string name="country_region_name_au">호주</string>
+  <string name="country_region_name_aw">아루바</string>
+  <string name="country_region_name_az">아제르바이잔</string>
+  <string name="country_region_name_ba">보스니아 헤르체고비나</string>
+  <string name="country_region_name_bb">바베이도스</string>
+  <string name="country_region_name_bd">방글라데시</string>
+  <string name="country_region_name_be">벨기에</string>
+  <string name="country_region_name_bf">부르키나 파소</string>
+  <string name="country_region_name_bg">불가리아</string>
+  <string name="country_region_name_bh">바레인</string>
+  <string name="country_region_name_bi">부룬디</string>
+  <string name="country_region_name_bj">베냉</string>
+  <string name="country_region_name_bm">버뮤다</string>
+  <string name="country_region_name_bn">브루나이</string>
+  <string name="country_region_name_bo">볼리비아</string>
+  <string name="country_region_name_br">브라질</string>
+  <string name="country_region_name_bs">바하마</string>
+  <string name="country_region_name_bt">부탄</string>
+  <string name="country_region_name_bw">보츠와나</string>
+  <string name="country_region_name_by">벨라루스</string>
+  <string name="country_region_name_bz">벨리즈</string>
+  <string name="country_region_name_ca">캐나다</string>
+  <string name="country_region_name_cd">콩고 공화국</string>
+  <string name="country_region_name_cf">중앙 아프리카 공화국</string>
+  <string name="country_region_name_cg">콩고 공화국</string>
+  <string name="country_region_name_ch">스위스</string>
+  <string name="country_region_name_ci">아이보리 해안</string>
+  <string name="country_region_name_ck">쿡 제도</string>
+  <string name="country_region_name_cl">칠레</string>
+  <string name="country_region_name_cm">카메룬</string>
+  <string name="country_region_name_cn">중국</string>
+  <string name="country_region_name_co">콜롬비아</string>
+  <string name="country_region_name_cr">코스타리카</string>
+  <string name="country_region_name_cv">카보 베르데</string>
+  <string name="country_region_name_cy">키프로스</string>
+  <string name="country_region_name_cz">체코 공화국</string>
+  <string name="country_region_name_de">독일</string>
+  <string name="country_region_name_dj">지부티</string>
+  <string name="country_region_name_dk">덴마크</string>
+  <string name="country_region_name_dm">도미니카</string>
+  <string name="country_region_name_do">도미니카 공화국</string>
+  <string name="country_region_name_dz">알제리</string>
+  <string name="country_region_name_ec">에콰도르</string>
+  <string name="country_region_name_ee">에스토니아</string>
+  <string name="country_region_name_eg">이집트</string>
+  <string name="country_region_name_es">스페인</string>
+  <string name="country_region_name_et">에티오피아</string>
+  <string name="country_region_name_fi">핀란드</string>
+  <string name="country_region_name_fj">피지</string>
+  <string name="country_region_name_fo">페로 제도</string>
+  <string name="country_region_name_fr">프랑스</string>
+  <string name="country_region_name_ga">가봉</string>
+  <string name="country_region_name_gb">영국</string>
+  <string name="country_region_name_gd">그레나다</string>
+  <string name="country_region_name_ge">그루지야</string>
+  <string name="country_region_name_gf">프랑스령 기아나</string>
+  <string name="country_region_name_gh">가나</string>
+  <string name="country_region_name_gi">지브롤터</string>
+  <string name="country_region_name_gl">그린란드</string>
+  <string name="country_region_name_gm">감비아</string>
+  <string name="country_region_name_gn">기니</string>
+  <string name="country_region_name_gp">과들루프</string>
+  <string name="country_region_name_gq">적도 기니</string>
+  <string name="country_region_name_gr">그리스</string>
+  <string name="country_region_name_gt">과테말라</string>
+  <string name="country_region_name_gu">괌</string>
+  <string name="country_region_name_gw">기니 비사우</string>
+  <string name="country_region_name_gy">가이아나</string>
+  <string name="country_region_name_hk">홍콩</string>
+  <string name="country_region_name_hn">온두라스</string>
+  <string name="country_region_name_hr">크로아티아</string>
+  <string name="country_region_name_ht">아이티</string>
+  <string name="country_region_name_hu">헝가리</string>
+  <string name="country_region_name_id">인도네시아</string>
+  <string name="country_region_name_ie">아일랜드</string>
+  <string name="country_region_name_il">이스라엘</string>
+  <string name="country_region_name_in">인도</string>
+  <string name="country_region_name_iq">이라크</string>
+  <string name="country_region_name_is">아이슬란드</string>
+  <string name="country_region_name_it">이탈리아</string>
+  <string name="country_region_name_jm">자메이카</string>
+  <string name="country_region_name_jo">요르단</string>
+  <string name="country_region_name_jp">일본</string>
+  <string name="country_region_name_ke">케냐</string>
+  <string name="country_region_name_kg">키르기스스탄</string>
+  <string name="country_region_name_kh">캄보디아</string>
+  <string name="country_region_name_ki">키리바시</string>
+  <string name="country_region_name_km">코모로</string>
+  <string name="country_region_name_kn">세인트 키츠 네비스</string>
+  <string name="country_region_name_kr">대한민국</string>
+  <string name="country_region_name_kw">쿠웨이트</string>
+  <string name="country_region_name_ky">케이맨 제도</string>
+  <string name="country_region_name_kz">카자흐스탄</string>
+  <string name="country_region_name_la">라오스</string>
+  <string name="country_region_name_lb">레바논</string>
+  <string name="country_region_name_lc">세인트 루시아</string>
+  <string name="country_region_name_li">리히텐슈타인</string>
+  <string name="country_region_name_lk">스리랑카</string>
+  <string name="country_region_name_lr">라이베리아</string>
+  <string name="country_region_name_ls">레소토</string>
+  <string name="country_region_name_lt">리투아니아</string>
+  <string name="country_region_name_lu">룩셈부르크</string>
+  <string name="country_region_name_lv">라트비아</string>
+  <string name="country_region_name_ly">리비아</string>
+  <string name="country_region_name_ma">모로코</string>
+  <string name="country_region_name_mc">모나코</string>
+  <string name="country_region_name_md">몰도바</string>
+  <string name="country_region_name_me">몬테네그로</string>
+  <string name="country_region_name_mg">마다가스카르</string>
+  <string name="country_region_name_mk">구 유고슬라비아 마케도니아 공화국</string>
+  <string name="country_region_name_ml">말리</string>
+  <string name="country_region_name_mm">미얀마</string>
+  <string name="country_region_name_mn">몽골</string>
+  <string name="country_region_name_mo">마카오</string>
+  <string name="country_region_name_mq">마르티니크</string>
+  <string name="country_region_name_mr">모리타니아</string>
+  <string name="country_region_name_ms">몬세라트</string>
+  <string name="country_region_name_mt">몰타</string>
+  <string name="country_region_name_mu">모리셔스</string>
+  <string name="country_region_name_mv">몰디브</string>
+  <string name="country_region_name_mw">말라위</string>
+  <string name="country_region_name_mx">멕시코</string>
+  <string name="country_region_name_my">말레이시아</string>
+  <string name="country_region_name_mz">모잠비크</string>
+  <string name="country_region_name_na">나미비아</string>
+  <string name="country_region_name_nc">뉴칼레도니아</string>
+  <string name="country_region_name_ne">니제르</string>
+  <string name="country_region_name_ng">나이지리아</string>
+  <string name="country_region_name_ni">니카라과</string>
+  <string name="country_region_name_nl">네덜란드</string>
+  <string name="country_region_name_no">노르웨이</string>
+  <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_pe">페루</string>
+  <string name="country_region_name_pg">파푸아 뉴기니</string>
+  <string name="country_region_name_ph">필리핀</string>
+  <string name="country_region_name_pk">파키스탄</string>
+  <string name="country_region_name_pl">폴란드</string>
+  <string name="country_region_name_pr">푸에르토리코</string>
+  <string name="country_region_name_ps">팔레스타인 영토</string>
+  <string name="country_region_name_pt">포르투갈</string>
+  <string name="country_region_name_pw">팔라우</string>
+  <string name="country_region_name_py">파라과이</string>
+  <string name="country_region_name_qa">카타르</string>
+  <string name="country_region_name_re">레위니옹 섬</string>
+  <string name="country_region_name_ro">루마니아</string>
+  <string name="country_region_name_rs">세르비아</string>
+  <string name="country_region_name_ru">러시아</string>
+  <string name="country_region_name_rw">르완다</string>
+  <string name="country_region_name_sa">사우디 아라비아</string>
+  <string name="country_region_name_sb">솔로몬 제도</string>
+  <string name="country_region_name_sc">세이셸</string>
+  <string name="country_region_name_se">스웨덴</string>
+  <string name="country_region_name_sg">싱가폴</string>
+  <string name="country_region_name_si">슬로베니아</string>
+  <string name="country_region_name_sk">슬로바키아</string>
+  <string name="country_region_name_sl">시에라 리온</string>
+  <string name="country_region_name_sn">세네갈</string>
+  <string name="country_region_name_so">소말리아</string>
+  <string name="country_region_name_sr">수리남</string>
+  <string name="country_region_name_ss">남수단</string>
+  <string name="country_region_name_st">상투메 프린시페</string>
+  <string name="country_region_name_sv">엘살바도르</string>
+  <string name="country_region_name_sz">스와질란드</string>
+  <string name="country_region_name_tc">터크스 케이커스 제도</string>
+  <string name="country_region_name_td">차드</string>
+  <string name="country_region_name_tg">토고</string>
+  <string name="country_region_name_th">태국</string>
+  <string name="country_region_name_tj">타지키스탄</string>
+  <string name="country_region_name_tl">동티모르</string>
+  <string name="country_region_name_tm">투르크메니스탄</string>
+  <string name="country_region_name_tn">튀니지아</string>
+  <string name="country_region_name_to">통가</string>
+  <string name="country_region_name_tr">터키</string>
+  <string name="country_region_name_tt">트리니다드 토바고</string>
+  <string name="country_region_name_tw">대만</string>
+  <string name="country_region_name_tz">탄자니아</string>
+  <string name="country_region_name_ua">우크라이나</string>
+  <string name="country_region_name_ug">우간다</string>
+  <string name="country_region_name_us">미국</string>
+  <string name="country_region_name_uy">우루과이</string>
+  <string name="country_region_name_uz">우즈베키스탄</string>
+  <string name="country_region_name_vc">세인트 빈센트 그레나딘</string>
+  <string name="country_region_name_ve">베네수엘라</string>
+  <string name="country_region_name_vg">영국령 버진 아일랜드</string>
+  <string name="country_region_name_vi">미국령 버진 아일랜드</string>
+  <string name="country_region_name_vn">베트남</string>
+  <string name="country_region_name_vu">바누아투</string>
+  <string name="country_region_name_ws">사모아</string>
+  <string name="country_region_name_ye">예멘</string>
+  <string name="country_region_name_za">남아공화국</string>
+  <string name="country_region_name_zm">잠비아</string>
+  <string name="country_region_name_zw">짐바브웨</string>
+  <string name="data_privacy_button">다음</string>
+  <string name="data_privacy_content">COVIDSafe에 등록하기 전에 COVIDSafe *개인 정보 보호 정책을* 읽는 것이 중요합니다. \n\n16세 미만이라면, 그 부모 또는 보호자도 반드시 *개인 정보 보호 정책을* 읽어야 합니다. \n\nCOVIDSafe의 사용은 전적으로 자발적입니다. 언제든지 앱을 설치 또는 삭제할 수 있습니다. COVIDSafe를 삭제하면, \"여러분은 보안 서버에 있는 자신의 정보 삭제\"도 요청할 수 있습니다. \n\nCOVIDSafe에 등록하려면, 성명 (또는 가명) , 휴대폰 번호, 연령대 및 우편 번호를 입력해야 합니다. \n\n등록 시 제출한 정보 및 여러분의 COVIDSafe 사용 정보는 보안성 높은 서버에 수집 및 저장됩니다. \n\nCOVIDSafe는 여러분의 위치 정보를 수집하지 않습니다. \n\nCOVIDSafe는 접촉 시각 및 여러분과 접촉한 다른 COVIDSafe 사용자의 익명 ID 코드, 블루투스® 신호 강도 및 다른 사용자의 전화기 모델 등을 여러분 장치에 기록합니다. \n\n여러분과 접촉한 다른 COVIDSafe 사용자의 장치에도 여러분의 익명 ID 코드 및 접촉일과 시각, 블루투스® 신호 강도 및 다른 사용자의 전화기 모델 등을 여러분 장치에 기록됩니다.  \n\n다른 사용자가 COVID-19 양성 결과를 받으면, 그들은 자신의 접촉 정보를 업로드할 수 있으며, 주 또는 테리토리 보건 담당자가 접촉 추적 목적으로 여러분에게 연락을 취할 수 있습니다. \n\n여러분의 등록 정보는 접촉 추적 및 COVIDSafe의 적절하고 합법적인 기능을 위해서만 사용 또는 공개됩니다. \n\n자세한 정보는 \"호주 정부 보건부\" 웹사이트에서 확인할 수 있습니다. \n\n자신의 정보에 대한 권리와 개인 정보의 취급 및 공유 방법에 대한 자세한 내용은 COVIDSafe *개인 정보 보호 정책을* 참조하십시오.</string>
+  <!-- OnBoarding Data Privacy -->
+  <string name="data_privacy_headline">등록 및 개인정보 보호</string>
+  <string name="data_privacy_headline_content_description">제목, 등록 및 개인정보 보호</string>
+  <string name="dialog_error_uploading_message">정보를 업로드하는 동안 오류가 발생했습니다. 다시 시도하세요.</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="enter_number_button">PIN 받기</string>
+  <string name="enter_number_content">본 휴대폰 번호 확인을 위해 6자리 PIN을 보내겠습니다.</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\nCOVIDSafe가 작동하려면, 자신의 장치와 전화번호를 사용하여 등록해야 합니다.</string>
+  <string name="enter_pin_button">확인하기</string>
+  <!-- OnBoarding Enter PIN -->
+  <string name="enter_pin_headline" formatted="false">%s %s에 보내진 PIN을 입력하세요</string>
+  <string name="enter_pin_resend_pin">PIN 다시 보내기</string>
+  <string name="enter_pin_timer_expire">비밀 번호가 ~ 후에 만료됩니다</string>
+  <string name="enter_pin_wrong_number">잘못된 휴대폰 번호입니까?</string>
+  <!-- for production -->
+  <string name="generic_error">나중에 다시 시도하세요.</string>
+  <string name="generic_internet_error">인터넷 연결상태를 확인하세요.</string>
+  <string name="home_app_permission_push_notification_prompt">COVIDSafe가 푸시 알림을 하도록 허용해 주세요.</string>
+  <string name="home_app_permission_status_subtitle">COVIDSafe는 올바른 설정없이는 작동되지 않습니다.</string>
+  <string name="home_app_permission_status_title">설정을 확인하세요.</string>
+  <string name="home_been_tested_title">보건 담당자가 당신의 정보를 업로드할 것을 당신에게 요청했습니까?</string>
+  <string name="home_bluetooth_permission">블루투스®: %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_uploaded">자가 격리 등록</string>
+  <string name="home_data_uploaded_button">등록</string>
+  <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>
+  <!-- Home -->
+  <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>
+  <string name="home_header_uploaded_on_date">당신의 정보가 %s에 업로드 되었습니다.</string>
+  <string name="home_location_permission">위치: %s</string>
+  <string name="home_non_battery_optimization_permission">배터리 최적화: %s</string>
+  <string name="home_permission_off">Off</string>
+  <string name="home_permission_on">On</string>
+  <string name="home_push_notification_permission">푸시 알림: %s</string>
+  <string name="home_set_complete_disclaimer_title">COVID-19의 확산을 함께 방지합시다.</string>
   <string name="home_set_complete_external_link_app_content">최신 뉴스 및 조언을 보려면 정부 앱을 다운로드하세요.</string>
+  <string name="home_set_complete_external_link_app_title">코로나 바이러스 앱 받기</string>
+  <string name="home_set_complete_external_link_app_url">https://www.health.gov.au/resources/apps-and-tools/coronavirus-australia-app</string>
   <string name="home_set_complete_external_link_been_contacted_content">양성 결과가 나온 경우에만 본인의 정보를 업로드할 수 있습니다.</string>
   <string name="home_set_complete_external_link_been_contacted_title">보건 담당자가 당신에게 연락했습니까?</string>
-  <string name="home_set_complete_external_link_help_topics_title">토픽별 도움</string>
   <string name="home_set_complete_external_link_help_topics_content">앱에 대한 질문이나 문제가 있는 경우.</string>
+  <string name="home_set_complete_external_link_help_topics_title">토픽별 도움</string>
+  <string name="home_set_complete_external_link_news_content">최신 코로나 바이러스 뉴스를 보려면, aus.gov.au을 방문하세요.</string>
+  <string name="home_set_complete_external_link_news_title">최신 뉴스 및 업데이트</string>
+  <string name="home_set_complete_external_link_news_url">https://www.australia.gov.au</string>
+  <string name="home_set_complete_external_link_self_isolation_register_url">https://covid-form.service.gov.au</string>
+  <string name="home_set_complete_external_link_share_content">다른 이들에게 참여를 권유하세요. 우리는 함께할 때 더 강해집니다.</string>
+  <string name="home_set_complete_external_link_share_title">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="action_report_an_issue">문제 신고하기</string>
-  <string name="upload_answer_yes">예</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>
+  <!-- OnBoarding How it works -->
+  <string name="how_it_works_headline">COVIDSafe의 작동 원리</string>
+  <string name="how_it_works_headline_content_description">제목, COVIDSafe의 작동 원리</string>
+  <string name="intro_button">저도 동참하고 싶어요</string>
+  <string name="intro_content">COVIDSafe는 코로나 바이러스 확산으로부터 지역사회를 보호하기 위해 호주 정부에 의해 개발되었습니다. \n\nCOVIDSafe는 당신과 다른 앱 사용자와의 접촉을 안전하게 기록합니다. 바이러스 양성 결과가 나온 사람과 당신이 근거리 접촉을 한 경우 주 및 테리토리 보건 담당자가 당신에게 연락을 취할 수 있습니다. \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_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>
+  <!-- Splash Screen -->
+  <string name="migration_in_progress">COVIDSafe 업데이트 진행 중. \n\n업데이트가 완료될 때까지 휴대폰이 꺼지지 않도록 해주세요.</string>
+  <string name="navigation_back_button_content_description">이전 페이지</string>
+  <string name="notification_active_body">외출 시 혹은 공공 장소에 있을 때 COVIDSafe가 활성화되어 있도록 하세요.</string>
+  <!-- Notifications -->
+  <string name="notification_active_title">COVIDSafe가 활성화되어 있습니다.</string>
+  <string name="notification_not_active_body">외출 시 혹은 공공 장소에 있을 때 COVIDSafe가 활성화되어 있도록 하세요.</string>
+  <string name="notification_not_active_title">COVIDSafe가 활성화되어 있지 않습니다.</string>
+  <string name="options_for_australia">호주 관련 옵션</string>
+  <string name="permission_button">진행</string>
+  <string name="permission_content">COVIDSafe는 블루투스® 및 알림 기능이 활성화되어야 작동됩니다. \n\n \'진행\'을 선택하여 다음을 수행하십시오: \n\n 1. 블루투스® 사용 \n\n 2. 위치 액세스 허용 \n\n 3. 배터리 최적화 비활성화 \n\n\n 안드로이드 상 블루투스®가 작동하려면 위치 액세스 권한이 필요합니다. \n\n COVIDSafe는 페어링 요청을 보내지 않습니다.</string>
+  <!-- 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. 블루투스®는 ON 상태여야 합니다. \n\n3. 배터리 최적화는 OFF 상태여야 합니다.\n\n4. COVIDSafe는 페어링 요청을 보내지 않습니다. *더 자세히 알아보세요*.</string>
+  <!-- OnBoarding Permission Success -->
+  <string name="permission_success_headline">등록에 성공했습니다.</string>
+  <string name="permission_success_warning">COVIDSafe에 대한 푸시 알림을 켜 놓으면 앱이 제대로 작동하지 않는 경우 신속하게 알려드릴 수 있습니다.</string>
+  <string name="personal_details_age_content_description">연령대 선택</string>
+  <string name="personal_details_age_dialog_title">본인의 연령을 선택하세요.</string>
+  <string name="personal_details_age_error_prompt">본인의 연령대를 선택하세요.</string>
+  <string name="personal_details_age_title">연령대 (선택)</string>
+  <string name="personal_details_button">계속</string>
+  <string name="personal_details_dialog_ok">선택하기</string>
+  <!-- OnBoarding Personal details -->
+  <string name="personal_details_headline">본인의 정보 입력</string>
+  <string name="personal_details_headline_content_description">제목, 본인의 정보를 입력하세요</string>
+  <string name="personal_details_name_content_description">성명 입력</string>
+  <string name="personal_details_name_error_prompt">본인의 성명을 입력하세요.</string>
+  <string name="personal_details_name_title">성명 (또는 가명)</string>
+  <string name="personal_details_post_code">호주의 우편번호</string>
+  <string name="personal_details_post_code_content_description">우편번호 입력</string>
+  <string name="personal_details_post_code_dialog_title">우편번호</string>
+  <string name="personal_details_post_code_error_prompt">호주 우편번호는 반드시 4자리 숫자여야 합니다.</string>
+  <string name="personal_details_post_code_hint">예 : 2000</string>
+  <string name="registration_consent_content">본인은 호주 정부 보건부 장관의 법적 결정에 따라, 데이터 저장소 관리자로서 Digital Transformation Agency가 다음 정보를 수집하는 것에 동의합니다:</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 양성 결과를 받고 자신의 접촉 데이터를 업로드한 경우, 다른 COVIDSafe 사용자들과의 본인의 접촉 정보.</string>
+  <string name="search">검색</string>
+  <!-- OnBoarding Enter Number -->
+  <string name="select_country_or_region">국가 또는 지역을 선택하세요</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="share_this_app_content">COVID-19의 확산을 막아주세요! 호주 정부의 앱인 COVIDSafe를 다운로드하세요. # COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
+  <string name="title_help">도움</string>
+  <string name="under_sixteen_content">본인은 호주 정부 보건부 장관의 법적 결정에 따라, 데이터 저장소 관리자로서 다음 정보를 수집하는 것에 대해 본인 부모 또는 보호자가 Digital Transformation Agency에 동의한다는 것을 확인합니다:</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>
+  <string name="under_sixteen_second_paragraph">다른 COVIDSafe 사용자가 COVID-19 양성 결과를 받고 자신의 접촉 데이타를 업로드한 경우, 다른 COVIDSafe 사용자들과 나와의 접촉에 대한 정보.</string>
   <string name="upload_answer_no">아니요</string>
-  <string name="upload_step_1_header">보건 담당자가 당신의 정보를 업로드할 것을 당신에게 요청하고 있습니까?</string>
+  <!-- Upload flow -->
+  <string name="upload_answer_yes">예</string>
+  <string name="upload_consent_button">동의합니다</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="home_app_permission_status_title">설정을 확인하세요.</string>
-  <string name="permission_success_button">계속</string>
-  <string name="home_header_active_no_action_required">추가 조치가 필요하지 않습니다.</string>
-  <string name="home_header_uploaded_on_date">당신의 정보가 %s에 업로드 되었습니다.</string>
-  <string name="home_header_inactive_check_your_permissions">설정을 확인하세요.</string>
-  <string name="home_bluetooth_permission">블루투스®: %s</string>
-  <string name="home_non_battery_optimization_permission">배터리 최적화: %s</string>
-  <string name="home_location_permission">위치: %s</string>
-  <string name="home_push_notification_permission">푸시 알림: %s</string>
-  <string name="home_permission_on">On</string>
-  <string name="home_permission_off">Off</string>
-  <string name="home_app_permission_push_notification_prompt">COVIDSafe가 푸시 알림을 하도록 허용해 주세요.</string>
+  <string name="upload_step_1_header">보건 담당자가 당신의 정보를 업로드할 것을 당신에게 요청하고 있습니까?</string>
+  <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_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="action_verify_upload_pin">내 정보 업로드하기</string>
-  <string name="action_verify_invalid_pin">잘못된 PIN입니다. 보건 담당자에게 다른 PIN을 보내달라고 요청하십시오.</string>
-  <string name="action_continue">계속</string>
-  <string name="action_upload_done">계속</string>
+  <string name="us_consent_button">동의</string>
+  <string name="wrong_ping_number">잘못된 PIN 입력</string>
+
+  <string name="battery_optimisation_prompt">배터리 최적화를 비활성화 해야합니다.</string>
+  <string name="change_language">언어를 변경하십시오</string>
+  <string name="change_language_content">다른 언어로 COVIDSafe 사용에 대한 안내서를 읽으십시오.</string>
+  <string name="country_region_name_au2">노퍽 섬</string>
   <string name="country_region_name_cu">쿠바</string>
   <string name="country_region_name_cw">퀴라소</string>
   <string name="country_region_name_ir">이란</string>
   <string name="country_region_name_sd">수단</string>
-  <string name="country_region_name_ie">아일랜드</string>
-  <string name="country_region_name_il">이스라엘</string>
-  <string name="data_privacy_button">다음</string>
-  <string name="invalid_australian_phone_number_error_prompt">호주 휴대폰 번호는 최대 10자리입니다.</string>
-  <string name="enter_number_button">PIN 받기</string>
-  <string name="search">검색</string>
-  <string name="country_region_name_al">알바니아</string>
-  <string name="country_region_name_dz">알제리</string>
-  <string name="country_region_name_ao">앙골라</string>
-  <string name="country_region_name_ai">앵귈라</string>
-  <string name="country_region_name_ag">앤티가 바부다</string>
-  <string name="country_region_name_ar">아르헨티나</string>
-  <string name="country_region_name_am">아르메니아</string>
-  <string name="country_region_name_aw">아루바</string>
-  <string name="country_region_name_au">호주</string>
-  <string name="country_region_name_at">오스트리아</string>
-  <string name="country_region_name_az">아제르바이잔</string>
-  <string name="country_region_name_bs">바하마</string>
-  <string name="country_region_name_bh">바레인</string>
-  <string name="country_region_name_bd">방글라데시</string>
-  <string name="country_region_name_bb">바베이도스</string>
-  <string name="country_region_name_by">벨라루스</string>
-  <string name="country_region_name_be">벨기에</string>
-  <string name="country_region_name_hk">홍콩</string>
-  <string name="country_region_name_hu">헝가리</string>
-  <string name="country_region_name_is">아이슬란드</string>
-  <string name="country_region_name_in">인도</string>
-  <string name="country_region_name_id">인도네시아</string>
-  <string name="country_region_name_iq">이라크</string>
-  <string name="country_region_name_ci">아이보리 해안</string>
-  <string name="country_region_name_jm">자메이카</string>
-  <string name="country_region_name_jp">일본</string>
-  <string name="country_region_name_jo">요르단</string>
-  <string name="country_region_name_kz">카자흐스탄</string>
-  <string name="country_region_name_ke">케냐</string>
-  <string name="country_region_name_kw">쿠웨이트</string>
-  <string name="country_region_name_kg">키르기스스탄</string>
-  <string name="country_region_name_la">라오스</string>
-  <string name="country_region_name_lv">라트비아</string>
-  <string name="country_region_name_lb">레바논</string>
-  <string name="country_region_name_li">리히텐슈타인</string>
-  <string name="country_region_name_lt">리투아니아</string>
-  <string name="country_region_name_no">노르웨이</string>
-  <string name="country_region_name_om">오만</string>
-  <string name="country_region_name_pk">파키스탄</string>
-  <string name="country_region_name_vn">베트남</string>
-  <string name="country_region_name_vg">영국령 버진 아일랜드</string>
-  <string name="country_region_name_vi">미국령 버진 아일랜드</string>
-  <string name="country_region_name_ye">예멘</string>
-  <string name="country_region_name_zm">잠비아</string>
-  <string name="enter_pin_headline" formatted="false">%s %s에 보내진 PIN을 입력하세요</string>
-  <string name="dialog_error_uploading_message">정보를 업로드하는 동안 오류가 발생했습니다. 다시 시도하세요.</string>
-  <string name="dialog_error_uploading_positive">다시 시도</string>
-  <string name="dialog_error_uploading_negative">취소</string>
-  <string name="title_help">도움</string>
-  <string name="share_this_app_content">COVID-19의 확산을 막아주세요! 호주 정부의 앱인 COVIDSafe를 다운로드하세요. # COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
-  <string name="service_not_ok_title">COVIDSafe가 활성화되어 있지 않습니다</string>
-  <string name="intro_button">저도 동참하고 싶어요</string>
-  <string name="how_it_works_headline">COVIDSafe의 작동 원리</string>
-  <string name="how_it_works_button">다음</string>
-  <string name="country_region_name_dm">도미니카</string>
-  <string name="country_region_name_do">도미니카 공화국</string>
-  <string name="country_region_name_ec">에콰도르</string>
-  <string name="country_region_name_sv">엘살바도르</string>
-  <string name="country_region_name_ee">에스토니아</string>
-  <string name="country_region_name_fj">피지</string>
-  <string name="country_region_name_fi">핀란드</string>
-  <string name="country_region_name_fr">프랑스</string>
-  <string name="country_region_name_ga">가봉</string>
-  <string name="country_region_name_ge">그루지야</string>
-  <string name="country_region_name_de">독일</string>
-  <string name="country_region_name_gh">가나</string>
-  <string name="country_region_name_gr">그리스</string>
-  <string name="country_region_name_gd">그레나다</string>
-  <string name="country_region_name_gu">괌</string>
-  <string name="country_region_name_gt">과테말라</string>
-  <string name="country_region_name_gw">기니 비사우</string>
-  <string name="country_region_name_ht">아이티</string>
-  <string name="country_region_name_hn">온두라스</string>
-  <string name="country_region_name_pa">파나마</string>
-  <string name="country_region_name_es">스페인</string>
-  <string name="country_region_name_lk">스리랑카</string>
-  <string name="country_region_name_se">스웨덴</string>
-  <string name="country_region_name_ch">스위스</string>
-  <string name="country_region_name_tw">대만</string>
-  <string name="country_region_name_tj">타지키스탄</string>
-  <string name="country_region_name_tz">탄자니아</string>
-  <string name="country_region_name_th">태국</string>
-  <string name="country_region_name_tg">토고</string>
-  <string name="country_region_name_tt">트리니다드 토바고</string>
-  <string name="country_region_name_tn">튀니지아</string>
-  <string name="country_region_name_tr">터키</string>
-  <string name="country_region_name_tm">투르크메니스탄</string>
-  <string name="country_region_name_tc">터크스 케이커스 제도</string>
-  <string name="country_region_name_ug">우간다</string>
-  <string name="country_region_name_ua">우크라이나</string>
-  <string name="country_region_name_ae">아랍 에미리트</string>
-  <string name="country_region_name_gb">영국</string>
-  <string name="country_region_name_us">미국</string>
-  <string name="country_region_name_uy">우루과이</string>
-  <string name="country_region_name_uz">우즈베키스탄</string>
-  <string name="country_region_name_ve">베네수엘라</string>
-  <string name="enter_pin_resend_pin">PIN 다시 보내기</string>
-  <string name="enter_pin_button">확인하기</string>
-  <string name="permission_headline">앱 설정</string>
-  <string name="generic_error">나중에 다시 시도하세요.</string>
-  <string name="registration_consent_headline">등록 동의</string>
-  <string name="personal_details_name_title">성명</string>
-  <string name="personal_details_name_content_description">성명 입력</string>
-  <string name="personal_details_age_title">연령대 (선택)</string>
-  <string name="navigation_back_button_content_description">이전 페이지</string>
-  <string name="select_country_or_region">국가 또는 지역을 선택하세요</string>
-  <string name="country_region_name_bz">벨리즈</string>
-  <string name="country_region_name_bj">베냉</string>
-  <string name="country_region_name_bm">버뮤다</string>
-  <string name="country_region_name_bo">볼리비아</string>
-  <string name="country_region_name_ba">보스니아 헤르체고비나</string>
-  <string name="country_region_name_bw">보츠와나</string>
-  <string name="country_region_name_br">브라질</string>
-  <string name="country_region_name_bg">불가리아</string>
-  <string name="country_region_name_kh">캄보디아</string>
-  <string name="country_region_name_cm">카메룬</string>
-  <string name="country_region_name_ca">캐나다</string>
-  <string name="country_region_name_cv">카보 베르데</string>
-  <string name="country_region_name_ky">케이맨 제도</string>
-  <string name="country_region_name_cl">칠레</string>
-  <string name="country_region_name_cn">중국</string>
-  <string name="country_region_name_co">콜롬비아</string>
-  <string name="country_region_name_cr">코스타리카</string>
-  <string name="country_region_name_hr">크로아티아</string>
-  <string name="country_region_name_cy">키프로스</string>
-  <string name="country_region_name_cz">체코 공화국</string>
-  <string name="country_region_name_dk">덴마크</string>
-  <string name="country_region_name_lu">룩셈부르크</string>
-  <string name="country_region_name_mo">마카오</string>
-  <string name="country_region_name_my">말레이시아</string>
-  <string name="country_region_name_ml">말리</string>
-  <string name="country_region_name_mt">몰타</string>
-  <string name="country_region_name_mq">마르티니크</string>
-  <string name="country_region_name_mu">모리셔스</string>
-  <string name="country_region_name_mx">멕시코</string>
-  <string name="country_region_name_md">몰도바</string>
-  <string name="country_region_name_ms">몬세라트</string>
-  <string name="country_region_name_ma">모로코</string>
-  <string name="country_region_name_mz">모잠비크</string>
-  <string name="country_region_name_mm">미얀마</string>
-  <string name="country_region_name_na">나미비아</string>
-  <string name="country_region_name_np">네팔</string>
-  <string name="country_region_name_nl">네덜란드</string>
-  <string name="country_region_name_nz">뉴질랜드</string>
-  <string name="country_region_name_ni">니카라과</string>
-  <string name="country_region_name_ne">니제르</string>
-  <string name="country_region_name_ng">나이지리아</string>
-  <string name="country_region_name_pg">파푸아 뉴기니</string>
-  <string name="country_region_name_py">파라과이</string>
-  <string name="country_region_name_pe">페루</string>
-  <string name="country_region_name_ph">필리핀</string>
-  <string name="country_region_name_pl">폴란드</string>
-  <string name="country_region_name_pt">포르투갈</string>
-  <string name="country_region_name_pr">푸에르토리코</string>
-  <string name="country_region_name_qa">카타르</string>
-  <string name="country_region_name_ru">러시아</string>
-  <string name="country_region_name_rw">르완다</string>
-  <string name="country_region_name_kn">세인트 키츠 네비스</string>
-  <string name="country_region_name_lc">세인트 루시아</string>
-  <string name="country_region_name_vc">세인트 빈센트 그레나딘</string>
-  <string name="country_region_name_sn">세네갈</string>
-  <string name="country_region_name_rs">세르비아</string>
-  <string name="country_region_name_sg">싱가폴</string>
-  <string name="country_region_name_sk">슬로바키아</string>
-  <string name="country_region_name_si">슬로베니아</string>
-  <string name="country_region_name_sb">솔로몬 제도</string>
-  <string name="country_region_name_za">남아공화국</string>
-  <string name="country_region_name_kr">대한민국</string>
+  <string name="disabled">비활성화 됨</string>
+  <string name="done_success">완료</string>
+  <string name="enabled">활성화 됨</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="Enter_your_mobile_number_label">본인의 휴대폰 번호를 입력하세요</string>
+  <string name="heading">제목</string>
+  <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_1">문제를 해결하고 COVIDSafe를 다시 활성화하는 방법</string>
+  <string name="internet_screen_content_2">새 버전의 업데이트가 가능할 때</string>
+  <string name="internet_screen_heading">COVIDSafe의 성능을 향상시키기 위해 인터넷에 연결하십시오</string>
+  <string name="need_location_service">COVIDSafe가 작동하려면 설정에서 위치서비스를 켜야 합니다.</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="norfolk_hint">예: 51234</string>
+  <string name="notification_update_content">최신 개선 사항에 접근하려면 귀하의 앱을 업데이트하십시오.</string>
+  <string name="notification_update_heading">COVIDSafe 업데이트가 가능함</string>
+  <string name="personal_details_name_characters_prompt">성명에는 영어 알파벳을 사용하십시오. 다른 언어, 혹은 \',\' 또는 \'?\'와 같은 기호를 사용하지 마십시오.</string>
+  <string name="pin_number">핀 번호</string>
+  <string name="PINNumber_VO_Label">핀 번호</string>
+  <string name="PN_MobileNumber_VOLabel">휴대폰 번호</string>
+  <string name="ReceivePinIssue">PIN을 받는 데 문제가 있습니까?</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="Select_country_or_region_headline">국가 또는 지역을 선택하세요</string>
+  <string name="service_ok_body">외출 시 혹은 공공 장소에 있을 때 COVIDSafe가 활성화되어 있도록 하세요.</string>
+  <string name="service_ok_title">COVIDSafe가 활성화되어 있습니다.</string>
+  <string name="stepCounter" formatted="false">%d 의 단계들 중 %d 단계</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="under_sixteen_registration_consent_first_paragraph">나의 등록 정보.</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 스토어를 통해 업데이트하십시오.</string>
+  <string name="update_available_play_store_btn">구글 플레이 스토어 가기</string>
+  <string name="update_available_title">업데이트 가능!</string>
 </resources>

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

@@ -1,290 +1,431 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-  <string name="home_header_active_title">COVIDSafe đang hoạt động.</string>
-  <string name="home_header_inactive_title">COVIDSafe không hoạt động.</string>
-  <string name="home_version_number">Phiên bản số: %s</string>
-  <string name="how_it_works_content">Tín hiệu Bluetooth® được sử dụng để xác định khi bạn ở 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 thông tin về tiếp xúc gần. Thông tin đượ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 thông tin về tiếp xúc gần của bạn vào 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>
-  <string name="data_privacy_content">Điều quan trọng là bạn phải đọc *chính sách bảo mật* của 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 này 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 cần nhập tên, 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ề vị trí của bạn. \n\nCOVIDSafe sẽ lưu ý thời gian tiếp xúc và mã ID ẩn danh của những người dùng COVIDSafe khác mà bạn tiếp xúc. \n\nNhững người dùng COVIDSafe khác mà bạn tiếp xúc sẽ ghi lại mã ID ẩn danh và thời gian tiếp xúc với bạn trên máy 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 việc 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à cho hoạt động đúng đắn và hợp pháp của COVIDSafe. \n\nThông tin thêm có sẵn tại trang mạng của *Bộ Y tế Chính phủ Úc*. \n\nXem *chính sách bảo mật* của COVIDSafe để biết thêm chi tiết về quyền về thông tin của bạn và cách xử lý và chia sẻ thông tin đó.</string>
-  <string name="permission_success_content">1. Khi bạn rời khỏi nhà, hãy mang theo điện thoại bên mình và chắc rằng COVIDSafe đang hoạt động. \n\n 2. Nên BẬT Bluetooth®. \n\n 3. Nên TẮT tối ưu hóa pin. \n\n 4. COVIDSafe không gửi yêu cầu kết nối. *Tìm hiểu thêm * .</string>
-  <string name="home_header_no_pairing">COVIDSafe không gửi *yêu cầu kết nối*.</string>
-  <string name="personal_details_name_characters_prompt">Vui lòng sử dụng các ký tự tiếng Anh để nhập họ và tên đầy đủ của bạn. Không sử dụng các ngôn ngữ khác hoặc ký hiệu như \',\' hoặc \'?\'.</string>
-  <string name="update_available_play_store_btn">Vào Google Play Store</string>
-  <string name="pin_number">mã số pin</string>
-  <string name="update_available_title">Cập nhật có sẵn!</string>
-  <string name="update_available_message">Chúng tôi đã và đang cải thiện COVIDSafe.</string>
-  <string name="update_available_dismiss_btn">Nhắc tôi sau</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="heading">Tiêu đề</string>
-  <string name="home_set_complete_external_link_app_url">https://www.health.gov.au/resource/apps-and-tools/coronavirus-australia-app</string>
-  <string name="upload_step_4_sub_header">Nếu bạn không đồng ý, thông tin về việc tiếp xúc gần của bạn sẽ không được đăng tải. \n\nNếu bạn đồng ý, thông tin về việc tiếp xúc gần của bạn sẽ được đăng tải và chia sẻ với các nhân viên y tế của tiểu bang hoặc lãnh thổ cho các mục đích truy tìm tiếp xúc. \n\nĐọc *chính sách bảo mật* của COVIDSafe để biết thêm chi tiết.</string>
-  <string name="ReceivePinIssue">Có vấn đề với việc nhận mã PIN?</string>
-  <string name="disabled">Đã tắt</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="enabled">Đã bật</string>
-  <string name="service_ok_title">COVIDSafe đang 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="under_sixteen_headline">Bạn cần có sự đồng ý của cha mẹ/người giám hộ để kích hoạt</string>
-  <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="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="dialog_error_uploading_message">Bị lỗi trong khi đăng tải thông tin của bạn, vui lòng thử lại.</string>
-  <string name="dialog_error_uploading_positive">Thử lại</string>
-  <string name="dialog_error_uploading_negative">Hủy bỏ</string>
-  <string name="title_help">Trợ giúp</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="service_not_ok_title">COVIDSafe không hoạt động</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_action">Kiểm tra ứng dụng ngay</string>
-  <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="intro_headline">Cùng nhau, chúng ta có thể ngăn chặn sự lây lan của COVID-19</string>
-  <string name="intro_content">Chính phủ Úc đã phát triển COVIDSafe để giúp giữ an toàn cho cộng đồng tránh khỏi sự lây lan của coronavirus. \n\nCOVIDSafe sẽ ghi lại một cách bảo mật các tiếp xúc của bạn với với những người dùng ứng dụng khác. Điều này sẽ cho phép các nhân viên y tế của tiểu bang và lãnh thổ liên lạc với bạn, nếu bạn đã tiếp xúc gần với người đã xét nghiệm dương tính với vi-rút. \n\nCùng nhau chúng ta có thể giúp ngăn chặn sự lây lan và giữ sức khỏe.</string>
-  <string name="intro_button">Tôi muốn giúp đỡ</string>
-  <string name="how_it_works_headline">COVIDSafe hoạt động như thế nào</string>
-  <string name="how_it_works_button">Tiếp theo</string>
-  <string name="data_privacy_headline">Đăng ký và bảo mật</string>
-  <string name="data_privacy_button">Tiếp theo</string>
-  <string name="consent_call_for_action">Chọn \'Tôi đồng ý\' để xác nhận đồng ý.</string>
+  <string name="action_continue">Tiếp tục</string>
+  <string name="action_report_an_issue">Báo cáo sự cố</string>
+  <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="activity_self_isolation_button">Tiếp tục</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>
+  <!-- Onboarding Change Device Name -->
+  <string name="change_device_name_headline">Tên thiết bị của bạn</string>
+  <string name="change_device_name_headline_content_description">Tiêu đề, Tên thiết bị của bạn</string>
+  <string name="change_device_name_new_device_name">Chỉnh sửa tên thiết bị</string>
+  <string name="change_device_name_primary_action">Tiếp tục</string>
+  <string name="change_device_name_secondary_action">Bỏ qua và giữ nguyên</string>
   <string name="consent_button">Tôi đồng ý</string>
-  <string name="registration_consent_headline">Đồng ý đăng ký</string>
-  <string name="registration_consent_content">Tôi đồng ý để Bộ Y tế Úc thu thập:</string>
-  <string name="registration_consent_first_paragraph">Thông tin đăng ký của tôi giúp các nhân viên y tế tiểu bang và lãnh thổ theo dõi sự tiếp xúc.</string>
-  <string name="registration_consent_second_paragraph">Thông tin tiếp xúc của tôi từ những người sử dụng COVIDSafe khác sau khi họ xét nghiệm dương tính với COVID-19.</string>
-  <string name="personal_details_headline">Nhập thông tin cá nhân của bạn</string>
-  <string name="personal_details_name_title">Tên đầy đủ</string>
-  <string name="personal_details_name_content_description">Nhập tên đầy đủ</string>
-  <string name="personal_details_age_title">Độ tuổi (chọn)</string>
-  <string name="personal_details_age_content_description">Chọn độ tuổi</string>
-  <string name="personal_details_age_error_prompt">Vui lòng chọn độ tuổi của bạn.</string>
-  <string name="personal_details_post_code">Mã bưu điện ở Úc</string>
-  <string name="personal_details_post_code_content_description">Nhập mã bưu điện</string>
-  <string name="personal_details_post_code_error_prompt">Số mã bưu điện Úc phải gồm 4 chữ số.</string>
-  <string name="navigation_back_button_content_description">Trang trước</string>
-  <string name="personal_details_button">Tiếp tục</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 Bộ Y tế Úc thu thập:</string>
-  <string name="under_sixteen_first_paragraph">Thông tin đăng ký của tôi giúp các nhân viên y tế tiểu bang và lãnh thổ theo dõi sự tiếp xúc.</string>
-  <string name="under_sixteen_second_paragraph">Thông tin tiếp xúc của tôi từ những người sử dụng COVIDSafe khác sau khi họ xét nghiệm dương tính với COVID-19.</string>
-  <string name="select_country_or_region">Chọn quốc gia hoặc khu vực</string>
-  <string name="enter_number_headline">Nhập sô điện thoại di động của bạn</string>
-  <string name="invalid_phone_number">Số điện thoại không hợp lệ.</string>
-  <string name="invalid_norfolk_island_phone_number_error_prompt">Số điện thoại di động ở Đảo Norfolk chứa từ 5 đến 6 chữ số.</string>
-  <string name="invalid_australian_phone_number_error_prompt">Số điện thoại di động ở Úc chứa tối đa 10 chữ số.</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>
-  <string name="enter_number_relative">Đăng ký dùm bạn bè hoặc người thân? \n\nHọ cần phải đăng ký bằng máy điện thoại và số điện thoại của riêng họ để COVIDSafe có thể hoạt động cho họ.</string>
-  <string name="enter_number_button">Nhận mã PIN</string>
-  <string name="search">Tìm kiếm</string>
-  <string name="options_for_australia">Tùy chọn cho Úc</string>
-  <string name="country_region_name_al">Albania</string>
-  <string name="country_region_name_dz">Algeria</string>
-  <string name="country_region_name_ao">Angola</string>
+  <!-- Shared Consent Actions -->
+  <string name="consent_call_for_action">Chọn \'Tôi đồng ý\' để xác nhận đồng ý.</string>
+  <string name="country_region_name_ad">Andorra</string>
+  <string name="country_region_name_ae">Các Tiểu Vương Quốc Ả Rập Thống Nhất</string>
+  <!-- Countries -->
+  <string name="country_region_name_af">Afghanistan</string>
   <string name="country_region_name_ag">Antigua và Barbuda</string>
   <string name="country_region_name_ai">Anguilla</string>
-  <string name="country_region_name_ar">Argentina</string>
+  <string name="country_region_name_al">Albania</string>
   <string name="country_region_name_am">Armenia</string>
-  <string name="country_region_name_aw">Aruba</string>
-  <string name="country_region_name_au">Úc</string>
+  <string name="country_region_name_an">Antilles Hà Lan</string>
+  <string name="country_region_name_ao">Angola</string>
+  <string name="country_region_name_ar">Argentina</string>
   <string name="country_region_name_at">Áo</string>
+  <string name="country_region_name_au">Úc</string>
+  <string name="country_region_name_aw">Aruba</string>
   <string name="country_region_name_az">Azerbaijan</string>
-  <string name="country_region_name_bs">Bahamas</string>
-  <string name="country_region_name_bh">Bahrain</string>
-  <string name="country_region_name_bd">Bangladesh</string>
+  <string name="country_region_name_ba">Bosnia và Herzegovina</string>
   <string name="country_region_name_bb">Barbados</string>
-  <string name="country_region_name_by">Belarus</string>
+  <string name="country_region_name_bd">Bangladesh</string>
   <string name="country_region_name_be">Bỉ</string>
-  <string name="country_region_name_bz">Belize</string>
+  <string name="country_region_name_bf">Burkina Faso</string>
+  <string name="country_region_name_bg">Bulgaria</string>
+  <string name="country_region_name_bh">Bahrain</string>
+  <string name="country_region_name_bi">Burundi</string>
   <string name="country_region_name_bj">Benin</string>
   <string name="country_region_name_bm">Bermuda</string>
+  <string name="country_region_name_bn">Brunei</string>
   <string name="country_region_name_bo">Bolivia</string>
-  <string name="country_region_name_ba">Bosnia và Herzegovina</string>
-  <string name="country_region_name_bw">Botswana</string>
   <string name="country_region_name_br">Brazil</string>
-  <string name="country_region_name_bg">Bulgaria</string>
-  <string name="country_region_name_bf">Burkina Faso</string>
-  <string name="country_region_name_kh">Campuchia</string>
-  <string name="country_region_name_cm">Cameroon</string>
+  <string name="country_region_name_bs">Bahamas</string>
+  <string name="country_region_name_bt">Bhutan</string>
+  <string name="country_region_name_bw">Botswana</string>
+  <string name="country_region_name_by">Belarus</string>
+  <string name="country_region_name_bz">Belize</string>
   <string name="country_region_name_ca">Canada</string>
-  <string name="country_region_name_cv">Cape Verde</string>
-  <string name="country_region_name_ky">Quần đảo Cayman</string>
+  <string name="country_region_name_cd">Cộng hòa Dân chủ Congo</string>
+  <string name="country_region_name_cf">Cộng hòa Trung Phi</string>
+  <string name="country_region_name_cg">Cộng hòa Congo</string>
+  <string name="country_region_name_ch">Thụy sĩ</string>
+  <string name="country_region_name_ci">Bờ biển Ngà</string>
+  <string name="country_region_name_ck">Quần đảo Cook</string>
   <string name="country_region_name_cl">Chi Lê</string>
+  <string name="country_region_name_cm">Cameroon</string>
   <string name="country_region_name_cn">Trung Quốc</string>
   <string name="country_region_name_co">Colombia</string>
   <string name="country_region_name_cr">Costa Rica</string>
-  <string name="country_region_name_hr">Croatia</string>
+  <string name="country_region_name_cv">Cape Verde</string>
   <string name="country_region_name_cy">Síp</string>
   <string name="country_region_name_cz">Cộng hòa Séc</string>
+  <string name="country_region_name_de">Đức</string>
+  <string name="country_region_name_dj">Djibouti</string>
   <string name="country_region_name_dk">Đan mạch</string>
   <string name="country_region_name_dm">Dominica</string>
   <string name="country_region_name_do">Cộng hòa Dominica</string>
+  <string name="country_region_name_dz">Algeria</string>
   <string name="country_region_name_ec">Ecuador</string>
-  <string name="country_region_name_sv">El Salvador</string>
   <string name="country_region_name_ee">Estonia</string>
-  <string name="country_region_name_fj">Fiji</string>
+  <string name="country_region_name_eg">Ai Cập</string>
+  <string name="country_region_name_es">Tây Ban Nha</string>
+  <string name="country_region_name_et">Ethiopia</string>
   <string name="country_region_name_fi">Phần Lan</string>
+  <string name="country_region_name_fj">Fiji</string>
+  <string name="country_region_name_fo">Quần đảo Faroe</string>
   <string name="country_region_name_fr">Pháp</string>
   <string name="country_region_name_ga">Gabon</string>
-  <string name="country_region_name_ge">Georgia</string>
-  <string name="country_region_name_de">Đức</string>
-  <string name="country_region_name_gh">Ghana</string>
-  <string name="country_region_name_gr">Hy Lạp</string>
+  <string name="country_region_name_gb">Vương quốc Anh</string>
   <string name="country_region_name_gd">Grenada</string>
-  <string name="country_region_name_gu">Guam</string>
+  <string name="country_region_name_ge">Georgia</string>
+  <string name="country_region_name_gf">Guiana thuộc Pháp</string>
+  <string name="country_region_name_gh">Ghana</string>
+  <string name="country_region_name_gi">Gibraltar</string>
+  <string name="country_region_name_gl">Greenland</string>
+  <string name="country_region_name_gm">Gambia</string>
+  <string name="country_region_name_gn">Guinea</string>
+  <string name="country_region_name_gp">Guadeloupe</string>
+  <string name="country_region_name_gq">Guinea Xích đạo</string>
+  <string name="country_region_name_gr">Hy Lạp</string>
   <string name="country_region_name_gt">Guatemala</string>
+  <string name="country_region_name_gu">Guam</string>
   <string name="country_region_name_gw">Guinea-Bissau</string>
-  <string name="country_region_name_ht">Haiti</string>
-  <string name="country_region_name_hn">Honduras</string>
+  <string name="country_region_name_gy">Guyana</string>
   <string name="country_region_name_hk">Hồng Kông</string>
+  <string name="country_region_name_hn">Honduras</string>
+  <string name="country_region_name_hr">Croatia</string>
+  <string name="country_region_name_ht">Haiti</string>
   <string name="country_region_name_hu">Hungary</string>
-  <string name="country_region_name_is">Iceland</string>
-  <string name="country_region_name_in">Ấn Độ</string>
   <string name="country_region_name_id">Indonesia</string>
-  <string name="country_region_name_iq">Iraq</string>
   <string name="country_region_name_ie">Ái Nhĩ Lan</string>
   <string name="country_region_name_il">Israel</string>
-  <string name="country_region_name_ci">Bờ biển Ngà</string>
+  <string name="country_region_name_in">Ấn Độ</string>
+  <string name="country_region_name_iq">Iraq</string>
+  <string name="country_region_name_is">Iceland</string>
+  <string name="country_region_name_it">Ý</string>
   <string name="country_region_name_jm">Jamaica</string>
-  <string name="country_region_name_jp">Nhật Bản</string>
   <string name="country_region_name_jo">Jordan</string>
-  <string name="country_region_name_kz">Kazakhstan</string>
+  <string name="country_region_name_jp">Nhật Bản</string>
   <string name="country_region_name_ke">Kenya</string>
-  <string name="country_region_name_kw">Kuwait</string>
   <string name="country_region_name_kg">Kyrgyzstan</string>
+  <string name="country_region_name_kh">Campuchia</string>
+  <string name="country_region_name_ki">Kiribati</string>
+  <string name="country_region_name_km">Comoros</string>
+  <string name="country_region_name_kn">Saint Kitts và Nevis</string>
+  <string name="country_region_name_kr">Hàn quốc</string>
+  <string name="country_region_name_kw">Kuwait</string>
+  <string name="country_region_name_ky">Quần đảo Cayman</string>
+  <string name="country_region_name_kz">Kazakhstan</string>
   <string name="country_region_name_la">Lào</string>
-  <string name="country_region_name_lv">Latvia</string>
   <string name="country_region_name_lb">Lebanon</string>
+  <string name="country_region_name_lc">Saint Lucia</string>
   <string name="country_region_name_li">Liechtenstein</string>
+  <string name="country_region_name_lk">Sri Lanka</string>
+  <string name="country_region_name_lr">Liberia</string>
+  <string name="country_region_name_ls">Lesotho</string>
   <string name="country_region_name_lt">Lithuania</string>
   <string name="country_region_name_lu">Luxembourg</string>
-  <string name="country_region_name_mo">Ma Cao</string>
-  <string name="country_region_name_mk">Cộng hoà Macedonia trực thuộc Nam Tư cũ </string>
-  <string name="country_region_name_my">Mã Lai</string>
-  <string name="country_region_name_ml">Mali</string>
-  <string name="country_region_name_mt">Malta</string>
-  <string name="country_region_name_mq">Martinique</string>
-  <string name="country_region_name_mu">Mauritius</string>
-  <string name="country_region_name_mx">Mexico</string>
-  <string name="country_region_name_md">Moldova</string>
-  <string name="country_region_name_ms">Montserrat</string>
+  <string name="country_region_name_lv">Latvia</string>
+  <string name="country_region_name_ly">Libya</string>
   <string name="country_region_name_ma">Ma-rốc</string>
-  <string name="country_region_name_mz">Mozambique</string>
+  <string name="country_region_name_mc">Monaco</string>
+  <string name="country_region_name_md">Moldova</string>
+  <string name="country_region_name_me">Montenegro</string>
+  <string name="country_region_name_mg">Madagascar</string>
+  <string name="country_region_name_mk">Cộng hoà Macedonia trực thuộc Nam Tư cũ </string>
+  <string name="country_region_name_ml">Mali</string>
   <string name="country_region_name_mm">Myanmar</string>
+  <string name="country_region_name_mn">Mông Cổ</string>
+  <string name="country_region_name_mo">Ma Cao</string>
+  <string name="country_region_name_mq">Martinique</string>
+  <string name="country_region_name_mr">Mauritania</string>
+  <string name="country_region_name_ms">Montserrat</string>
+  <string name="country_region_name_mt">Malta</string>
+  <string name="country_region_name_mu">Mauritius</string>
+  <string name="country_region_name_mv">Maldives</string>
+  <string name="country_region_name_mw">Malawi</string>
+  <string name="country_region_name_mx">Mexico</string>
+  <string name="country_region_name_my">Mã Lai</string>
+  <string name="country_region_name_mz">Mozambique</string>
   <string name="country_region_name_na">Namibia</string>
-  <string name="country_region_name_np">Nepal</string>
-  <string name="country_region_name_nl">Hà lan</string>
-  <string name="country_region_name_nz">New Zealand</string>
-  <string name="country_region_name_ni">Nicaragua</string>
+  <string name="country_region_name_nc">New Caledonia</string>
   <string name="country_region_name_ne">Niger</string>
   <string name="country_region_name_ng">Nigeria</string>
+  <string name="country_region_name_ni">Nicaragua</string>
+  <string name="country_region_name_nl">Hà lan</string>
   <string name="country_region_name_no">Na Uy</string>
+  <string name="country_region_name_np">Nepal</string>
+  <string name="country_region_name_nz">New Zealand</string>
   <string name="country_region_name_om">Oman</string>
-  <string name="country_region_name_pk">Pakistan</string>
   <string name="country_region_name_pa">Panama</string>
-  <string name="country_region_name_pg">Papua New Guinea</string>
-  <string name="country_region_name_py">Paraguay</string>
   <string name="country_region_name_pe">Peru</string>
+  <string name="country_region_name_pg">Papua New Guinea</string>
   <string name="country_region_name_ph">Philippine</string>
+  <string name="country_region_name_pk">Pakistan</string>
   <string name="country_region_name_pl">Ba Lan</string>
-  <string name="country_region_name_pt">Bồ Đào Nha</string>
   <string name="country_region_name_pr">Puerto Rico</string>
+  <string name="country_region_name_ps">Lãnh thổ Palestine</string>
+  <string name="country_region_name_pt">Bồ Đào Nha</string>
+  <string name="country_region_name_pw">Palau</string>
+  <string name="country_region_name_py">Paraguay</string>
   <string name="country_region_name_qa">Qatar</string>
+  <string name="country_region_name_re">Đảo Reunion</string>
+  <string name="country_region_name_ro">Rumani</string>
+  <string name="country_region_name_rs">Serbia</string>
   <string name="country_region_name_ru">Nga</string>
   <string name="country_region_name_rw">Rwanda</string>
-  <string name="country_region_name_kn">Saint Kitts và Nevis</string>
-  <string name="country_region_name_lc">Saint Lucia</string>
-  <string name="country_region_name_vc">Saint Vincent và Grenadines</string>
-  <string name="country_region_name_sn">Senegal</string>
-  <string name="country_region_name_rs">Serbia</string>
-  <string name="country_region_name_sg">Singapore</string>
-  <string name="country_region_name_sk">Slovakia</string>
-  <string name="country_region_name_si">Slovenia</string>
+  <string name="country_region_name_sa">Ả Rập Saudi</string>
   <string name="country_region_name_sb">Quần đảo Solomon</string>
-  <string name="country_region_name_za">Nam Phi</string>
-  <string name="country_region_name_kr">Hàn quốc</string>
-  <string name="country_region_name_es">Tây Ban Nha</string>
-  <string name="country_region_name_lk">Sri Lanka</string>
+  <string name="country_region_name_sc">Seychelles</string>
   <string name="country_region_name_se">Thụy Điển</string>
-  <string name="country_region_name_ch">Thụy sĩ</string>
-  <string name="country_region_name_tw">Đài Loan</string>
-  <string name="country_region_name_tj">Tajikistan</string>
-  <string name="country_region_name_tz">Tanzania</string>
-  <string name="country_region_name_th">Thái lan</string>
-  <string name="country_region_name_tg">Togo</string>
-  <string name="country_region_name_tt">Trinidad và Tobago</string>
-  <string name="country_region_name_tn">Tunisia</string>
-  <string name="country_region_name_tr">Thổ nhĩ kỳ</string>
-  <string name="country_region_name_tm">Turkmenistan</string>
+  <string name="country_region_name_sg">Singapore</string>
+  <string name="country_region_name_si">Slovenia</string>
+  <string name="country_region_name_sk">Slovakia</string>
+  <string name="country_region_name_sl">Sierra Leone</string>
+  <string name="country_region_name_sn">Senegal</string>
+  <string name="country_region_name_so">Somalia</string>
+  <string name="country_region_name_sr">Suriname</string>
+  <string name="country_region_name_ss">Nam Sudan</string>
+  <string name="country_region_name_st">Sao Tome và Principe</string>
+  <string name="country_region_name_sv">El Salvador</string>
+  <string name="country_region_name_sz">Swaziland</string>
   <string name="country_region_name_tc">Quần đảo Turks và Caicos</string>
-  <string name="country_region_name_ug">Uganda</string>
+  <string name="country_region_name_td">Chad</string>
+  <string name="country_region_name_tg">Togo</string>
+  <string name="country_region_name_th">Thái lan</string>
+  <string name="country_region_name_tj">Tajikistan</string>
+  <string name="country_region_name_tl">Đông Timor</string>
+  <string name="country_region_name_tm">Turkmenistan</string>
+  <string name="country_region_name_tn">Tunisia</string>
+  <string name="country_region_name_to">Tonga</string>
+  <string name="country_region_name_tr">Thổ nhĩ kỳ</string>
+  <string name="country_region_name_tt">Trinidad và Tobago</string>
+  <string name="country_region_name_tw">Đài Loan</string>
+  <string name="country_region_name_tz">Tanzania</string>
   <string name="country_region_name_ua">Ukraine</string>
-  <string name="country_region_name_ae">Các Tiểu Vương Quốc Ả Rập Thống Nhất</string>
-  <string name="country_region_name_gb">Vương quốc Anh</string>
+  <string name="country_region_name_ug">Uganda</string>
   <string name="country_region_name_us">Hoa Kỳ</string>
   <string name="country_region_name_uy">Uruguay</string>
   <string name="country_region_name_uz">Uzbekistan</string>
+  <string name="country_region_name_vc">Saint Vincent và Grenadines</string>
   <string name="country_region_name_ve">Venezuela</string>
-  <string name="country_region_name_vn">Việt Nam</string>
   <string name="country_region_name_vg">Quần đảo Virgin, Anh</string>
   <string name="country_region_name_vi">Quần đảo Virgin, Hoa Kỳ</string>
+  <string name="country_region_name_vn">Việt Nam</string>
+  <string name="country_region_name_vu">Vanuatu</string>
+  <string name="country_region_name_ws">Samoa</string>
   <string name="country_region_name_ye">Yemen</string>
+  <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="enter_pin_headline" formatted="false">Nhập mã PIN được gửi tới %s %s</string>
-  <string name="enter_pin_wrong_number">Số điện thoại này có sai không?</string>
-  <string name="enter_pin_timer_expire">MÃ PIN của bạn sẽ hết hạn trong</string>
-  <string name="wrong_ping_number">Nhập sai mã PIN</string>
-  <string name="enter_pin_resend_pin">Gửi lại mã PIN</string>
+  <string name="data_privacy_button">Tiếp theo</string>
+  <string name="data_privacy_content">Điều quan trọng là bạn phải đọc *chính sách bảo mật* COVIDSafe trước khi đăng ký COVIDSafe. \n\nNếu bạn dưới 16 tuổi, cha mẹ/người giám hộ của bạn cũng phải đọc *chính sách bảo mật *. \n\nSử dụng COVIDSafe là hoàn toàn tự nguyện. Bạn có thể cài đặt hoặc xóa ứng dụng bất cứ lúc nào. Nếu bạn xóa COVIDSafe, *bạn cũng có thể yêu cầu xóa thông tin của mình* khỏi máy chủ bảo mật. \n\nĐể đăng ký COVIDSafe, bạn sẽ cần nhập tên (hoặc biệt danh), số điện thoại di động, độ tuổi và mã bưu điện. \n\nThông tin bạn gửi khi đăng ký và thông tin về việc sử dụng COVIDSafe của bạn sẽ được thu thập và lưu trữ trên một máy chủ có độ an toàn cao. \n\nCOVIDSafe sẽ không thu thập thông tin vị trí của bạn. \n\nCOVIDSafe sẽ ghi nhớ thời gian tiếp xúc, mã ID ẩn danh của những người dùng COVIDSafe khác mà bạn tiếp xúc, cường độ tín hiệu Bluetooth® và kiểu điện thoại của người dùng khác trên thiết bị của bạn. \n\nNhững người dùng COVIDSafe khác mà bạn tiếp xúc cũng sẽ ghi nhớ mã ID ẩn danh của bạn, thời gian tiếp xúc, cường độ tín hiệu Bluetooth® và kiểu điện thoại của bạn, trên thiết bị của họ.\n\nNếu người dùng khác xét nghiệm dương tính với COVID-19, họ có thể đăng tải thông tin tiếp xúc của họ và nhân viên y tế của tiểu bang hoặc lãnh thổ có thể liên hệ với bạn nhằm mục đích truy tìm tiếp xúc. \n\nChi tiết đăng ký của bạn sẽ chỉ được sử dụng hoặc tiết lộ để theo dõi việc tiếp xúc và hoạt động đúng đắn và hợp pháp của COVIDSafe. \n\nThông tin để tìm hiểu thêm có tại trang mạng của *Bộ Y tế Chính phủ Úc*. \n\n Xem *chính sách bảo mật* của COVIDSafe để biết thêm chi tiết các quyền về thông tin của bạn và cách xử lý và chia sẻ thông tin đó.\n </string>
+  <!-- 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="dialog_error_uploading_message">Bị lỗi trong khi đăng tải thông tin của bạn, vui lòng thử lại.</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="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>
+  <string name="enter_number_for_example">Ví dụ:</string>
+  <string name="enter_number_headline">Nhập sô điện thoại di động của bạn</string>
+  <string name="enter_number_prefix">+61</string>
+  <string name="enter_number_relative">Đăng ký dùm bạn bè hoặc người thân? \n\nHọ cần phải đăng ký bằng máy điện thoại và số điện thoại của riêng họ để COVIDSafe có thể hoạt động cho họ.</string>
   <string name="enter_pin_button">Xác minh</string>
-  <string name="permission_headline">Cài đặt ứng dụng</string>
-  <string name="permission_content">COVIDSafe cần Bluetooth® và thông báo được kích hoạt để hoạt động. \n\n Chọn \'Kích hoạt\' để: \n\n 1. Kích hoạ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\n\nAndroid cần quyền truy cập Vị trí để Bluetooth® hoạt động. \n\nCOVIDSafe không gửi yêu cầu ghép nối.</string>
-  <string name="permission_button">Kích hoạt</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="change_device_name_headline">Tên thiết bị của bạn</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ị sử dụng Bluetooth® khác ở xung quanh bạn sẽ có thể thấy tên này. Chúng tôi khuyên bạn nên sử dụng tên thiết bị không bao gồm thông tin cá nhân của bạn.</string>
-  <string name="change_device_name_new_device_name">Tên thiết bị mới</string>
-  <string name="change_device_name_default_device_name">Điện thoại Android</string>
-  <string name="change_device_name_primary_action">Thay đổi và tiếp tục</string>
-  <string name="change_device_name_secondary_action">Bỏ qua và giữ nguyên</string>
-  <string name="permission_success_headline">Bạn đã đăng ký thành công</string>
-  <string name="permission_success_button">Tiếp tục</string>
-  <string name="home_header_active_no_action_required">Không cần làm gì thêm.</string>
-  <string name="home_header_inactive_check_your_permissions">Kiểm tra cài đặt của bạn.</string>
-  <string name="home_header_uploaded_on_date">Thông tin của bạn đã được đăng tải lên %s .</string>
-  <string name="home_bluetooth_permission">Bluetooth®: %s</string>
-  <string name="home_non_battery_optimization_permission">Tối ưu hóa pin: %s</string>
-  <string name="home_location_permission">Vị trí: %s</string>
-  <string name="home_push_notification_permission">Gửi thông báo: %s</string>
-  <string name="home_permission_on">Mở</string>
-  <string name="home_permission_off">Tắt</string>
-  <string name="home_app_permission_status_title">Kiểm tra cài đặt của bạn</string>
-  <string name="home_app_permission_status_subtitle">COVIDSafe sẽ không hoạt động nếu không có cài đặt phù hợp.</string>
+  <!-- OnBoarding Enter PIN -->
+  <string name="enter_pin_headline" formatted="false">Nhập mã PIN được gửi tới %s %s</string>
+  <string name="enter_pin_resend_pin">Gửi lại mã PIN</string>
+  <string name="enter_pin_timer_expire">Mã PIN của bạn sẽ hết hạn trong</string>
+  <string name="enter_pin_wrong_number">Số điện thoại này có sai không?</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="home_app_permission_push_notification_prompt">Cho phép COVIDSafe gửi thông báo.</string>
-  <string name="home_set_complete_external_link_share_title">Chia sẻ COVIDSafe</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_app_permission_status_subtitle">COVIDSafe sẽ không hoạt động nếu không có cài đặt phù hợp.</string>
+  <string name="home_app_permission_status_title">Kiểm tra cài đặt của bạn</string>
+  <string name="home_been_tested_title">Nhân viên y tế có yêu cầu bạn đăng tải dữ liệu của bạn chưa?</string>
+  <string name="home_bluetooth_permission">Bluetooth®: %s</string>
+  <string name="home_data_has_been_uploaded">Dữ liệu của bạn đã được đăng tải</string>
+  <string name="home_data_has_been_uploaded_message">Bạn đang giúp ngăn chặn sự lây lan của COVID-19 bằng cách đăng tải dữ liệu của bạn hàng ngày trong khi tự cách ly.</string>
+  <string name="home_data_uploaded">Đăng ký tự cách ly</string>
+  <string name="home_data_uploaded_button">Đăng ký</string>
+  <string name="home_data_uploaded_message">Giúp ngăn chặn sự lây lan của COVID-19 và theo dõi các triệu chứng của bạn.</string>
+  <string name="home_header_active_no_action_required">Không cần làm gì thêm.</string>
+  <!-- Home -->
+  <string name="home_header_active_title">COVIDSafe đang hoạt động.</string>
+  <!-- Home -->
+  <string name="home_header_active_title_thanks">Cảm ơn, COVIDSafe hiện đang hoạt động.</string>
+  <string name="home_header_inactive_check_your_permissions">Kiểm tra cài đặt của bạn.</string>
+  <string name="home_header_inactive_title">COVIDSafe không hoạt động.</string>
+  <string name="home_header_no_pairing">COVIDSafe không gửi *yêu cầu ghép nối*.</string>
+  <string name="home_header_uploaded_on_date">Thông tin của bạn đã được đăng tải lên %s .</string>
+  <string name="home_location_permission">Vị trí: %s</string>
+  <string name="home_non_battery_optimization_permission">Tối ưu hóa pin: %s</string>
+  <string name="home_permission_off">Tắt</string>
+  <string name="home_permission_on">Mở</string>
+  <string name="home_push_notification_permission">Gửi thông báo: %s</string>
+  <string name="home_set_complete_disclaimer_title">Hãy ngăn chặn sự lây lan của COVID-19.</string>
+  <string name="home_set_complete_external_link_app_content">Tải xuống ứng dụng của chính phủ để biết những tin tức và lời khuyên mới nhất.</string>
+  <string name="home_set_complete_external_link_app_title">Tải ứng dụng Coronavirus</string>
+  <string name="home_set_complete_external_link_app_url">https://www.health.gov.au/resource/apps-and-tools/coronavirus-australia-app</string>
+  <string name="home_set_complete_external_link_been_contacted_content">Bạn chỉ có thể đăng tải thông tin của mình nếu bạn được xét nghiệm có kết quả dương tính.</string>
+  <string name="home_set_complete_external_link_been_contacted_title">Nhân viên y tế có liên lạc với bạn không?</string>
+  <string name="home_set_complete_external_link_help_topics_content">Nếu bạn có sự cố hoặc thắc mắc về ứng dụng.</string>
+  <string name="home_set_complete_external_link_help_topics_title">Các chủ đề trợ giúp</string>
+  <string name="home_set_complete_external_link_news_content">Vào aus.gov.au để biết tin tức mới nhất về Coronavirus.</string>
   <string name="home_set_complete_external_link_news_title">Tin tức và cập nhật mới nhất</string>
   <string name="home_set_complete_external_link_news_url">https://www.australia.gov.au</string>
-  <string name="home_set_complete_external_link_news_content">Vào aus.gov.au để biết tin tức mới nhất về Coronavirus.</string>
-  <string name="home_set_complete_external_link_app_title">Tải ứng dụng Coronavirus</string>
-  <string name="home_set_complete_external_link_app_content">Tải xuống ứng dụng của chính phủ để biết những tin tức và lời khuyên mới nhất.</string>
-  <string name="home_set_complete_external_link_been_contacted_title">Nhân viên y tế có liên lạc với bạn không?</string>
-  <string name="home_set_complete_external_link_been_contacted_content">Bạn chỉ có thể đăng tải thông tin của mình nếu bạn được xét nghiệm có kết quả dương tính.</string>
-  <string name="home_set_complete_external_link_help_topics_title">Các chủ đề trợ giúp</string>
-  <string name="home_set_complete_external_link_help_topics_content">Nếu bạn có sự cố hoặc thắc mắc về ứng dụng.</string>
-  <string name="action_report_an_issue">Báo cáo sự cố</string>
-  <string name="upload_answer_yes">Có</string>
+  <string name="home_set_complete_external_link_self_isolation_register_url">https://covid-form.service.gov.au</string>
+  <string name="home_set_complete_external_link_share_content">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_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="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>
+  <!-- OnBoarding How it works -->
+  <string name="how_it_works_headline">COVIDSafe hoạt động như thế nào</string>
+  <string name="how_it_works_headline_content_description">Tiêu đề, COVIDSafe hoạt động như thế nào</string>
+  <string name="intro_button">Tôi muốn giúp đỡ</string>
+  <string name="intro_content">Chính phủ Úc đã phát triển COVIDSafe để giúp giữ an toàn cho cộng đồng tránh khỏi sự lây lan của coronavirus. \n\nCOVIDSafe sẽ ghi lại một cách bảo mật các tiếp xúc của bạn với với những người dùng ứng dụng khác. Điều này sẽ cho phép các nhân viên y tế của tiểu bang và lãnh thổ liên lạc với bạn, nếu bạn đã tiếp xúc gần với người đã xét nghiệm dương tính với vi-rút. \n\nCùng nhau chúng ta có thể giúp ngăn chặn sự lây lan và giữ sức khỏe.</string>
+  <!-- OnBoarding Intro -->
+  <string name="intro_headline">Cùng nhau, chúng ta có thể ngăn chặn sự lây lan của COVID-19</string>
+  <string name="intro_headline_content_description">Tiêu đề, Cùng nhau, chúng ta có thể ngăn chặn sự lây lan của COVID-19</string>
+  <string name="invalid_age">Tuổi không thể để trống</string>
+  <string name="invalid_australian_phone_number_error_prompt">Số điện thoại di động ở Úc chứa tối đa 10 chữ số.</string>
+  <string name="invalid_name">Tên không hợp lệ</string>
+  <string name="invalid_norfolk_island_phone_number_error_prompt">Số điện thoại di động ở Đảo Norfolk chứa từ 5 đến 6 chữ số.</string>
+  <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>
+  <!-- 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="navigation_back_button_content_description">Trang trước</string>
+  <string name="notification_active_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>
+  <!-- Notifications -->
+  <string name="notification_active_title">COVIDSafe đang hoạt động</string>
+  <string name="notification_not_active_body">Đảm bảo COVIDSafe hoạt động trước khi bạn rời khỏi nhà hoặc khi ở những nơi công cộng.</string>
+  <string name="notification_not_active_title">COVIDSafe không hoạt động</string>
+  <string name="options_for_australia">Tùy chọn cho Úc</string>
+  <string name="permission_button">Kích hoạt</string>
+  <string name="permission_content">COVIDSafe cần Bluetooth® và thông báo được kích hoạt để hoạt động. \n\n Chọn \'Kích hoạt\' để: \n\n 1. Kích hoạ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\n\nAndroid cần quyền truy cập Vị trí để Bluetooth® hoạt động. \n\nCOVIDSafe không gửi yêu cầu 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. Khi bạn rời khỏi nhà, hãy mang theo điện thoại bên mình và chắc rằng COVIDSafe đang hoạt động. \n\n 2. Nên BẬT Bluetooth®. \n\n 3. Nên TẮT tối ưu hóa pin. \n\n 4. COVIDSafe không gửi yêu cầu ghép nối. *Tìm hiểu thêm * .</string>
+  <!-- OnBoarding Permission Success -->
+  <string name="permission_success_headline">Bạn đã đăng ký thành công</string>
+  <string name="permission_success_warning">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>
+  <string name="personal_details_age_content_description">Chọn độ tuổi</string>
+  <string name="personal_details_age_dialog_title">Chọn tuổi của bạn</string>
+  <string name="personal_details_age_error_prompt">Vui lòng chọn độ tuổi của bạn.</string>
+  <string name="personal_details_age_title">Độ tuổi (chọn)</string>
+  <string name="personal_details_button">Tiếp tục</string>
+  <string name="personal_details_dialog_ok">Chọn</string>
+  <!-- OnBoarding Personal details -->
+  <string name="personal_details_headline">Nhập thông tin cá nhân của bạn</string>
+  <string name="personal_details_headline_content_description">Tiêu đề, Nhập thông tin cá nhân của bạn</string>
+  <string name="personal_details_name_content_description">Nhập tên đầy đủ</string>
+  <string name="personal_details_name_error_prompt">Vui lòng nhập tên đầy đủ của bạn.</string>
+  <string name="personal_details_name_title">Tên đầy đủ (hoặc biệt danh)</string>
+  <string name="personal_details_post_code">Mã bưu điện ở Úc</string>
+  <string name="personal_details_post_code_content_description">Nhập mã bưu điện</string>
+  <string name="personal_details_post_code_dialog_title">Mã bưu điện</string>
+  <string name="personal_details_post_code_error_prompt">Số mã bưu điện Úc phải gồm 4 chữ số.</string>
+  <string name="personal_details_post_code_hint">Ví dụ: 2000</string>
+  <string name="registration_consent_content">Tôi đồng ý cho Cơ quan Chuyển đổi Kỹ thuật số với tư cách là nhà quản trị cửa hàng dữ liệu, theo quyết định pháp lý của Bộ trưởng Bộ Y tế Chính phủ Úc thu thập:</string>
+  <string name="registration_consent_first_paragraph">Thông tin đăng ký của tôi.</string>
+  <!-- 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 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="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>
+  <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="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="title_help">Trợ giúp</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 -->
+  <string name="under_sixteen_headline">Bạn cần có sự đồng ý của cha mẹ/người giám hộ để kích hoạt</string>
+  <string name="under_sixteen_headline_content_description">Tiêu đề, Bạn cần có sự đồng ý của cha mẹ/người giám hộ để kích hoạt</string>
+  <string name="under_sixteen_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 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="upload_answer_no">Không</string>
-  <string name="upload_step_1_header">Nhân viên y tế có yêu cầu bạn đăng tải thông tin của bạn không?</string>
-  <string name="upload_step_1_body">Chỉ khi bạn xét nghiệm dương tính với COVID-19, nhân viên y tế của tiểu bang hoặc lãnh thổ sẽ liên lạc với bạn để hỗ trợ đăng tải thông tin của bạn một cách tự nguyện. \n\nKhi nhấn \'Có\', bạn cần phải đồng ý đăng tải thông tin của mình.</string>
-  <string name="upload_step_4_header">Đăng tải sự đồng ý</string>
-  <string name="upload_step_verify_pin_header">Đăng tải thông tin của bạn</string>
-  <string name="upload_step_verify_pin_sub_header">Nhân viên y tế của tiểu bang hoặc lãnh thổ sẽ gửi mã PIN qua tin nhắn đến thiết bị di động của bạn. Nhập mã PIN vào đây để đăng tải thông tin của bạn.</string>
-  <string name="action_verify_upload_pin">Đăng tải thông tin của tôi</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>
+  <!-- Upload flow -->
+  <string name="upload_answer_yes">Có</string>
+  <string name="upload_consent_button">Tôi đồng ý</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>
   <string name="upload_finished_sub_header">Bạn đã đăng tải thành công thông tin của mình vào hệ thống lưu trữ bảo mật cao của COVIDSafe. \n\nCác nhân viên y tế của tiểu bang hoặc lãnh thổ sẽ thông báo cho những người sử dụng COVIDSafe khác khi tiếp xúc gần với bạn. Danh tính của bạn sẽ được ẩn danh đối với người sử dụng khác.</string>
-  <string name="action_continue">Tiếp tục</string>
-  <string name="action_upload_done">Tiếp tục</string>
+  <string name="upload_step_1_body">Chỉ khi bạn xét nghiệm dương tính với COVID-19, nhân viên y tế của tiểu bang hoặc lãnh thổ sẽ liên lạc với bạn để hỗ trợ đăng tải thông tin của bạn một cách tự nguyện. \n\nKhi nhấn \'Có\', bạn cần phải đồng ý đăng tải thông tin của mình.</string>
+  <string name="upload_step_1_header">Nhân viên y tế có yêu cầu bạn đăng tải thông tin của bạn không?</string>
+  <string name="upload_step_1_header_content_description">Tiêu đề, Nhân viên y tế có yêu cầu bạn đăng tải thông tin của bạn không?</string>
+  <string name="upload_step_4_header">Đăng tải sự đồng ý</string>
+  <string name="upload_step_4_header_content_description">Tiêu đề,  Đăng tải sự đồng ý</string>
+  <string name="upload_step_4_sub_header">Nếu bạn không đồng ý, dữ liệu về việc tiếp xúc của bạn sẽ không được đăng tải. \n\nNếu bạn đồng ý, dữ liệu về việc tiếp xúc của bạn sẽ được đăng tải và chia sẻ với các nhân viên y tế của tiểu bang hoặc lãnh thổ cho các mục đích truy tìm tiếp xúc. \n\nCác nhân viên y tế tiếu bang và lãnh thổ chỉ có thể truy cập thông tin về các tiếp xúc gần của bạn.\n\nĐọc *chính sách bảo mật* của COVIDSafe để biết thêm chi tiết.</string>
+  <string name="upload_step_verify_pin_header">Đăng tải thông tin của bạn</string>
+  <string name="upload_step_verify_pin_header_content_description">Tiêu đề, Đăng tải thông tin của bạn</string>
+  <string name="upload_step_verify_pin_sub_header">Nhân viên y tế của tiểu bang hoặc lãnh thổ sẽ gửi mã PIN qua tin nhắn đến thiết bị di động của bạn. Nhập mã PIN vào đây để đăng tải thông tin của bạn.</string>
+  <string name="us_consent_button">Tôi đồng ý</string>
+  <string name="wrong_ping_number">Nhập sai mã PIN</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="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="country_region_name_au2">Đảo Norfolk</string>
   <string name="country_region_name_cu">Cuba</string>
   <string name="country_region_name_cw">Curaçao</string>
   <string name="country_region_name_ir">Iran</string>
   <string name="country_region_name_sd">Sudan</string>
+  <string name="disabled">Đã tắt</string>
+  <string name="done_success">Hoàn tất</string>
+  <string name="enabled">Đã bật</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="heading">Tiêu đề</string>
+  <string name="improve_heading">Cải thiện hoạt động của COVIDSafe</string>
+  <string name="internet_connection_content">Kết nối với internet để đảm bảo nhận được thông báo về các sự cố và cập nhật.</string>
+  <string name="internet_connection_heading">Không có kết nối Internet</string>
+  <string name="internet_screen_content">Đôi khi COVIDSafe cần kết nối với máy chủ để đảm bảo  có thể xác định các vấn đề xảy ra với ứng dụng. \n\n Kết nối với internet đảm bảo bạn nhận được thông báo:</string>
+  <string name="internet_screen_content_1">cách khắc phục sự cố và kích hoạt lại COVIDSafe</string>
+  <string name="internet_screen_content_2">khi có phiên bản cập nhật mới</string>
+  <string name="internet_screen_heading">Kết nối với internet để cải thiện hoạt động của COVIDSafe</string>
+  <string name="need_location_service">Để COVIDSafe hoạt động, bạn cần bật Vị trí trong Cài đặt.</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="norfolk_hint">Ví dụ: 51234</string>
+  <string name="notification_update_content">Cập nhật ứng dụng của bạn để truy cập những cải thiện mới nhất.</string>
+  <string name="notification_update_heading">Cập nhật COVIDSafe có sẵn</string>
+  <string name="personal_details_name_characters_prompt">Vui lòng sử dụng các ký tự tiếng Anh để nhập họ và tên đầy đủ của bạn. Không sử dụng các ngôn ngữ khác hoặc ký hiệu như \',\' hoặc \'?\'.</string>
+  <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="ReceivePinIssue">Có vấn đề với việc nhận mã PIN?</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="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="stepCounter" formatted="false">Bước %d của %d</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="under_sixteen_registration_consent_first_paragraph">Thông tin đăng ký của tôi.</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="under_sixteen_consent_call_for_action">Chọn \'Tôi đồng ý\' để xác nhận sự đồng ý.</string>
+  <string name="update_available_dismiss_btn">Nhắc tôi sau</string>
+  <string name="update_available_message_android">Chúng tôi đã và đang cải thiện COVIDSafe. Cập nhật qua Cửa hàng Google Play (Google Play Store).</string>
+  <string name="update_available_play_store_btn">Vào Google Play Store</string>
+  <string name="update_available_title">Cập nhật có sẵn!</string>
 </resources>

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

@@ -1,290 +1,431 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-  <string name="home_header_active_title">COVIDSafe已激活。</string>
-  <string name="home_header_inactive_title">COVIDSafe未激活。</string>
-  <string name="data_privacy_content">在注册COVIDSafe之前，请务必阅读COVIDSafe隐私政策。 \n\n如果您未满16岁，您的父母/监护人也必须阅读隐私政策。 \n\n使用COVIDSafe属自愿行为。您可以随时安装或删除该应用程序。如果删除COVIDSafe，您也可以要求从安全服务器中删除您的个人信息。 \n\n要注册使用COVIDSafe，您需要输入姓名，手机号码，年龄段和邮政编码。 \n\n注册时提交的信息以及有关COVIDSafe使用的信息将被收集并储存在高度安全的服务器上。 \n\n COVIDSafe不会收集您的位置信息。 \n\n COVIDSafe将记录发生接触的时间以及与您接触的其他COVIDSafe用户的匿名ID代码。 \n\n与您接触的其他COVIDSafe用户将在其手机上看到一个匿名ID代码以及与您发生接触的时间。 \n\n如果其他用户对COVID-19的测试结果呈阳性，他们可以上传自己的联系信息。为了追踪接触者，州或领地的卫生官员有可能会与您联系。 \n\n您的详细注册信息仅在追踪接触者以及维持COVIDSafe的合法正常运行时候使用或披露。 \n\n如需更多信息，请访问澳大利亚政府卫生部网站。 \n\n如需进一步了解您对个人信息的权利，以及个人信息的处理和共享方式，请参阅COVIDSafe隐私策略。</string>
-  <string name="personal_details_name_characters_prompt">请输入姓名的英文拼音。请勿使用其他语言或符号，例如“，”\'或“？”。</string>
-  <string name="pin_number">pin码</string>
-  <string name="update_available_title">更新可用！</string>
-  <string name="update_available_message">我们一直在改进COVIDSafe。</string>
-  <string name="update_available_dismiss_btn">稍后提醒我</string>
-  <string name="update_available_play_store_btn">前往Google Play Store</string>
-  <string name="heading">标题</string>
-  <string name="need_location_service">为了使COVIDSafe运行，您需要在“设置”中打开“位置”。</string>
-  <string name="permission_success_content">1. 离家时，请随身携带手机，并确保COVIDSafe处于激活状态。 \n\n2. 蓝牙®应保持开启状态。 \n\n3. 电池优化应关闭。 \n\n4. COVIDSafe不会发送配对请求。 *了解更多信息* 。</string>
-  <string name="home_header_no_pairing">COVIDSafe不会发送*配对请求*。</string>
-  <string name="how_it_works_content">COVIDSafe需要使用蓝牙®信号以确定您靠近另一个COVIDSafe用户的时间。 \n\n您与其他COVIDSafe用户之间的每一次密切接触都被记录下来，以创建密切接触信息。该信息经过加密，且仅储存在您的手机中。 \n\n如果您使用COVIDSafe并对COVID-19测试呈阳性，则州或领地卫生官员将与您联系。经您同意，他们会协助您将密切接触者信息上传至高度安全的信息储存系统。\n\n如果您与测试结果呈阳性的其他COVIDSafe用户发生密切接触，则州或领地卫生官员也会与您联系。 \n\n如需更多信息，请参阅*帮助主题*页。</string>
-  <string name="upload_finished_sub_header">您已成功将个人信息上传到COVIDSafe高度安全的储存系统。 \n\n根据记录，其他COVIDSafe用户与您如有密切接触，州或领地卫生官员将通知他们。您的身份对其他用户将保持匿名状态。</string>
-  <string name="registration_consent_first_paragraph">我的注册信息，以便州和领地卫生官员追踪接触者。</string>
-  <string name="personal_details_post_code_error_prompt">您的澳大利亚邮政编码必须包含4位数。</string>
-  <string name="enter_number_button">获取PIN码</string>
-  <string name="home_set_complete_external_link_news_content">前往aus.gov.au了解冠状病毒的最新消息。</string>
-  <string name="home_set_complete_external_link_app_title">下载冠状病毒应用程序</string>
-  <string name="home_set_complete_external_link_been_contacted_content">只有在您的病毒检测呈阳性时，才能上传个人信息。</string>
-  <string name="ReceivePinIssue">接收PIN码时遇到问题？</string>
-  <string name="enabled">已启用</string>
-  <string name="disabled">已停用</string>
-  <string name="battery_optimisation_prompt">您不能使用电池优化功能。</string>
-  <string name="service_ok_title">COVIDSafe已激活。</string>
-  <string name="service_ok_body">离开家和在公共场所时，请确保COVIDSafe处于激活状态。</string>
-  <string name="permission_content">COVIDSafe需要启用蓝牙®和通知功能才能运行。 \n\n选择“继续”以： \n\n 1.启用蓝牙® \n\n 2.允许获得位置权限\n\n 3.禁用电池优化功能\n\n\n Android需要位置权限才能使蓝牙®正常运行。 \n\n COVIDSafe不会发送配对请求。</string>
-  <string name="home_set_complete_external_link_app_url">https://www.health.gov.au/resources/apps-and-tools/coronavirus-australia-app</string>
-  <string name="upload_step_4_sub_header">未经您的同意，您的密切接触者信息不会被上传。 \n\n如果您同意，您的密切接触者信息将被上传并与州或领地卫生官员共享，以便追踪密切接触者。 \n\n阅读COVIDSafe*隐私政策*以获得更多详细信息。</string>
-  <string name="generic_error">请稍后再试</string>
-  <string name="generic_internet_error">请检查您的互联网连接</string>
-  <string name="dialog_uploading_message">您的COVIDSafe信息正在上传中。 \n\n请不要关闭该应用程序。</string>
-  <string name="dialog_error_uploading_message">个人信息上传时发生错误，请重试。</string>
-  <string name="dialog_error_uploading_positive">重试</string>
-  <string name="share_this_app_content">让我们一起阻止COVID-19的传播！下载 COVIDSafe—澳大利亚政府开发的一款应用程序。 #COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
-  <string name="dialog_error_uploading_negative">取消</string>
-  <string name="title_help">帮助</string>
-  <string name="service_not_ok_title">COVIDSafe未激活</string>
-  <string name="service_not_ok_body">离家前和在公共场所时，确保COVIDSafe处于激活状态。</string>
-  <string name="service_not_ok_action">立即查看应用程序</string>
-  <string name="migration_in_progress">COVIDSafe正在更新。 \n\n请保持开机状态直至更新完成。</string>
-  <string name="intro_headline">齐心协力，阻止COVID-19的传播</string>
-  <string name="intro_content">为了避免冠状病毒的传播，澳大利亚政府开发了COVIDSafe。 \n\n COVIDSafe会以保密的方式记录您与其他用户发生的接触。如果您与病毒测试呈阳性的人发生密切接触，州和领地的卫生官员将与您联系。 \n\n让我们齐心协力，阻止病毒传播，保护大众健康。</string>
-  <string name="intro_button">我想贡献一己之力</string>
-  <string name="how_it_works_headline">COVIDSafe 的工作原理</string>
-  <string name="how_it_works_button">下一步</string>
-  <string name="data_privacy_headline">注册及隐私</string>
-  <string name="data_privacy_button">下一步</string>
-  <string name="consent_call_for_action">选择“我同意”以确认同意。</string>
+  <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_upload_pin">上传个人信息</string>
+  <string name="activity_self_isolation_button">继续</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>
+  <!-- Onboarding Change Device Name -->
+  <string name="change_device_name_headline">您的设备名称</string>
+  <string name="change_device_name_headline_content_description">Heading，您的设备名称</string>
+  <string name="change_device_name_new_device_name">修改设备名称</string>
+  <string name="change_device_name_primary_action">继续</string>
+  <string name="change_device_name_secondary_action">跳过并保留原设备名称</string>
   <string name="consent_button">我同意</string>
-  <string name="registration_consent_headline">注册同意书</string>
-  <string name="registration_consent_content">我同意澳大利亚卫生部收集以下信息：</string>
-  <string name="registration_consent_second_paragraph">在其他COVIDSafe用户的COVID-19测试呈阳性时，从该用户处获取我的联系信息</string>
-  <string name="under_sixteen_second_paragraph">在其他COVIDSafe用户的COVID-19测试呈阳性时，从该用户处获取我的联系信息</string>
-  <string name="personal_details_headline">输入您的个人信息</string>
-  <string name="personal_details_name_title">全名</string>
-  <string name="personal_details_name_content_description">输入全名</string>
-  <string name="personal_details_age_title">年龄范围（请选择）</string>
-  <string name="personal_details_age_content_description">选择年龄范围</string>
-  <string name="personal_details_age_error_prompt">请选择您的年龄范围。</string>
-  <string name="personal_details_post_code">澳大利亚邮政编码</string>
-  <string name="personal_details_post_code_content_description">输入邮政编码</string>
-  <string name="navigation_back_button_content_description">上一页</string>
-  <string name="personal_details_button">继续</string>
-  <string name="under_sixteen_headline">您需要得到父母/监护人的同意才能继续</string>
-  <string name="under_sixteen_content">我确认我的父母或监护人同意澳大利亚卫生部收集以下信息：</string>
-  <string name="under_sixteen_first_paragraph">我的注册信息，以便州和领地卫生官员追踪接触者。</string>
-  <string name="select_country_or_region">选择国家或地区</string>
-  <string name="enter_number_headline">请输入您的手机号码</string>
-  <string name="invalid_phone_number">无效电话号码。</string>
-  <string name="invalid_australian_phone_number_error_prompt">澳大利亚手机号码最多包含10位数。</string>
-  <string name="invalid_norfolk_island_phone_number_error_prompt">诺福克岛的手机号码包含5到6位数。</string>
-  <string name="enter_number_content">我们将向您发送一个6位数的PIN码以验证您的手机号码。</string>
-  <string name="enter_number_relative">您是否代表朋友或亲戚注册？\n他们需要用自己的手机和电话号码进行注册才能使用COVIDSafe。</string>
-  <string name="search">搜索</string>
-  <string name="options_for_australia">澳大利亚选项</string>
-  <string name="country_region_name_al">阿尔巴尼亚</string>
-  <string name="country_region_name_dz">阿尔及利亚</string>
+  <!-- Shared Consent Actions -->
+  <string name="consent_call_for_action">选择“我同意”以确认同意。</string>
+  <string name="country_region_name_ad">安道尔</string>
+  <string name="country_region_name_ae">阿拉伯联合酋长国</string>
+  <!-- Countries -->
+  <string name="country_region_name_af">阿富汗</string>
   <string name="country_region_name_ag">安提瓜和巴布达</string>
-  <string name="country_region_name_ao">安哥拉</string>
   <string name="country_region_name_ai">安圭拉</string>
+  <string name="country_region_name_al">阿尔巴尼亚</string>
   <string name="country_region_name_am">亚美尼亚</string>
+  <string name="country_region_name_an">荷属安的列斯</string>
+  <string name="country_region_name_ao">安哥拉</string>
   <string name="country_region_name_ar">阿根廷</string>
-  <string name="country_region_name_aw">阿鲁巴</string>
-  <string name="country_region_name_az">阿塞拜疆</string>
   <string name="country_region_name_at">奥地利</string>
   <string name="country_region_name_au">澳大利亚</string>
-  <string name="country_region_name_bs">巴哈马</string>
-  <string name="country_region_name_bh">巴林</string>
-  <string name="country_region_name_bd">孟加拉国</string>
+  <string name="country_region_name_aw">阿鲁巴</string>
+  <string name="country_region_name_az">阿塞拜疆</string>
+  <string name="country_region_name_ba">波斯尼亚和黑塞哥维那</string>
   <string name="country_region_name_bb">巴巴多斯</string>
-  <string name="country_region_name_by">白俄罗斯</string>
+  <string name="country_region_name_bd">孟加拉国</string>
   <string name="country_region_name_be">比利时</string>
-  <string name="country_region_name_bz">伯利兹</string>
+  <string name="country_region_name_bf">布基纳法索</string>
+  <string name="country_region_name_bg">保加利亚</string>
+  <string name="country_region_name_bh">巴林</string>
+  <string name="country_region_name_bi">布隆迪</string>
   <string name="country_region_name_bj">贝宁</string>
   <string name="country_region_name_bm">百慕大</string>
+  <string name="country_region_name_bn">文莱</string>
   <string name="country_region_name_bo">玻利维亚</string>
-  <string name="country_region_name_ba">波斯尼亚和黑塞哥维那</string>
-  <string name="country_region_name_bw">博茨瓦纳</string>
   <string name="country_region_name_br">巴西</string>
-  <string name="country_region_name_bg">保加利亚</string>
-  <string name="country_region_name_bf">布基纳法索</string>
-  <string name="country_region_name_kh">柬埔寨</string>
-  <string name="country_region_name_cv">佛得角</string>
-  <string name="country_region_name_cm">喀麦隆</string>
+  <string name="country_region_name_bs">巴哈马</string>
+  <string name="country_region_name_bt">不丹</string>
+  <string name="country_region_name_bw">博茨瓦纳</string>
+  <string name="country_region_name_by">白俄罗斯</string>
+  <string name="country_region_name_bz">伯利兹</string>
   <string name="country_region_name_ca">加拿大</string>
-  <string name="country_region_name_ky">开曼群岛</string>
+  <string name="country_region_name_cd">刚果民主共和国</string>
+  <string name="country_region_name_cf">中非共和国</string>
+  <string name="country_region_name_cg">刚果共和国</string>
+  <string name="country_region_name_ch">瑞士</string>
+  <string name="country_region_name_ci">科特迪瓦</string>
+  <string name="country_region_name_ck">库克群岛</string>
   <string name="country_region_name_cl">智利</string>
+  <string name="country_region_name_cm">喀麦隆</string>
   <string name="country_region_name_cn">中国</string>
   <string name="country_region_name_co">哥伦比亚</string>
   <string name="country_region_name_cr">哥斯达黎加</string>
-  <string name="country_region_name_hr">克罗地亚</string>
+  <string name="country_region_name_cv">佛得角</string>
   <string name="country_region_name_cy">塞浦路斯</string>
   <string name="country_region_name_cz">捷克共和国</string>
+  <string name="country_region_name_de">德国</string>
+  <string name="country_region_name_dj">吉布提</string>
   <string name="country_region_name_dk">丹麦</string>
   <string name="country_region_name_dm">多米尼加</string>
   <string name="country_region_name_do">多米尼加共和国</string>
+  <string name="country_region_name_dz">阿尔及利亚</string>
   <string name="country_region_name_ec">厄瓜多尔</string>
-  <string name="country_region_name_sv">萨尔瓦多</string>
   <string name="country_region_name_ee">爱沙尼亚</string>
-  <string name="country_region_name_fj">斐济</string>
+  <string name="country_region_name_eg">埃及</string>
+  <string name="country_region_name_es">西班牙</string>
+  <string name="country_region_name_et">埃塞俄比亚</string>
   <string name="country_region_name_fi">芬兰</string>
+  <string name="country_region_name_fj">斐济</string>
+  <string name="country_region_name_fo">法罗群岛</string>
   <string name="country_region_name_fr">法国</string>
   <string name="country_region_name_ga">加蓬</string>
-  <string name="country_region_name_ge">格鲁吉亚</string>
-  <string name="country_region_name_de">德国</string>
-  <string name="country_region_name_gh">加纳</string>
+  <string name="country_region_name_gb">英国</string>
   <string name="country_region_name_gd">格林纳达</string>
+  <string name="country_region_name_ge">格鲁吉亚</string>
+  <string name="country_region_name_gf">法属圭亚那</string>
+  <string name="country_region_name_gh">加纳</string>
+  <string name="country_region_name_gi">直布罗陀</string>
+  <string name="country_region_name_gl">格陵兰</string>
+  <string name="country_region_name_gm">冈比亚</string>
+  <string name="country_region_name_gn">几内亚</string>
+  <string name="country_region_name_gp">瓜德罗普</string>
+  <string name="country_region_name_gq">赤道几内亚</string>
   <string name="country_region_name_gr">希腊</string>
-  <string name="country_region_name_gu">关岛</string>
   <string name="country_region_name_gt">危地马拉</string>
+  <string name="country_region_name_gu">关岛</string>
   <string name="country_region_name_gw">几内亚比绍</string>
-  <string name="country_region_name_ht">海地</string>
-  <string name="country_region_name_hn">洪都拉斯</string>
+  <string name="country_region_name_gy">圭亚那</string>
   <string name="country_region_name_hk">香港</string>
+  <string name="country_region_name_hn">洪都拉斯</string>
+  <string name="country_region_name_hr">克罗地亚</string>
+  <string name="country_region_name_ht">海地</string>
   <string name="country_region_name_hu">匈牙利</string>
-  <string name="country_region_name_is">冰岛</string>
-  <string name="country_region_name_in">印度</string>
   <string name="country_region_name_id">印度尼西亚</string>
-  <string name="country_region_name_iq">伊拉克</string>
   <string name="country_region_name_ie">爱尔兰</string>
   <string name="country_region_name_il">以色列</string>
-  <string name="country_region_name_ci">科特迪瓦</string>
+  <string name="country_region_name_in">印度</string>
+  <string name="country_region_name_iq">伊拉克</string>
+  <string name="country_region_name_is">冰岛</string>
+  <string name="country_region_name_it">意大利</string>
   <string name="country_region_name_jm">牙买加</string>
-  <string name="country_region_name_jp">日本</string>
   <string name="country_region_name_jo">约旦</string>
-  <string name="country_region_name_kz">哈萨克斯坦</string>
+  <string name="country_region_name_jp">日本</string>
   <string name="country_region_name_ke">肯尼亚</string>
-  <string name="country_region_name_kw">科威特</string>
   <string name="country_region_name_kg">吉尔吉斯斯坦</string>
+  <string name="country_region_name_kh">柬埔寨</string>
+  <string name="country_region_name_ki">基里巴斯</string>
+  <string name="country_region_name_km">科摩罗</string>
+  <string name="country_region_name_kn">圣基茨和尼维斯</string>
+  <string name="country_region_name_kr">韩国</string>
+  <string name="country_region_name_kw">科威特</string>
+  <string name="country_region_name_ky">开曼群岛</string>
+  <string name="country_region_name_kz">哈萨克斯坦</string>
   <string name="country_region_name_la">老挝</string>
-  <string name="country_region_name_lv">拉脱维亚</string>
   <string name="country_region_name_lb">黎巴嫩</string>
+  <string name="country_region_name_lc">圣卢西亚</string>
   <string name="country_region_name_li">列支敦士登</string>
+  <string name="country_region_name_lk">斯里兰卡</string>
+  <string name="country_region_name_lr">利比里亚</string>
+  <string name="country_region_name_ls">莱索托</string>
   <string name="country_region_name_lt">立陶宛</string>
   <string name="country_region_name_lu">卢森堡</string>
-  <string name="country_region_name_mo">澳门</string>
-  <string name="country_region_name_mk">前南斯拉夫马其顿共和国</string>
-  <string name="country_region_name_my">马来西亚</string>
-  <string name="country_region_name_ml">马里</string>
-  <string name="country_region_name_mt">马耳他</string>
-  <string name="country_region_name_mq">马提尼克</string>
-  <string name="country_region_name_mu">毛里求斯</string>
-  <string name="country_region_name_mx">墨西哥</string>
-  <string name="country_region_name_md">摩尔多瓦</string>
-  <string name="country_region_name_ms">蒙特塞拉特</string>
+  <string name="country_region_name_lv">拉脱维亚</string>
+  <string name="country_region_name_ly">利比亚</string>
   <string name="country_region_name_ma">摩洛哥</string>
-  <string name="country_region_name_mz">莫桑比克</string>
+  <string name="country_region_name_mc">摩纳哥</string>
+  <string name="country_region_name_md">摩尔多瓦</string>
+  <string name="country_region_name_me">黑山</string>
+  <string name="country_region_name_mg">马达加斯加</string>
+  <string name="country_region_name_mk">前南斯拉夫马其顿共和国</string>
+  <string name="country_region_name_ml">马里</string>
   <string name="country_region_name_mm">缅甸</string>
+  <string name="country_region_name_mn">蒙古</string>
+  <string name="country_region_name_mo">澳门</string>
+  <string name="country_region_name_mq">马提尼克</string>
+  <string name="country_region_name_mr">毛里塔尼亚</string>
+  <string name="country_region_name_ms">蒙特塞拉特</string>
+  <string name="country_region_name_mt">马耳他</string>
+  <string name="country_region_name_mu">毛里求斯</string>
+  <string name="country_region_name_mv">马尔代夫</string>
+  <string name="country_region_name_mw">马拉维</string>
+  <string name="country_region_name_mx">墨西哥</string>
+  <string name="country_region_name_my">马来西亚</string>
+  <string name="country_region_name_mz">莫桑比克</string>
   <string name="country_region_name_na">纳米比亚</string>
-  <string name="country_region_name_np">尼泊尔</string>
-  <string name="country_region_name_nl">荷兰</string>
-  <string name="country_region_name_nz">新西兰</string>
-  <string name="country_region_name_ni">尼加拉瓜</string>
+  <string name="country_region_name_nc">新喀里多尼亚</string>
   <string name="country_region_name_ne">尼日尔</string>
   <string name="country_region_name_ng">尼日利亚</string>
+  <string name="country_region_name_ni">尼加拉瓜</string>
+  <string name="country_region_name_nl">荷兰</string>
   <string name="country_region_name_no">挪威</string>
+  <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_pk">巴基斯坦</string>
   <string name="country_region_name_pa">巴拿马</string>
-  <string name="country_region_name_pg">巴布亚新几内亚</string>
-  <string name="country_region_name_py">巴拉圭</string>
   <string name="country_region_name_pe">秘鲁</string>
+  <string name="country_region_name_pg">巴布亚新几内亚</string>
   <string name="country_region_name_ph">菲律宾</string>
+  <string name="country_region_name_pk">巴基斯坦</string>
   <string name="country_region_name_pl">波兰</string>
-  <string name="country_region_name_pt">葡萄牙</string>
   <string name="country_region_name_pr">波多黎各</string>
+  <string name="country_region_name_ps">巴勒斯坦领土</string>
+  <string name="country_region_name_pt">葡萄牙</string>
+  <string name="country_region_name_pw">帕劳</string>
+  <string name="country_region_name_py">巴拉圭</string>
   <string name="country_region_name_qa">卡塔尔</string>
+  <string name="country_region_name_re">留尼汪岛</string>
+  <string name="country_region_name_ro">罗马尼亚</string>
+  <string name="country_region_name_rs">塞尔维亚</string>
   <string name="country_region_name_ru">俄罗斯</string>
   <string name="country_region_name_rw">卢旺达</string>
-  <string name="country_region_name_kn">圣基茨和尼维斯</string>
-  <string name="country_region_name_lc">圣卢西亚</string>
-  <string name="country_region_name_vc">圣文森特和格林纳丁斯</string>
-  <string name="country_region_name_sn">塞内加尔</string>
-  <string name="country_region_name_rs">塞尔维亚</string>
-  <string name="country_region_name_sg">新加坡</string>
-  <string name="country_region_name_sk">斯洛伐克</string>
-  <string name="country_region_name_si">斯洛文尼亚</string>
+  <string name="country_region_name_sa">沙特阿拉伯</string>
   <string name="country_region_name_sb">所罗门群岛</string>
-  <string name="country_region_name_za">南非</string>
-  <string name="country_region_name_kr">韩国</string>
-  <string name="country_region_name_es">西班牙</string>
-  <string name="country_region_name_lk">斯里兰卡</string>
+  <string name="country_region_name_sc">塞舌尔</string>
   <string name="country_region_name_se">瑞典</string>
-  <string name="country_region_name_ch">瑞士</string>
-  <string name="country_region_name_tw">台湾</string>
-  <string name="country_region_name_tj">塔吉克斯坦</string>
-  <string name="country_region_name_tz">坦桑尼亚</string>
-  <string name="country_region_name_th">泰国</string>
-  <string name="country_region_name_tg">多哥</string>
-  <string name="country_region_name_tt">特立尼达和多巴哥</string>
-  <string name="country_region_name_tn">突尼斯</string>
-  <string name="country_region_name_tr">土耳其</string>
-  <string name="country_region_name_tm">土库曼斯坦</string>
+  <string name="country_region_name_sg">新加坡</string>
+  <string name="country_region_name_si">斯洛文尼亚</string>
+  <string name="country_region_name_sk">斯洛伐克</string>
+  <string name="country_region_name_sl">塞拉利昂</string>
+  <string name="country_region_name_sn">塞内加尔</string>
+  <string name="country_region_name_so">索马里</string>
+  <string name="country_region_name_sr">苏里南</string>
+  <string name="country_region_name_ss">南苏丹</string>
+  <string name="country_region_name_st">圣多美和普林西比</string>
+  <string name="country_region_name_sv">萨尔瓦多</string>
+  <string name="country_region_name_sz">斯威士兰</string>
   <string name="country_region_name_tc">特克斯和凯科斯群岛</string>
-  <string name="country_region_name_ug">乌干达</string>
+  <string name="country_region_name_td">乍得</string>
+  <string name="country_region_name_tg">多哥</string>
+  <string name="country_region_name_th">泰国</string>
+  <string name="country_region_name_tj">塔吉克斯坦</string>
+  <string name="country_region_name_tl">东帝汶</string>
+  <string name="country_region_name_tm">土库曼斯坦</string>
+  <string name="country_region_name_tn">突尼斯</string>
+  <string name="country_region_name_to">汤加</string>
+  <string name="country_region_name_tr">土耳其</string>
+  <string name="country_region_name_tt">特立尼达和多巴哥</string>
+  <string name="country_region_name_tw">台湾</string>
+  <string name="country_region_name_tz">坦桑尼亚</string>
   <string name="country_region_name_ua">乌克兰</string>
-  <string name="country_region_name_ae">阿拉伯联合酋长国</string>
-  <string name="country_region_name_gb">英国</string>
+  <string name="country_region_name_ug">乌干达</string>
   <string name="country_region_name_us">美国</string>
   <string name="country_region_name_uy">乌拉圭</string>
   <string name="country_region_name_uz">乌兹别克斯坦</string>
+  <string name="country_region_name_vc">圣文森特和格林纳丁斯</string>
   <string name="country_region_name_ve">委内瑞拉</string>
-  <string name="country_region_name_vn">越南</string>
   <string name="country_region_name_vg">英属维尔京群岛</string>
   <string name="country_region_name_vi">美属维尔京群岛</string>
+  <string name="country_region_name_vn">越南</string>
+  <string name="country_region_name_vu">瓦努阿图</string>
+  <string name="country_region_name_ws">萨摩亚</string>
   <string name="country_region_name_ye">也门</string>
+  <string name="country_region_name_za">南非</string>
   <string name="country_region_name_zm">赞比亚</string>
   <string name="country_region_name_zw">津巴布韦</string>
-  <string name="enter_pin_headline" formatted="false">输入发送到%s%s的PIN码</string>
-  <string name="enter_pin_wrong_number">请确认手机号码是否正确</string>
-  <string name="enter_pin_timer_expire">您的PIN码将在此时间后失效</string>
-  <string name="wrong_ping_number">错误的PIN码</string>
-  <string name="enter_pin_resend_pin">重新发送PIN码</string>
+  <string name="data_privacy_button">下一步</string>
+  <string name="data_privacy_content">注册COVIDSafe之前，请务必阅读COVIDSafe的*隐私政策*。 \n\n如果您未满16岁，您的父母/监护人也必须阅读*隐私政策*。 \n\n使用COVIDSafe属自愿行为。您可以随时安装或删除该应用程序。如果删除COVIDSafe，*您也可以要求从安全服务器上删除您的信息*。 \n\n您需要输入姓名（或化名），手机号码，年龄段和邮政编码来注册使用COVIDSafe。 \n\n注册时提交的信息以及有关COVIDSafe使用的信息将被收集并存储在高度安全的服务器上。 \n\nCOVIDSafe不会收集您的位置信息。 \n\nCOVIDSafe将在您的设备上记录发生接触的时间、与您发生过接触的其他用户的匿名ID码、蓝牙®信号强度以及其他用户的手机型号。 \n\n与您发生接触的其他COVIDSafe用户的设备上也会记录您的匿名ID代码、与您发生接触的日期和时间、蓝牙®信号强度以及您的手机型号。 \n\n如果其他用户的COVID-19检测结果为阳性，他们可以上传自己的接触者信息，而州或领地的卫生官员可能会出于追踪接触者的目的与您联系。 \n\n您的详细注册信息仅在追踪接触者以及维持COVIDSafe的合法正常运行时使用或披露。  \n\n如需了解更多信息，请访问*澳大利亚政府卫生部*网站。 \n\n如需进一步了解您对个人信息的权利，以及个人信息的处理和共享方式，请参阅COVIDSafe *隐私政策*。</string>
+  <!-- OnBoarding Data Privacy -->
+  <string name="data_privacy_headline">注册及隐私</string>
+  <string name="data_privacy_headline_content_description">Heading，注册及隐私</string>
+  <string name="dialog_error_uploading_message">个人信息上传时发生错误，请重试。</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="enter_number_button">获取PIN码</string>
+  <string name="enter_number_content">我们将向您发送一个6位数的PIN码以验证您的手机号码。</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他们需要用自己的手机和电话号码进行注册才能使用COVIDSafe。</string>
   <string name="enter_pin_button">验证</string>
-  <string name="permission_headline">应用设置</string>
-  <string name="permission_location_rationale">安卓需要获取您的位置信息才能启用蓝牙功能，运行COVIDSafe，否则COVIDSafe无法正常运行</string>
-  <string name="permission_button">继续</string>
-  <string name="change_device_name_headline">您的设备名称</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_new_device_name">新设备名称</string>
-  <string name="change_device_name_default_device_name">安卓手机</string>
-  <string name="change_device_name_primary_action">更改并继续</string>
-  <string name="change_device_name_secondary_action">跳过并保留原设备名称</string>
-  <string name="permission_success_headline">您已成功注册</string>
-  <string name="permission_success_button">继续</string>
-  <string name="home_header_active_no_action_required">无须进一步操作。</string>
-  <string name="home_header_inactive_check_your_permissions">检查您的设置</string>
-  <string name="home_header_uploaded_on_date">个人信息已在%s 上传。</string>
-  <string name="home_bluetooth_permission">蓝牙®： %s</string>
-  <string name="home_non_battery_optimization_permission">电池优化： %s</string>
-  <string name="home_location_permission">位置： %s</string>
-  <string name="home_push_notification_permission">推送通知： %s</string>
-  <string name="home_permission_on">开</string>
-  <string name="home_permission_off">关</string>
-  <string name="home_app_permission_status_title">检查您的设置</string>
-  <string name="home_app_permission_status_subtitle">若设置不正确，COVIDSafe将无法运行。</string>
+  <!-- OnBoarding Enter PIN -->
+  <string name="enter_pin_headline" formatted="false">输入发送到%s%s的PIN码</string>
+  <string name="enter_pin_resend_pin">重新发送PIN码</string>
+  <string name="enter_pin_timer_expire">您的PIN码将在此时间后失效</string>
+  <string name="enter_pin_wrong_number">请确认手机号码是否正确</string>
+  <!-- for production -->
+  <string name="generic_error">请稍后再试</string>
+  <string name="generic_internet_error">请检查您的互联网连接</string>
   <string name="home_app_permission_push_notification_prompt">允许COVIDSafe推送通知。</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_app_permission_status_subtitle">若设置不正确，COVIDSafe将无法运行。</string>
+  <string name="home_app_permission_status_title">检查您的设置</string>
+  <string name="home_been_tested_title">是否有卫生官员要求您上传数据？</string>
+  <string name="home_bluetooth_permission">蓝牙®： %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_uploaded">自我隔离注册</string>
+  <string name="home_data_uploaded_button">注册</string>
+  <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>
+  <!-- Home -->
+  <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>
+  <string name="home_header_uploaded_on_date">个人信息已在%s 上传。</string>
+  <string name="home_location_permission">位置： %s</string>
+  <string name="home_non_battery_optimization_permission">电池优化： %s</string>
+  <string name="home_permission_off">关</string>
+  <string name="home_permission_on">开</string>
+  <string name="home_push_notification_permission">推送通知： %s</string>
+  <string name="home_set_complete_disclaimer_title">让我们齐心协力，阻止COVID-19的传播。</string>
+  <string name="home_set_complete_external_link_app_content">下载政府应用程序，了解最新消息和建议。</string>
+  <string name="home_set_complete_external_link_app_title">下载冠状病毒应用程序</string>
+  <string name="home_set_complete_external_link_app_url">https://www.health.gov.au/resources/apps-and-tools/coronavirus-australia-app</string>
+  <string name="home_set_complete_external_link_been_contacted_content">只有在您的病毒检测呈阳性时，才能上传个人信息。</string>
+  <string name="home_set_complete_external_link_been_contacted_title">是否有卫生官员联系过您？</string>
+  <string name="home_set_complete_external_link_help_topics_content">如果应用程序在使用时出现问题或者您对其有疑问。</string>
+  <string name="home_set_complete_external_link_help_topics_title">帮助主题</string>
+  <string name="home_set_complete_external_link_news_content">前往aus.gov.au了解冠状病毒的最新消息。</string>
   <string name="home_set_complete_external_link_news_title">最新消息和情况更新</string>
   <string name="home_set_complete_external_link_news_url">https://www.australia.gov.au</string>
-  <string name="home_set_complete_external_link_app_content">下载政府应用程序，了解最新消息和建议。</string>
-  <string name="home_set_complete_external_link_been_contacted_title">是否有卫生官员联系过您？</string>
-  <string name="home_set_complete_external_link_help_topics_title">帮助主题</string>
-  <string name="home_set_complete_external_link_help_topics_content">如果应用程序在使用时出现问题或者您对其有疑问。</string>
-  <string name="action_report_an_issue">报告问题</string>
+  <string name="home_set_complete_external_link_self_isolation_register_url">https://covid-form.service.gov.au</string>
+  <string name="home_set_complete_external_link_share_content">邀请他人助力。万众一心，其利断金。</string>
+  <string name="home_set_complete_external_link_share_title">分享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="upload_answer_yes">是</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>
+  <!-- OnBoarding How it works -->
+  <string name="how_it_works_headline">COVIDSafe 的工作原理</string>
+  <string name="how_it_works_headline_content_description">Heading，COVIDSafe的工作原理</string>
+  <string name="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">Heading，齐心协力，阻止COVID-19的传播</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>
+  <!-- Splash Screen -->
+  <string name="migration_in_progress">COVIDSafe正在更新。 \n\n请保持开机状态直至更新完成。</string>
+  <string name="navigation_back_button_content_description">上一页</string>
+  <string name="notification_active_body">离家和在公共场所时，确保COVIDSafe处于激活状态。</string>
+  <!-- Notifications -->
+  <string name="notification_active_title">COVIDSafe已激活</string>
+  <string name="notification_not_active_body">离家前和在公共场所时，确保COVIDSafe处于激活状态。</string>
+  <string name="notification_not_active_title">COVIDSafe未激活</string>
+  <string name="options_for_australia">澳大利亚选项</string>
+  <string name="permission_button">继续</string>
+  <string name="permission_content">COVIDSafe需要启用蓝牙®和通知功能才能运行。 \n\n选择“继续”以： \n\n 1.启用蓝牙® \n\n 2.允许获得位置权限\n\n 3.禁用电池优化功能\n\n\n Android需要位置权限才能使蓝牙®正常运行。 \n\n COVIDSafe不会发送配对请求。</string>
+  <!-- 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不会发送配对请求。 *了解更多信息* 。</string>
+  <!-- OnBoarding Permission Success -->
+  <string name="permission_success_headline">您已成功注册</string>
+  <string name="permission_success_warning">开启COVIDSafe的推送通知功能，以便在应用程序无法正常运行时及时通知您。</string>
+  <string name="personal_details_age_content_description">选择年龄范围</string>
+  <string name="personal_details_age_dialog_title">选择您的年龄</string>
+  <string name="personal_details_age_error_prompt">请选择您的年龄范围。</string>
+  <string name="personal_details_age_title">年龄范围（请选择）</string>
+  <string name="personal_details_button">继续</string>
+  <string name="personal_details_dialog_ok">选择</string>
+  <!-- OnBoarding Personal details -->
+  <string name="personal_details_headline">输入您的个人信息</string>
+  <string name="personal_details_headline_content_description">Heading，输入您的个人信息</string>
+  <string name="personal_details_name_content_description">输入全名</string>
+  <string name="personal_details_name_error_prompt">请输入您的全名。</string>
+  <string name="personal_details_name_title">全名（或化名）</string>
+  <string name="personal_details_post_code">澳大利亚邮政编码</string>
+  <string name="personal_details_post_code_content_description">输入邮政编码</string>
+  <string name="personal_details_post_code_dialog_title">邮政编码</string>
+  <string name="personal_details_post_code_error_prompt">您的澳大利亚邮政编码必须包含4位数。</string>
+  <string name="personal_details_post_code_hint">例如：2000</string>
+  <string name="registration_consent_content">我同意数字转换局作为数据存储管理方可以根据澳大利亚政府卫生部常务副部长依法作出的决议，收集以下信息：</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="search">搜索</string>
+  <!-- OnBoarding Enter Number -->
+  <string name="select_country_or_region">选择国家或地区</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="share_this_app_content">让我们一起阻止COVID-19的传播！下载 COVIDSafe—澳大利亚政府开发的一款应用程序。 #COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
+  <string name="title_help">帮助</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">Heading，您需要得到父母/监护人的同意才能继续</string>
+  <string name="under_sixteen_second_paragraph">我与其他COVIDSafe用户的接触信息（如果与我发生过接触的其他用户COVID-19检测呈阳性并上传其接触者数据）。</string>
   <string name="upload_answer_no">否</string>
-  <string name="upload_step_1_header">是否有卫生官员要求您上传个人信息？</string>
-  <string name="upload_step_1_body">只有在您的COVID-19测试呈阳性时，州或领地卫生官员才会联系您，以协助您上传个人信息。 \n\n按“是”后，请同意上传您的个人信息。</string>
-  <string name="upload_step_4_header">上传同意书</string>
-  <string name="upload_step_verify_pin_header">上传个人信息</string>
-  <string name="upload_step_verify_pin_sub_header">州或领地卫生官员将通过短信向您的手机发送 PIN码。请在下面输入PIN码以上传个人信息。</string>
-  <string name="action_verify_upload_pin">上传个人信息</string>
-  <string name="action_verify_invalid_pin">PIN码无效，请要求卫生官员向您再发送一个PIN码。</string>
+  <!-- Upload flow -->
+  <string name="upload_answer_yes">是</string>
+  <string name="upload_consent_button">我同意</string>
+  <string name="upload_failed">上传失败</string>
   <string name="upload_finished_header">感谢您协助阻止COVID-19的传播！</string>
-  <string name="action_continue">继续</string>
-  <string name="action_upload_done">继续</string>
+  <string name="upload_finished_header_content_description">Heading，感谢您协助阻止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_header">是否有卫生官员要求您上传个人信息？</string>
+  <string name="upload_step_1_header_content_description">Heading，是否有卫生官员要求您上传个人信息？</string>
+  <string name="upload_step_4_header">上传同意书</string>
+  <string name="upload_step_4_header_content_description">Heading，上传同意书</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">Heading，上传个人信息</string>
+  <string name="upload_step_verify_pin_sub_header">州或领地卫生官员将通过短信向您的手机发送 PIN码。请在下面输入PIN码以上传个人信息。</string>
+  <string name="us_consent_button">我同意</string>
+  <string name="wrong_ping_number">错误的PIN码</string>
+
+  <string name="battery_optimisation_prompt">您不能使用电池优化功能。</string>
+  <string name="change_language">更改语言</string>
+  <string name="change_language_content">阅读其他语言版本的COVIDSafe使用指南。</string>
   <string name="country_region_name_au2">诺福克岛</string>
   <string name="country_region_name_cu">古巴</string>
   <string name="country_region_name_cw">库拉索</string>
   <string name="country_region_name_ir">伊朗</string>
   <string name="country_region_name_sd">苏丹</string>
+  <string name="disabled">已停用</string>
+  <string name="done_success">完成</string>
+  <string name="enabled">已启用</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="Enter_your_mobile_number_label">请输入您的手机号码</string>
+  <string name="heading">标题</string>
+  <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_1">如何修复问题并再次激活 COVIDSafe</string>
+  <string name="internet_screen_content_2">有新版本更新可用时</string>
+  <string name="internet_screen_heading">连接到互联网以提升 COVIDSafe 的性能</string>
+  <string name="need_location_service">为了使COVIDSafe运行，您需要在“设置”中打开“位置”。</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="norfolk_hint">例如：51234</string>
+  <string name="notification_update_content">请更新您的应用程序以获得改进后的版本。</string>
+  <string name="notification_update_heading">COVIDSafe 更新可用</string>
+  <string name="personal_details_name_characters_prompt">请输入姓名的英文拼音。请勿使用其他语言或符号，例如“，”\'或“？”。</string>
+  <string name="pin_number">pin码</string>
+  <string name="PINNumber_VO_Label">PIN码</string>
+  <string name="PN_MobileNumber_VOLabel">手机号码</string>
+  <string name="ReceivePinIssue">接收PIN码时遇到问题？</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="Select_country_or_region_headline">选择国家或地区</string>
+  <string name="service_ok_body">离开家和在公共场所时，请确保COVIDSafe处于激活状态。</string>
+  <string name="service_ok_title">COVIDSafe已激活。</string>
+  <string name="stepCounter" formatted="false">第%d步，共%d步</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="under_sixteen_registration_consent_first_paragraph">我的注册信息。</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商店更新。</string>
+  <string name="update_available_play_store_btn">前往Google Play Store</string>
+  <string name="update_available_title">更新可用！</string>
 </resources>

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

@@ -1,290 +1,431 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-  <string name="home_header_active_title">COVIDSafe 已在啓用狀態</string>
-  <string name="home_header_inactive_title">COVIDSafe 未在啓用狀態。</string>
-  <string name="data_privacy_content">在註册 COVIDSafe 之前，請務必閱讀 COVIDSafe *私隱政策*。 \n\n如果你未滿 16 歲，你的父母/監護人必須閱讀*私隱政策*。 \n\n使用 COVIDSafe 純屬自願性質。你可以隨時安裝或刪除本應用程式。如果刪除 COVIDSafe，*你亦可以要求刪除在保密伺服器内的個人資料*。\n\n要註册使用 COVIDSafe，你需要輸入姓名、手機號碼、年齡組别及郵遞區號。 \n\n我們會收集你註冊時提供的資料和關於你使用COVIDSafe的資料並且儲存在一個高度保密的伺服器內。 \n\nCOVIDSafe 不會收集你的定位資訊。 \n\nCOVIDSafe 將會記錄接觸的發生時間，以及其他與你接觸的 COVIDSafe 用戶的匿名 ID。 \n\n其他與你接觸的 COVIDSafe 用戶亦將會在其設備上記錄你的匿名 ID 及與你接觸的時間。 \n\n如果其他用戶被驗出 COVID-19 陽性，他們可以上傳其聯絡資料。為了追蹤接觸者，各州或領地的衛生部官員可能會聯絡你。 \n\n我們在追蹤接觸者和確保COVIDSafe 運作正常且合法時才會使用並且透露你的詳細註冊資料。 \n\n欲了解更多資訊，請瀏覧*澳洲政府衛生部*的網站。 \n\n如需進一步了解你對個人資料的權利，及個人資料的處理和共享方式，請參閱 COVIDSafe *私隱政策*。</string>
-  <string name="personal_details_name_characters_prompt">請用英文字母輸入你的全名。請勿使用其他語言的文字或符號，例如 ‘，’ \'或 ‘？’。</string>
-  <string name="need_location_service">若要執行 COVIDSafe ，你需要開啓在 「設定」項下的 「定位」功能。 </string>
-  <string name="upload_step_verify_pin_sub_header">各州或領地的衛生部官員將會透過簡訊傳送一條 PIN 碼到您的設備。請在下面輸入 PIN 碼來上傳個人資料。</string>
-  <string name="update_available_message">我們一直都在改良 COVIDSafe。</string>
-  <string name="update_available_play_store_btn">轉往 Google Play 商店</string>
+  <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="upload_step_1_body">只在您被驗出 COVID-19 陽性時，各州或領地的衛生部官員才會聯絡您，協助您自願上傳您的資料。\n\n按「是」後，請同意上傳您的資料。</string>
-  <string name="home_set_complete_external_link_news_title">最新資訊及更新事宜</string>
-  <string name="home_app_permission_status_subtitle">若設定錯誤，將無法執行 COVIDSafe。</string>
-  <string name="intro_button">我肯出一分力</string>
-  <string name="intro_content">爲了避免冠狀病毒在社區擴散，澳洲政府開發了 COVIDSafe。 \n\nCOVIDSafe 會保密地記錄您與其他用戶之間的接觸。如果您曾密切接觸過被驗出病毒陽性的人士，各州和領地的衛生部官員就可以聯絡您。 \n\n讓我們齊心協力，遏止病毒傳播，確保生活健康。</string>
-  <string name="migration_in_progress">正在更新 COVIDSafe。\n\n請保持開機狀態直至更新完成為止。</string>
-  <string name="upload_finished_sub_header">您已成功將個人資料上傳到 COVIDSafe 高度保密的儲存系統。\n\n若錄得有其他 COVIDSafe 用户曾密切接觸過您，各州或領地的衛生部官員將會通知他們。您的身份仍舊予以保密。</string>
-  <string name="pin_number">PIN 碼</string>
+  <string name="action_verify_upload_pin">上傳我的資料</string>
+  <string name="activity_self_isolation_button">繼續</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>
+  <!-- Onboarding Change Device Name -->
+  <string name="change_device_name_headline">您的設備名稱</string>
+  <string name="change_device_name_headline_content_description">標題，您的設備名稱</string>
+  <string name="change_device_name_new_device_name">修改設備名字</string>
+  <string name="change_device_name_primary_action">繼續</string>
+  <string name="change_device_name_secondary_action">跳過並保留原設備名稱</string>
+  <string name="consent_button">我同意</string>
+  <!-- Shared Consent Actions -->
+  <string name="consent_call_for_action">選擇「我同意」以確認同意聲明。</string>
+  <string name="country_region_name_ad">安道爾</string>
+  <string name="country_region_name_ae">阿拉伯聯合酋長國</string>
+  <!-- Countries -->
+  <string name="country_region_name_af">阿富汗</string>
+  <string name="country_region_name_ag">安地卡及巴布達</string>
+  <string name="country_region_name_ai">安圭拉</string>
+  <string name="country_region_name_al">阿爾巴尼亞</string>
+  <string name="country_region_name_am">亞美尼亞</string>
+  <string name="country_region_name_an">荷屬安的列斯</string>
+  <string name="country_region_name_ao">安哥拉</string>
+  <string name="country_region_name_ar">阿根廷</string>
+  <string name="country_region_name_at">奧地利</string>
+  <string name="country_region_name_au">澳洲</string>
+  <string name="country_region_name_aw">阿魯巴</string>
+  <string name="country_region_name_az">阿塞拜疆</string>
+  <string name="country_region_name_ba">波斯尼亞和黑塞哥維那</string>
+  <string name="country_region_name_bb">巴貝多</string>
+  <string name="country_region_name_bd">孟加拉</string>
+  <string name="country_region_name_be">比利時</string>
+  <string name="country_region_name_bf">布吉納法索</string>
+  <string name="country_region_name_bg">保加利亞</string>
+  <string name="country_region_name_bh">巴林</string>
+  <string name="country_region_name_bi">蒲隆地</string>
+  <string name="country_region_name_bj">貝南</string>
+  <string name="country_region_name_bm">百慕達</string>
+  <string name="country_region_name_bn">汶萊</string>
+  <string name="country_region_name_bo">玻利維亞</string>
+  <string name="country_region_name_br">巴西</string>
+  <string name="country_region_name_bs">巴哈馬</string>
+  <string name="country_region_name_bt">不丹</string>
+  <string name="country_region_name_bw">波札那</string>
+  <string name="country_region_name_by">白俄羅斯</string>
+  <string name="country_region_name_bz">伯利茲</string>
+  <string name="country_region_name_ca">加拿大</string>
+  <string name="country_region_name_cd">剛果民主共和國</string>
+  <string name="country_region_name_cf">中非共和國</string>
+  <string name="country_region_name_cg">剛果共和國</string>
+  <string name="country_region_name_ch">瑞士</string>
+  <string name="country_region_name_ci">象牙海岸</string>
+  <string name="country_region_name_ck">庫克群島</string>
+  <string name="country_region_name_cl">智利</string>
+  <string name="country_region_name_cm">喀麥隆</string>
+  <string name="country_region_name_cn">中國</string>
+  <string name="country_region_name_co">哥倫比亞</string>
+  <string name="country_region_name_cr">哥斯達黎加</string>
+  <string name="country_region_name_cv">維德角</string>
+  <string name="country_region_name_cy">塞浦路斯</string>
+  <string name="country_region_name_cz">捷克共和國</string>
+  <string name="country_region_name_de">德國</string>
+  <string name="country_region_name_dj">吉布地</string>
+  <string name="country_region_name_dk">丹麥</string>
+  <string name="country_region_name_dm">多明尼加</string>
+  <string name="country_region_name_do">多明尼加共和國</string>
+  <string name="country_region_name_dz">阿爾及利亞</string>
+  <string name="country_region_name_ec">厄瓜多爾</string>
+  <string name="country_region_name_ee">愛沙尼亞</string>
+  <string name="country_region_name_eg">埃及</string>
+  <string name="country_region_name_es">西班牙</string>
+  <string name="country_region_name_et">埃塞俄比亞</string>
+  <string name="country_region_name_fi">芬蘭</string>
+  <string name="country_region_name_fj">斐濟</string>
+  <string name="country_region_name_fo">法羅群島</string>
+  <string name="country_region_name_fr">法國</string>
+  <string name="country_region_name_ga">加蓬</string>
+  <string name="country_region_name_gb">英國</string>
+  <string name="country_region_name_gd">格林納達</string>
+  <string name="country_region_name_ge">喬治亞</string>
+  <string name="country_region_name_gf">法屬圭亞那</string>
+  <string name="country_region_name_gh">加納</string>
+  <string name="country_region_name_gi">直布羅陀</string>
+  <string name="country_region_name_gl">格陵蘭</string>
+  <string name="country_region_name_gm">岡比亞</string>
+  <string name="country_region_name_gn">畿內亞</string>
+  <string name="country_region_name_gp">瓜德羅普</string>
+  <string name="country_region_name_gq">赤道畿內亞</string>
+  <string name="country_region_name_gr">希臘</string>
+  <string name="country_region_name_gt">瓜地馬拉</string>
+  <string name="country_region_name_gu">關島</string>
+  <string name="country_region_name_gw">畿內亞比索</string>
+  <string name="country_region_name_gy">圭亞那</string>
+  <string name="country_region_name_hk">香港</string>
+  <string name="country_region_name_hn">洪都拉斯</string>
+  <string name="country_region_name_hr">克羅地亞</string>
+  <string name="country_region_name_ht">海地</string>
+  <string name="country_region_name_hu">匈牙利</string>
+  <string name="country_region_name_id">印尼</string>
+  <string name="country_region_name_ie">愛爾蘭</string>
+  <string name="country_region_name_il">以色列</string>
+  <string name="country_region_name_in">印度</string>
+  <string name="country_region_name_iq">伊拉克</string>
+  <string name="country_region_name_is">冰島</string>
+  <string name="country_region_name_it">意大利</string>
+  <string name="country_region_name_jm">牙買加</string>
+  <string name="country_region_name_jo">約旦</string>
+  <string name="country_region_name_jp">日本</string>
+  <string name="country_region_name_ke">肯亞</string>
+  <string name="country_region_name_kg">吉爾吉斯斯坦</string>
+  <string name="country_region_name_kh">柬埔寨</string>
+  <string name="country_region_name_ki">吉里巴斯</string>
+  <string name="country_region_name_km">葛摩羅斯</string>
+  <string name="country_region_name_kn">聖基茨和尼維斯</string>
+  <string name="country_region_name_kr">南韓</string>
+  <string name="country_region_name_kw">科威特</string>
+  <string name="country_region_name_ky">開曼群島</string>
+  <string name="country_region_name_kz">哈薩克斯坦</string>
+  <string name="country_region_name_la">寮国</string>
+  <string name="country_region_name_lb">黎巴嫩</string>
+  <string name="country_region_name_lc">聖盧西亞</string>
+  <string name="country_region_name_li">列支敦士登</string>
+  <string name="country_region_name_lk">斯里蘭卡</string>
+  <string name="country_region_name_lr">賴比瑞亞</string>
+  <string name="country_region_name_ls">賴索托</string>
+  <string name="country_region_name_lt">立陶宛</string>
+  <string name="country_region_name_lu">盧森堡</string>
+  <string name="country_region_name_lv">拉脫維亞</string>
+  <string name="country_region_name_ly">利比亞</string>
+  <string name="country_region_name_ma">摩洛哥</string>
+  <string name="country_region_name_mc">摩納哥</string>
+  <string name="country_region_name_md">摩爾多瓦</string>
+  <string name="country_region_name_me">黑山</string>
+  <string name="country_region_name_mg">馬達加斯加</string>
+  <string name="country_region_name_mk">前南斯拉夫馬其頓共和國</string>
+  <string name="country_region_name_ml">馬里</string>
+  <string name="country_region_name_mm">緬甸</string>
+  <string name="country_region_name_mn">蒙古</string>
+  <string name="country_region_name_mo">澳門</string>
+  <string name="country_region_name_mq">馬提尼克</string>
+  <string name="country_region_name_mr">毛里塔尼亞</string>
+  <string name="country_region_name_ms">蒙特塞拉特</string>
+  <string name="country_region_name_mt">馬耳他</string>
+  <string name="country_region_name_mu">毛里求斯</string>
+  <string name="country_region_name_mv">馬爾代夫</string>
+  <string name="country_region_name_mw">馬拉威</string>
+  <string name="country_region_name_mx">墨西哥</string>
+  <string name="country_region_name_my">馬來西亞</string>
+  <string name="country_region_name_mz">莫三比克</string>
+  <string name="country_region_name_na">納米比亞</string>
+  <string name="country_region_name_nc">新喀里多尼亞</string>
+  <string name="country_region_name_ne">尼日爾</string>
+  <string name="country_region_name_ng">尼日利亞</string>
+  <string name="country_region_name_ni">尼加拉瓜</string>
+  <string name="country_region_name_nl">荷蘭</string>
+  <string name="country_region_name_no">挪威</string>
+  <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_pe">秘魯</string>
+  <string name="country_region_name_pg">巴布亞新畿內亞</string>
+  <string name="country_region_name_ph">菲律賓</string>
+  <string name="country_region_name_pk">巴基斯坦</string>
+  <string name="country_region_name_pl">波蘭</string>
+  <string name="country_region_name_pr">波多黎各</string>
+  <string name="country_region_name_ps">巴勒斯坦領土</string>
+  <string name="country_region_name_pt">葡萄牙</string>
+  <string name="country_region_name_pw">帛琉</string>
+  <string name="country_region_name_py">巴拉圭</string>
+  <string name="country_region_name_qa">卡達</string>
+  <string name="country_region_name_re">留尼旺島</string>
+  <string name="country_region_name_ro">羅馬尼亞</string>
+  <string name="country_region_name_rs">塞爾維亞</string>
+  <string name="country_region_name_ru">俄羅斯</string>
+  <string name="country_region_name_rw">盧旺達</string>
+  <string name="country_region_name_sa">沙特阿拉伯</string>
+  <string name="country_region_name_sb">所羅門群島</string>
+  <string name="country_region_name_sc">塞席爾</string>
+  <string name="country_region_name_se">瑞典</string>
+  <string name="country_region_name_sg">新加坡</string>
+  <string name="country_region_name_si">斯洛文尼亞</string>
+  <string name="country_region_name_sk">斯洛伐克</string>
+  <string name="country_region_name_sl">獅子山共和國</string>
+  <string name="country_region_name_sn">塞內加爾</string>
+  <string name="country_region_name_so">索馬利亞</string>
+  <string name="country_region_name_sr">蘇里南</string>
+  <string name="country_region_name_ss">南蘇丹</string>
+  <string name="country_region_name_st">聖多美和普林西比</string>
+  <string name="country_region_name_sv">薩爾瓦多</string>
+  <string name="country_region_name_sz">史瓦帝尼</string>
+  <string name="country_region_name_tc">特克斯和凱科斯群島</string>
+  <string name="country_region_name_td">乍得</string>
+  <string name="country_region_name_tg">多哥</string>
+  <string name="country_region_name_th">泰國</string>
+  <string name="country_region_name_tj">塔吉克斯坦</string>
+  <string name="country_region_name_tl">東帝汶</string>
+  <string name="country_region_name_tm">土庫曼斯坦</string>
+  <string name="country_region_name_tn">突尼西亞</string>
+  <string name="country_region_name_to">東加</string>
+  <string name="country_region_name_tr">土耳其</string>
+  <string name="country_region_name_tt">特立尼達和多巴哥</string>
+  <string name="country_region_name_tw">台灣</string>
+  <string name="country_region_name_tz">坦桑尼亞</string>
+  <string name="country_region_name_ua">烏克蘭</string>
+  <string name="country_region_name_ug">烏干達</string>
+  <string name="country_region_name_us">美國</string>
+  <string name="country_region_name_uy">烏拉圭</string>
+  <string name="country_region_name_uz">烏茲別克斯坦</string>
+  <string name="country_region_name_vc">聖文森特和格林納丁斯</string>
+  <string name="country_region_name_ve">委內瑞拉</string>
+  <string name="country_region_name_vg">英屬維爾京群島</string>
+  <string name="country_region_name_vi">美屬維爾京群島</string>
+  <string name="country_region_name_vn">越南</string>
+  <string name="country_region_name_vu">瓦努阿圖</string>
+  <string name="country_region_name_ws">薩摩亞</string>
+  <string name="country_region_name_ye">也門</string>
+  <string name="country_region_name_za">南非</string>
+  <string name="country_region_name_zm">贊比亞</string>
+  <string name="country_region_name_zw">津巴布韋</string>
+  <string name="data_privacy_button">下一步</string>
+  <string name="data_privacy_content">在註册 COVIDSafe 之前，請務必閱讀 COVIDSafe *私隱政策*。 \n\n如果你未滿 16 歲，你的父母/監護人亦必須閱讀*私隱政策*。 \n\n使用 COVIDSafe 純屬自願性質。你可以隨時安裝或刪除本應用程式。如果刪除 COVIDSafe，*你亦可以要求刪除在保密伺服器内的個人資料*。\n\n要註册使用 COVIDSafe，你需要輸入一个名字（或假名）、手機號碼、年齡組别及郵遞區號。 \n\n我們會收集你註冊時提供的資料和關於你使用COVIDSafe的資料並且儲存在一個高度保密的伺服器內。 \n\nCOVIDSafe 不會收集你的位置資訊。 \n\nCOVIDSafe 將會在你的設備上記錄與你接觸過的其他 COVIDSafe 用戶的接觸時間，其匿名 ID，藍牙®信號強度和其手機型號。\n\n其他與你接觸過的 COVIDSafe 用戶的設備上亦會記錄你的匿名 ID 及與你接觸的日期時間，藍牙®信號強度和你的手機型號。 \n\n如果其他用戶被驗出 COVID-19 陽性，他們可以上傳其接觸者資料。為了追蹤接觸者，各州或領地的衛生部官員可能會聯絡你。 \n\n我們在追蹤接觸者和確保COVIDSafe 正常且合法運作時才會使用並且透露你的詳細註冊資料。 \n\n欲了解更多資訊，請瀏覧*澳洲政府衛生部*的網站。 \n\n如需進一步了解你對個人資料的權利，及個人資料的處理和共享方式，請參閱 COVIDSafe *私隱政策*。</string>
+  <!-- OnBoarding Data Privacy -->
+  <string name="data_privacy_headline">註册及私隱權</string>
+  <string name="data_privacy_headline_content_description">標題，註册及私隱權</string>
+  <string name="dialog_error_uploading_message">個人資料上傳時發生錯誤，請重試。</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="enter_number_button">收取 PIN 碼</string>
+  <string name="enter_number_content">我們將向您傳送一條 6 數位的 PIN 碼來驗證您的手機號碼。</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">輸入傳送到%s%s的 PIN 碼</string>
+  <string name="enter_pin_resend_pin">重新寄出 PIN 碼</string>
   <string name="enter_pin_timer_expire">您的 PIN 碼將在此時間後無效</string>
-  <string name="permission_location_rationale">為執行 COVIDSafe，Android 需要取得您的定位權限才能啟用藍牙功能，否則無法正常執行 COVIDSafe </string>
-  <string name="permission_content">COVIDSafe 需要開啓藍牙®及通知功能才能運作。 \n\n選擇 「繼續」以： \n\n 1. 開啓藍牙® \n\n 2. 允許取得定位權限\n\n 3. 關閉電池優化功能\n\n\n Android 需要定位權限才能啓用藍牙®。 \n\n COVIDSafe 不會傳送配對請求。</string>
-  <string name="how_it_works_headline">COVIDSafe 是如何執行的</string>
-  <string name="how_it_works_content">COVIDSafe 需要使用藍牙®訊號以確定您在何時接近另一名 COVIDSafe 用戶。 \n\n您與其他COVIDSafe用戶之間的每一次密切接觸都會被記錄下來，以建立密切接觸者資料。該資料會被加密，並僅儲存在您的手機内。\n\n如果您是 COVIDSafe 用户並被驗出 COVID-19 陽性，則各州或領地衛生部官員將會與您聯絡。他們會協助您自願地將密切接觸者資料上傳到高度保密的資料儲存系統。\n\n如果您曾密切接觸過另一名被驗出 COVID-19 陽性的 COVIDSafe 用戶，則各州或領地的衛生部官員亦會聯絡您。 \n\n欲知詳情，請參閱*求助主題*頁</string>
-  <string name="permission_success_content">1. 請在離家時隨身攜帶手機，並確保 COVIDSafe 處於啟用狀態。 \n\n2. 應保持藍牙®在開啓狀態。 \n\n3. 應關閉電池優化功能。 \n\n4. COVIDSafe 不會傳送配對請求。 *了解更多* 。</string>
+  <string name="enter_pin_wrong_number">請確認手機號碼是否正確</string>
+  <!-- for production -->
+  <string name="generic_error">請稍後再試</string>
+  <string name="generic_internet_error">請檢查您的互聯網連接</string>
+  <string name="home_app_permission_push_notification_prompt">允許 COVIDSafe 傳送通知。</string>
+  <string name="home_app_permission_status_subtitle">若設定錯誤，將無法執行 COVIDSafe。</string>
+  <string name="home_app_permission_status_title">檢查您的設定</string>
+  <string name="home_been_tested_title">是否有衛服部官員要求您上傳您的資料？</string>
+  <string name="home_bluetooth_permission">藍牙®： %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_uploaded">自我隔離註册</string>
+  <string name="home_data_uploaded_button">註册</string>
+  <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>
+  <!-- Home -->
+  <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>
-  <string name="upload_step_4_sub_header">除非您同意，否則您的密切接觸者資料不會被上傳。\n\n如果您同意，您的密切接觸者資料將會被上傳並與各州或領地的衛生部官員共享，作為追蹤接觸者之用。\n\n欲知詳情，請參閱 COVIDSafe *私隱政策*。</string>
-  <string name="service_ok_body">在您離家及在公共場所時，請保持 COVIDSafe 在啟用狀態。</string>
-  <string name="service_ok_title">COVIDSafe 已在啓用狀態</string>
-  <string name="battery_optimisation_prompt">您必須關閉電池優化功能。</string>
-  <string name="ReceivePinIssue">接收 PIN 碼時遇到問題？</string>
-  <string name="upload_finished_header">感謝您協助遏止 COVID-19 的擴散！</string>
-  <string name="home_set_complete_external_link_help_topics_content">如果您對應用程式有疑難或疑問。</string>
-  <string name="home_set_complete_external_link_been_contacted_content">只有在您被驗出病毒陽性時，才能上傳個人資料。</string>
+  <string name="home_header_uploaded_on_date">您的資料已在%s 上傳。</string>
+  <string name="home_location_permission">位置： %s</string>
+  <string name="home_non_battery_optimization_permission">電池優化： %s</string>
+  <string name="home_permission_off">關</string>
+  <string name="home_permission_on">開</string>
+  <string name="home_push_notification_permission">傳送通知： %s</string>
+  <string name="home_set_complete_disclaimer_title">讓我們遏止 COVID-19 的擴散。</string>
   <string name="home_set_complete_external_link_app_content">下載政府應用程式來收取最新資訊及忠告。</string>
   <string name="home_set_complete_external_link_app_title">收取冠狀病毒應用程式</string>
+  <string name="home_set_complete_external_link_app_url">https://www.health.gov.au/resources/apps-and-tools/coronavirus-australia-app</string>
+  <string name="home_set_complete_external_link_been_contacted_content">只有在您被驗出病毒陽性時，才能上傳個人資料。</string>
+  <string name="home_set_complete_external_link_been_contacted_title">是否有衛生部官員聯絡您？</string>
+  <string name="home_set_complete_external_link_help_topics_content">如果您對應用程式有疑難或疑問。</string>
+  <string name="home_set_complete_external_link_help_topics_title">求助主題</string>
+  <string name="home_set_complete_external_link_news_content">請到 aus.gov.au 了解冠狀病毒的最新資訊。</string>
+  <string name="home_set_complete_external_link_news_title">最新資訊及更新事宜</string>
+  <string name="home_set_complete_external_link_news_url">https://www.australia.gov.au</string>
+  <string name="home_set_complete_external_link_self_isolation_register_url">https://covid-form.service.gov.au</string>
   <string name="home_set_complete_external_link_share_content">邀請他人參與防疫。團結便是力量！</string>
   <string name="home_set_complete_external_link_share_title">齊齊使用 COVIDSafe</string>
-  <string name="home_app_permission_push_notification_prompt">允許 COVIDSafe 傳送通知。</string>
-  <string name="home_push_notification_permission">傳送通知： %s</string>
-  <string name="home_non_battery_optimization_permission">電池優化： %s</string>
-  <string name="change_device_name_secondary_action">跳過並保留原設備名稱</string>
-  <string name="change_device_name_default_device_name">Android 手機</string>
-  <string name="change_device_name_new_device_name">新的設備名稱</string>
-  <string name="change_device_name_content_line_2">在您周圍的其他藍牙®設備將能看到此名稱，我們建議使用一個不包括個人資料的設備名稱。</string>
-  <string name="change_device_name_content_line_1">您現在的設備名稱是%s 。</string>
-  <string name="change_device_name_headline">您的設備名稱</string>
-  <string name="enter_pin_resend_pin">重新寄出 PIN 碼</string>
-  <string name="wrong_ping_number">輸入了錯誤的 PIN 碼</string>
-  <string name="enter_pin_headline" formatted="false">輸入傳送到%s%s的 PIN 碼</string>
-  <string name="country_region_name_zw">津巴布韋</string>
-  <string name="country_region_name_zm">贊比亞</string>
-  <string name="country_region_name_ye">也門</string>
-  <string name="country_region_name_uz">烏茲別克斯坦</string>
-  <string name="country_region_name_ae">阿拉伯聯合酋長國</string>
-  <string name="country_region_name_tz">坦桑尼亞</string>
-  <string name="country_region_name_si">斯洛文尼亞</string>
-  <string name="country_region_name_lc">聖盧西亞</string>
-  <string name="country_region_name_rw">盧旺達</string>
-  <string name="country_region_name_ng">尼日利亞</string>
-  <string name="country_region_name_mu">毛里求斯</string>
-  <string name="country_region_name_kg">吉爾吉斯斯坦</string>
-  <string name="country_region_name_kz">哈薩克斯坦</string>
-  <string name="country_region_name_gw">畿內亞比索</string>
-  <string name="country_region_name_ec">厄瓜多爾</string>
-  <string name="country_region_name_cy">塞浦路斯</string>
-  <string name="country_region_name_hr">克羅地亞</string>
-  <string name="country_region_name_cr">哥斯達黎加</string>
-  <string name="country_region_name_ba">波斯尼亞和黑塞哥維那</string>
-  <string name="country_region_name_bd">孟加拉</string>
-  <string name="country_region_name_az">阿塞拜疆</string>
-  <string name="options_for_australia">澳洲適用選項</string>
-  <string name="enter_number_button">收取 PIN 碼</string>
-  <string name="enter_number_relative">是否替朋友或親戚註册？\n\n他們需用自己的設備及電話號碼進行註册才能使用 COVIDSafe。</string>
-  <string name="enter_number_content">我們將向您傳送一條 6 數位的 PIN 碼來驗證您的手機號碼。</string>
-  <string name="invalid_australian_phone_number_error_prompt">澳洲手機號碼最多有10 個數位。</string>
-  <string name="under_sixteen_second_paragraph">當其他 COVIDSafe 用戶被驗出 COVID-19 陽性時，從該用戶處取得我的聯絡資料。</string>
-  <string name="under_sixteen_headline">您需要經父母/監護人同意才能繼續</string>
-  <string name="personal_details_post_code_error_prompt">您的澳洲郵遞區號必須是個 4 位數字。</string>
-  <string name="registration_consent_second_paragraph">當其他 COVIDSafe 用戶被驗出 COVID-19 陽性時，從該用戶處取得我的聯絡資料。</string>
-  <string name="consent_call_for_action">選擇「我同意」以確認同意聲明。</string>
-  <string name="data_privacy_headline">註册及私隱權</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="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>
+  <!-- OnBoarding How it works -->
+  <string name="how_it_works_headline">COVIDSafe 是如何執行的</string>
+  <string name="how_it_works_headline_content_description">標題，COVIDSafe 是如何執行的</string>
+  <string name="intro_button">我肯出一分力</string>
+  <string name="intro_content">爲了避免冠狀病毒在社區擴散，澳洲政府開發了 COVIDSafe。 \n\nCOVIDSafe 會保密地記錄您與其他用戶之間的接觸。如果您曾密切接觸過被驗出病毒陽性的人士，各州和領地的衛生部官員就可以聯絡您。 \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_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>
+  <!-- Splash Screen -->
+  <string name="migration_in_progress">正在更新 COVIDSafe。\n\n請保持開機狀態直至更新完成為止。</string>
+  <string name="navigation_back_button_content_description">上一頁</string>
+  <string name="notification_active_body">在您離家或在公共場所時，請保持 COVIDSafe 在啟用狀態。</string>
+  <!-- Notifications -->
+  <string name="notification_active_title">COVIDSafe 已在啓用狀態</string>
+  <string name="notification_not_active_body">在您離家前或在公共場所時，請確保 COVIDSafe 處於啟用狀態。</string>
+  <string name="notification_not_active_title">COVIDSafe 未在啓用狀態</string>
+  <string name="options_for_australia">澳洲適用選項</string>
+  <string name="permission_button">繼續</string>
+  <string name="permission_content">COVIDSafe 需要開啓藍牙®及通知功能才能運作。 \n\n選擇 「繼續」以： \n\n 1. 開啓藍牙® \n\n 2. 允許取得定位權限\n\n 3. 關閉電池優化功能\n\n\n Android 需要定位權限才能啓用藍牙®。 \n\n COVIDSafe 不會傳送配對請求。</string>
+  <!-- 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 不會傳送配對請求。 *了解更多* 。</string>
+  <!-- OnBoarding Permission Success -->
+  <string name="permission_success_headline">您已成功註册</string>
+  <string name="permission_success_warning">開啓 COVIDSafe 的傳送通知功能，以便在無法正常執行應用程式時及時通知您。</string>
+  <string name="personal_details_age_content_description">選擇年齡組別</string>
+  <string name="personal_details_age_dialog_title">選擇您的年齡</string>
+  <string name="personal_details_age_error_prompt">請選擇您的年齡組別。</string>
+  <string name="personal_details_age_title">年齡組別（選擇）</string>
+  <string name="personal_details_button">繼續</string>
+  <string name="personal_details_dialog_ok">選擇</string>
+  <!-- OnBoarding Personal details -->
+  <string name="personal_details_headline">輸入您的詳細資料</string>
+  <string name="personal_details_headline_content_description">標題，輸入您的詳細資料</string>
+  <string name="personal_details_name_content_description">輸入全名</string>
+  <string name="personal_details_name_error_prompt">請輸入您的全名。</string>
+  <string name="personal_details_name_title">全名（或假名）</string>
+  <string name="personal_details_post_code">澳洲郵遞區號</string>
+  <string name="personal_details_post_code_content_description">輸入郵遞區號</string>
+  <string name="personal_details_post_code_dialog_title">郵遞區號</string>
+  <string name="personal_details_post_code_error_prompt">您的澳洲郵遞區號必須是個 4 位數字。</string>
+  <string name="personal_details_post_code_hint">例如：2000</string>
+  <string name="registration_consent_content">我同意數字化轉型局作為數據儲存管理者，根據澳大利亞政府衛生部常務副部長的合法決定，收集以下信息：</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="search">搜尋</string>
+  <!-- OnBoarding Enter Number -->
+  <string name="select_country_or_region">選擇國家或地區</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="share_this_app_content">同我一齊遏止 COVID-19 的擴散！下載澳洲政府提供的 COVIDSafe 應用程式。 ＃COVID19 #coronavirusaustralia #stayhomesavelives https://covidsafe.gov.au</string>
-  <string name="dialog_uploading_message">正在上傳您的 COVIDSafe 資料。 \n\n請勿關閉應用程式。</string>
-  <string name="generic_internet_error">請檢查您的互聯網連接</string>
-  <string name="update_available_title">可用更新版！</string>
-  <string name="update_available_dismiss_btn">請稍後提醒</string>
-  <string name="heading">標題</string>
-  <string name="permission_button">繼續</string>
-  <string name="registration_consent_first_paragraph">我的註册資料以便各州或領地衛生部官員追蹤接觸者。</string>
-  <string name="under_sixteen_first_paragraph">我的註册資料以便各州及領地衛生部官員追蹤接觸者。</string>
-  <string name="home_set_complete_external_link_been_contacted_title">是否有衛生部官員聯絡您？</string>
-  <string name="upload_step_1_header">是否有衛生部官員要求您上傳您的資料？</string>
-  <string name="registration_consent_content">我同意澳洲衛生部收集以下資訊：</string>
-  <string name="personal_details_headline">輸入您的詳細資料</string>
-  <string name="personal_details_age_error_prompt">請選擇您的年齡組別。</string>
-  <string name="personal_details_post_code">澳洲郵遞區號</string>
-  <string name="personal_details_post_code_content_description">輸入郵遞區號</string>
-  <string name="under_sixteen_content">我確認我的父母或監護人同意澳洲衛生部收集以下資訊：</string>
-  <string name="enter_number_headline">輸入您的手機號碼</string>
-  <string name="country_region_name_ag">安地卡及巴布達</string>
-  <string name="country_region_name_bb">巴貝多</string>
-  <string name="country_region_name_bj">貝南</string>
-  <string name="country_region_name_bw">波札那</string>
-  <string name="country_region_name_bf">布吉納法索</string>
-  <string name="country_region_name_cv">維德角</string>
-  <string name="country_region_name_dm">多明尼加</string>
-  <string name="country_region_name_ge">喬治亞</string>
-  <string name="country_region_name_gt">瓜地馬拉</string>
-  <string name="country_region_name_id">印尼</string>
-  <string name="country_region_name_ke">肯亞</string>
-  <string name="country_region_name_mz">莫三比克</string>
-  <string name="country_region_name_nz">紐西蘭</string>
-  <string name="country_region_name_qa">卡達</string>
-  <string name="country_region_name_tn">突尼西亞</string>
-  <string name="enter_pin_wrong_number">請確認手機號碼是否正確</string>
-  <string name="permission_headline">應用程式設定</string>
-  <string name="home_header_active_no_action_required">無需採取進一步行動。</string>
-  <string name="home_header_inactive_check_your_permissions">檢查您的設定。</string>
-  <string name="home_header_uploaded_on_date">您的資料已在%s 上傳。</string>
-  <string name="home_location_permission">位置： %s</string>
-  <string name="home_app_permission_status_title">檢查您的設定</string>
-  <string name="home_set_complete_external_link_news_content">請到 aus.gov.au 了解冠狀病毒的最新資訊。</string>
-  <string name="home_set_complete_external_link_app_url">https://www.health.gov.au/resources/apps-and-tools/coronavirus-australia-app</string>
-  <string name="action_report_an_issue">回報問題</string>
-  <string name="upload_step_verify_pin_header">上傳您的資料</string>
-  <string name="enabled">已啟用</string>
-  <string name="disabled">已停用</string>
-  <string name="registration_consent_headline">註册同意書</string>
-  <string name="enter_pin_button">驗證</string>
-  <string name="select_country_or_region">選擇國家或地區</string>
-  <string name="personal_details_age_content_description">選擇年齡組別</string>
-  <string name="upload_step_4_header">上傳同意聲明</string>
-  <string name="country_region_name_ve">委內瑞拉</string>
-  <string name="country_region_name_vn">越南</string>
-  <string name="permission_success_headline">您已成功註册</string>
-  <string name="country_region_name_vg">英屬維爾京群島</string>
-  <string name="country_region_name_vi">美屬維爾京群島</string>
-  <string name="country_region_name_sb">所羅門群島</string>
-  <string name="upload_answer_yes">是</string>
-  <string name="country_region_name_sn">塞內加爾</string>
-  <string name="country_region_name_rs">塞爾維亞</string>
-  <string name="country_region_name_sg">新加坡</string>
-  <string name="country_region_name_sk">斯洛伐克</string>
-  <string name="change_device_name_primary_action">更改並繼續</string>
-  <string name="country_region_name_za">南非</string>
-  <string name="country_region_name_kr">南韓</string>
-  <string name="country_region_name_by">白俄羅斯</string>
-  <string name="navigation_back_button_content_description">上一頁</string>
-  <string name="home_bluetooth_permission">藍牙®： %s</string>
-  <string name="home_permission_on">開</string>
-  <string name="home_permission_off">關</string>
-  <string name="country_region_name_es">西班牙</string>
-  <string name="country_region_name_lk">斯里蘭卡</string>
-  <string name="country_region_name_se">瑞典</string>
-  <string name="country_region_name_ch">瑞士</string>
-  <string name="country_region_name_tw">台灣</string>
-  <string name="country_region_name_us">美國</string>
-  <string name="search">搜尋</string>
-  <string name="action_continue">繼續</string>
-  <string name="action_upload_done">繼續</string>
-  <string name="personal_details_button">繼續</string>
-  <string name="invalid_phone_number">無效電話號碼。</string>
-  <string name="invalid_norfolk_island_phone_number_error_prompt">諾福克島的手機號碼是個5至6位數字。</string>
-  <string name="country_region_name_gu">關島</string>
-  <string name="home_set_complete_external_link_news_url">https://www.australia.gov.au</string>
-  <string name="upload_answer_no">否</string>
-  <string name="country_region_name_na">納米比亞</string>
-  <string name="action_verify_upload_pin">上傳我的資料</string>
   <string name="title_help">求助</string>
-  <string name="personal_details_name_title">全名</string>
-  <string name="personal_details_name_content_description">輸入全名</string>
-  <string name="country_region_name_kh">柬埔寨</string>
-  <string name="country_region_name_ga">加蓬</string>
-  <string name="country_region_name_de">德國</string>
-  <string name="country_region_name_gh">加納</string>
-  <string name="country_region_name_gr">希臘</string>
-  <string name="country_region_name_gd">格林納達</string>
-  <string name="country_region_name_ne">尼日爾</string>
-  <string name="country_region_name_no">挪威</string>
-  <string name="country_region_name_om">阿曼</string>
-  <string name="country_region_name_pk">巴基斯坦</string>
-  <string name="country_region_name_pa">巴拿馬</string>
-  <string name="country_region_name_pg">巴布亞新畿內亞</string>
-  <string name="country_region_name_pe">秘魯</string>
-  <string name="country_region_name_ph">菲律賓</string>
-  <string name="country_region_name_pl">波蘭</string>
-  <string name="country_region_name_pt">葡萄牙</string>
-  <string name="country_region_name_pr">波多黎各</string>
-  <string name="country_region_name_ru">俄羅斯</string>
-  <string name="country_region_name_kn">聖基茨和尼維斯</string>
-  <string name="country_region_name_vc">聖文森特和格林納丁斯</string>
-  <string name="country_region_name_tj">塔吉克斯坦</string>
-  <string name="country_region_name_th">泰國</string>
-  <string name="dialog_error_uploading_message">個人資料上傳時發生錯誤，請重試。</string>
-  <string name="country_region_name_bs">巴哈馬</string>
-  <string name="country_region_name_hk">香港</string>
-  <string name="country_region_name_lu">盧森堡</string>
-  <string name="country_region_name_ni">尼加拉瓜</string>
-  <string name="country_region_name_py">巴拉圭</string>
-  <string name="country_region_name_tg">多哥</string>
-  <string name="country_region_name_tt">特立尼達和多巴哥</string>
-  <string name="country_region_name_uy">烏拉圭</string>
-  <string name="country_region_name_mm">緬甸</string>
-  <string name="home_set_complete_external_link_help_topics_title">求助主題</string>
-  <string name="home_version_number">版本號： %s</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>
+  <string name="under_sixteen_second_paragraph">我與其他COVIDSafe用戶的接觸資料，如果我接觸過的另一用戶COVID-19測試呈陽性並且上傳了其接觸者數據。</string>
+  <string name="upload_answer_no">否</string>
+  <!-- Upload flow -->
+  <string name="upload_answer_yes">是</string>
+  <string name="upload_consent_button">我同意</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_header">是否有衛生部官員要求您上傳您的資料？</string>
+  <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州和領地衛生官員將只能獲取關於你的密切接觸者的資料。\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 碼到您的設備。請在下面輸入 PIN 碼來上傳個人資料。</string>
+  <string name="us_consent_button">我同意</string>
+  <string name="wrong_ping_number">輸入了錯誤的 PIN 碼</string>
+
+  <string name="battery_optimisation_prompt">您必須關閉電池優化功能。</string>
+  <string name="change_language">更換語言</string>
+  <string name="change_language_content">用其他語言閱讀COVIDSafe使用指南。</string>
   <string name="country_region_name_au2">諾福克島</string>
-  <string name="country_region_name_ir">伊朗</string>
-  <string name="country_region_name_cw">庫拉索</string>
-  <string name="country_region_name_sd">蘇丹</string>
   <string name="country_region_name_cu">古巴</string>
-  <string name="country_region_name_ht">海地</string>
-  <string name="country_region_name_hn">洪都拉斯</string>
-  <string name="country_region_name_hu">匈牙利</string>
-  <string name="country_region_name_is">冰島</string>
-  <string name="country_region_name_in">印度</string>
-  <string name="country_region_name_iq">伊拉克</string>
-  <string name="country_region_name_ie">愛爾蘭</string>
-  <string name="country_region_name_il">以色列</string>
-  <string name="country_region_name_ci">象牙海岸</string>
-  <string name="country_region_name_jm">牙買加</string>
-  <string name="country_region_name_jp">日本</string>
-  <string name="country_region_name_jo">約旦</string>
-  <string name="country_region_name_np">尼泊爾</string>
-  <string name="country_region_name_nl">荷蘭</string>
-  <string name="country_region_name_tr">土耳其</string>
-  <string name="country_region_name_tm">土庫曼斯坦</string>
-  <string name="country_region_name_tc">特克斯和凱科斯群島</string>
-  <string name="country_region_name_ug">烏干達</string>
-  <string name="country_region_name_ua">烏克蘭</string>
-  <string name="country_region_name_gb">英國</string>
-  <string name="country_region_name_dz">阿爾及利亞</string>
-  <string name="country_region_name_ao">安哥拉</string>
-  <string name="country_region_name_ai">安圭拉</string>
-  <string name="country_region_name_ar">阿根廷</string>
-  <string name="country_region_name_am">亞美尼亞</string>
-  <string name="country_region_name_aw">阿魯巴</string>
-  <string name="country_region_name_au">澳洲</string>
-  <string name="country_region_name_at">奧地利</string>
-  <string name="country_region_name_bh">巴林</string>
-  <string name="country_region_name_be">比利時</string>
-  <string name="country_region_name_bz">伯利茲</string>
-  <string name="country_region_name_bm">百慕達</string>
-  <string name="country_region_name_bo">玻利維亞</string>
-  <string name="country_region_name_br">巴西</string>
-  <string name="country_region_name_bg">保加利亞</string>
-  <string name="permission_success_button">繼續</string>
-  <string name="how_it_works_button">下一步</string>
-  <string name="data_privacy_button">下一步</string>
-  <string name="consent_button">我同意</string>
-  <string name="generic_error">請稍後再試</string>
-  <string name="dialog_error_uploading_positive">重試</string>
-  <string name="dialog_error_uploading_negative">取消</string>
-  <string name="country_region_name_al">阿爾巴尼亞</string>
-  <string name="country_region_name_cm">喀麥隆</string>
-  <string name="country_region_name_ca">加拿大</string>
-  <string name="country_region_name_ky">開曼群島</string>
-  <string name="country_region_name_cl">智利</string>
-  <string name="country_region_name_cn">中國</string>
-  <string name="country_region_name_co">哥倫比亞</string>
-  <string name="country_region_name_cz">捷克共和國</string>
-  <string name="country_region_name_dk">丹麥</string>
-  <string name="country_region_name_do">多明尼加共和國</string>
-  <string name="country_region_name_sv">薩爾瓦多</string>
-  <string name="country_region_name_ee">愛沙尼亞</string>
-  <string name="country_region_name_fj">斐濟</string>
-  <string name="country_region_name_fi">芬蘭</string>
-  <string name="country_region_name_fr">法國</string>
-  <string name="country_region_name_kw">科威特</string>
-  <string name="country_region_name_la">寮国</string>
-  <string name="country_region_name_lv">拉脫維亞</string>
-  <string name="country_region_name_lb">黎巴嫩</string>
-  <string name="country_region_name_li">列支敦士登</string>
-  <string name="country_region_name_lt">立陶宛</string>
-  <string name="country_region_name_mo">澳門</string>
-  <string name="country_region_name_mk">前南斯拉夫馬其頓共和國</string>
-  <string name="country_region_name_my">馬來西亞</string>
-  <string name="country_region_name_ml">馬里</string>
-  <string name="country_region_name_mt">馬耳他</string>
-  <string name="country_region_name_mq">馬提尼克</string>
-  <string name="country_region_name_mx">墨西哥</string>
-  <string name="country_region_name_md">摩爾多瓦</string>
-  <string name="country_region_name_ms">蒙特塞拉特</string>
-  <string name="country_region_name_ma">摩洛哥</string>
-  <string name="personal_details_age_title">年齡組別（選擇）</string>
+  <string name="country_region_name_cw">庫拉索</string>
+  <string name="country_region_name_ir">伊朗</string>
+  <string name="country_region_name_sd">蘇丹</string>
+  <string name="disabled">已停用</string>
+  <string name="done_success">完成</string>
+  <string name="enabled">已啟用</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="Enter_your_mobile_number_label">請輸入您的手機號碼</string>
+  <string name="heading">標題</string>
+  <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_1">如何修補問題並且再次使COVIDSafe激活</string>
+  <string name="internet_screen_content_2">當一個新版本更新可用時</string>
+  <string name="internet_screen_heading">連接到互聯網來改良COVIDSafe的性能\n</string>
+  <string name="need_location_service">若要執行 COVIDSafe ，你需要開啓在 「設定」項下的 「定位」功能。 </string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="norfolk_hint">例如：51234</string>
+  <string name="notification_update_content">更新你的應用程式來獲取最新的改良。</string>
+  <string name="notification_update_heading">COVIDSafe更新可用</string>
+  <string name="personal_details_name_characters_prompt">請用英文字母輸入你的全名。請勿使用其他語言的文字或符號，例如 ‘，’ \'或 ‘？’。</string>
+  <string name="pin_number">PIN 碼</string>
+  <string name="PINNumber_VO_Label">PIN 碼</string>
+  <string name="PN_MobileNumber_VOLabel">手機號碼</string>
+  <string name="ReceivePinIssue">接收 PIN 碼時遇到問題？</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="Select_country_or_region_headline">選擇國家或地區</string>
+  <string name="service_ok_body">在您離家及在公共場所時，請保持 COVIDSafe 在啟用狀態。</string>
+  <string name="service_ok_title">COVIDSafe 已在啓用狀態</string>
+  <string name="stepCounter" formatted="false">第%d步，共%d步</string>
+  <!-- Figma page Android Screens (05/06) -->
+  <string name="under_sixteen_registration_consent_first_paragraph">我的註册資料</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 商店更新。</string>
+  <string name="update_available_play_store_btn">轉往 Google Play 商店</string>
+  <string name="update_available_title">更新可用！</string>
 </resources>

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

@@ -1,290 +1,431 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-    <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="home_header_active_title">COVIDSafe is active.</string>
-    <string name="home_header_inactive_title">COVIDSafe is not active.</string>
-    <string name="data_privacy_content">It is important that you read the COVIDSafe *privacy policy* before you register for COVIDSafe.\n\nIf you are under 16 years of age, your parent/guardian must also read the *privacy policy*.\n\nUse of COVIDSafe is completely voluntary. You can install or delete the application at any time. If you delete COVIDSafe, *you may also ask for your information to be deleted* from the secure server.\n\nTo register for COVIDSafe, you will need to enter a name (or pseudonym), mobile number, age range and postcode.\n\nInformation you submit when you register, and information about your use of COVIDSafe will be collected and stored on a highly secure server.\n\nCOVIDSafe will not collect your location information.\n\nCOVIDSafe will note the time of contact, anonymous ID code of other COVIDSafe users you come into contact with, Bluetooth® signal strength and the phone model of other users, on your device.\n\nOther COVIDSafe users you come into contact with will also note your anonymous ID code, the date and time of contact with you, Bluetooth® signal strength and your phone model, on their device.\n\nIf another user tests positive to COVID-19, they may upload their contact information and a state or territory health official may contact you for contact tracing purposes. \n\nYour registration details will only be used or disclosed for contact tracing and for the proper and lawful functioning of COVIDSafe. \n\nMore information is available at the *Australian Government Department of Health* website.\n\nSee the COVIDSafe *privacy policy* for further details about your rights about your information and how it will be handled and shared.</string>
-    <string name="upload_step_4_sub_header">Unless you consent, your contact data will not be uploaded.\n\nIf you consent, your contact data will be uploaded and shared with state or territory health officials for contact tracing purposes.\n\nState and territory health officials will only be able to access information about your close contacts.\n\nRead the COVIDSafe *privacy policy* for further details.</string>
-    <string name="personal_details_name_title">Full name (or pseudonym)</string>
-    <string name="under_sixteen_second_paragraph">Information about my contact with other COVIDSafe users, if another user I have come into contact with tests positive for COVID-19 and uploads their contact data.</string>
-    <string name="registration_consent_second_paragraph">Information about my contact with other COVIDSafe users, if another user I have come into contact with tests positive for COVID-19 and uploads their contact data.</string>
-    <string name="registration_consent_first_paragraph">My registration information.</string>
-    <string name="under_sixteen_first_paragraph">My registration information.</string>
-    <string name="registration_consent_content">I consent to the Digital Transformation Agency as data store administrator, under legal determination made by the Secretary of the Australian Government Department of Health collecting:</string>
-    <string name="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 you the 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>
-    <string name="permission_success_content">1. When you leave home, keep your phone with you and make sure COVIDSafe is active.\n\n2. Bluetooth® should be kept ON.\n\n3. Battery optimisation should be OFF.\n\n4. COVIDSafe does not send pairing requests. *Learn more*.</string>
-    <string name="home_header_no_pairing">COVIDSafe does not send *pairing requests*.</string>
-    <string name="need_location_service">For COVIDSafe to work you need to turn on Location in Settings.</string>
-    <string name="heading">Heading</string>
-    <string name="update_available_play_store_btn">Go to Google Play Store</string>
-    <string name="update_available_dismiss_btn">Remind me later</string>
-    <string name="update_available_message">We’ve been making improvements to COVIDSafe.</string>
-    <string name="update_available_title">Update available!</string>
-    <string name="pin_number">pin number</string>
-    <string name="personal_details_name_characters_prompt">Please use English characters for your full name. Do not use other languages or symbols like \',\' or \'?\'.</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="battery_optimisation_prompt">You must disable battery optimisation.</string>
-    <string name="disabled">Disabled</string>
-    <string name="enabled">Enabled</string>
-    <string name="ReceivePinIssue">Issues receiving your PIN?</string>
-    <string name="personal_details_age_error_prompt">Please select your age range.</string>
-    <string name="invalid_norfolk_island_phone_number_error_prompt">Mobile numbers in Norfolk Island contain 5 to 6 digits.</string>
-    <string name="home_non_battery_optimization_permission">Battery optimisation: %s</string>
-    <string name="home_version_number">Version number:%s</string>
-    <string name="enter_number_content">We’ll send you a 6-digit PIN to verify your mobile number.</string>
-    <string name="home_app_permission_push_notification_prompt">Allow COVIDSafe to push notifications.</string>
-    <string name="home_header_inactive_check_your_permissions">Check your settings.</string>
-    <string name="home_set_complete_external_link_share_content">Invite others to help. Together, we’re stronger.</string>
-    <string name="home_header_active_no_action_required">No further action is required.</string>
-    <string name="enter_pin_timer_expire">Your PIN will expire in  </string>
-    <string name="country_region_name_sd">Sudan</string>
-    <string name="country_region_name_ir">Iran</string>
-    <string name="country_region_name_cw">Curaçao</string>
-    <string name="country_region_name_cu">Cuba</string>
-    <string name="country_region_name_au2">Norfolk Island</string>
-    <string name="action_upload_done">Continue</string>
     <string name="action_continue">Continue</string>
-    <string name="upload_finished_sub_header">You have successfully uploaded your information to the COVIDSafe highly secure storage system.\n\nState or territory health officials will notify other COVIDSafe users that have recorded instances of close contact with you. Your identity will remain anonymous to other users.</string>
-    <string name="upload_finished_header">Thank you for helping to stop the spread of COVID-19!</string>
+    <string name="action_report_an_issue">Report an issue</string>
+    <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="upload_step_verify_pin_sub_header">A state or territory health official will send a PIN to your device via text message. Enter it below to upload your information.</string>
-    <string name="upload_step_verify_pin_header">Upload your information</string>
-    <string name="upload_step_4_header"> Upload consent</string>
-    <string name="upload_step_1_body">Only if you test positive to COVID-19 will a state or territory health official contact you to assist with voluntary upload of your information.\n\nOnce you press ‘Yes’ you’ll need to provide consent to upload your information. </string>
-    <string name="upload_step_1_header">Is a health official asking you to upload your information?</string>
-    <string name="upload_answer_no">No</string>
-    <string name="upload_answer_yes">Yes</string>
-    <string name="action_report_an_issue">Report an issue</string>
-    <string name="home_set_complete_external_link_help_topics_content">If you have issues or questions about the app.</string>
-    <string name="home_set_complete_external_link_help_topics_title">Help topics</string>
-    <string name="home_set_complete_external_link_app_url">https://www.health.gov.au/resources/apps-and-tools/coronavirus-australia-app</string>
-    <string name="home_set_complete_external_link_been_contacted_content">You can only upload your information if you have tested positive.</string>
-    <string name="home_set_complete_external_link_been_contacted_title">Has a health official contacted you?</string>
-    <string name="home_set_complete_external_link_app_content">Download the government app for the latest news and advice.</string>
-    <string name="home_set_complete_external_link_app_title">Get the Coronavirus app</string>
-    <string name="home_set_complete_external_link_news_content">Head to aus.gov.au for the latest Coronavirus news.</string>
-    <string name="home_set_complete_external_link_news_url">https://www.australia.gov.au</string>
-    <string name="home_set_complete_external_link_news_title">Latest news and updates</string>
-    <string name="home_set_complete_external_link_share_title">Share COVIDSafe</string>
-    <string name="home_app_permission_status_subtitle">COVIDSafe won\'t work without the right settings. </string>
-    <string name="home_app_permission_status_title">Check your settings</string>
-    <string name="home_permission_off">Off</string>
-    <string name="home_permission_on">On</string>
-    <string name="home_push_notification_permission">Push Notification: %s</string>
-    <string name="home_location_permission">Location: %s</string>
-    <string name="home_bluetooth_permission">Bluetooth®: %s</string>
-    <string name="home_header_uploaded_on_date">Your information was uploaded on %s.</string>
-    <string name="permission_success_button">Continue</string>
-    <string name="permission_success_headline">You\'ve successfully registered</string>
-    <string name="change_device_name_secondary_action">Skip and keep as it is</string>
-    <string name="change_device_name_primary_action">Change and continue</string>
-    <string name="change_device_name_default_device_name">Android phone</string>
-    <string name="change_device_name_new_device_name">New device name</string>
-    <string name="change_device_name_content_line_2">Other Bluetooth® devices around you will be able to see this name. We recommend to use a device name that does not include your personal details.</string>
+    <string name="activity_self_isolation_button">Continue</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>
+    <!-- Onboarding Change Device Name -->
     <string name="change_device_name_headline">Your device name</string>
-    <string name="permission_location_rationale">Android requires location access to enable Bluetooth® functions for COVIDSafe. COVIDSafe cannot work properly without it</string>
-    <string name="permission_button">Proceed</string>
-    <string name="permission_content">COVIDSafe needs Bluetooth® and notifications enabled to work.\n\nSelect ‘Proceed’ to:\n\n1. Enable Bluetooth®\n\n2. Allow Location permissions\n\n3. Disable Battery optimisation\n\n\nAndroid needs Location permissions for Bluetooth® to work.\n\nCOVIDSafe does not send pairing requests.</string>
-    <string name="permission_headline">App settings</string>
-    <string name="enter_pin_button">Verify</string>
-    <string name="enter_pin_resend_pin">Resend PIN</string>
-    <string name="wrong_ping_number"> Wrong PIN entered</string>
-    <string name="enter_pin_wrong_number">Is this mobile number wrong?</string>
-    <string name="enter_pin_headline" formatted="false">Enter the PIN sent to %s %s</string>
-    <string name="country_region_name_zw">Zimbabwe</string>
-    <string name="country_region_name_zm">Zambia</string>
-    <string name="country_region_name_ye">Yemen</string>
-    <string name="country_region_name_vi">Virgin Islands, US</string>
-    <string name="country_region_name_vg">Virgin Islands, British</string>
-    <string name="country_region_name_vn">Vietnam</string>
-    <string name="country_region_name_ve">Venezuela</string>
-    <string name="country_region_name_uz">Uzbekistan</string>
-    <string name="country_region_name_uy">Uruguay</string>
-    <string name="country_region_name_us">United States</string>
-    <string name="country_region_name_gb">United Kingdom</string>
+    <string name="change_device_name_headline_content_description">Heading, Your device name</string>
+    <string name="change_device_name_new_device_name">Edit device name</string>
+    <string name="change_device_name_primary_action">Continue</string>
+    <string name="change_device_name_secondary_action">Skip and keep as it is</string>
+    <string name="consent_button">I agree</string>
+    <!-- Shared Consent Actions -->
+    <string name="consent_call_for_action">Select \'I agree\' to confirm consent.</string>
+    <string name="country_region_name_ad">Andorra</string>
     <string name="country_region_name_ae">United Arab Emirates</string>
-    <string name="country_region_name_ua">Ukraine</string>
-    <string name="country_region_name_ug">Uganda</string>
-    <string name="country_region_name_tc">Turks and Caicos Islands</string>
-    <string name="country_region_name_tm">Turkmenistan</string>
-    <string name="country_region_name_tr">Turkey</string>
-    <string name="country_region_name_tn">Tunisia</string>
-    <string name="country_region_name_tt">Trinidad and Tobago</string>
-    <string name="country_region_name_tg">Togo</string>
-    <string name="country_region_name_th">Thailand</string>
-    <string name="country_region_name_tz">Tanzania</string>
-    <string name="country_region_name_tj">Tajikistan</string>
-    <string name="country_region_name_tw">Taiwan</string>
-    <string name="country_region_name_ch">Switzerland</string>
-    <string name="country_region_name_se">Sweden</string>
-    <string name="country_region_name_lk">Sri Lanka</string>
-    <string name="country_region_name_es">Spain</string>
-    <string name="country_region_name_kr">South Korea</string>
-    <string name="country_region_name_za">South Africa</string>
-    <string name="country_region_name_sb">Solomon Islands</string>
-    <string name="country_region_name_si">Slovenia</string>
-    <string name="country_region_name_sk">Slovakia</string>
-    <string name="country_region_name_sg">Singapore</string>
-    <string name="country_region_name_rs">Serbia</string>
-    <string name="country_region_name_sn">Senegal</string>
-    <string name="country_region_name_vc">Saint Vincent and the Grenadines</string>
-    <string name="country_region_name_lc">Saint Lucia</string>
-    <string name="country_region_name_kn">Saint Kitts and Nevis</string>
-    <string name="country_region_name_rw">Rwanda</string>
-    <string name="country_region_name_ru">Russia</string>
-    <string name="country_region_name_qa">Qatar</string>
-    <string name="country_region_name_pr">Puerto Rico</string>
-    <string name="country_region_name_pt">Portugal</string>
-    <string name="country_region_name_pl">Poland</string>
-    <string name="country_region_name_ph">Philippines</string>
-    <string name="country_region_name_pe">Peru</string>
-    <string name="country_region_name_py">Paraguay</string>
-    <string name="country_region_name_pg">Papua New Guinea</string>
-    <string name="country_region_name_pa">Panama</string>
-    <string name="country_region_name_pk">Pakistan</string>
-    <string name="country_region_name_om">Oman</string>
-    <string name="country_region_name_no">Norway</string>
-    <string name="country_region_name_ng">Nigeria</string>
-    <string name="country_region_name_ne">Niger</string>
-    <string name="country_region_name_ni">Nicaragua</string>
-    <string name="country_region_name_nz">New Zealand</string>
-    <string name="country_region_name_nl">Netherlands</string>
-    <string name="country_region_name_np">Nepal</string>
-    <string name="country_region_name_na">Namibia</string>
-    <string name="country_region_name_mm">Myanmar</string>
-    <string name="country_region_name_mz">Mozambique</string>
-    <string name="country_region_name_ma">Morocco</string>
-    <string name="country_region_name_ms">Montserrat</string>
-    <string name="country_region_name_md">Moldova</string>
-    <string name="country_region_name_mx">Mexico</string>
-    <string name="country_region_name_mu">Mauritius</string>
-    <string name="country_region_name_mq">Martinique</string>
-    <string name="country_region_name_mt">Malta</string>
-    <string name="country_region_name_ml">Mali</string>
-    <string name="country_region_name_my">Malaysia</string>
-    <string name="country_region_name_mk">Former Yugoslav Republic of Macedonia</string>
-    <string name="country_region_name_mo">Macau</string>
-    <string name="country_region_name_lu">Luxembourg</string>
-    <string name="country_region_name_lt">Lithuania</string>
-    <string name="country_region_name_li">Liechtenstein</string>
-    <string name="country_region_name_lb">Lebanon</string>
-    <string name="country_region_name_lv">Latvia</string>
-    <string name="country_region_name_la">Laos</string>
-    <string name="country_region_name_kg">Kyrgyzstan</string>
-    <string name="country_region_name_kw">Kuwait</string>
-    <string name="country_region_name_ke">Kenya</string>
-    <string name="country_region_name_kz">Kazakhstan</string>
-    <string name="country_region_name_jo">Jordan</string>
-    <string name="country_region_name_jp">Japan</string>
-    <string name="country_region_name_jm">Jamaica</string>
-    <string name="country_region_name_ci">Ivory Coast</string>
-    <string name="country_region_name_il">Israel</string>
-    <string name="country_region_name_ie">Ireland</string>
-    <string name="country_region_name_iq">Iraq</string>
-    <string name="country_region_name_id">Indonesia</string>
-    <string name="country_region_name_in">India</string>
-    <string name="country_region_name_is">Iceland</string>
-    <string name="country_region_name_hu">Hungary</string>
-    <string name="country_region_name_hk">Hong Kong</string>
-    <string name="country_region_name_hn">Honduras</string>
-    <string name="country_region_name_ht">Haiti</string>
-    <string name="country_region_name_gw">Guinea-Bissau</string>
-    <string name="country_region_name_gt">Guatemala</string>
-    <string name="country_region_name_gu">Guam</string>
-    <string name="country_region_name_gd">Grenada</string>
-    <string name="country_region_name_gr">Greece</string>
-    <string name="country_region_name_gh">Ghana</string>
-    <string name="country_region_name_de">Germany</string>
-    <string name="country_region_name_ge">Georgia</string>
-    <string name="country_region_name_ga">Gabon</string>
-    <string name="country_region_name_fr">France</string>
-    <string name="country_region_name_fi">Finland</string>
-    <string name="country_region_name_fj">Fiji</string>
-    <string name="country_region_name_ee">Estonia</string>
-    <string name="country_region_name_sv">El Salvador</string>
-    <string name="country_region_name_ec">Ecuador</string>
-    <string name="country_region_name_do">Dominican Republic</string>
-    <string name="country_region_name_dm">Dominica</string>
-    <string name="country_region_name_dk">Denmark</string>
-    <string name="country_region_name_cz">Czech Republic</string>
-    <string name="country_region_name_cy">Cyprus</string>
-    <string name="country_region_name_hr">Croatia</string>
-    <string name="country_region_name_cr">Costa Rica</string>
-    <string name="country_region_name_co">Colombia</string>
-    <string name="country_region_name_cn">China</string>
-    <string name="country_region_name_cl">Chile</string>
-    <string name="country_region_name_ky">Cayman Islands</string>
-    <string name="country_region_name_cv">Cape Verde</string>
-    <string name="country_region_name_ca">Canada</string>
-    <string name="country_region_name_cm">Cameroon</string>
-    <string name="country_region_name_kh">Cambodia</string>
-    <string name="country_region_name_bf">Burkina Faso</string>
-    <string name="country_region_name_bg">Bulgaria</string>
-    <string name="country_region_name_br">Brazil</string>
-    <string name="country_region_name_bw">Botswana</string>
-    <string name="country_region_name_ba">Bosnia and Herzegovina</string>
-    <string name="country_region_name_bo">Bolivia</string>
-    <string name="country_region_name_bm">Bermuda</string>
-    <string name="country_region_name_bj">Benin</string>
-    <string name="country_region_name_bz">Belize</string>
-    <string name="country_region_name_be">Belgium</string>
-    <string name="country_region_name_by">Belarus</string>
-    <string name="country_region_name_bb">Barbados</string>
-    <string name="country_region_name_bd">Bangladesh</string>
-    <string name="country_region_name_bh">Bahrain</string>
-    <string name="country_region_name_bs">Bahamas</string>
-    <string name="country_region_name_az">Azerbaijan</string>
+    <!-- Countries -->
+    <string name="country_region_name_af">Afghanistan</string>
+    <string name="country_region_name_ag">Antigua and Barbuda</string>
+    <string name="country_region_name_ai">Anguilla</string>
+    <string name="country_region_name_al">Albania</string>
+    <string name="country_region_name_am">Armenia</string>
+    <string name="country_region_name_an">Netherlands Antilles</string>
+    <string name="country_region_name_ao">Angola</string>
+    <string name="country_region_name_ar">Argentina</string>
     <string name="country_region_name_at">Austria</string>
     <string name="country_region_name_au">Australia</string>
     <string name="country_region_name_aw">Aruba</string>
-    <string name="country_region_name_am">Armenia</string>
-    <string name="country_region_name_ar">Argentina</string>
-    <string name="country_region_name_ag">Antigua and Barbuda</string>
-    <string name="country_region_name_ai">Anguilla</string>
-    <string name="country_region_name_ao">Angola</string>
+    <string name="country_region_name_az">Azerbaijan</string>
+    <string name="country_region_name_ba">Bosnia and Herzegovina</string>
+    <string name="country_region_name_bb">Barbados</string>
+    <string name="country_region_name_bd">Bangladesh</string>
+    <string name="country_region_name_be">Belgium</string>
+    <string name="country_region_name_bf">Burkina Faso</string>
+    <string name="country_region_name_bg">Bulgaria</string>
+    <string name="country_region_name_bh">Bahrain</string>
+    <string name="country_region_name_bi">Burundi</string>
+    <string name="country_region_name_bj">Benin</string>
+    <string name="country_region_name_bm">Bermuda</string>
+    <string name="country_region_name_bn">Brunei</string>
+    <string name="country_region_name_bo">Bolivia</string>
+    <string name="country_region_name_br">Brazil</string>
+    <string name="country_region_name_bs">Bahamas</string>
+    <string name="country_region_name_bt">Bhutan</string>
+    <string name="country_region_name_bw">Botswana</string>
+    <string name="country_region_name_by">Belarus</string>
+    <string name="country_region_name_bz">Belize</string>
+    <string name="country_region_name_ca">Canada</string>
+    <string name="country_region_name_cd">Democratic Republic of the Congo</string>
+    <string name="country_region_name_cf">Central African Republic</string>
+    <string name="country_region_name_cg">Republic of the Congo</string>
+    <string name="country_region_name_ch">Switzerland</string>
+    <string name="country_region_name_ci">Ivory Coast</string>
+    <string name="country_region_name_ck">Cook Islands</string>
+    <string name="country_region_name_cl">Chile</string>
+    <string name="country_region_name_cm">Cameroon</string>
+    <string name="country_region_name_cn">China</string>
+    <string name="country_region_name_co">Colombia</string>
+    <string name="country_region_name_cr">Costa Rica</string>
+    <string name="country_region_name_cv">Cape Verde</string>
+    <string name="country_region_name_cy">Cyprus</string>
+    <string name="country_region_name_cz">Czech Republic</string>
+    <string name="country_region_name_de">Germany</string>
+    <string name="country_region_name_dj">Djibouti</string>
+    <string name="country_region_name_dk">Denmark</string>
+    <string name="country_region_name_dm">Dominica</string>
+    <string name="country_region_name_do">Dominican Republic</string>
     <string name="country_region_name_dz">Algeria</string>
-    <string name="country_region_name_al">Albania</string>
-    <string name="options_for_australia">Options for Australia</string>
-    <string name="search">Search</string>
-    <string name="enter_number_button">Get PIN</string>
-    <string name="enter_number_relative">Trying to register on behalf of a friend or relative?\n\nThey will need to register using their own device and phone number so that COVIDSafe can work for them. </string>
-    <string name="invalid_australian_phone_number_error_prompt">Australian mobile numbers contain a maximum of 10 digits.</string>
-    <string name="invalid_phone_number">Invalid phone number.</string>
-    <string name="enter_number_headline">Enter your mobile number</string>
-    <string name="select_country_or_region">Select country or region</string>
-    <string name="under_sixteen_headline">You need the consent of your parent/guardian to proceed</string>
-    <string name="personal_details_button">Continue</string>
-    <string name="navigation_back_button_content_description">Previous page</string>
-    <string name="personal_details_post_code_error_prompt">Your Australian postcode number must contain 4 digits. </string>
-    <string name="personal_details_post_code_content_description">Enter postcode</string>
-    <string name="personal_details_post_code">Postcode in Australia</string>
-    <string name="personal_details_age_content_description">Select age range</string>
-    <string name="personal_details_age_title">Age range (select)</string>
-    <string name="personal_details_name_content_description">Enter full name</string>
-    <string name="personal_details_headline">Enter your details</string>
-    <string name="registration_consent_headline">Registration consent</string>
-    <string name="consent_button">I agree</string>
-    <string name="consent_call_for_action">Select \'I agree\' to confirm consent.</string>
+    <string name="country_region_name_ec">Ecuador</string>
+    <string name="country_region_name_ee">Estonia</string>
+    <string name="country_region_name_eg">Egypt</string>
+    <string name="country_region_name_es">Spain</string>
+    <string name="country_region_name_et">Ethiopia</string>
+    <string name="country_region_name_fi">Finland</string>
+    <string name="country_region_name_fj">Fiji</string>
+    <string name="country_region_name_fo">Faroe Islands</string>
+    <string name="country_region_name_fr">France</string>
+    <string name="country_region_name_ga">Gabon</string>
+    <string name="country_region_name_gb">United Kingdom</string>
+    <string name="country_region_name_gd">Grenada</string>
+    <string name="country_region_name_ge">Georgia</string>
+    <string name="country_region_name_gf">French Guiana</string>
+    <string name="country_region_name_gh">Ghana</string>
+    <string name="country_region_name_gi">Gibraltar</string>
+    <string name="country_region_name_gl">Greenland</string>
+    <string name="country_region_name_gm">Gambia</string>
+    <string name="country_region_name_gn">Guinea</string>
+    <string name="country_region_name_gp">Guadeloupe</string>
+    <string name="country_region_name_gq">Equatorial Guinea</string>
+    <string name="country_region_name_gr">Greece</string>
+    <string name="country_region_name_gt">Guatemala</string>
+    <string name="country_region_name_gu">Guam</string>
+    <string name="country_region_name_gw">Guinea-Bissau</string>
+    <string name="country_region_name_gy">Guyana</string>
+    <string name="country_region_name_hk">Hong Kong</string>
+    <string name="country_region_name_hn">Honduras</string>
+    <string name="country_region_name_hr">Croatia</string>
+    <string name="country_region_name_ht">Haiti</string>
+    <string name="country_region_name_hu">Hungary</string>
+    <string name="country_region_name_id">Indonesia</string>
+    <string name="country_region_name_ie">Ireland</string>
+    <string name="country_region_name_il">Israel</string>
+    <string name="country_region_name_in">India</string>
+    <string name="country_region_name_iq">Iraq</string>
+    <string name="country_region_name_is">Iceland</string>
+    <string name="country_region_name_it">Italy</string>
+    <string name="country_region_name_jm">Jamaica</string>
+    <string name="country_region_name_jo">Jordan</string>
+    <string name="country_region_name_jp">Japan</string>
+    <string name="country_region_name_ke">Kenya</string>
+    <string name="country_region_name_kg">Kyrgyzstan</string>
+    <string name="country_region_name_kh">Cambodia</string>
+    <string name="country_region_name_ki">Kiribati</string>
+    <string name="country_region_name_km">Comoros</string>
+    <string name="country_region_name_kn">Saint Kitts and Nevis</string>
+    <string name="country_region_name_kr">South Korea</string>
+    <string name="country_region_name_kw">Kuwait</string>
+    <string name="country_region_name_ky">Cayman Islands</string>
+    <string name="country_region_name_kz">Kazakhstan</string>
+    <string name="country_region_name_la">Laos</string>
+    <string name="country_region_name_lb">Lebanon</string>
+    <string name="country_region_name_lc">Saint Lucia</string>
+    <string name="country_region_name_li">Liechtenstein</string>
+    <string name="country_region_name_lk">Sri Lanka</string>
+    <string name="country_region_name_lr">Liberia</string>
+    <string name="country_region_name_ls">Lesotho</string>
+    <string name="country_region_name_lt">Lithuania</string>
+    <string name="country_region_name_lu">Luxembourg</string>
+    <string name="country_region_name_lv">Latvia</string>
+    <string name="country_region_name_ly">Libya</string>
+    <string name="country_region_name_ma">Morocco</string>
+    <string name="country_region_name_mc">Monaco</string>
+    <string name="country_region_name_md">Moldova</string>
+    <string name="country_region_name_me">Montenegro</string>
+    <string name="country_region_name_mg">Madagascar</string>
+    <string name="country_region_name_mk">Former Yugoslav Republic of Macedonia</string>
+    <string name="country_region_name_ml">Mali</string>
+    <string name="country_region_name_mm">Myanmar</string>
+    <string name="country_region_name_mn">Mongolia</string>
+    <string name="country_region_name_mo">Macau</string>
+    <string name="country_region_name_mq">Martinique</string>
+    <string name="country_region_name_mr">Mauritania</string>
+    <string name="country_region_name_ms">Montserrat</string>
+    <string name="country_region_name_mt">Malta</string>
+    <string name="country_region_name_mu">Mauritius</string>
+    <string name="country_region_name_mv">Maldives</string>
+    <string name="country_region_name_mw">Malawi</string>
+    <string name="country_region_name_mx">Mexico</string>
+    <string name="country_region_name_my">Malaysia</string>
+    <string name="country_region_name_mz">Mozambique</string>
+    <string name="country_region_name_na">Namibia</string>
+    <string name="country_region_name_nc">New Caledonia</string>
+    <string name="country_region_name_ne">Niger</string>
+    <string name="country_region_name_ng">Nigeria</string>
+    <string name="country_region_name_ni">Nicaragua</string>
+    <string name="country_region_name_nl">Netherlands</string>
+    <string name="country_region_name_no">Norway</string>
+    <string name="country_region_name_np">Nepal</string>
+    <string name="country_region_name_nz">New Zealand</string>
+    <string name="country_region_name_om">Oman</string>
+    <string name="country_region_name_pa">Panama</string>
+    <string name="country_region_name_pe">Peru</string>
+    <string name="country_region_name_pg">Papua New Guinea</string>
+    <string name="country_region_name_ph">Philippines</string>
+    <string name="country_region_name_pk">Pakistan</string>
+    <string name="country_region_name_pl">Poland</string>
+    <string name="country_region_name_pr">Puerto Rico</string>
+    <string name="country_region_name_ps">Palestinian Territories</string>
+    <string name="country_region_name_pt">Portugal</string>
+    <string name="country_region_name_pw">Palau</string>
+    <string name="country_region_name_py">Paraguay</string>
+    <string name="country_region_name_qa">Qatar</string>
+    <string name="country_region_name_re">Reunion Island</string>
+    <string name="country_region_name_ro">Romania</string>
+    <string name="country_region_name_rs">Serbia</string>
+    <string name="country_region_name_ru">Russia</string>
+    <string name="country_region_name_rw">Rwanda</string>
+    <string name="country_region_name_sa">Saudi Arabia</string>
+    <string name="country_region_name_sb">Solomon Islands</string>
+    <string name="country_region_name_sc">Seychelles</string>
+    <string name="country_region_name_se">Sweden</string>
+    <string name="country_region_name_sg">Singapore</string>
+    <string name="country_region_name_si">Slovenia</string>
+    <string name="country_region_name_sk">Slovakia</string>
+    <string name="country_region_name_sl">Sierra Leone</string>
+    <string name="country_region_name_sn">Senegal</string>
+    <string name="country_region_name_so">Somalia</string>
+    <string name="country_region_name_sr">Suriname</string>
+    <string name="country_region_name_ss">South Sudan</string>
+    <string name="country_region_name_st">Sao Tome and Principe</string>
+    <string name="country_region_name_sv">El Salvador</string>
+    <string name="country_region_name_sz">Swaziland</string>
+    <string name="country_region_name_tc">Turks and Caicos Islands</string>
+    <string name="country_region_name_td">Chad</string>
+    <string name="country_region_name_tg">Togo</string>
+    <string name="country_region_name_th">Thailand</string>
+    <string name="country_region_name_tj">Tajikistan</string>
+    <string name="country_region_name_tl">Timor-Leste</string>
+    <string name="country_region_name_tm">Turkmenistan</string>
+    <string name="country_region_name_tn">Tunisia</string>
+    <string name="country_region_name_to">Tonga</string>
+    <string name="country_region_name_tr">Turkey</string>
+    <string name="country_region_name_tt">Trinidad and Tobago</string>
+    <string name="country_region_name_tw">Taiwan</string>
+    <string name="country_region_name_tz">Tanzania</string>
+    <string name="country_region_name_ua">Ukraine</string>
+    <string name="country_region_name_ug">Uganda</string>
+    <string name="country_region_name_us">United States</string>
+    <string name="country_region_name_uy">Uruguay</string>
+    <string name="country_region_name_uz">Uzbekistan</string>
+    <string name="country_region_name_vc">Saint Vincent and the Grenadines</string>
+    <string name="country_region_name_ve">Venezuela</string>
+    <string name="country_region_name_vg">Virgin Islands, British</string>
+    <string name="country_region_name_vi">Virgin Islands, US</string>
+    <string name="country_region_name_vn">Vietnam</string>
+    <string name="country_region_name_vu">Vanuatu</string>
+    <string name="country_region_name_ws">Samoa</string>
+    <string name="country_region_name_ye">Yemen</string>
+    <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="data_privacy_button">Next</string>
+    <string name="data_privacy_content">It is important that you read the COVIDSafe *privacy policy* before you register for COVIDSafe.\n\nIf you are under 16 years of age, your parent/guardian must also read the *privacy policy*.\n\nUse of COVIDSafe is completely voluntary. You can install or delete the application at any time. If you delete COVIDSafe, *you may also ask for your information to be deleted* from the secure server.\n\nTo register for COVIDSafe, you will need to enter a name (or pseudonym), mobile number, age range and postcode.\n\nInformation you submit when you register, and information about your use of COVIDSafe will be collected and stored on a highly secure server.\n\nCOVIDSafe will not collect your location information.\n\nCOVIDSafe will note the time of contact, anonymous ID code of other COVIDSafe users you come into contact with, Bluetooth® signal strength and the phone model of other users, on your device.\n\nOther COVIDSafe users you come into contact with will also note your anonymous ID code, the date and time of contact with you, Bluetooth® signal strength and your phone model, on their device.\n\nIf another user tests positive to COVID-19, they may upload their contact information and a state or territory health official may contact you for contact tracing purposes. \n\nYour registration details will only be used or disclosed for contact tracing and for the proper and lawful functioning of COVIDSafe. \n\nMore information is available at the *Australian Government Department of Health* website.\n\nSee the COVIDSafe *privacy policy* for further details about your rights about your information and how it will be handled and shared.</string>
+    <!-- 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="dialog_error_uploading_message">An error occurred while uploading your information, please try again.</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="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>
+    <string name="enter_number_for_example">For example:</string>
+    <string name="enter_number_headline">Enter your mobile number</string>
+    <string name="enter_number_prefix">+61</string>
+    <string name="enter_number_relative">Trying to register on behalf of a friend or relative?\n\nThey will need to register using their own device and phone number so that COVIDSafe can work for them. </string>
+    <string name="enter_pin_button">Verify</string>
+    <!-- OnBoarding Enter PIN -->
+    <string name="enter_pin_headline" formatted="false">Enter the PIN sent to %s %s</string>
+    <string name="enter_pin_resend_pin">Resend PIN</string>
+    <string name="enter_pin_timer_expire">Your PIN will expire in</string>
+    <string name="enter_pin_wrong_number">Is this mobile number wrong?</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="home_app_permission_push_notification_prompt">Allow COVIDSafe to push notifications.</string>
+    <string name="home_app_permission_status_subtitle">COVIDSafe won\'t work without the right settings. </string>
+    <string name="home_app_permission_status_title">Check your settings</string>
+    <string name="home_been_tested_title">Has a health official asked you to upload your data?</string>
+    <string name="home_bluetooth_permission">Bluetooth®: %s</string>
+    <string name="home_data_has_been_uploaded">Your data has been uploaded</string>
+    <string name="home_data_has_been_uploaded_message">You\’re helping stop the spread of COVID-19 by uploading your data daily while in self-isolation.</string>
+    <string name="home_data_uploaded">Register for self isolation</string>
+    <string name="home_data_uploaded_button">Register</string>
+    <string name="home_data_uploaded_message">Help stop the spread of COVID-19 and track your symptoms.</string>
+    <string name="home_header_active_no_action_required">No further action is required.</string>
+    <!-- Home -->
+    <string name="home_header_active_title">COVIDSafe is active.</string>
+    <!-- Home -->
+    <string name="home_header_active_title_thanks">Thanks, COVIDSafe is now active.</string>
+    <string name="home_header_inactive_check_your_permissions">Check your settings.</string>
+    <string name="home_header_inactive_title">COVIDSafe is not active.</string>
+    <string name="home_header_no_pairing">COVIDSafe does not send *pairing requests*.</string>
+    <string name="home_header_uploaded_on_date">Your information was uploaded on %s.</string>
+    <string name="home_location_permission">Location: %s</string>
+    <string name="home_non_battery_optimization_permission">Battery optimisation: %s</string>
+    <string name="home_permission_off">Off</string>
+    <string name="home_permission_on">On</string>
+    <string name="home_push_notification_permission">Push Notification: %s</string>
+    <string name="home_set_complete_disclaimer_title">Let\'s stop the spread of COVID-19.</string>
+    <string name="home_set_complete_external_link_app_content">Download the government app for the latest news and advice.</string>
+    <string name="home_set_complete_external_link_app_title">Get the Coronavirus app</string>
+    <string name="home_set_complete_external_link_app_url">https://www.health.gov.au/resources/apps-and-tools/coronavirus-australia-app</string>
+    <string name="home_set_complete_external_link_been_contacted_content">You can only upload your information if you have tested positive.</string>
+    <string name="home_set_complete_external_link_been_contacted_title">Has a health official contacted you?</string>
+    <string name="home_set_complete_external_link_help_topics_content">If you have issues or questions about the app.</string>
+    <string name="home_set_complete_external_link_help_topics_title">Help topics</string>
+    <string name="home_set_complete_external_link_news_content">Head to aus.gov.au for the latest Coronavirus news.</string>
+    <string name="home_set_complete_external_link_news_title">Latest news and updates</string>
+    <string name="home_set_complete_external_link_news_url">https://www.australia.gov.au</string>
+    <string name="home_set_complete_external_link_self_isolation_register_url">https://covid-form.service.gov.au</string>
+    <string name="home_set_complete_external_link_share_content">Invite others to help. Together, we’re stronger.</string>
+    <string name="home_set_complete_external_link_share_title">Share COVIDSafe</string>
+    <string name="home_setup_help">Help</string>
+    <string name="home_setup_incomplete_subtitle">COVIDSafe needs permission to access these features.</string>
+    <string name="home_setup_incomplete_title">Check\npermissions</string>
+    <string name="home_version_number">Version number:%s</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>
+    <!-- OnBoarding How it works -->
     <string name="how_it_works_headline">How COVIDSafe works</string>
+    <string name="how_it_works_headline_content_description">Heading, How COVIDSafe works</string>
     <string name="intro_button">I want to help</string>
     <string name="intro_content">COVIDSafe has been developed by the Australian Government to help keep the community safe from the spread of coronavirus.\n\nCOVIDSafe will securely note contact that you have with other users of the app. This will allow state and territory health officials to contact you, if you have been in close contact with someone who has tested positive to the virus.\n\nTogether we can help stop the spread and stay healthy.</string>
+    <!-- OnBoarding Intro -->
     <string name="intro_headline">Together we can stop the spread of COVID-19</string>
+    <string name="intro_headline_content_description">Heading, Together we can stop the spread of COVID-19</string>
+    <string name="invalid_age">Age cannot be empty</string>
+    <string name="invalid_australian_phone_number_error_prompt">Australian mobile numbers contain a maximum of 10 digits.</string>
+    <string name="invalid_name">Invalid name</string>
+    <string name="invalid_norfolk_island_phone_number_error_prompt">Mobile numbers in Norfolk Island contain 5 to 6 digits.</string>
+    <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>
+    <!-- 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="navigation_back_button_content_description">Previous page</string>
+    <string name="notification_active_body">Keep COVIDSafe active when you leave home or are in public places.</string>
+    <!-- Notifications -->
+    <string name="notification_active_title">COVIDSafe is active</string>
+    <string name="notification_not_active_body">Make sure COVIDSafe is active before you leave home or when in public places.</string>
+    <string name="notification_not_active_title">COVIDSafe is not active</string>
+    <string name="options_for_australia">Options for Australia</string>
+    <string name="permission_button">Proceed</string>
+    <string name="permission_content">COVIDSafe needs Bluetooth® and notifications enabled to work.\n\nSelect ‘Proceed’ to:\n\n1. Enable Bluetooth®\n\n2. Allow Location permissions\n\n3. Disable Battery optimisation\n\n\nAndroid needs Location permissions for Bluetooth® to work.\n\nCOVIDSafe does not send pairing requests.</string>
+    <!-- OnBoarding Permission -->
+    <string name="permission_headline">App settings</string>
+    <string name="permission_location_rationale">Android requires location access to enable Bluetooth® functions for COVIDSafe. COVIDSafe cannot work properly without it</string>
+    <string name="permission_success_button">Done</string>
+    <string name="permission_success_content">1. When you leave home, keep your phone with you and make sure COVIDSafe is active.\n\n2. Bluetooth® should be kept ON.\n\n3. Battery optimisation should be OFF.\n\n4. COVIDSafe does not send pairing requests. *Learn more*.</string>
+    <!-- OnBoarding Permission Success -->
+    <string name="permission_success_headline">You\'ve successfully registered</string>
+    <string name="permission_success_warning">Keep push notifications on for COVIDSafe so we can notify you quickly if the app isn\'t working properly.</string>
+    <string name="personal_details_age_content_description">Select age range</string>
+    <string name="personal_details_age_dialog_title">Select your age</string>
+    <string name="personal_details_age_error_prompt">Please select your age range.</string>
+    <string name="personal_details_age_title">Age range (select)</string>
+    <string name="personal_details_button">Continue</string>
+    <string name="personal_details_dialog_ok">Select</string>
+    <!-- OnBoarding Personal details -->
+    <string name="personal_details_headline">Enter your details</string>
+    <string name="personal_details_headline_content_description">Heading, Enter your details</string>
+    <string name="personal_details_name_content_description">Enter full name</string>
+    <string name="personal_details_name_error_prompt">Please enter your full name.</string>
+    <string name="personal_details_name_title">Full name (or pseudonym)</string>
+    <string name="personal_details_post_code">Postcode in Australia</string>
+    <string name="personal_details_post_code_content_description">Enter postcode</string>
+    <string name="personal_details_post_code_dialog_title">Postcode</string>
+    <string name="personal_details_post_code_error_prompt">Your Australian postcode number must contain 4 digits. </string>
+    <string name="personal_details_post_code_hint">e.g. 2000</string>
+    <string name="registration_consent_content">I consent to the Digital Transformation Agency as data store administrator, under legal determination made by the Secretary of the Australian Government Department of Health collecting:</string>
+    <string name="registration_consent_first_paragraph">My registration information.</string>
+    <!-- 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="search">Search</string>
+    <!-- OnBoarding Enter Number -->
+    <string name="select_country_or_region">Select country or region</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="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="title_help">Help</string>
-    <string name="dialog_error_uploading_negative">Cancel</string>
-    <string name="dialog_error_uploading_positive">Try again</string>
-    <string name="dialog_error_uploading_message">An error occurred while uploading your information, please 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="generic_internet_error">Please check your internet connection</string>
-    <string name="generic_error">Please try again later</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 -->
+    <string name="under_sixteen_headline">You need the consent of your parent/guardian to proceed</string>
+    <string name="under_sixteen_headline_content_description">Heading, You need the consent of your parent/guardian to proceed</string>
+    <string name="under_sixteen_second_paragraph">Information about my contact with other COVIDSafe users, if another user I have come into contact with tests positive for COVID-19 and uploads their contact data.</string>
+    <string name="upload_answer_no">No</string>
+    <!-- Upload flow -->
+    <string name="upload_answer_yes">Yes</string>
+    <string name="upload_consent_button">I agree</string>
+    <string name="upload_failed">Upload failed</string>
+    <string name="upload_finished_header">Thank you for helping to stop the spread of COVID-19!</string>
+    <string name="upload_finished_header_content_description">Heading, Thank you for helping to stop the spread of COVID-19!</string>
+    <string name="upload_finished_sub_header">You have successfully uploaded your information to the COVIDSafe highly secure storage system.\n\nState or territory health officials will notify other COVIDSafe users that have recorded instances of close contact with you. Your identity will remain anonymous to other users.</string>
+    <string name="upload_step_1_body">Only if you test positive to COVID-19 will a state or territory health official contact you to assist with voluntary upload of your information.\n\nOnce you press ‘Yes’ you’ll need to provide consent to upload your information. </string>
+    <string name="upload_step_1_header">Is a health official asking you to upload your information?</string>
+    <string name="upload_step_1_header_content_description">Heading, Is a health official asking you to upload your information?</string>
+    <string name="upload_step_4_header"> Upload consent</string>
+    <string name="upload_step_4_header_content_description">Heading, Upload consent</string>
+    <string name="upload_step_4_sub_header">Unless you consent, your contact data will not be uploaded.\n\nIf you consent, your contact data will be uploaded and shared with state or territory health officials for contact tracing purposes.\n\nState and territory health officials will only be able to access information about your close contacts.\n\nRead the COVIDSafe *privacy policy* for further details.</string>
+    <string name="upload_step_verify_pin_header">Upload your information</string>
+    <string name="upload_step_verify_pin_header_content_description">Heading, Upload your information</string>
+    <string name="upload_step_verify_pin_sub_header">A state or territory health official will send a PIN to your device via text message. Enter it below to upload your information.</string>
+    <string name="us_consent_button">I agree</string>
+    <string name="wrong_ping_number"> Wrong PIN entered</string>
+
+    <string name="battery_optimisation_prompt">You must disable battery optimisation.</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="country_region_name_au2">Norfolk Island</string>
+    <string name="country_region_name_cu">Cuba</string>
+    <string name="country_region_name_cw">Curaçao</string>
+    <string name="country_region_name_ir">Iran</string>
+    <string name="country_region_name_sd">Sudan</string>
+    <string name="disabled">Disabled</string>
+    <string name="done_success">Done</string>
+    <string name="enabled">Enabled</string>
+    <!-- Figma page Android Screens (05/06) -->
+    <string name="Enter_your_mobile_number_label">Enter your mobile number</string>
+    <string name="heading">Heading</string>
+    <string name="improve_heading">Improve the performance of COVIDSafe</string>
+    <string name="internet_connection_content">Connect to the internet to ensure you get notified of issues and updates.</string>
+    <string name="internet_connection_heading">No internet connection</string>
+    <string name="internet_screen_content">COVIDSafe needs to connect to the server from time to time to ensure it can identify issues with the app.\n\nConnecting to the internet ensures you receive notifications on:</string>
+    <string name="internet_screen_content_1">how to fix issues and set COVIDSafe active again</string>
+    <string name="internet_screen_content_2">when a new version update is available</string>
+    <string name="internet_screen_heading">Connect to the internet to improve the performance of COVIDSafe</string>
+    <string name="need_location_service">For COVIDSafe to work you need to turn on Location in Settings.</string>
+    <!-- Figma page Android Screens (05/06) -->
+    <string name="norfolk_hint">For example: 51234</string>
+    <string name="notification_update_content">Update your app to access the latest improvements.</string>
+    <string name="notification_update_heading">COVIDSafe update available </string>
+    <string name="personal_details_name_characters_prompt">Please use English characters for your full name. Do not use other languages or symbols like \',\' or \'?\'.</string>
+    <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="ReceivePinIssue">Issues receiving your PIN?</string>
+    <!-- Figma page Android Screens (05/06) -->
+    <string name="Select_country_or_region_headline">Select country or region</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="stepCounter" formatted="false">Step %d of %d</string>
+    <!-- Figma page Android Screens (05/06) -->
+    <string name="under_sixteen_registration_consent_first_paragraph">My registration information.</string>
+    <!-- Figma page Android Screens (05/06) -->
+    <string name="under_sixteen_consent_call_for_action">Select \'I agree\' to confirm consent. </string>
+    <string name="update_available_dismiss_btn">Remind me later</string>
+    <string name="update_available_message_android">We’ve been making improvements to COVIDSafe. Update via Google Play Store.</string>
+    <string name="update_available_play_store_btn">Go to Google Play Store</string>
+    <string name="update_available_title">Update available!</string>
 </resources>