From cab6cb15108b11533f0dbd08a2b65fa9aa788419 Mon Sep 17 00:00:00 2001
From: COVIDSafe Support <64945427+covidsafe-support@users.noreply.github.com>
Date: Fri, 10 Dec 2021 19:05:42 +1100
Subject: [PATCH] COVIDSafe code from version 2.9 (#55)

---
 CovidSafe.xcodeproj/project.pbxproj           |  32 ++--
 CovidSafe/Base.lproj/Main.storyboard          |  39 ++++-
 CovidSafe/NSMutableString + Extensions.swift  |  46 ++++-
 CovidSafe/PrivacyPolicyViewController.swift   |   2 +
 .../RegistrationConsentViewController.swift   |  13 ++
 CovidSafe/UITextView + Extensions.swift       |   1 +
 CovidSafe/UnderSixteenViewController.swift    |  15 ++
 CovidSafe/ar.lproj/Localizable.strings        | 154 ++++++++--------
 CovidSafe/el.lproj/Localizable.strings        | 164 +++++++++---------
 CovidSafe/en.lproj/Localizable.strings        | 158 +++++++++--------
 CovidSafe/it.lproj/Localizable.strings        | 158 +++++++++--------
 CovidSafe/ko.lproj/Localizable.strings        | 158 +++++++++--------
 CovidSafe/pa-IN.lproj/Localizable.strings     | 156 +++++++++--------
 CovidSafe/tr.lproj/Localizable.strings        | 154 ++++++++--------
 CovidSafe/vi.lproj/Localizable.strings        | 158 +++++++++--------
 CovidSafe/zh-Hans.lproj/Localizable.strings   | 158 +++++++++--------
 CovidSafe/zh-Hant.lproj/Localizable.strings   | 158 +++++++++--------
 scripts/lokalise.sh                           |   6 +-
 18 files changed, 944 insertions(+), 786 deletions(-)

diff --git a/CovidSafe.xcodeproj/project.pbxproj b/CovidSafe.xcodeproj/project.pbxproj
index 34ce436..207b562 100644
--- a/CovidSafe.xcodeproj/project.pbxproj
+++ b/CovidSafe.xcodeproj/project.pbxproj
@@ -1979,7 +1979,7 @@
 				CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 132;
+				CURRENT_PROJECT_VERSION = 135;
 				DEVELOPMENT_TEAM = 45792XH5L8;
 				INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -1987,7 +1987,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.8;
+				MARKETING_VERSION = 2.9;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe;
 				PRODUCT_NAME = COVIDSafe;
@@ -2063,7 +2063,7 @@
 				CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 132;
+				CURRENT_PROJECT_VERSION = 135;
 				DEVELOPMENT_TEAM = 45792XH5L8;
 				INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -2071,7 +2071,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.8;
+				MARKETING_VERSION = 2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe;
 				PRODUCT_NAME = COVIDSafe;
 				PROVISIONING_PROFILE_SPECIFIER = COVIDSafe;
@@ -2091,7 +2091,7 @@
 				CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 132;
+				CURRENT_PROJECT_VERSION = 135;
 				DEVELOPMENT_TEAM = 45792XH5L8;
 				INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/staging-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -2099,7 +2099,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.8;
+				MARKETING_VERSION = 2.9;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe.uat;
@@ -2121,7 +2121,7 @@
 				CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 132;
+				CURRENT_PROJECT_VERSION = 135;
 				DEVELOPMENT_TEAM = 45792XH5L8;
 				INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/staging-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -2129,7 +2129,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.8;
+				MARKETING_VERSION = 2.9;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe.uat;
@@ -2151,7 +2151,7 @@
 				CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 132;
+				CURRENT_PROJECT_VERSION = 135;
 				DEVELOPMENT_TEAM = 45792XH5L8;
 				INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/staging-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -2159,7 +2159,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.8;
+				MARKETING_VERSION = 2.9;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe.uat;
 				PRODUCT_MODULE_NAME = COVIDSafe;
@@ -2181,7 +2181,7 @@
 				CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 132;
+				CURRENT_PROJECT_VERSION = 135;
 				DEVELOPMENT_TEAM = 45792XH5L8;
 				INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/staging-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -2189,7 +2189,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.8;
+				MARKETING_VERSION = 2.9;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe.uat;
 				PRODUCT_MODULE_NAME = COVIDSafe;
@@ -2329,7 +2329,7 @@
 				CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 132;
+				CURRENT_PROJECT_VERSION = 135;
 				DEVELOPMENT_TEAM = 45792XH5L8;
 				INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -2337,7 +2337,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.8;
+				MARKETING_VERSION = 2.9;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe;
 				PRODUCT_NAME = COVIDSafe;
@@ -2357,7 +2357,7 @@
 				CODE_SIGN_ENTITLEMENTS = "CovidSafe/Project Bluetrace.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 132;
+				CURRENT_PROJECT_VERSION = 135;
 				DEVELOPMENT_TEAM = 45792XH5L8;
 				INFOPLIST_FILE = "$(SRCROOT)/CovidSafe/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -2365,7 +2365,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.8;
+				MARKETING_VERSION = 2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = au.gov.health.covidsafe;
 				PRODUCT_NAME = COVIDSafe;
 				PROVISIONING_PROFILE_SPECIFIER = COVIDSafe;
diff --git a/CovidSafe/Base.lproj/Main.storyboard b/CovidSafe/Base.lproj/Main.storyboard
index 21325aa..677136e 100644
--- a/CovidSafe/Base.lproj/Main.storyboard
+++ b/CovidSafe/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="8X4-AC-7cb">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="8X4-AC-7cb">
     <device id="retina5_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -235,7 +235,7 @@
                                                 </constraints>
                                             </imageView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Together we can stop the spread of COVID-19" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="00h-JA-MfK">
-                                                <rect key="frame" x="32" y="208" width="354.66666666666669" height="61"/>
+                                                <rect key="frame" x="32" y="208" width="355" height="61"/>
                                                 <accessibility key="accessibilityConfiguration">
                                                     <accessibilityTraits key="traits" staticText="YES" header="YES"/>
                                                 </accessibility>
@@ -841,7 +841,7 @@ They will need to register using their own device and phone number so that COVID
                         <color key="sectionIndexBackgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="CountryCell" id="8do-WN-Rfo" customClass="CountryCellViewCell" customModule="COVIDSafe" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="24.333333969116211" width="414" height="66.333335876464844"/>
+                                <rect key="frame" x="0.0" y="44.666666030883789" width="414" height="66.333335876464844"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="8do-WN-Rfo" id="jdA-4g-Z20">
                                     <rect key="frame" x="0.0" y="0.0" width="414" height="66.333335876464844"/>
@@ -1666,6 +1666,7 @@ For more information please refer to the *Help Topics* page.</string>
                     <navigationItem key="navigationItem" id="CfU-xv-EVP"/>
                     <nil key="simulatedTopBarMetrics"/>
                     <connections>
+                        <outlet property="introLabel" destination="l6E-t2-z2H" id="ZsP-2z-5c5"/>
                         <segue destination="tmd-7A-Wz4" kind="show" identifier="iConsentSegue" id="h8R-i7-zdK"/>
                     </connections>
                 </viewController>
@@ -1740,7 +1741,7 @@ See the COVIDSafe *privacy policy* for further details about your rights about y
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                                 <userDefinedRuntimeAttributes>
-                                                    <userDefinedRuntimeAttribute type="string" keyPath="localizationKey" value="data_privacy_content"/>
+                                                    <userDefinedRuntimeAttribute type="string" keyPath="localizationKey" value="data_privacy_content_android"/>
                                                 </userDefinedRuntimeAttributes>
                                             </textView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Registration and privacy" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Q0u-wa-fYL">
@@ -2159,7 +2160,7 @@ See the COVIDSafe *privacy policy* for further details about your rights about y
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HxI-sW-1by">
-                                <rect key="frame" x="0.0" y="0.0" width="414" height="647"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="592"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DY3-Bs-8h2" userLabel="ContentView">
                                         <rect key="frame" x="0.0" y="0.0" width="414" height="414.66666666666669"/>
@@ -2304,7 +2305,7 @@ See the COVIDSafe *privacy policy* for further details about your rights about y
                                 </constraints>
                             </scrollView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="C8B-6S-UGU">
-                                <rect key="frame" x="32" y="655" width="350" height="49"/>
+                                <rect key="frame" x="32" y="600" width="350" height="49"/>
                                 <color key="backgroundColor" red="0.0" green="0.40000000000000002" blue="0.1058823529" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <accessibility key="accessibilityConfiguration" hint="please consent to proceed"/>
                                 <constraints>
@@ -2321,20 +2322,42 @@ See the COVIDSafe *privacy policy* for further details about your rights about y
                                     <action selector="doneOntap:" destination="GKS-Wl-QbF" eventType="touchUpInside" id="h4R-Sa-TOb"/>
                                 </connections>
                             </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iQ8-ni-wBl">
+                                <rect key="frame" x="32" y="657" width="350" height="49"/>
+                                <color key="backgroundColor" red="0.63921568630000003" green="0.098039215690000001" blue="0.098039215690000001" alpha="1" colorSpace="calibratedRGB"/>
+                                <accessibility key="accessibilityConfiguration" hint="please consent to proceed"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="49" id="rAk-ex-har"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
+                                <state key="normal" title="I do not agree">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                </state>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="localizationKey" value="non_consent_button"/>
+                                </userDefinedRuntimeAttributes>
+                                <connections>
+                                    <action selector="dontAgreeTapped:" destination="GKS-Wl-QbF" eventType="touchUpInside" id="k3S-GY-BY0"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
+                            <constraint firstItem="iQ8-ni-wBl" firstAttribute="top" secondItem="C8B-6S-UGU" secondAttribute="bottom" constant="8" id="0f8-Pe-Dmy"/>
                             <constraint firstItem="C8B-6S-UGU" firstAttribute="leading" secondItem="C9Z-le-9Gl" secondAttribute="leading" constant="32" id="Dqh-2I-raE"/>
+                            <constraint firstAttribute="trailing" secondItem="iQ8-ni-wBl" secondAttribute="trailing" constant="32" id="M2m-XF-j7y"/>
                             <constraint firstItem="C8B-6S-UGU" firstAttribute="top" secondItem="HxI-sW-1by" secondAttribute="bottom" constant="8" id="Vzy-X6-5Gx"/>
-                            <constraint firstItem="n1U-7K-j10" firstAttribute="top" secondItem="C8B-6S-UGU" secondAttribute="bottom" constant="32" id="dgy-9q-XRO"/>
                             <constraint firstItem="HxI-sW-1by" firstAttribute="trailing" secondItem="C9Z-le-9Gl" secondAttribute="trailing" id="g0Z-zj-hkW"/>
                             <constraint firstItem="HxI-sW-1by" firstAttribute="top" secondItem="igf-1X-v6T" secondAttribute="bottom" id="ld9-RV-hXG"/>
                             <constraint firstItem="HxI-sW-1by" firstAttribute="leading" secondItem="C9Z-le-9Gl" secondAttribute="leading" id="sCn-WT-Ne1"/>
+                            <constraint firstItem="iQ8-ni-wBl" firstAttribute="leading" secondItem="C9Z-le-9Gl" secondAttribute="leading" constant="32" id="skQ-F4-gqI"/>
                             <constraint firstAttribute="trailing" secondItem="C8B-6S-UGU" secondAttribute="trailing" constant="32" id="t6r-v9-G5t"/>
+                            <constraint firstItem="n1U-7K-j10" firstAttribute="top" secondItem="iQ8-ni-wBl" secondAttribute="bottom" constant="30" id="vsw-TU-gAS"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="Stz-cr-egJ"/>
                     <connections>
+                        <outlet property="introLabel" destination="QDG-kZ-uPM" id="oKa-Xo-hJ5"/>
                         <outlet property="stepCounterLabel" destination="phd-aD-1If" id="Zlo-Ih-5hz"/>
                         <segue destination="mND-9i-sIw" kind="show" identifier="under16Consent" id="bMl-IY-pjw"/>
                     </connections>
diff --git a/CovidSafe/NSMutableString + Extensions.swift b/CovidSafe/NSMutableString + Extensions.swift
index b34be7a..d126c07 100644
--- a/CovidSafe/NSMutableString + Extensions.swift	
+++ b/CovidSafe/NSMutableString + Extensions.swift	
@@ -6,7 +6,8 @@ public extension NSMutableAttributedString {
     
     enum ElementType {
         case Link,
-        Bold
+        Bold,
+        Italic
     }
     
     func parseHTMLLinks() {
@@ -25,6 +26,14 @@ public extension NSMutableAttributedString {
         }
     }
     
+    func parseItalicTags() {
+        let regexItalicStartElementString = #"\<i(.*?)\>"#
+        let regexItalicEndElementTextString = #"\<\/i\>"#
+        while canParseOccurence(elementStartRegex: regexItalicStartElementString, elementEndRegex: regexItalicEndElementTextString) {
+            parseHtmlOccurence(elementStartRegex: regexItalicStartElementString, elementEndRegex: regexItalicEndElementTextString, elementType: .Italic)
+        }
+    }
+    
     func canParseOccurence(elementStartRegex: String, elementEndRegex: String) -> Bool {
         guard string.range(of: elementStartRegex, options: .regularExpression) != nil else {
             return false
@@ -72,6 +81,11 @@ public extension NSMutableAttributedString {
             replaceCharacters(in: nsEndElementRange, with: "#")
             replaceCharacters(in: nsStartElementRange, with: "#")
             addBold(enclosedIn: "#")
+        case .Italic:
+            //remove bold marking from text
+            replaceCharacters(in: nsEndElementRange, with: "%")
+            replaceCharacters(in: nsStartElementRange, with: "%")
+            addItalic(enclosedIn: "%")
         }
         
     }
@@ -136,4 +150,34 @@ public extension NSMutableAttributedString {
         
         return true
     }
+    
+    @discardableResult
+    func addItalic(enclosedIn marker: String) -> Bool {
+        guard !marker.isEmpty else { return false }
+        
+        let regexString = "\(marker)(.*?)\(marker)"
+        guard let strRange = string.range(of: regexString, options: .regularExpression) else {
+            return false
+        }
+        let convertedRange = NSRange(strRange, in: string)
+        
+        let matchingString = string[strRange]
+        let enclosedString = matchingString.replacingOccurrences(of: marker, with: "")
+        let nsBeginRange = NSRange(location: convertedRange.location, length: marker.count)
+        let nsEndRange = NSRange(location: convertedRange.upperBound - marker.count, length: marker.count)
+        // first replace end, otherwise the range will change
+        replaceCharacters(in: nsEndRange, with: "")
+        replaceCharacters(in: nsBeginRange, with: "")
+        
+        let linkRange = NSRange(location: convertedRange.location, length: enclosedString.count)
+        
+        // for now only supporting body. Need to get the UIFont from the current string.
+        let attributes: [NSAttributedString.Key: Any] = [
+            .font: UIFont.preferredFont(forTextStyle: .body).italic()
+        ]
+        
+        addAttributes(attributes, range: linkRange)
+        
+        return true
+    }
 }
diff --git a/CovidSafe/PrivacyPolicyViewController.swift b/CovidSafe/PrivacyPolicyViewController.swift
index b21a3ae..9ba1e01 100644
--- a/CovidSafe/PrivacyPolicyViewController.swift
+++ b/CovidSafe/PrivacyPolicyViewController.swift
@@ -45,11 +45,13 @@ class PrivacyPolicyViewController: UIViewController, UITextViewDelegate {
         super.viewDidLoad()
         let privacyPolicyUrl = URLHelper.getPrivacyPolicyURL()
         privacyText.delegate = self
+        privacyText.parseHTMLTags()
         privacyText.addLink(privacyPolicyUrl, enclosedIn: "*")
         privacyText.addLink(privacyPolicyUrl, enclosedIn: "*")
         privacyText.addLink("\(URLHelper.getHelpURL())#delete-information", enclosedIn: "*")
         privacyText.addLink("https://covidsafe.gov.au", enclosedIn: "*")
         privacyText.addLink(privacyPolicyUrl, enclosedIn: "*")
+        privacyText.addLink("\(privacyPolicyUrl)#contact-us", enclosedIn: "*")
     }
 
 }
diff --git a/CovidSafe/RegistrationConsentViewController.swift b/CovidSafe/RegistrationConsentViewController.swift
index 0621e24..db1c8ce 100644
--- a/CovidSafe/RegistrationConsentViewController.swift
+++ b/CovidSafe/RegistrationConsentViewController.swift
@@ -9,6 +9,19 @@ import UIKit
 
 class RegistrationConsentViewController: UIViewController {
     
+    @IBOutlet weak var introLabel: UILabel!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        guard let attributedString = introLabel.attributedText else {
+            return
+        }
+        let mutableString = NSMutableAttributedString(attributedString: attributedString)
+        mutableString.parseItalicTags()
+        introLabel.attributedText = mutableString
+    }
+    
     @IBAction func onBackTapped(_ sender: UIButton) {
         self.navigationController?.popViewController(animated: true)
     }
diff --git a/CovidSafe/UITextView + Extensions.swift b/CovidSafe/UITextView + Extensions.swift
index 879b02d..98af7fd 100644
--- a/CovidSafe/UITextView + Extensions.swift	
+++ b/CovidSafe/UITextView + Extensions.swift	
@@ -28,6 +28,7 @@ extension UITextView {
         let mutableString = NSMutableAttributedString(attributedString: attributedText)
         mutableString.parseHTMLLinks()
         mutableString.parseBoldTags()
+        mutableString.parseItalicTags()
         self.attributedText = mutableString
         tintColor = UIColor.covidSafeColor
     }
diff --git a/CovidSafe/UnderSixteenViewController.swift b/CovidSafe/UnderSixteenViewController.swift
index 433bf00..8860247 100644
--- a/CovidSafe/UnderSixteenViewController.swift
+++ b/CovidSafe/UnderSixteenViewController.swift
@@ -15,6 +15,7 @@ class UnderSixteenViewController: UIViewController, RegistrationHandler {
     public var reauthenticating: Bool = false
     
     @IBOutlet weak var stepCounterLabel: UILabel!
+    @IBOutlet weak var introLabel: UILabel!
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -23,6 +24,13 @@ class UnderSixteenViewController: UIViewController, RegistrationHandler {
             1,
             4
         )
+        
+        guard let attributedString = introLabel.attributedText else {
+            return
+        }
+        let mutableString = NSMutableAttributedString(attributedString: attributedString)
+        mutableString.parseItalicTags()
+        introLabel.attributedText = mutableString
     }
     
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
@@ -39,4 +47,11 @@ class UnderSixteenViewController: UIViewController, RegistrationHandler {
         performSegue(withIdentifier: "under16Consent", sender: nil)
     }
 
+    @IBAction func dontAgreeTapped(_ sender: Any) {
+        let errorAlert = UIAlertController(title: "",
+                                           message: "non_consent_popup".localizedString(),
+                                           preferredStyle: .alert)
+        errorAlert.addAction(UIAlertAction(title: "global_OK".localizedString(), style: .default))
+        present(errorAlert, animated: true)
+    }
 }
diff --git a/CovidSafe/ar.lproj/Localizable.strings b/CovidSafe/ar.lproj/Localizable.strings
index 71565e5..48cf4ed 100644
--- a/CovidSafe/ar.lproj/Localizable.strings
+++ b/CovidSafe/ar.lproj/Localizable.strings
@@ -1,3 +1,38 @@
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothOFF" = "الوصول إلى Bluetooth®: متوقف";
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothON" = "الوصول إلى Bluetooth: مشغّل";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF" = "\U200FBluetooth®: متوقف";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF_content" = "شغِّل Bluetooth® على هاتفك، اختر \"السماح باتصالات جديدة\" في حال ظهورها.";
+/* Figma page iOS Screens (05/06) */
+"BluetoothON" = "Bluetooth®: مشغّل";
+/* Figma page Android Screens (05/06) */
+"Enter_your_mobile_number_label" = "أدخل رقم هاتفك المحمول";
+/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
+"IntroLabel" = "ساعد في وقف الانتشار\nوإنقاذ الأرواح.";
+/* Figma page iOS Screens (05/06) */
+"NotificationsBlurbLink" = "تغيير إعدادات الإشعارات";
+/* Figma page iOS Screens (05/06) */
+"NotificationsDisabledBlurb" = "لن تتلقى إشعارًا إذا كان تطبيق COVIDSafe لا يعمل. \nغيّر إعدادات الإشعارات";
+/* Figma page iOS Screens (05/06) */
+"NotificationsEnabledBlurb" = "سوف تتلقى إشعارًا إذا كان تطبيق COVIDSafe لا يعمل. غيّر إعدادات الإشعارات";
+"OS2b_Item_4" = "4. يتطلب جهاز iphone الخاص بك تشغيل الموقع الجغرافي ليتمكن تطبيق COVIDSafe من العمل. *لا يقوم تطبيق COVIDSafe بجمع بيانات الموقع الجغرافي أو تخزينها أو استخدامها*";
+"PINNumber_VO_Label" = "رقم التعريف الشخصي PIN";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusBody" = "تأكد من أن التطبيق يعمل قبل مغادرتك المنزل وعند وجودك في الأماكن العامة من خلال تمكين Bluetooth®.";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusTitle" = "\U200F COVIDSafe لا يعمل";
+"PN_MobileNumber_VOLabel" = "رقم الهاتف المحمول";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderBody" = "افتح تطبيق COVIDSafe لتتأكد من أنه يعمل.";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderTitle" = "لم يتم اكتشاف أي لقاءات لمدة 48 ساعة";
+"PostcodeValidationErrorMessage" = "يُرجى إدخال رمز بريدي أسترالي صالح.";
+/* Figma page Android Screens (05/06) */
+"Select_country_or_region_headline" = "اختر البلد أو المنطقة";
+"Support_VOLabel" = "الدعم. للحصول على مساعدة بشأن المشكلات التي لا تغطيها مواضيع المساعدة";
 "action_continue" = "تابع";
 "action_report_an_issue" = "بلِّغ عن مشكلة";
 "action_upload_done" = "تمّ";
@@ -11,20 +46,10 @@
 "activity_intro_2" = "";
 /* Figma page iOS Screens (05/06) */
 "allow_bluetooth_call" = "السماح لتطبيق COVIDSafe بالوصول إلى Bluetooth®";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothOFF" = "الوصول إلى Bluetooth®: متوقف";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothON" = "الوصول إلى Bluetooth: مشغّل";
 "app_activity_bluetooth_handshakes_heading" = "";
 "australian_capital_territory" = "إقليم العاصمة الأسترالية";
 "ble_handshakes_yesterday" = "";
 "bluetooth_handshakes" = "مصافحات \U200F Bluetooth";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF" = "\U200FBluetooth®: متوقف";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF_content" = "شغِّل Bluetooth® على هاتفك، اختر \"السماح باتصالات جديدة\" في حال ظهورها.";
-/* Figma page iOS Screens (05/06) */
-"BluetoothON" = "Bluetooth®: مشغّل";
 "cancel_snooze" = "إلغاء الغفوة";
 "cases_28_days" = "الحالات الجديدة في ال 28 يومًا الماضية";
 "cases_7_days" = "الحالات الجديدة في آخر 7 أيام";
@@ -250,8 +275,9 @@
 "country_region_name_zw" = "زيمبابوي";
 "customise_days" = "تخصيص الأيام";
 "data_privacy_button" = "التالي";
-"data_privacy_content" = "من المهم أن تقرأ *سياسة الخصوصية* لتطبيق COVIDSafe قبل التسجيل.\n\nسيقوم COVIDSafe بجمع معلوماتك الشخصية أو استخدامها أو الكشف عنها فقط بما يتماشى مع هذه السياسة وقانون الخصوصية لعام 1988.\n\n إذا كان عمرك يقل عن 16 عاماً، يجب على أحد والديك/الوصي عليك أيضاً قراءة *سياسة الخصوصية*. \n\nاستخدام تطبيق COVIDSafe هو أمر إختياري تماماً. يمكنك تثبيت التطبيق أو حذفه في أي وقت. إذا قمت بحذف تطبيق COVIDSafe، *يمكنك أيضاً طلب حذف معلوماتك* من الخادم الآمن. \n\nللتسجيل في تطبيق COVIDSafe، ستحتاج إلى إدخال اسم (أو اسم مستعار) ورقم هاتف محمول وفئة عمرية ورمز بريدي. \n\n يتم تخزين المعلومات التي تعطيها عند التسجيل، والمعلومات المتعلقة باستخدامك لتطبيق COVIDSafe في خادم آمن للغاية. \n\nيتم جمع المعلومات أيضًا للتأكد من أن تطبيق COVIDSafe يعمل بشكل صحيح على جهازك، ويتضمن ذلك نظام تشغيل جهازك وإصدار التطبيق الذي قمت بتثبيته واللغة التي تستخدمها في جهازك وما إذا كانت تقنية Bluetooth® تعمل وما إذا كان التطبيق الخاص بك قد سجل أي لقاءات في الأيام السبعة السابقة.\n\nلن يقوم تطبيق COVIDSafe بجمع معلومات عن موقعك الجغرافي. \n\nسيسجل تطبيق COVIDSafe تاريخ ووقت الاتصال والرمز مجهول الهوية لمستخدمي COVIDSafe الآخرين الذين تتواصل معهم وقوة إشارة Bluetooth، وطراز الهاتف المحمول للمستخدمين الآخرين على جهازك. \n\nكما سيسجل تطبيق COVIDSafe على أجهزة المستخدمين الآخرين الذين تتواصل معهم أيضاً الرمز مجهول الهوية الخاص بك وتاريخ ووقت الاتصال بك وقوة إشارة Bluetooth وطراز هاتفك المحمول.  \n\n إذا جاءت نتيجة فحص COVID-19 لمستخدم آخر إيجابية، فقد يقوم هذا المستخدم بتحميل تفاصيل الاتصال به وقد يتصل بك موظف من دائرة الصحة في الولاية أو الإقليم لأغراض تعقب الاختلاط. \n\n سيتم استخدام تفاصيل التسجيل الخاصة بك أو الكشف عنها فقط لتعقب الاختلاط ولتشغيل التطبيق بالطرق المناسبة والقانونية. \n\n يتوفر المزيد من المعلومات على الموقع الإلكتروني *covidsafe.gov.au*. \n\n راجع *سياسة الخصوصية* لتطبيق COVIDSafe للاطلاع على مزيد من التفاصيل حول حقوقك المتعلقة بمعلوماتك وكيف سيتم التعامل معها ومشاركتها.";
-"data_privacy_content_VO" = "من المهم أن تقرأ سياسة الخصوصية لتطبيق COVIDSafe قبل التسجيل. \n\nسيقوم COVIDSafe بجمع معلوماتك الشخصية أو استخدامها أو الكشف عنها فقط بما يتماشى مع هذه السياسة وقانون الخصوصية لعام 1988.\n\nإذا كان عمرك يقل عن 16 عاماً، يجب على أحد والديك/الوصي عليك أيضاً قراءة سياسة الخصوصية. \n\nاستخدام تطبيق COVIDSafe هو أمر إختياري تماماً. يمكنك تثبيت التطبيق أو حذفه في أي وقت. إذا قمت بحذف تطبيق COVIDSafe، يمكنك أيضاً طلب حذف معلوماتك من الخادم الآمن. \n \nللتسجيل في تطبيق COVIDSafe، ستحتاج إلى إدخال اسم (أو اسم مستعار) ورقم هاتف محمول وفئة عمرية ورمز بريدي. \n\n يتم تخزين المعلومات التي تعطيها عند التسجيل، والمعلومات المتعلقة باستخدامك لتطبيق COVIDSafe في خادم آمن للغاية. \n \n يتم جمع المعلومات أيضًا للتأكد من أن تطبيق COVIDSafe يعمل بشكل صحيح على جهازك، ويتضمن ذلك نظام تشغيل جهازك وإصدار التطبيق الذي قمت بتثبيته واللغة التي تستخدمها في جهازك وما إذا كانت تقنية Bluetooth تعمل وما إذا كان التطبيق الخاص بك قد سجل أي لقاءات في الأيام السبعة السابقة.\n\n لن يقوم تطبيق COVIDSafe بجمع معلومات عن موقعك الجغرافي. \n\nسيسجل تطبيق COVIDSafe تاريخ ووقت الاتصال والرمز مجهول الهوية لمستخدمي COVIDSafe الآخرين الذين تتواصل معهم وقوة إشارة Bluetooth، وطراز الهاتف المحمول للمستخدمين الآخرين على جهازك. \n\nكما سيسجل تطبيق COVIDSafe على أجهزة المستخدمين الآخرين الذين تتواصل معهم أيضاً الرمز مجهول الهوية الخاص بك وتاريخ ووقت الاتصال بك وقوة إشارة Bluetooth وطراز هاتفك المحمول.  \n\nإذا جاءت نتيجة فحص COVID-19 لمستخدم آخر إيجابية، فقد يقوم هذا المستخدم بتحميل تفاصيل الاتصال به وقد يتصل بك موظف من دائرة الصحة في الولاية أو الإقليم لأغراض تعقب الاختلاط.  \n\n سيتم استخدام تفاصيل التسجيل الخاصة بك أو الكشف عنها فقط لتعقب الاختلاط ولتشغيل COVIDSafe بالطرق المناسبة والقانونية. \n\nيتوفر المزيد من المعلومات على الموقع الإلكتروني covidsafe.gov.au.  \n\n راجع سياسة الخصوصية لتطبيق COVIDSafe للاطلاع على مزيد من التفاصيل حول حقوقك المتعلقة بمعلوماتك وكيف سيتم التعامل معها ومشاركتها.";
+"data_privacy_content" = "من المهم أن تقرأ سياسة الخصوصية لتطبيق COVIDSafe قبل التسجيل لتطبيق COVIDSafe. سيقوم COVIDSafe بجمع معلوماتك الشخصية أو استخدامها أو الكشف عنها فقط بما يتماشى مع هذه السياسة وقانون الخصوصية لعام 1988.\n\nإذا كان عمرك أقل من 16 عامًا، فيجب على أحد والديك/الوصي عليك أيضًا قراءة *سياسة الخصوصية*. \n\nاستخدام تطبيق COVIDSafe هو أمر طوعي بالكامل. يمكنك تثبيت التطبيق أو حذفه في أي وقت. إذا قمت بحذف تطبيق COVIDSafe، *فيمكنك أيضًا طلب حذف معلوماتك* من الخادم الآمن. إذا لم تقدم معلوماتك الشخصية، فلن يعمل تطبيق COVIDSafe على النحو المنشود. \n \nللتسجيل في تطبيق COVIDSafe، ستحتاج إلى إدخال اسم (أو اسم مستعار) ورقم هاتف محمول وفئة عمرية ورمز بريدي. \n\n يتم تخزين المعلومات التي تقدمها عند التسجيل، والمعلومات المتعلقة باستخدامك لتطبيق COVIDSafe في خادم آمن للغاية. \n \n يتم جمع المعلومات أيضًا للتأكد من أن تطبيق COVIDSafe يعمل بشكل صحيح على جهازك، ويتضمن ذلك نظام تشغيل جهازك وإصدار التطبيق الذي قمت بتثبيته واللغة التي تستخدمها في جهازك وما إذا كانت تقنية البلوتوث تعمل وما إذا كان التطبيق الخاص بك قد سجل أي لقاءات في الأيام السبعة السابقة.\n\n لن يقوم تطبيق COVIDSafe بجمع معلومات عن موقعك الجغرافي. \n\nسيسجل تطبيق COVIDSafe تاريخ ووقت الاتصال ورمز المعرف المشفر لمستخدمي COVIDSafe الآخرين الذين تتواصل معهم وقوة إشارة البلوتوث وطراز الهاتف المحمول للمستخدمين الآخرين على جهازك. \n\nسيسجل تطبيق COVIDSafe على أجهزة المستخدمين الآخرين الذين تتواصل معهم أيضًا رمز المعرف المشفر وتاريخ ووقت الاتصال بك وقوة إشارة البلوتوث وطراز هاتفك على أجهزتهم.\n\nإذا جاءت نتيجة فحص كوفيد-19 لمستخدم آخر إيجابية، فقد يقوم هذا المستخدم بتحميل تفاصيل الاتصال به وقد يتصل بك موظف من دائرة الصحة في الولاية أو الإقليم لأغراض تعقب المخالطة. \n\nسيتم استخدام تفاصيل التسجيل الخاصة بك أو الكشف عنها فقط لتقفّي المخالطة وللأغراض المناسبة والقانونية لتطبيق COVIDSafe. \n\nيتوفر المزيد من المعلومات على موقع الويب covidsafe.gov.au.\n\nتوفر سياسة خصوصية COVIDSafe مزيدًا من التفاصيل حول حقوقك فيما يتعلق بمعلوماتك وكيف سيتم التعامل معها ومشاركتها.\n\nيتم توفير تفاصيل الاتصال المتعلقة باستفسارات وشكاوى الخصوصية الخاصة بتطبيق COVIDSafe في سياسة الخصوصية ضمن اتصل بنا.";
+"data_privacy_content_VO" = "من المهم أن تقرأ سياسة الخصوصية لتطبيق COVIDSafe قبل التسجيل لتطبيق COVIDSafe. سيقوم COVIDSafe بجمع معلوماتك الشخصية أو استخدامها أو الكشف عنها فقط بما يتماشى مع هذه السياسة وقانون الخصوصية لعام 1988.\n\nإذا كان عمرك أقل من 16 عامًا، فيجب على أحد والديك/الوصي عليك أيضًا قراءة *سياسة الخصوصية*. \n\nاستخدام تطبيق COVIDSafe هو أمر طوعي بالكامل. يمكنك تثبيت التطبيق أو حذفه في أي وقت. إذا قمت بحذف تطبيق COVIDSafe، *فيمكنك أيضًا طلب حذف معلوماتك* من الخادم الآمن. إذا لم تقدم معلوماتك الشخصية، فلن يعمل تطبيق COVIDSafe على النحو المنشود. \n \nللتسجيل في تطبيق COVIDSafe، ستحتاج إلى إدخال اسم (أو اسم مستعار) ورقم هاتف محمول وفئة عمرية ورمز بريدي. \n\n يتم تخزين المعلومات التي تقدمها عند التسجيل، والمعلومات المتعلقة باستخدامك لتطبيق COVIDSafe في خادم آمن للغاية. \n \n يتم جمع المعلومات أيضًا للتأكد من أن تطبيق COVIDSafe يعمل بشكل صحيح على جهازك، ويتضمن ذلك نظام تشغيل جهازك وإصدار التطبيق الذي قمت بتثبيته واللغة التي تستخدمها في جهازك وما إذا كانت تقنية البلوتوث تعمل وما إذا كان التطبيق الخاص بك قد سجل أي لقاءات في الأيام السبعة السابقة.\n\n لن يقوم تطبيق COVIDSafe بجمع معلومات عن موقعك الجغرافي. \n\nسيسجل تطبيق COVIDSafe تاريخ ووقت الاتصال ورمز المعرف المشفر لمستخدمي COVIDSafe الآخرين الذين تتواصل معهم وقوة إشارة البلوتوث وطراز الهاتف المحمول للمستخدمين الآخرين على جهازك. \n\nسيسجل تطبيق COVIDSafe على أجهزة المستخدمين الآخرين الذين تتواصل معهم أيضًا رمز المعرف المشفر وتاريخ ووقت الاتصال بك وقوة إشارة البلوتوث وطراز هاتفك على أجهزتهم.\n\nإذا جاءت نتيجة فحص كوفيد-19 لمستخدم آخر إيجابية، فقد يقوم هذا المستخدم بتحميل تفاصيل الاتصال به وقد يتصل بك موظف من دائرة الصحة في الولاية أو الإقليم لأغراض تعقب المخالطة. \n\nسيتم استخدام تفاصيل التسجيل الخاصة بك أو الكشف عنها فقط لتقفّي المخالطة وللأغراض المناسبة والقانونية لتطبيق COVIDSafe. \n\nيتوفر المزيد من المعلومات على موقع الويب covidsafe.gov.au. \n\nتوفر سياسة خصوصية COVIDSafe مزيدًا من التفاصيل حول حقوقك فيما يتعلق بمعلوماتك وكيف سيتم التعامل معها ومشاركتها.\n\nيتم توفير تفاصيل الاتصال المتعلقة باستفسارات وشكاوى الخصوصية الخاصة بتطبيق COVIDSafe في سياسة الخصوصية ضمن اتصل بنا.";
+"data_privacy_content_android" = "من المهم أن تقرأ *سياسة الخصوصية* لتطبيق COVIDSafe قبل التسجيل لتطبيق COVIDSafe. سيقوم COVIDSafe بجمع معلوماتك الشخصية أو استخدامها أو الكشف عنها فقط بما يتماشى مع هذه السياسة <i>وقانون الخصوصية لعام 1988</i>.\n\nإذا كان عمرك أقل من 16 عامًا، فيجب على أحد والديك/الوصي عليك أيضًا قراءة *سياسة الخصوصية*. \n\nاستخدام تطبيق COVIDSafe هو أمر طوعي بالكامل. يمكنك تثبيت التطبيق أو حذفه في أي وقت. إذا قمت بحذف تطبيق COVIDSafe، *فيمكنك أيضًا طلب حذف معلوماتك* من الخادم الآمن. \n\nللتسجيل في تطبيق COVIDSafe، ستحتاج إلى إدخال اسم (أو اسم مستعار) ورقم هاتف محمول وفئة عمرية ورمز بريدي. إذا لم تقدم معلوماتك الشخصية، فلن يعمل تطبيق COVIDSafe على النحو المنشود. \n\n يتم تخزين المعلومات التي تقدمها عند التسجيل، والمعلومات المتعلقة باستخدامك لتطبيق COVIDSafe في خادم آمن للغاية. \n \nيتم جمع المعلومات أيضًا للتأكد من أن COVIDSafe يعمل بشكل صحيح على جهازك، ويتضمن ذلك نظام تشغيل جهازك وإصدار التطبيق الذي قمت بتثبيته واللغة التي تستخدمها في جهازك وما إذا كانت تقنية Bluetooth® تعمل وما إذا كان التطبيق الخاص بك قد سجل أي لقاءات في الأيام السبعة السابقة.\n \nعلى أجهزة Android، ستشمل أيضًا معلومات حول ما إذا كان قد تم تعطيل تحسين البطارية وتمكين خدمات الموقع الجغرافي. \n\nلن يقوم تطبيق COVIDSafe بجمع معلومات عن موقعك الجغرافي. \n\nسيسجل تطبيق COVIDSafe تاريخ ووقت الاتصال ورمز المعرف المشفر لمستخدمي COVIDSafe الآخرين الذين تتواصل معهم وقوة إشارة البلوتوث وطراز الهاتف المحمول للمستخدمين الآخرين على جهازك.\n\nسيسجل تطبيق COVIDSafe على أجهزة المستخدمين الآخرين الذين تتواصل معهم أيضًا رمز المعرف المشفر وتاريخ ووقت الاتصال بك وقوة إشارة البلوتوث وطراز هاتفك على أجهزتهم.\n\nإذا جاءت نتيجة فحص كوفيد-19 لمستخدم آخر إيجابية، فقد يقوم هذا المستخدم بتحميل تفاصيل الاتصال به وقد يتصل بك موظف من دائرة الصحة في الولاية أو الإقليم لأغراض تعقب المخالطة.\n\nسيتم استخدام تفاصيل التسجيل الخاصة بك أو الكشف عنها فقط لتقفّي المخالطة وللأغراض المناسبة والقانونية لتطبيق COVIDSafe. \n\nيتوفر المزيد من المعلومات على موقع الويب *covidsafe.gov.au*.\n \nتوفر سياسة خصوصية *COVIDSafe* مزيدًا من التفاصيل حول حقوقك فيما يتعلق بمعلوماتك وكيف سيتم التعامل معها ومشاركتها.\n\nيتم توفير تفاصيل الاتصال المتعلقة باستفسارات وشكاوى الخصوصية الخاصة بتطبيق COVIDSafe في سياسة الخصوصية ضمن اتصل بنا.";
 /* OnBoarding Data Privacy */
 "data_privacy_headline" = "التسجيل والخصوصية";
 "deaths" = "الوفيات";
@@ -272,8 +298,6 @@
 "enter_pin_resend_pin" = "إعادة إرسال رقم التعريف الشخصي";
 "enter_pin_timer_expire" = "ستنتهي صلاحية رقم التعريف الشخصي الخاص بك في غضون";
 "enter_pin_wrong_number" = "هل رقم الهاتف المحمول هذا خاطئ؟";
-/* Figma page Android Screens (05/06) */
-"Enter_your_mobile_number_label" = "أدخل رقم هاتفك المحمول";
 "every_day" = "كل يوم";
 "factors_dotpoint1" = "عدد مستخدمي تطبيق COVIDSafe الموجودين من حولك";
 "factors_dotpoint2" = "طراز الجهاز وعمره";
@@ -289,10 +313,10 @@
 /* Error message for when a user tries to signup outside of Australia. */
 "geoblock_error_message" = "";
 "geoblock_rego_error" = "";
+"global_OK" = "حسناً";
 "global_back" = "رجوع";
 "global_close" = "إغلاق";
 "global_double_tap" = "أنقر مرتين للتصحيح";
-"global_OK" = "حسناً";
 "hide" = "إخفاء";
 "home_app_permission_status_subtitle" = "لن يعمل تطبيق COVIDSafe بدون الإعدادات الصحيحة.";
 "home_app_permission_status_title" = "تحقق من إعدادات هاتفك";
@@ -300,10 +324,13 @@
 "home_data_uploaded_message" = "ساعد في وقف انتشار COVID-19 وتتبع أعراضك.";
 "home_header_active_no_action_required" = "لا يلزم اتخاذ أي إجراء آخر.";
 /* Home */
+"home_header_active_title" = "\u200F COVIDSafe يعمل.";
+/* Home */
 "home_header_active_title" = "\U200F COVIDSafe يعمل.";
 /* Home */
 "home_header_active_title_thanks" = "شكراً ، COVIDSafe يعمل الآن.";
 "home_header_inactive_check_your_permissions" = "تحقق من إعدادات هاتفك.";
+"home_header_inactive_title" = "\u200F COVIDSafe لا يعمل";
 "home_header_inactive_title" = "\U200F COVIDSafe لا يعمل";
 "home_header_uploaded_on_date_ios" = "تم تحميل معلوماتك على %@ .";
 "home_set_complete_external_link_app_content" = "قم بتنزيل التطبيق الحكومي للحصول على أحدث الأخبار والنصائح.";
@@ -352,8 +379,6 @@
 "intro_content" = "تم تطوير تطبيق COVIDSafe من قبل الحكومة الأسترالية للمساعدة في الحفاظ على المجتمع في مأمن من انتشار فيروس كورونا. \n\n سوف يدوّن تطبيق COVIDSafe بشكل آمن اختلاطك بمستخدمين آخرين للتطبيق. سيسمح ذلك لموظفي دائرة الصحة في الولاية أو الإقليم بالاتصال بك إذا حصل اختلاط عن قرب بينك وبين شخص أظهرت نتيجة فحصه أنه مصاب بالفيروس. \n\n معاً يمكننا المساعدة في وقف الانتشار والبقاء بصحة جيدة.";
 /* OnBoarding Intro */
 "intro_headline" = "معاً يمكننا وقف انتشار COVID-19";
-/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
-"IntroLabel" = "ساعد في وقف الانتشار\nوإنقاذ الأرواح.";
 "invalid_australian_phone_number_error_prompt" = "تتألف أرقام الهواتف المحمولة في أستراليا من 10 أرقام كحد أقصى.";
 "invalid_norfolk_island_phone_number_error_prompt" = "تتألف أرقام الهواتف المحمولة في جزيرة نورفولك من 5 إلى 6 أرقام.";
 "is_snoozed" = "تطبيق \U200F COVIDSafe هو في غفوة حاليًا";
@@ -389,26 +414,22 @@
 "no_handshakes_item3" = "أغلق هاتفك وقم بإعادة تشغيله وافتح التطبيق مجددًا.";
 "no_handshakes_item4" = "";
 "no_handshakes_link" = "اقرأ المزيد حول كيفية التحقق مما إذا كان تطبييق COVIDSafe يعمل بشكل صحيح";
+"non_consent_button" = "لا أوافق";
+"non_consent_popup" = "لا يمكنك متابعة عملية التسجيل بدون موافقة ولي الأمر أو الوصي.\n\nيُرجى الخروج وحذف التطبيق.";
 /* Figma page Android Screens (05/06) */
 "norfolk_hint" = "على سبيل المثال: 51234";
 "northern_territory" = "الإقليم الشمالي";
 "notification_bluetooth" = "قم بتشغيل البلوتوث لكي يتمكن تطبيق COVIDSafe من العمل.";
 "notification_internet_content" = "افتح التطبيق وتحقق من اتصال جهازك بالإنترنت ليتمكن تطبيق COVIDSafe من العمل.";
+"notification_internet_content" = "افتح التطبيق وتحقق من اتصال جهازك بالإنترنت.";
 "notification_not_active_title" = "\U200F COVIDSafe لا يعمل";
 "notification_settings" = "افتح التطبيق للتحقق من الإعدادات.";
 "notification_update_content" = "قم بتحديث تطبيقك للحصول على أحدث التحسينات.";
 "notification_update_heading" = "يتوفر تحديث لتطبيق COVIDSafe ";
-/* Figma page iOS Screens (05/06) */
-"NotificationsBlurbLink" = "تغيير إعدادات الإشعارات";
-/* Figma page iOS Screens (05/06) */
-"NotificationsDisabledBlurb" = "لن تتلقى إشعارًا إذا كان تطبيق COVIDSafe لا يعمل. \nغيّر إعدادات الإشعارات";
-/* Figma page iOS Screens (05/06) */
-"NotificationsEnabledBlurb" = "سوف تتلقى إشعارًا إذا كان تطبيق COVIDSafe لا يعمل. غيّر إعدادات الإشعارات";
 "numbers_error" = "تعذر التحقق من أحدث الأرقام.";
 "numbers_no_internet" = "اتصل بالإنترنت لكي تحصل على آخر الأرقام.";
 "numbers_refresh" = "قم بالتحديث الآن";
 "options_for_australia" = "خيارات لأستراليا";
-"OS2b_Item_4" = "4. يتطلب جهاز iphone الخاص بك تشغيل الموقع الجغرافي ليتمكن تطبيق COVIDSafe من العمل. *لا يقوم تطبيق COVIDSafe بجمع بيانات الموقع الجغرافي أو تخزينها أو استخدامها*";
 "overseas_acquired" = "%@ تم التقاطه في الخارج";
 "permission_button" = "تابع";
 /* Figma page iOS Screens (05/06) */
@@ -432,30 +453,19 @@
 "personal_details_name_title" = "الاسم الكامل (أو الاسم المستعار)";
 "personal_details_post_code" = "الرمز البريدي في أستراليا";
 "personal_details_post_code_error_prompt" = "يجب أن يحتوي رقم رمزك البريدي الأسترالي على 4 أرقام.";
-"PINNumber_VO_Label" = "رقم التعريف الشخصي PIN";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusBody" = "تأكد من أن التطبيق يعمل قبل مغادرتك المنزل وعند وجودك في الأماكن العامة من خلال تمكين Bluetooth®.";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusTitle" = "\U200F COVIDSafe لا يعمل";
-"PN_MobileNumber_VOLabel" = "رقم الهاتف المحمول";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderBody" = "افتح تطبيق COVIDSafe لتتأكد من أنه يعمل.";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderTitle" = "لم يتم اكتشاف أي لقاءات لمدة 48 ساعة";
 "postcode_api_error" = "لقد حصل خطأ. تحقق من الاتصال بالإنترنت وحاول مرة أخرى.";
 "postcode_change_label" = "الرمز البريدي الحالي في أستراليا";
 "postcode_success" = "تم تحديث الرمز البريدي الخاص بك";
-"PostcodeValidationErrorMessage" = "يُرجى إدخال رمز بريدي أسترالي صالح.";
 "privacy_policy" = "";
 "privacy_policy_description" = "";
 "queensland" = "ولاية كوينزلاند";
 "recovered" = "مجموع الحالات التي تعافت";
-"registration_consent_content" = "أوافق على أن تقوم وكالة التحول الرقمي، كونها مسؤولة عن تخزين البيانات، بموجب قرار قانوني صادر عن أمين عام وزارة الصحة في الحكومة الأسترالية بجمع:";
+"registration_consent_content" = "أوافق على أن تقوم وزارة الصحة، كونها مسؤولة عن تخزين البيانات، بموجب قانون الخصوصية لعام 1988 بجمع:";
 "registration_consent_diagnostic" = "معلومات للتأكد من أن تطبيق COVIDSafe يعمل بشكل صحيح على جهازي.";
-"registration_consent_first_paragraph" = "معلومات التسجيل الخاصة بي.";
+"registration_consent_first_paragraph" = "معلومات التسجيل،";
 /* Onboarding Registration Consent */
 "registration_consent_headline" = "الموافقة على التسجيل";
-"registration_consent_second_paragraph" = "معلومات حول اختلاطي بمستخدمين آخرين لتطبيق COVIDSafe في حال أظهرت نتائج الفحص أن مستخدمًا آخر كنت على تواصل معه مصاب بفيروس COVID-19، وقام هذا المستخدم بتحميل بيانات الاتصال به.";
+"registration_consent_second_paragraph" = "معلومات حول اختلاطي بمستخدمين آخرين لتطبيق COVIDSafe في حال أظهرت نتائج الفحص أن مستخدمًا آخر كنت على تواصل معه مصاب بفيروس كوفيد-19، وقام هذا المستخدم بتحميل بيانات الاتصال به،";
 "restrictions_accommodation" = "أماكن الإقامة";
 "restrictions_activity" = "النشاط";
 "restrictions_cafes" = "المقاهي والمطاعم";
@@ -481,8 +491,6 @@
 "scheduled" = "قمت بتحديد مدة غفوة تطبيق COVIDSafe من %@ إلى %@.";
 /* OnBoarding Enter Number */
 "select_country_or_region" = "اختر البلد أو المنطقة";
-/* Figma page Android Screens (05/06) */
-"Select_country_or_region_headline" = "اختر البلد أو المنطقة";
 "select_state_territory_button" = "اختر الولاية أو الإقليم";
 "select_state_territory_heading" = "اختر الولاية أو الإقليم";
 "set_snooze_time" = "حدّد وقت الغفوة";
@@ -514,7 +522,6 @@
 "stepCounter" = "الخطوة %d من %d";
 "support" = "الدعم";
 "support_content" = "للحصول على مساعدة بشأن المشكلات التي لا تغطيها مواضيع المساعدة";
-"Support_VOLabel" = "الدعم. للحصول على مساعدة بشأن المشكلات التي لا تغطيها مواضيع المساعدة";
 "tasmania" = "ولاية تسمانيا";
 /* Example: "From 22 to 28 January 2021" */
 "to" = "";
@@ -524,17 +531,16 @@
 "total_per_state" = "مجموع الحالات المؤكدة في كل ولاية وإقليم";
 "twenty_eight_days" = "28 يومًا";
 "type_in_time" = "أدخل الوقت";
-"UILaunchStoryboardName" = "LaunchScreen_ar";
+/* Figma page Android Screens (05/06) */
+"under-sixteen_consent_call_for_action" = "حدد \"أوافق\" لتأكيد الموافقة أو \"لا أوافق\" إذا لم تتمكن من تأكيد موافقة ولي الأمر أو الوصي.";
 "under_investigation" = "";
-"under_sixteen_content" = "أؤكد موافقة أحد والدي أو الوصي علي على أن تعمل وكالة التحول الرقمي كمدير لتخزين البيانات، بموجب قرار قانوني من قبل أمين وزارة الصحة في الحكومة الأسترالية لجمع:";
-"under_sixteen_first_paragraph" = "معلومات التسجيل الخاصة بي.";
+"under_sixteen_content" = "أؤكد موافقة أحد والدي أو الوصي علي على أن تعمل وزارة الصحة، كونها مسؤولة عن تخزين البيانات، بموجب قانون الخصوصية لعام 1988 على جمع:";
+"under_sixteen_first_paragraph" = "معلومات التسجيل،";
 /* OnBoarding Under Sixteen */
 "under_sixteen_headline" = "تحتاج إلى موافقة أحد والديك/ الوصي للمضي قدماً";
 /* Figma page Android Screens (05/06) */
-"under_sixteen_registration_consent_first_paragraph" = "معلومات التسجيل الخاصة بي.";
-"under_sixteen_second_paragraph" = "معلومات حول اختلاطي بمستخدمين آخرين لتطبيق COVIDSafe في حال أظهرت نتائج الفحص أن مستخدمًا آخر كنت على تواصل معه مصاب بفيروس COVID-19، وقام هذا المستخدم بتحميل بيانات الاتصال به.";
-/* Figma page Android Screens (05/06) */
-"under-sixteen_consent_call_for_action" = "اختر \"أوافق\" لتأكيد الموافقة.";
+"under_sixteen_registration_consent_first_paragraph" = "معلومات التسجيل،";
+"under_sixteen_second_paragraph" = "معلومات حول اختلاطي بمستخدمين آخرين لتطبيق COVIDSafe في حال أظهرت نتائج الفحص أن مستخدمًا آخر كنت على تواصل معه مصاب بفيروس كوفيد-19، وقام هذا المستخدم بتحميل بيانات الاتصال به،";
 "update_available_app_store_btn" = "انتقل إلى App Store";
 "update_available_dismiss_btn" = "ذكّرني لاحقًا";
 "update_available_message_ios" = "لقد أجرينا تحسينات على تطبيق COVIDSafe. قم بتحديث التطبيق عبر متجر التطبيقات App Store.";
@@ -572,38 +578,16 @@
 "Done" = "تـمّ";
 /* Feedback */
 "EmailPlaceholder" = "أدخل عنوان بريدك الإلكتروني (مطلوب)";
+"EnterPINSent" = "أدخل رقم التعريف الشخصي المرسل إلى %@";
 /* Phone number and PIN */
 "EnterPhoneReVerify" = "أدخل رقم هاتفك المحمول لإعادة التحقق";
-"EnterPINSent" = "أدخل رقم التعريف الشخصي المرسل إلى %@";
-/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_message" = "مرحبا يا صديقي، كيف تود المتابعة؟";
-/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_title" = "صندوق الملاحظات";
-/* Title for button that launches new feedback flow. */
-"entryPrompt_newFeedback_button_title" = "ملاحظات جديدة";
 "FoundIssueWithApp" = "هل وجدت مشكلة في تطبيق COVIDSafe؟";
-/* *** Feedback localised strings *** */
-"global_cancel_button_title" = "إلغاء";
-"global_send_button_title" = "أرسل";
-"global_sending_indication_title" = "الإرسال جار";
-"global_success_indication_title" = "نجاح";
 /* upload */
 "InformationUploaded" = "تم تحميل معلوماتك على %@ .";
 "InvalidOTP" = "يجب أن يكون رمزاً مكوناً من 6 أرقام";
 "IssueDescPlaceholder" = "يرجى تحديد المشكلة";
 "IssueFooter" = "قد نتصل بك للحصول على مزيد من التفاصيل حول ملاحظاتك. لن يتم استخدام عنوان بريدك الإلكتروني لأي غرض آخر.";
 "IssueThankYou" = "شكراً لك! لقد تلقينا ملاحظاتك.";
-/* Delete screenshot action sheet action button title. */
-"newFeedback_deleteScreenshot_actionTitle" = "حذف لقطة الشاشة";
-/* Messsage shown to user asking to confirm screenshot deletion. */
-"newFeedback_deleteScreenshotConfirmation_message" = "سيتم حذف لقطة الشاشة هذه نهائياً.";
-"newFeedback_invalidEmail_errorMessage" = "يرجى ادخل عنوان بريد إلكتروني صالح!";
-/* Error message displayed to users when feedback has empty description */
-"newFeedback_noMessage_errorMessage" = "أخبرنا بشيء قبل الإرسال.";
-/* Error message displayed to users when feedback fails to send. */
-"newFeedback_send_errorMessage" = "خطأ في إرسال الملاحظات";
-/* Navigation Bar title shown during new feedback flow. */
-"newFeedbackFlow_navigationTitle" = "بلِّغ عن مشكلة";
 "Next" = "التالي";
 /* registration succcess */
 "OS2b_Item1" = "1. عندما تغادر المنزل، ابق هاتفك بحوزتك وتأكد من أن تطبيق COVIDSafe يعمل.";
@@ -611,6 +595,7 @@
 "OS2b_Item2_VOLabel" = "2. يجب إبقاء Bluetooth مشغلًا.";
 "OS2b_Item3" = "3. لا يرسل تطبيق COVIDSafe طلبات الاقتران. إعرِف المزيد.";
 "OS2b_Item3Underline" = "إعرِف المزيد";
+"PINWillExpire" = "سوف تنتهي صلاحية رقم التعريف الشخصي الخاص بك في %@";
 /* home */
 "PairingRequestsInfo" = "لا يرسل تطبيق COVIDSafe طلبات الاقتران.";
 "PairingRequestsInfoUnderline" = "طلبات الاقتران";
@@ -618,7 +603,6 @@
 "PhoneNumberFormatErrorTitle" = "صيغة الرقم خاطئة";
 "PhoneVerificationErrorMessage" = "يرجى التحقق من التفاصيل والمحاولة مرة أخرى.";
 "PhoneVerificationErrorTitle" = "خطأ في التحقق من رقم الهاتف";
-"PINWillExpire" = "سوف تنتهي صلاحية رقم التعريف الشخصي الخاص بك في %@";
 "ReceivePinIssue" = "مشكلات في تلقي رقم التعريف الشخصي الخاص بك؟";
 /* help */
 "ReportAnIssue" = "بلِّغ عن مشكلة";
@@ -627,13 +611,35 @@
 "UploadFailed" = "فشل التحميل. يرجى إعادة المحاولة لاحقًا.";
 "UploadFailedErrorMessage" = "يرجى إعادة المحاولة لاحقًا.";
 "ValidationError" = "خطأ في التحقق من سريان المفعول";
+/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_message" = "مرحبا يا صديقي، كيف تود المتابعة؟";
+/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_title" = "صندوق الملاحظات";
+/* Title for button that launches new feedback flow. */
+"entryPrompt_newFeedback_button_title" = "ملاحظات جديدة";
+/* *** Feedback localised strings *** */
+"global_cancel_button_title" = "إلغاء";
+"global_send_button_title" = "أرسل";
+"global_sending_indication_title" = "الإرسال جار";
+"global_success_indication_title" = "نجاح";
+/* Navigation Bar title shown during new feedback flow. */
+"newFeedbackFlow_navigationTitle" = "بلِّغ عن مشكلة";
+/* Messsage shown to user asking to confirm screenshot deletion. */
+"newFeedback_deleteScreenshotConfirmation_message" = "سيتم حذف لقطة الشاشة هذه نهائياً.";
+/* Delete screenshot action sheet action button title. */
+"newFeedback_deleteScreenshot_actionTitle" = "حذف لقطة الشاشة";
+"newFeedback_invalidEmail_errorMessage" = "يرجى ادخل عنوان بريد إلكتروني صالح!";
+/* Error message displayed to users when feedback has empty description */
+"newFeedback_noMessage_errorMessage" = "أخبرنا بشيء قبل الإرسال.";
+/* Error message displayed to users when feedback fails to send. */
+"newFeedback_send_errorMessage" = "خطأ في إرسال الملاحظات";
 "GetCoronaVirusApp_VOLabel" = "احصل على تطبيق Coronavirus. قم بتنزيل التطبيق الحكومي للحصول على آخر الأخبار والنصائح.";
 "HelpTopics_VOLabel" = "مواضيع المساعدة. إرشادات حول كيفية استكشاف المشكلات التقنية وإصلاحها";
 "LatestNews_VOLabel" = "آخر الأخبار والمستجدات. قم بزيارة الموقع aus.gov.au للاطلاع على آخر أخبار فيروس كورونا.";
 "NotificationsDisabled_VOLabel" = "الإشعارات معطّلة. لن تتلقى إشعارًا إذا كان تطبيق COVIDSafe لا يعمل.\nقم بتغيير إعدادات الإشعارات";
 "NotificationsEnabled_VOLabel" = "يُسمح بالإشعارات. سوف تتلقى إشعارًا إذا كان تطبيق COVIDSafe لا يعمل.\nقم بتغيير إعدادات الإشعارات";
 "OS1b_TopParagraph_VOLabel" = "تُستخدم إشارات Bluetooth لتحديد وجودك بالقرب من مستخدم آخر لتطبيق COVIDSafe. \n سيتم تدوين ملاحظة في كل مرة يحصل فيها اختلاط عن قرب بينك وبين مستخدمي تطبيق COVIDSafe الآخرين لجمع معلومات عن اختلاط الأشخاص. يتم تشفير هذه المعلومات وتخزينها فقط في هاتفك. \n إذا جاءت نتيجة فحصك ﻟ COVID-19 إيجابية كمستخدم لتطبيق COVIDSafe، سوف يتصل بك أحد موظفي دائرة الصحة في الولاية أو الإقليم ويساعدك في القيام بتحميل اختياري لمعلومات الاتصال  بك إلى نظام تخزين معلومات آمن للغاية \nيمكن أيضًا لموظفي دائرة الصحة في الولاية أو الإقليم الاتصال بك إذا حصل اتصال وثيق بينك وبين مستخدم آخر لتطبيق COVIDSafe أظهرت نتائج الفحص أنه مصاب بالفيروس. \n لمزيد من المعلومات، يرجى الرجوع إلى صفحة مواضيع المساعدة.";
-"permission_content_iOS_2_VOLabel" = "1. Bluetooth \n2. الإشعارات\n3. خدمات الموقع الجغرافي";
-"permission_content_iOS_VOLabel" = "يحتاج تطبيق COVIDSafe لأن يكون Bluetooth مشغلًا لكي يعمل.  لا يرسل تطبيق COVIDSafe طلبات الاقتران.\n\nيسمح تمكين الإشعارات بتلقي تحديثات لتذكيرك عندما يكون تطبيق COVIDSafe متوقفًا عن العمل. \n\nيتطلب جهاز iphone الخاص بك تشغيل الموقع الجغرافي ليتمكن تطبيق COVIDSafe من العمل.\n*لا يقوم تطبيق COVIDSafe* بتتبّع بيانات الموقع الجغرافي أو تخزينها*\n\n اختر \"تابع\" لتمكين:";
 "ShareCovidSafe_VOLabel" = "شارك COVIDSafe. قم بدعوة الآخرين للمساعدة. معاً، نحن أقوى.";
 "UploadData_VOLabel" = "هل اتصل بك أحد موظفي دائرة الصحة؟ يمكنك تحميل معلوماتك فقط إذا كانت نتيجة فحصك إيجابية.";
+"permission_content_iOS_2_VOLabel" = "1. Bluetooth \n2. الإشعارات\n3. خدمات الموقع الجغرافي";
+"permission_content_iOS_VOLabel" = "يحتاج تطبيق COVIDSafe لأن يكون Bluetooth مشغلًا لكي يعمل.  لا يرسل تطبيق COVIDSafe طلبات الاقتران.\n\nيسمح تمكين الإشعارات بتلقي تحديثات لتذكيرك عندما يكون تطبيق COVIDSafe متوقفًا عن العمل. \n\nيتطلب جهاز iphone الخاص بك تشغيل الموقع الجغرافي ليتمكن تطبيق COVIDSafe من العمل.\n*لا يقوم تطبيق COVIDSafe* بتتبّع بيانات الموقع الجغرافي أو تخزينها*\n\n اختر \"تابع\" لتمكين:";
\ No newline at end of file
diff --git a/CovidSafe/el.lproj/Localizable.strings b/CovidSafe/el.lproj/Localizable.strings
index 92a28c7..c1f1725 100644
--- a/CovidSafe/el.lproj/Localizable.strings
+++ b/CovidSafe/el.lproj/Localizable.strings
@@ -1,3 +1,38 @@
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothOFF" = "Πρόσβαση στο Bluetooth®: ΑΠΕΝΕΡΓΟΠΟΙΗΜΕΝΗ";
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothON" = "Πρόσβαση στο Bluetooth®: ΕΝΕΡΓΟΠΟΙΗΜΕΝΗ";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF" = "Bluetooth®: ΑΠΕΝΕΡΓΟΠΟΙΗΜΕΝΟ";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF_content" = "Ενεργοποιήστε το Bluetooth® του τηλεφώνου σας. Επιλέξτε «να επιτρέπονται Νέες Συνδέσεις» εάν εμφανιστούν.";
+/* Figma page iOS Screens (05/06) */
+"BluetoothON" = "Bluetooth®: ΕΝΕΡΓΟ";
+/* Figma page Android Screens (05/06) */
+"Enter_your_mobile_number_label" = "Εισάγετε τον αριθμό του κινητού σας";
+/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
+"IntroLabel" = "Βοηθήστε να σταματήσουμε την εξάπλωση \nκαι σώστε ζωές.";
+/* Figma page iOS Screens (05/06) */
+"NotificationsBlurbLink" = "Αλλαγή στις ρυθμίσεις ειδοποιήσεων";
+/* Figma page iOS Screens (05/06) */
+"NotificationsDisabledBlurb" = "Δε θα λάβετε ειδοποίηση εάν η COVIDSafe δεν είναι ενεργή. \n Αλλαγή στις ρυθμίσεις ειδοποιήσεων";
+/* Figma page iOS Screens (05/06) */
+"NotificationsEnabledBlurb" = "Θα λάβετε ειδοποίηση εάν η COVIDSafe δεν είναι ενεργή. \n Αλλάξετε τις ρυθμίσεις ειδοποιήσεων";
+"OS2b_Item_4" = "4. Το iPhone σας απαιτεί άδεια τοποθεσίας για να λειτουργήσει η COVIDSafe. *Η COVIDSafe ΔΕΝ συλλέγει, δεν αποθηκεύει ούτε χρησιμοποιεί τα δεδομένα τοποθεσίας σας*";
+"PINNumber_VO_Label" = "Κωδικός PΙΝ";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusBody" = "Βεβαιωθείτε ότι είναι ενεργή πριν βγείτε από το σπίτι και όταν βρίσκεστε σε δημόσιους χώρους ενεργοποιώντας το Bluetooth®.";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusTitle" = "Η COVIDSafe δεν είναι ενεργή";
+"PN_MobileNumber_VOLabel" = "Αριθμός κινητού";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderBody" = "Ανοίξτε την COVIDSafe για να βεβαιωθείτε ότι λειτουργεί.";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderTitle" = "Δεν εντοπίστηκαν συναντήσεις για 48 ώρες";
+"PostcodeValidationErrorMessage" = "Εισάγετε έναν έγκυρο ταχυδρομικό κώδικα της Αυστραλίας.";
+/* Figma page Android Screens (05/06) */
+"Select_country_or_region_headline" = "Επιλέξτε χώρα ή περιοχή";
+"Support_VOLabel" = "Υποστήριξη. Για βοήθεια σε θέματα που δεν καλύπτονται στα θέματα Βοήθειας";
 "action_continue" = "Συνεχίστε";
 "action_report_an_issue" = "Αναφέρετε το πρόβλημα";
 "action_upload_done" = "Συνεχίστε";
@@ -11,20 +46,10 @@
 "activity_intro_2" = "";
 /* Figma page iOS Screens (05/06) */
 "allow_bluetooth_call" = "Επιτρέψτε την COVIDSafe να έχει πρόσβαση στο Bluetooth®";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothOFF" = "Πρόσβαση στο Bluetooth®: ΑΠΕΝΕΡΓΟΠΟΙΗΜΕΝΗ";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothON" = "Πρόσβαση στο Bluetooth®: ΕΝΕΡΓΟΠΟΙΗΜΕΝΗ";
 "app_activity_bluetooth_handshakes_heading" = "";
 "australian_capital_territory" = "Επικράτεια Αυστραλιανής Πρωτεύουσας";
 "ble_handshakes_yesterday" = "";
 "bluetooth_handshakes" = "Χειραψίες Bluetooth";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF" = "Bluetooth®: ΑΠΕΝΕΡΓΟΠΟΙΗΜΕΝΟ";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF_content" = "Ενεργοποιήστε το Bluetooth® του τηλεφώνου σας. Επιλέξτε «να επιτρέπονται Νέες Συνδέσεις» εάν εμφανιστούν.";
-/* Figma page iOS Screens (05/06) */
-"BluetoothON" = "Bluetooth®: ΕΝΕΡΓΟ";
 "cancel_snooze" = "Ακύρωση αναβολής";
 "cases_28_days" = "Νέα κρούσματα τις τελευταίες 28 ημέρες";
 "cases_7_days" = "Νέα κρούσματα τις τελευταίες 7 ημέρες";
@@ -250,8 +275,9 @@
 "country_region_name_zw" = "Ζιμπάμπουε";
 "customise_days" = "Προσαρμογή ημερών";
 "data_privacy_button" = "Επόμενο";
-"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 για περισσότερες λεπτομέρειες για τα δικαιώματά σας σχετικά με τις πληροφορίες σας και τον τρόπο χειρισμού και κοινοποίησής τους.";
-"data_privacy_content_VO" = "Συνίσταται να διαβάσετε την *πολιτική απορρήτου* της 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 για περισσότερες λεπτομέρειες για τα δικαιώματά σας σχετικά με τις πληροφορίες σας και τον τρόπο χειρισμού και κοινοποίησής τους.";
+"data_privacy_content" = "Συνιστάται να διαβάσετε την πολιτική απορρήτου της COVIDSafe πριν εγγραφείτε στην COVIDSafe. Η COVIDSafe θα συλλέγει, θα χρησιμοποιεί ή θα εμφανίζει τις προσωπικές σας πληροφορίες μόνο σε συμφωνία με αυτήν την πολιτική και τον Νόμο περί Απορρήτου του 1988.\n\nΕάν είστε κάτω των 16 ετών, ο γονέας/κηδεμόνας σας πρέπει επίσης να διαβάσει την πολιτική απορρήτου.\n\nΗ χρήση της COVIDSafe είναι εντελώς εθελοντική. Μπορείτε να εγκαταστήσετε ή να διαγράψετε την εφαρμογή ανά πάσα στιγμή. Εάν διαγράψετε την COVIDSafe, μπορείτε επίσης να ζητήσετε τη διαγραφή των στοιχείων σας από τον ασφαλή διακομιστή. Αν δεν δώσετε τα προσωπικά σας στοιχεία, η εφαρμογή COVIDSafe δεν μπορεί να εκτελέσει τις λειτουργίες για τις οποίες προορίζεται.\n\nΓια να εγγραφείτε στην COVIDSafe, θα πρέπει να εισαγάγετε όνομα (ή ψευδώνυμο), αριθμό κινητού τηλεφώνου, ηλικιακή ομάδα και ταχυδρομικό κώδικα.\n\nΟι πληροφορίες που εισάγετε κατά την εγγραφή σας και οι πληροφορίες από την από μέρους σας χρήση της COVIDSafe αποθηκεύονται σε έναν διακομιστή υψηλής ασφάλειας.\n\nΠληροφορίες συλλέγονται επίσης ώστε να διασφαλιστεί ότι η COVIDSafe λειτουργεί σωστά στη συσκευή σας. Αυτό αφορά το λειτουργικό σας σύστημα, την έκδοση της εφαρμογής που έχετε εγκαταστήσει, τη γλώσσα στην οποία είναι ρυθμισμένη η συσκευή σας, το αν λειτουργεί το Bluetooth σας και το αν η εφαρμογή σας έχει καταγράψει τυχόν συναντήσεις τις προηγούμενες επτά ημέρες.\n\nΗ COVIDSafe δεν συλλέγει τις πληροφορίες τοποθεσίας σας.\n\nΗ COVIDSafe καταγράφει, στη συσκευή σας, την ημερομηνία και ώρα της επαφής, τον κρυπτογραφημένο κωδικό ID άλλων χρηστών COVIDSafe με τους οποίους έρχεστε σε επαφή, την ισχύ του σήματος Bluetooth και το μοντέλο του τηλεφώνου των άλλων χρηστών.\n\nΟι άλλοι χρήστες COVIDSafe με τους οποίους έρχεστε σε επαφή θα καταγράφουν, στη συσκευή τους, τον κρυπτογραφημένο κωδικό ID σας, την ημερομηνία και ώρα επαφής μαζί σας, την ισχύ του σήματος Bluetooth και το μοντέλο του τηλεφώνου σας.\n\nΑν κάποιος άλλος χρήστης εξεταστεί και βρεθεί θετικός στην COVID-19, ενδέχεται να αναρτήσει τα στοιχεία επικοινωνίας του και ένας υπάλληλος του εθνικού ή τοπικού συστήματος υγείας ενδέχεται να επικοινωνήσει μαζί σας για σκοπούς ιχνηλάτησης επαφών.\n\nΟι πληροφορίες εγγραφής σας θα χρησιμοποιηθούν ή θα κοινοποιηθούν μόνο με σκοπό την ιχνηλάτηση επαφών, καθώς και τη σωστή και νόμιμη λειτουργία της COVIDSafe.\n\nΠερισσότερες πληροφορίες διατίθενται στον ιστότοπο covidsafe.gov.au.\n\nΣτην πολιτική απορρήτου της COVIDSafe παρέχονται περαιτέρω λεπτομέρειες σχετικά με τα δικαιώματά σας όσον αφορά τις πληροφορίες σας και τον τρόπο με τον οποίο θα υποβάλλονται σε διαχείριση και κοινοποίηση. \n\nΤα στοιχεία επικοινωνίας που αφορούν ερωτήματα και παράπονα σχετικά με το απόρρητο στην COVIDSafe παρέχονται στην πολιτική απορρήτου, στην ενότητα Επικοινωνία.";
+"data_privacy_content_VO" = "Συνιστάται να διαβάσετε την πολιτική απορρήτου της COVIDSafe πριν εγγραφείτε στην COVIDSafe. Η COVIDSafe θα συλλέγει, θα χρησιμοποιεί ή θα εμφανίζει τις προσωπικές σας πληροφορίες μόνο σε συμφωνία με αυτήν την πολιτική και τον Νόμο περί Απορρήτου του 1988.\n\nΕάν είστε κάτω των 16 ετών, ο γονέας/κηδεμόνας σας πρέπει επίσης να διαβάσει την πολιτική απορρήτου.\n\nΗ χρήση της COVIDSafe είναι εντελώς εθελοντική. Μπορείτε να εγκαταστήσετε ή να διαγράψετε την εφαρμογή ανά πάσα στιγμή. Εάν διαγράψετε την COVIDSafe, μπορείτε επίσης να ζητήσετε τη διαγραφή των στοιχείων σας από τον ασφαλή διακομιστή. Αν δεν δώσετε τα προσωπικά σας στοιχεία, η εφαρμογή COVIDSafe δεν μπορεί να εκτελέσει τις λειτουργίες για τις οποίες προορίζεται.\n\nΓια να εγγραφείτε στην COVIDSafe, θα πρέπει να εισαγάγετε όνομα (ή ψευδώνυμο), αριθμό κινητού τηλεφώνου, ηλικιακή ομάδα και ταχυδρομικό κώδικα.\n\nΟι πληροφορίες που εισάγετε κατά την εγγραφή σας και οι πληροφορίες από την από μέρους σας χρήση της COVIDSafe αποθηκεύονται σε έναν διακομιστή υψηλής ασφάλειας.\n\nΠληροφορίες συλλέγονται επίσης ώστε να διασφαλιστεί ότι η COVIDSafe λειτουργεί σωστά στη συσκευή σας. Αυτό αφορά το λειτουργικό σας σύστημα, την έκδοση της εφαρμογής που έχετε εγκαταστήσει, τη γλώσσα στην οποία είναι ρυθμισμένη η συσκευή σας, το αν λειτουργεί το Bluetooth σας και το αν η εφαρμογή σας έχει καταγράψει τυχόν συναντήσεις τις προηγούμενες επτά ημέρες.\n\nΗ COVIDSafe δεν συλλέγει τις πληροφορίες τοποθεσίας σας.\n\nΗ COVIDSafe καταγράφει, στη συσκευή σας, την ημερομηνία και ώρα της επαφής, τον κρυπτογραφημένο κωδικό ID άλλων χρηστών COVIDSafe με τους οποίους έρχεστε σε επαφή, την ισχύ του σήματος Bluetooth και το μοντέλο του τηλεφώνου των άλλων χρηστών.\n\nΟι άλλοι χρήστες COVIDSafe με τους οποίους έρχεστε σε επαφή θα καταγράφουν, στη συσκευή τους, τον κρυπτογραφημένο κωδικό ID σας, την ημερομηνία και ώρα επαφής μαζί σας, την ισχύ του σήματος Bluetooth και το μοντέλο του τηλεφώνου σας.\n\nΑν κάποιος άλλος χρήστης εξεταστεί και βρεθεί θετικός στην COVID-19, ενδέχεται να αναρτήσει τα στοιχεία επικοινωνίας του και ένας υπάλληλος του εθνικού ή τοπικού συστήματος υγείας ενδέχεται να επικοινωνήσει μαζί σας για σκοπούς ιχνηλάτησης επαφών.\n\nΟι πληροφορίες εγγραφής σας θα χρησιμοποιηθούν ή θα κοινοποιηθούν μόνο με σκοπό την ιχνηλάτηση επαφών, καθώς και τη σωστή και νόμιμη λειτουργία της COVIDSafe.\n\nΠερισσότερες πληροφορίες διατίθενται στον ιστότοπο covidsafe.gov.au.\n\nΣτην πολιτική απορρήτου της COVIDSafe παρέχονται περαιτέρω λεπτομέρειες σχετικά με τα δικαιώματά σας όσον αφορά τις πληροφορίες σας και τον τρόπο με τον οποίο θα υποβάλλονται σε διαχείριση και κοινοποίηση. \n\nΤα στοιχεία επικοινωνίας που αφορούν ερωτήματα και παράπονα σχετικά με το απόρρητο στην COVIDSafe παρέχονται στην πολιτική απορρήτου, στην ενότητα Επικοινωνία.";
+"data_privacy_content_android" = "Συνιστάται να διαβάσετε την *πολιτική απορρήτου* της COVIDSafe πριν εγγραφείτε στην COVIDSafe. Η COVIDSafe θα συλλέγει, θα χρησιμοποιεί ή θα εμφανίζει τις προσωπικές σας πληροφορίες μόνο σε συμφωνία με αυτήν την πολιτική και τον <i>Νόμο περί Απορρήτου του 1988</i>.\n\nΕάν είστε κάτω των 16 ετών, ο γονέας/κηδεμόνας σας πρέπει επίσης να διαβάσει την *πολιτική απορρήτου*. \n\nΗ χρήση της COVIDSafe είναι εντελώς εθελοντική. Μπορείτε να εγκαταστήσετε ή να διαγράψετε την εφαρμογή ανά πάσα στιγμή. Εάν διαγράψετε την COVIDSafe, *μπορείτε επίσης να ζητήσετε τη διαγραφή των στοιχείων σας* από τον ασφαλή διακομιστή. \n\nΓια να εγγραφείτε στην COVIDSafe, θα πρέπει να εισαγάγετε όνομα (ή ψευδώνυμο), αριθμό κινητού τηλεφώνου, ηλικιακή ομάδα και ταχυδρομικό κώδικα. Αν δεν δώσετε τα προσωπικά σας στοιχεία, η εφαρμογή COVIDSafe δεν μπορεί να εκτελέσει τις λειτουργίες για τις οποίες προορίζεται. \n\nΟι πληροφορίες που εισάγετε κατά την εγγραφή σας και οι πληροφορίες από την από μέρους σας χρήση της COVIDSafe αποθηκεύονται σε έναν διακομιστή υψηλής ασφάλειας.\n\nΠληροφορίες συλλέγονται επίσης ώστε να διασφαλιστεί ότι η COVIDSafe λειτουργεί σωστά στη συσκευή σας. Αυτό αφορά το λειτουργικό σας σύστημα, την έκδοση της εφαρμογής που έχετε εγκαταστήσει, τη γλώσσα στην οποία είναι ρυθμισμένη η συσκευή σας, το αν λειτουργεί το Bluetooth® σας και το αν η εφαρμογή σας έχει καταγράψει τυχόν συναντήσεις τις προηγούμενες επτά ημέρες.\n\nΣτις συσκευές Android, αφορά επίσης πληροφορίες σχετικά με το αν η βελτιστοποίηση λειτουργίας της μπαταρίας είναι απενεργοποιημένη και οι υπηρεσίες τοποθεσίας είναι ενεργοποιημένες.\n\nΗ COVIDSafe δεν συλλέγει τις πληροφορίες τοποθεσίας σας.\n\nΗ COVIDSafe καταγράφει, στη συσκευή σας, την ημερομηνία και ώρα της επαφής, τον κρυπτογραφημένο κωδικό ID άλλων χρηστών COVIDSafe με τους οποίους έρχεστε σε επαφή, την ισχύ του σήματος Bluetooth και το μοντέλο του τηλεφώνου των άλλων χρηστών.\n\nΟι άλλοι χρήστες COVIDSafe με τους οποίους έρχεστε σε επαφή θα καταγράφουν, στη συσκευή τους, τον κρυπτογραφημένο κωδικό ID σας, την ημερομηνία και ώρα επαφής μαζί σας, την ισχύ του σήματος Bluetooth και το μοντέλο του τηλεφώνου σας.\n\nΑν κάποιος άλλος χρήστης εξεταστεί και βρεθεί θετικός στην COVID-19, ενδέχεται να αναρτήσει τα στοιχεία επικοινωνίας του και ένας υπάλληλος του εθνικού ή τοπικού συστήματος υγείας ενδέχεται να επικοινωνήσει μαζί σας για σκοπούς ιχνηλάτησης επαφών.\n\nΟι πληροφορίες εγγραφής σας θα χρησιμοποιηθούν ή θα κοινοποιηθούν μόνο με σκοπό την ιχνηλάτηση επαφών, καθώς και τη σωστή και νόμιμη λειτουργία της COVIDSafe.\n\nΠερισσότερες πληροφορίες διατίθενται στον ιστότοπο *covidsafe.gov.au*.\n\nΣτην *πολιτική απορρήτου* της COVIDSafe παρέχονται περαιτέρω λεπτομέρειες σχετικά με τα δικαιώματά σας όσον αφορά τις πληροφορίες σας και τον τρόπο με τον οποίο θα υποβάλλονται σε διαχείριση και κοινοποίηση. \n\nΤα στοιχεία επικοινωνίας που αφορούν ερωτήματα και παράπονα σχετικά με το απόρρητο στην COVIDSafe παρέχονται στην πολιτική απορρήτου, στην ενότητα *Επικοινωνία*.";
 /* OnBoarding Data Privacy */
 "data_privacy_headline" = "Εγγραφή και προστασία του απορρήτου";
 "deaths" = "Θάνατοι";
@@ -272,8 +298,6 @@
 "enter_pin_resend_pin" = "Στείλτε ξανά τον κωδικό σας";
 "enter_pin_timer_expire" = "Ο κωδικός σας θα λήξει σε";
 "enter_pin_wrong_number" = "Είναι ο αριθμός κινητού λάθος;";
-/* Figma page Android Screens (05/06) */
-"Enter_your_mobile_number_label" = "Εισάγετε τον αριθμό του κινητού σας";
 "every_day" = "Κάθε μέρα";
 "factors_dotpoint1" = "αριθμός χρηστών της COVIDSafe στην περιοχή σας";
 "factors_dotpoint2" = "μοντέλο συσκευής και ηλικία";
@@ -287,12 +311,12 @@
 /* Example: "From 22 to 28 January 2021" */
 "from" = "";
 /* Error message for when a user tries to signup outside of Australia. */
-"geoblock_error_message" = "";
-"geoblock_rego_error" = "";
+"geoblock_error_message" = "Μπορείτε να συνδεθείτε χρησιμοποιώντας πάροχο Ίντερνετ εκτός Αυστραλίας. Αυτό μπορεί να συμβεί με τη χρήση περιαγωγής διεθνών δεδομένων σε μια κάρτα SIM που δεν προέρχεται από την Αυστραλία.";
+"geoblock_rego_error" = "Σημείωση: Μπορείτε να συμπληρώσετε την εγγραφή μόνο εφόσον εισέλθετε στην Αυστραλία.";
+"global_OK" = "OK";
 "global_back" = "Πίσω";
 "global_close" = "Κλείστε";
 "global_double_tap" = "πατήστε δύο φορές για επεξεργασία";
-"global_OK" = "OK";
 "hide" = "Απόκρυψη";
 "home_app_permission_status_subtitle" = "Η COVIDSafe δε θα λειτουργήσει χωρίς τις σωστές ρυθμίσεις.";
 "home_app_permission_status_title" = "Ελέγξτε τις ρυθμίσεις σας";
@@ -302,9 +326,12 @@
 /* Home */
 "home_header_active_title" = "Η COVIDSafe είναι ενεργή";
 /* Home */
+"home_header_active_title" = "Η COVIDSafe είναι ενεργή";
+/* Home */
 "home_header_active_title_thanks" = "Η COVIDSafe είναι ενεργή.";
 "home_header_inactive_check_your_permissions" = "Ελέγξτε τις ρυθμίσεις σας";
 "home_header_inactive_title" = "Η COVIDSafe δεν είναι ενεργή";
+"home_header_inactive_title" = "Η COVIDSafe δεν είναι ενεργή";
 "home_header_uploaded_on_date_ios" = "Τα στοιχεία σας αναρτήθηκαν στο %@";
 "home_set_complete_external_link_app_content" = "Κατεβάστε την εφαρμογή της κυβέρνησης για τις τελευταίες ειδήσεις και συμβουλές.";
 "home_set_complete_external_link_app_title" = "Αποκτήστε την εφαρμογή για τον Κορωνοϊό";
@@ -352,8 +379,6 @@
 "intro_content" = "Η COVIDSafe έχει αναπτυχθεί από την Αυστραλιανή Κυβέρνηση για την ασφάλεια της κοινότητας από την εξάπλωση του κορωνοϊού. \n\nΗ COVIDSafe θα σημειώσει με ασφάλεια την επαφή που έχετε με άλλους χρήστες της εφαρμογής. Αυτό θα επιτρέπει στους υπαλλήλους της Πολιτείας ή Επικράτειάς σας να επικοινωνήσουν μαζί σας, εάν έχετε στενή επαφή με κάποιον που έχει διαγνωστεί θετικά στον ιό.\n\nΜαζί μπορούμε να βοηθήσουμε να σταματήσουμε την εξάπλωση και να παραμείνουμε υγιείς.";
 /* OnBoarding Intro */
 "intro_headline" = "Μαζί μπορούμε να σταματήσουμε την εξάπλωση του COVID-19";
-/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
-"IntroLabel" = "Βοηθήστε να σταματήσουμε την εξάπλωση \nκαι σώστε ζωές.";
 "invalid_australian_phone_number_error_prompt" = "Οι αριθμοί κινητής τηλεφωνίας της Αυστραλίας περιέχουν έως 10 ψηφία.";
 "invalid_norfolk_island_phone_number_error_prompt" = "Οι αριθμοί κινητής τηλεφωνίας στο νησί Νόρφολκ περιέχουν 5 έως 6 ψηφία.";
 "is_snoozed" = "Η COVIDSafe βρίσκεται σε αναβολή";
@@ -364,8 +389,8 @@
 "jwt_heading" = "Παρακαλούμε εγγραφείτε ξανά";
 "jwt_success" = "Η εγγραφή ανανεώθηκε με επιτυχία";
 "last_7_days" = "Τις τελευταίες 7 ημέρες";
-"latest_case_numbers" = "";
-"latest_case_numbers_ios" = "";
+"latest_case_numbers" = "Οι τελευταίοι διαθέσιμοι αριθμοί περιστατικών από %@";
+"latest_case_numbers_ios" = "Οι τελευταίοι διαθέσιμοι αριθμοί περιστατικών από";
 "learn_more" = "";
 "loading_numbers" = "Φόρτωση τελευταίων αριθμών";
 "locally_acquired" = "%@ αποκτηθέν τοπικά";
@@ -389,26 +414,22 @@
 "no_handshakes_item3" = "Επανεκκινήστε το τηλέφωνό σας και ανοίξτε ξανά την εφαρμογή.";
 "no_handshakes_item4" = "";
 "no_handshakes_link" = "Διαβάστε περισσότερα για το πώς να ελέγξετε εάν η COVIDSafe λειτουργεί σωστά";
+"non_consent_button" = "Δεν συμφωνώ";
+"non_consent_popup" = "Δεν μπορείτε να συνεχίσετε τη διαδικασία εγγραφής χωρίς συναίνεση γονέα ή κηδεμόνα. \n\nΠαρακαλούμε βγείτε και σβήστε την εφαρμογή.";
 /* Figma page Android Screens (05/06) */
 "norfolk_hint" = "Για παράδειγμα: 51234";
 "northern_territory" = "Βόρεια Επικράτεια";
 "notification_bluetooth" = "Ενεργοποιήστε το Bluetooth για να λειτουργεί η COVIDSafe.";
 "notification_internet_content" = "Ανοίξτε την εφαρμογή και ελέγξτε τη σύνδεσή σας στο internet για να λειτουργήσει η COVIDSafe.";
+"notification_internet_content" = "Ανοίξτε την εφαρμογή και ελέγξτε τη σύνδεσή σας στο internet για να λειτουργήσει η COVIDSafe.";
 "notification_not_active_title" = "Η COVIDSafe δεν είναι ενεργή";
 "notification_settings" = "Ανοίξτε την εφαρμογή για να ελέγξετε τις ρυθμίσεις σας.";
 "notification_update_content" = "Ανανεώστε την εφαρμογή σας για πρόσβαση στις πιο πρόσφατες βελτιώσεις.";
 "notification_update_heading" = "Η ενημερωμένη έκδοση είναι διαθέσιμη!";
-/* Figma page iOS Screens (05/06) */
-"NotificationsBlurbLink" = "Αλλαγή στις ρυθμίσεις ειδοποιήσεων";
-/* Figma page iOS Screens (05/06) */
-"NotificationsDisabledBlurb" = "Δε θα λάβετε ειδοποίηση εάν η COVIDSafe δεν είναι ενεργή. \n Αλλαγή στις ρυθμίσεις ειδοποιήσεων";
-/* Figma page iOS Screens (05/06) */
-"NotificationsEnabledBlurb" = "Θα λάβετε ειδοποίηση εάν η COVIDSafe δεν είναι ενεργή. \n Αλλάξετε τις ρυθμίσεις ειδοποιήσεων";
 "numbers_error" = "Δεν είναι δυνατός ο έλεγχος για ενημερωμένους αριθμούς.";
 "numbers_no_internet" = "Συνδεθείτε στο Διαδίκτυο για να βεβαιωθείτε ότι λαμβάνετε ενημερωμένους αριθμούς.";
 "numbers_refresh" = "Ανανεώστε τώρα";
 "options_for_australia" = "Επιλογές για την Αυστραλία";
-"OS2b_Item_4" = "4. Το iPhone σας απαιτεί άδεια τοποθεσίας για να λειτουργήσει η COVIDSafe. *Η COVIDSafe ΔΕΝ συλλέγει, δεν αποθηκεύει ούτε χρησιμοποιεί τα δεδομένα τοποθεσίας σας*";
 "overseas_acquired" = "%@ αποκτηθέν στο εξωτερικό";
 "permission_button" = "Προχωρήστε";
 /* Figma page iOS Screens (05/06) */
@@ -432,30 +453,19 @@
 "personal_details_name_title" = "Ονοματεπώνυμο (ή ψευδώνυμο)";
 "personal_details_post_code" = "Ταχυδρομικός κώδικας στην Αυστραλία";
 "personal_details_post_code_error_prompt" = "Ο Αυστραλιανός ταχυδρομικός σας κώδικας πρέπει να περιέχει 4 ψηφία.";
-"PINNumber_VO_Label" = "Κωδικός PΙΝ";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusBody" = "Βεβαιωθείτε ότι είναι ενεργή πριν βγείτε από το σπίτι και όταν βρίσκεστε σε δημόσιους χώρους ενεργοποιώντας το Bluetooth®.";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusTitle" = "Η COVIDSafe δεν είναι ενεργή";
-"PN_MobileNumber_VOLabel" = "Αριθμός κινητού";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderBody" = "Ανοίξτε την COVIDSafe για να βεβαιωθείτε ότι λειτουργεί.";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderTitle" = "Δεν εντοπίστηκαν συναντήσεις για 48 ώρες";
 "postcode_api_error" = "Παρουσιάστηκε σφάλμα. Ελέγξτε τη σύνδεσή σας στο διαδίκτυο και δοκιμάστε ξανά.";
 "postcode_change_label" = "Ο ταχυδρομικός σας κώδικας στην Αυστραλία";
 "postcode_success" = "Ο ταχυδρομικός σας κώδικας έχει ενημερωθεί";
-"PostcodeValidationErrorMessage" = "Εισάγετε έναν έγκυρο ταχυδρομικό κώδικα της Αυστραλίας.";
 "privacy_policy" = "";
 "privacy_policy_description" = "";
 "queensland" = "Κουίνσλαντ";
 "recovered" = "Σύνολο ασθενών που ανάρρωσαν";
-"registration_consent_content" = "Συναινώ να είναι ο Οργανισμός Ψηφιακού Μετασχηματισμού διαχειριστής της αποθήκευσης δεδομένων, σύμφωνα με τη νομική απόφαση του Γενικού Γραμματέα Υγείας της Αυστραλίας που συλλέγει:";
+"registration_consent_content" = "Συναινώ ώστε το Υπουργείο Υγείας, ως διαχειριστής του χώρου αποθήκευσης δεδομένων σύμφωνα με τον Νόμο περί Απορρήτου του 1988, να συλλέγει τα εξής:";
 "registration_consent_diagnostic" = "Πληροφορίες για να διασφαλιστεί ότι η COVIDSafe λειτουργεί σωστά στη συσκευή μου.";
-"registration_consent_first_paragraph" = "Τα στοιχεία εγγραφής μου.";
+"registration_consent_first_paragraph" = "στοιχεία εγγραφής,";
 /* Onboarding Registration Consent */
 "registration_consent_headline" = "Συναίνεση εγγραφής";
-"registration_consent_second_paragraph" = "Πληροφορίες σχετικά με την επαφή μου με άλλους χρήστες της COVIDSafe, εάν άλλος χρήστης με τον οποίο έχω έρθει σε επαφή διαγνωστεί θετικά για το COVID-19 και ανεβάζει τα δικά του στοιχεία επικοινωνίας.";
+"registration_consent_second_paragraph" = "πληροφορίες για την επαφή μου με άλλους χρήστες της COVIDSafe, αν κάποιος άλλος χρήστης με τον οποίο έχω έρθει σε επαφή εξεταστεί και βρεθεί θετικός στην COVID-19 και αναρτήσει τα δικά του στοιχεία επικοινωνίας και";
 "restrictions_accommodation" = "Καταλύματα";
 "restrictions_activity" = "Δραστηριότητα";
 "restrictions_cafes" = "Καφετέριες και Εστιατόρια";
@@ -481,8 +491,6 @@
 "scheduled" = "Προγραμματίσατε την COVIDSafe για αναβολή από %@ έως %@ .";
 /* OnBoarding Enter Number */
 "select_country_or_region" = "Επιλέξτε χώρα ή περιοχή";
-/* Figma page Android Screens (05/06) */
-"Select_country_or_region_headline" = "Επιλέξτε χώρα ή περιοχή";
 "select_state_territory_button" = "Επιλογή πολιτείας ή επικράτειας";
 "select_state_territory_heading" = "Επιλογή πολιτείας ή επικράτειας";
 "set_snooze_time" = "Ορίστε χρόνο αναβολής";
@@ -514,7 +522,6 @@
 "stepCounter" = "Βήμα %d του %d";
 "support" = "Υποστήριξη";
 "support_content" = "Για βοήθεια σε θέματα που δεν καλύπτονται από θέματα Βοήθειας";
-"Support_VOLabel" = "Υποστήριξη. Για βοήθεια σε θέματα που δεν καλύπτονται στα θέματα Βοήθειας";
 "tasmania" = "Τασμανία";
 /* Example: "From 22 to 28 January 2021" */
 "to" = "";
@@ -524,17 +531,16 @@
 "total_per_state" = "Σύνολο επιβεβαιωμένων κρουσμάτων ανά πολιτεία και επικράτεια";
 "twenty_eight_days" = "28 ημέρες";
 "type_in_time" = "Πληκτρολογήστε την ώρα";
-"UILaunchStoryboardName" = "LaunchScreen_el_GR";
-"under_investigation" = "";
-"under_sixteen_content" = "Επιβεβαιώνω ότι ο γονέας ή ο κηδεμόνας μου συναινεί να είναι ο Οργανισμός Ψηφιακού Μετασχηματισμού  διαχειριστής του χώρου αποθήκευσης δεδομένων, σύμφωνα με νόμιμο καθορισμό του Γενικού Γραμματέα του Υπουργείου Υγείας της Αυστραλιανής Κυβέρνησης που συλλέγει:";
-"under_sixteen_first_paragraph" = "Τα στοιχεία εγγραφής μου.";
+/* Figma page Android Screens (05/06) */
+"under-sixteen_consent_call_for_action" = "Επιλέξτε «Συμφωνώ» για επιβεβαίωση της συναίνεσής σας ή «Δεν συμφωνώ» αν δεν μπορείτε να επιβεβαιώσετε τη συναίνεση γονέα ή κηδεμόνα. ";
+"under_investigation" = "%@ υπό διερεύνηση";
+"under_sixteen_content" = "Επιβεβαιώνω ότι ο γονέας ή ο κηδεμόνας μου συναινεί ώστε το Υπουργείο Υγείας, ως διαχειριστής του χώρου αποθήκευσης δεδομένων σύμφωνα με τον Νόμο περί Απορρήτου του 1988, να συλλέγει τα εξής:";
+"under_sixteen_first_paragraph" = "στοιχεία εγγραφής,";
 /* OnBoarding Under Sixteen */
 "under_sixteen_headline" = "Χρειάζεστε τη συναίνεση του γονέα/κηδεμόνα σας για να συνεχίσετε";
 /* Figma page Android Screens (05/06) */
-"under_sixteen_registration_consent_first_paragraph" = "Τα στοιχεία εγγραφής μου.";
-"under_sixteen_second_paragraph" = "Πληροφορίες για την επαφή μου με άλλους χρήστες της COVIDSafe, εάν ένας άλλος χρήστης με τον οποίο έχω έρθει σε επαφή έχει διαγνωστεί θετικά με COVID-19 και αναρτήσει τα στοιχεία επικοινωνίας του.";
-/* Figma page Android Screens (05/06) */
-"under-sixteen_consent_call_for_action" = "Επιλέξτε «Συμφωνώ» για επιβεβαίωση της συναίνεσής σας.";
+"under_sixteen_registration_consent_first_paragraph" = "στοιχεία εγγραφής,";
+"under_sixteen_second_paragraph" = "πληροφορίες για την επαφή μου με άλλους χρήστες της COVIDSafe, αν κάποιος άλλος χρήστης με τον οποίο έχω έρθει σε επαφή εξεταστεί και βρεθεί θετικός στην COVID-19 και αναρτήσει τα δικά του στοιχεία επικοινωνίας και";
 "update_available_app_store_btn" = "Πηγαίνετε στο App Store";
 "update_available_dismiss_btn" = "Θύμισέ μου αργότερα";
 "update_available_message_ios" = "Πραγματοποιήσαμε βελτιώσεις στην COVIDSafe. Ενημερώστε την εφαρμογή μέσῳ του App Store.";
@@ -572,38 +578,16 @@
 "Done" = "Ολοκλήρωση";
 /* Feedback */
 "EmailPlaceholder" = "Εισάγετε τη διεύθυνση email σας (απαιτείται)";
+"EnterPINSent" = "Εισάγετε τον κωδιό που στάλθηκε στο % @";
 /* Phone number and PIN */
 "EnterPhoneReVerify" = "Εισάγετε τον αριθμό του κινητού σας για επαλήθευση εκ νέου";
-"EnterPINSent" = "Εισάγετε τον κωδιό που στάλθηκε στο % @";
-/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_message" = "Γεια σας, πώς θα θέλατε να συνεχίσετε;";
-/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_title" = "Πλαίσιο σχολίων";
-/* Title for button that launches new feedback flow. */
-"entryPrompt_newFeedback_button_title" = "Νέα Σχόλια";
 "FoundIssueWithApp" = "Βρήκατε ένα πρόβλημα στην εφαρμογή COVIDSafe;";
-/* *** Feedback localised strings *** */
-"global_cancel_button_title" = "Ακύρωση";
-"global_send_button_title" = "Αποστολή";
-"global_sending_indication_title" = "Αποστολή";
-"global_success_indication_title" = "Επιτυχία";
 /* upload */
 "InformationUploaded" = "Τα στοιχεία σας αναρτήθηκαν στο %@";
 "InvalidOTP" = "Πρέπει να είναι εξαψήφιος κωδικός";
 "IssueDescPlaceholder" = "Περιγράψτε το πρόβλημα";
 "IssueFooter" = "Μπορεί να επικοινωνήσουμε μαζί σας για περισσότερες λεπτομέρειες σχετικά με τα σχόλια σας. Η διεύθυνση email σας δε θα χρησιμοποιηθεί για κανέναν άλλο σκοπό.";
 "IssueThankYou" = "Ευχαριστούμε! Λάβαμε τα σχόλια σας.";
-/* Delete screenshot action sheet action button title. */
-"newFeedback_deleteScreenshot_actionTitle" = "Διαγράψετε το στιγμιότυπο οθόνης";
-/* Messsage shown to user asking to confirm screenshot deletion. */
-"newFeedback_deleteScreenshotConfirmation_message" = "Το στιγμιότυπο οθόνης θα διαγραφεί οριστικά.";
-"newFeedback_invalidEmail_errorMessage" = "Εισάγετε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου (email)!";
-/* Error message displayed to users when feedback has empty description */
-"newFeedback_noMessage_errorMessage" = "Πείτε μας κάτι πριν το στείλετε.";
-/* Error message displayed to users when feedback fails to send. */
-"newFeedback_send_errorMessage" = "Σφάλμα κατά την αποστολή σχολίων";
-/* Navigation Bar title shown during new feedback flow. */
-"newFeedbackFlow_navigationTitle" = "Αναφορά προβλήματος";
 "Next" = "Επόμενο";
 /* registration succcess */
 "OS2b_Item1" = "1. Όταν βγαίνετε από το σπίτι, να έχετε το τηλέφωνό σας πάνω σας και να βεβαιωθείτε ότι η COVIDSafe είναι ενεργή.";
@@ -611,6 +595,7 @@
 "OS2b_Item2_VOLabel" = "2. Το Bluetooth πρέπει να παραμείνει ενεργοποιημένο.";
 "OS2b_Item3" = "3. Η COVIDSafe δεν αποστέλλει αιτήματα σύζευξης. Μάθετε περισσότερα.";
 "OS2b_Item3Underline" = "Μάθετε περισσότερα";
+"PINWillExpire" = "Ο κωδικός σας θα λήξει σε %@";
 /* home */
 "PairingRequestsInfo" = "Η COVIDSafe δεν αποστέλλει αιτήματα σύζευξης.";
 "PairingRequestsInfoUnderline" = "αιτήματα σύζευξης";
@@ -618,7 +603,6 @@
 "PhoneNumberFormatErrorTitle" = "Λάθος σύνταξη του αριθμού";
 "PhoneVerificationErrorMessage" = "Ελέγξτε τα στοιχεία σας και προσπαθήστε ξανά.";
 "PhoneVerificationErrorTitle" = "Σφάλμα επαλήθευσης του αριθμού τηλεφώνου";
-"PINWillExpire" = "Ο κωδικός σας θα λήξει σε %@";
 "ReceivePinIssue" = "Προβλήματα με τη λήψη του κωδικού σας;";
 /* help */
 "ReportAnIssue" = "Αναφέρετε ένα πρόβλημα";
@@ -627,13 +611,35 @@
 "UploadFailed" = "Η ανάρτηση απέτυχε. Δοκιμάστε πάλι αργότερα.";
 "UploadFailedErrorMessage" = "Δοκιμάστε ξανά αργότερα.";
 "ValidationError" = "Σφάλμα επικύρωσης";
+/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_message" = "Γεια σας, πώς θα θέλατε να συνεχίσετε;";
+/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_title" = "Πλαίσιο σχολίων";
+/* Title for button that launches new feedback flow. */
+"entryPrompt_newFeedback_button_title" = "Νέα Σχόλια";
+/* *** Feedback localised strings *** */
+"global_cancel_button_title" = "Ακύρωση";
+"global_send_button_title" = "Αποστολή";
+"global_sending_indication_title" = "Αποστολή";
+"global_success_indication_title" = "Επιτυχία";
+/* Navigation Bar title shown during new feedback flow. */
+"newFeedbackFlow_navigationTitle" = "Αναφορά προβλήματος";
+/* Messsage shown to user asking to confirm screenshot deletion. */
+"newFeedback_deleteScreenshotConfirmation_message" = "Το στιγμιότυπο οθόνης θα διαγραφεί οριστικά.";
+/* Delete screenshot action sheet action button title. */
+"newFeedback_deleteScreenshot_actionTitle" = "Διαγράψετε το στιγμιότυπο οθόνης";
+"newFeedback_invalidEmail_errorMessage" = "Εισάγετε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου (email)!";
+/* Error message displayed to users when feedback has empty description */
+"newFeedback_noMessage_errorMessage" = "Πείτε μας κάτι πριν το στείλετε.";
+/* Error message displayed to users when feedback fails to send. */
+"newFeedback_send_errorMessage" = "Σφάλμα κατά την αποστολή σχολίων";
 "GetCoronaVirusApp_VOLabel" = "Αποκτήστε την εφαρμογή για τον Κορωνοϊό. Κατεβάστε την κυβερνητική εφαρμογή για τις τελευταίες ειδήσεις και συμβουλές.";
 "HelpTopics_VOLabel" = "Θέματα βοήθειας. Εάν έχετε προβλήματα ή απορίες σχετικά με την εφαρμογή.";
 "LatestNews_VOLabel" = "Τελευταίες ειδήσεις και ενημερώσεις. Επισκεφτείτε τη σελίδα aus.gov.au για τα τελευταία νέα του Κορωνοϊού.";
 "NotificationsDisabled_VOLabel" = "Οι ειδοποιήσεις είναι απενεργοποιημένες. Δε θα λάβετε ειδοποίηση εάν η COVIDSafe δεν είναι ενεργή. \nΑλλάξετε τις ρυθμίσεις ειδοποίησης";
 "NotificationsEnabled_VOLabel" = "Οι ειδοποιήσεις είναι ενεργοποιημένες. Θα λάβετε ειδοποίηση εάν η COVIDSafe δεν είναι ενεργή. \nΑλλαγή ρυθμίσεων ειδοποίησης";
 "OS1b_TopParagraph_VOLabel" = "Τα σήματα Bluetooth χρησιμοποιούνται για να προσδιορίσουν πότε βρίσκεστε κοντά σε άλλο χρήστη της COVIDSafe. \nΚάθε στενή επαφή σας με άλλους χρήστες της COVIDSafe σημειώνεται για να δημιουργεί στενά στοιχεία επικοινωνίας. Οι πληροφορίες είναι κρυπτογραφημένες και αποθηκεύονται μόνο στο τηλέφωνό σας. \nΕάν έχετε διαγνωστεί θετικά στον COVID-19 κατόπιν χρήσης της COVIDSafe, ένας υπεύθυνος υγείας της Πολιτείας ή της Επικράτειάς σας θα επικοινωνήσει μαζί σας. Θα βοηθήσει με την εθελοντική ανάρτηση των προσωπικών στοιχείων επικοινωνίας σας σε ένα εξαιρετικά ασφαλές σύστημα αποθήκευσης πληροφοριών. \nΟι υπεύθυνοι υγείας της Πολιτείας ή της Επικράτειάς σας μπορούν επίσης να επικοινωνήσουν μαζί σας εάν ήρθατε σε στενή επαφή με άλλο χρήστη της COVIDSafe που επίσης διαγνώστηκε θετικά. \nΓια περισσότερες πληροφορίες, πηγαίνετε στη σελίδα Θέματα Βοήθειας.";
-"permission_content_iOS_2_VOLabel" = "1. Bluetooth\n 2. Ειδοποιήσεις\n 3. Υπηρεσίες Τοποθεσίας";
-"permission_content_iOS_VOLabel" = "Η COVIDSafe χρειάζεται Bluetooth για να λειτουργεί. Η COVIDSafe δεν αποστέλλει αιτήματα σύζευξης. \n\n Ενεργοποιώντας τις Ειδοποιήσεις, λαμβάνετε ενημερώσεις που σας υπενθυμίζουν πότε η COVIDSafe δεν είναι ενεργή. \n\nΤο iPhone σας απαιτεί άδεια τοποθεσίας για να λειτουργεί το COVIDSafe. * Η COVIDSafe ΔΕΝ παρακολουθεί ούτε αποθηκεύει τα δεδομένα τοποθεσίας σας * \n\n Επιλέξτε \"Συνέχεια\" για να ενεργοποιήσετε:";
 "ShareCovidSafe_VOLabel" = "Μοιραστείτε την COVIDSafe. Καλέστε και άλλους να βοηθήσουν. Μαζί, είμαστε ισχυρότεροι.";
 "UploadData_VOLabel" = "Έχει επικοινωνήσει μαζί σας υπάλληλος υγείας; Μπορείτε να αναρτήσετε τις πληροφορίες σας μόνο αν έχετε διαγνωστεί θετικά.";
+"permission_content_iOS_2_VOLabel" = "1. Bluetooth\n 2. Ειδοποιήσεις\n 3. Υπηρεσίες Τοποθεσίας";
+"permission_content_iOS_VOLabel" = "Η COVIDSafe χρειάζεται Bluetooth για να λειτουργεί. Η COVIDSafe δεν αποστέλλει αιτήματα σύζευξης. \n\n Ενεργοποιώντας τις Ειδοποιήσεις, λαμβάνετε ενημερώσεις που σας υπενθυμίζουν πότε η COVIDSafe δεν είναι ενεργή. \n\nΤο iPhone σας απαιτεί άδεια τοποθεσίας για να λειτουργεί το COVIDSafe. * Η COVIDSafe ΔΕΝ παρακολουθεί ούτε αποθηκεύει τα δεδομένα τοποθεσίας σας * \n\n Επιλέξτε \"Συνέχεια\" για να ενεργοποιήσετε:";
\ No newline at end of file
diff --git a/CovidSafe/en.lproj/Localizable.strings b/CovidSafe/en.lproj/Localizable.strings
index bb242b9..f903e9b 100644
--- a/CovidSafe/en.lproj/Localizable.strings
+++ b/CovidSafe/en.lproj/Localizable.strings
@@ -1,3 +1,38 @@
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothOFF" = "Access to Bluetooth®: OFF";
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothON" = "Access to Bluetooth®: ON";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF" = "Bluetooth®: OFF";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF_content" = "Turn on your phone’s Bluetooth®. Select ‘Allow New Connections’ if displayed.";
+/* Figma page iOS Screens (05/06) */
+"BluetoothON" = "Bluetooth®: ON";
+/* Figma page Android Screens (05/06) */
+"Enter_your_mobile_number_label" = "Enter your mobile number";
+/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
+"IntroLabel" = "Help stop the spread\nand save lives.";
+/* Figma page iOS Screens (05/06) */
+"NotificationsBlurbLink" = "Change notifications settings";
+/* Figma page iOS Screens (05/06) */
+"NotificationsDisabledBlurb" = "You will not receive a notification if COVIDSafe is not active.\nChange notifications settings";
+/* Figma page iOS Screens (05/06) */
+"NotificationsEnabledBlurb" = "You will receive a notification if COVIDSafe is not active.\nChange notifications settings";
+"OS2b_Item_4" = "4. Your iPhone requires Location permission for COVIDSafe to work. *COVIDSafe does NOT collect, store or use your location data*";
+"PINNumber_VO_Label" = "PIN number";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusBody" = "Make sure it’s active before you leave home and when in public places by enabling Bluetooth®.";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusTitle" = "COVIDSafe is not active";
+"PN_MobileNumber_VOLabel" = "Mobile number";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderBody" = "Open COVIDSafe to ensure it is running.";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderTitle" = "No encounters detected for 48 hours";
+"PostcodeValidationErrorMessage" = "Please enter a valid Australian postcode.";
+/* Figma page Android Screens (05/06) */
+"Select_country_or_region_headline" = "Select country or region";
+"Support_VOLabel" = "Support. For assistance on issues not covered by Help topics";
 "action_continue" = "Continue";
 "action_report_an_issue" = "Report an issue";
 "action_upload_done" = "Done";
@@ -11,20 +46,10 @@
 "activity_intro_2" = "The number of handshakes shows you were in close range with another COVIDSafe user. It does NOT mean that you have been in contact with a user who has tested positive for COVID-19.";
 /* Figma page iOS Screens (05/06) */
 "allow_bluetooth_call" = "Allow COVIDSafe to access Bluetooth®";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothOFF" = "Access to Bluetooth®: OFF";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothON" = "Access to Bluetooth®: ON";
 "app_activity_bluetooth_handshakes_heading" = "Bluetooth handshakes recorded by your device:";
 "australian_capital_territory" = "Australian Capital Territory";
 "ble_handshakes_yesterday" = "Bluetooth handshakes recorded by your device yesterday";
 "bluetooth_handshakes" = "Bluetooth handshakes";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF" = "Bluetooth®: OFF";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF_content" = "Turn on your phone’s Bluetooth®. Select ‘Allow New Connections’ if displayed.";
-/* Figma page iOS Screens (05/06) */
-"BluetoothON" = "Bluetooth®: ON";
 "cancel_snooze" = "Cancel snooze";
 "cases_28_days" = "New cases in the last 28 days";
 "cases_7_days" = "New cases in the last 7 days";
@@ -250,8 +275,9 @@
 "country_region_name_zw" = "Zimbabwe";
 "customise_days" = "Customise days";
 "data_privacy_button" = "Next";
-"data_privacy_content" = "It is important that you read the COVIDSafe *privacy policy* before you register for COVIDSafe.\n\nCOVIDSafe will collect, use or disclose your personal information only in accordance with this policy and the Privacy Act 1988.\n\nIf you are under 16 years of age, your parent/guardian must also read the *privacy policy*.\n\nUse of COVIDSafe is completely voluntary. You can install or delete the application at any time. If you delete COVIDSafe, *you may also ask for your information* to be deleted from the secure server.\n\nTo register for COVIDSafe, you will need to enter a name (or pseudonym), mobile number, age range and postcode.\n\nInformation you submit when you register and information about your use of COVIDSafe is stored on a highly secure server.\n\nInformation is also collected to make sure that COVIDSafe is working properly on your device. This includes your operating system, the version of the App you have installed, the language your device is set to, whether Bluetooth® is working and if your App has recorded any encounters in the previous seven days.\n\nCOVIDSafe will not collect your location information.\n\nCOVIDSafe will note the date and time of contact, anonymous ID code of other COVIDSafe users you come into contact with, Bluetooth signal strength and the phone model of other users, on your device.\n\nOther COVIDSafe users you come into contact with will note your anonymous ID code, the date and time of contact with you, Bluetooth signal strength and your phone model, on their device.\n\nIf another user tests positive to COVID-19, they may upload their contact information and a state or territory health official may contact you for contact tracing purposes.\n\nYour registration details will only be used or disclosed for contact tracing and for the proper and lawful functioning of COVIDSafe.\n\nMore information is available at the *covidsafe.gov.au* website.\n\nSee the COVIDSafe *privacy policy* for further details about your rights about your information and how it will be handled and shared.";
-"data_privacy_content_VO" = "It is important that you read the COVIDSafe privacy policy before you register for COVIDSafe.\n\nCOVIDSafe will collect, use or disclose your personal information only in accordance with this policy and the Privacy Act 1988.\n\nIf you are under 16 years of age, your parent/guardian must also read the privacy policy.\n\nUse of COVIDSafe is completely voluntary. You can install or delete the application at any time. If you delete COVIDSafe, you may also ask for your information to be deleted from the secure server.\n\nTo register for COVIDSafe, you will need to enter a name (or pseudonym), mobile number, age range and postcode.\n\nInformation you submit when you register and information about your use of COVIDSafe is stored on a highly secure server.\n\nInformation is also collected to make sure that COVIDSafe is working properly on your device. This includes your operating system, the version of the App you have installed, the language your device is set to, whether Bluetooth is working and if your App has recorded any encounters in the previous seven days.\n\nCOVIDSafe will not collect your location information.\n\nCOVIDSafe will note the date and time of contact, anonymous ID code of other COVIDSafe users you come into contact with, Bluetooth signal strength and the phone model of other users, on your device.\n\nOther COVIDSafe users you come into contact with will note your anonymous ID code, the date and time of contact with you, Bluetooth signal strength and your phone model, on their device.\n\nIf another user tests positive to COVID-19, they may upload their contact information and a state or territory health official may contact you for contact tracing purposes.\n\nYour registration details will only be used or disclosed for contact tracing and for the proper and lawful functioning of COVIDSafe.\n\nMore information is available at the covidsafe.gov.au website.\n\nSee the COVIDSafe privacy policy for further details about your rights about your information and how it will be handled and shared.";
+"data_privacy_content" = "It is important that you read the COVIDSafe *privacy policy* before you register for COVIDSafe. COVIDSafe will collect, use or disclose your personal information only in accordance with this policy and the <i>Privacy Act 1988</i>.\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. If you do not provide your personal information, the COVIDSafe app is unable to function as intended.\n\nTo register for COVIDSafe, you will need to enter a name (or pseudonym), mobile number, age range and postcode.\n\nInformation you submit when you register and information about your use of COVIDSafe is stored on a highly secure server.\n\nInformation is also collected to make sure that COVIDSafe is working properly on your device. This includes your operating system, the version of the App you have installed, the language your device is set to, whether Bluetooth® is working and if your App has recorded any encounters in the previous seven days.\n\nCOVIDSafe will not collect your location information.\n\nCOVIDSafe will note the date and time of contact, encrypted  ID code of other COVIDSafe users you come into contact with, Bluetooth signal strength and the phone model of other users, on your device.\n\nOther COVIDSafe users you come into contact with will note your encrypted  ID code, the date and time of contact with you, Bluetooth signal strength and your phone model, on their device.\n\nIf another user tests positive to COVID-19, they may upload their contact information and a state or territory health official may contact you for contact tracing purposes.\n\nYour registration details will only be used or disclosed for contact tracing and for the proper and lawful functioning of COVIDSafe.\n\nMore information is available at the *covidsafe.gov.au* website.\n\nThe COVIDSafe *privacy policy* provides further details about your rights about your information and how it will be handled and shared.\n\nContact details relating to COVIDSafe privacy enquiries and complaints are provided in the privacy policy under *Contact Us*.";
+"data_privacy_content_VO" = "It is important that you read the COVIDSafe privacy policy before you register for COVIDSafe. COVIDSafe will collect, use or disclose your personal information only in accordance with this policy and the Privacy Act 1988.\n\nIf you are under 16 years of age, your parent/guardian must also read the privacy policy.\n\nUse of COVIDSafe is completely voluntary. You can install or delete the application at any time. If you delete COVIDSafe, you may also ask for your information to be deleted from the secure server. If you do not provide your personal information, the COVIDSafe app is unable to function as intended.\n\nTo register for COVIDSafe, you will need to enter a name (or pseudonym), mobile number, age range and postcode.\n\nInformation you submit when you register and information about your use of COVIDSafe is stored on a highly secure server.\n\nInformation is also collected to make sure that COVIDSafe is working properly on your device. This includes your operating system, the version of the App you have installed, the language your device is set to, whether Bluetooth is working and if your App has recorded any encounters in the previous seven days.\n\nCOVIDSafe will not collect your location information.\n\nCOVIDSafe will note the date and time of contact, encrypted  ID code of other COVIDSafe users you come into contact with, Bluetooth signal strength and the phone model of other users, on your device.\n\nOther COVIDSafe users you come into contact with will note your encrypted  ID code, the date and time of contact with you, Bluetooth signal strength and your phone model, on their device.\n\nIf another user tests positive to COVID-19, they may upload their contact information and a state or territory health official may contact you for contact tracing purposes.\n\nYour registration details will only be used or disclosed for contact tracing and for the proper and lawful functioning of COVIDSafe.\n\nMore information is available at the covidsafe.gov.au website.\n\nThe COVIDSafe privacy policy provides further details about your rights about your information and how it will be handled and shared.\n\nContact details relating to COVIDSafe privacy enquiries and complaints are provided in the privacy policy under Contact Us.";
+"data_privacy_content_android" = "It is important that you read the COVIDSafe *privacy policy* before you register for COVIDSafe. COVIDSafe will collect, use or disclose your personal information only in accordance with this policy and the <i>Privacy Act 1988</i>.\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. If you do not provide your personal information, the COVIDSafe app is unable to function as intended.\n\nInformation you submit when you register and information about your use of COVIDSafe is stored on a highly secure server.\n\nInformation is also collected to make sure that COVIDSafe is working properly on your device. This includes your operating system, the version of the App you have installed, the language your device is set to, whether Bluetooth® is working and if your App has recorded any encounters in the previous seven days.\n\nOn Android devices, it also includes information about whether battery optimisation is disabled and location services is enabled.\n\nCOVIDSafe will not collect your location information.\n\nCOVIDSafe will note the date and time of contact, encrypted ID code of other COVIDSafe users you come into contact with, Bluetooth signal strength and the phone model of other users, on your device.\n\nOther COVIDSafe users you come into contact with will note your encrypted  ID code, the date and time of contact with you, Bluetooth signal strength and your phone model, on their device.\n\nIf another user tests positive to COVID-19, they may upload their contact information and a state or territory health official may contact you for contact tracing purposes.\n\nYour registration details will only be used or disclosed for contact tracing and for the proper and lawful functioning of COVIDSafe.\n\nMore information is available at the *covidsafe.gov.au* website.\n\nThe COVIDSafe *privacy policy* provides further details about your rights about your information and how it will be handled and shared. \n\nContact details relating to COVIDSafe privacy enquiries and complaints are provided in the privacy policy under *Contact Us*.";
 /* OnBoarding Data Privacy */
 "data_privacy_headline" = "Registration and privacy";
 "deaths" = "Deaths";
@@ -272,8 +298,6 @@
 "enter_pin_resend_pin" = "Resend PIN";
 "enter_pin_timer_expire" = "Your PIN will expire in";
 "enter_pin_wrong_number" = "Is this mobile number wrong?";
-/* Figma page Android Screens (05/06) */
-"Enter_your_mobile_number_label" = "Enter your mobile number";
 "every_day" = "Every day";
 "factors_dotpoint1" = "number of COVIDSafe users in range";
 "factors_dotpoint2" = "device model and age";
@@ -289,10 +313,10 @@
 /* Error message for when a user tries to signup outside of Australia. */
 "geoblock_error_message" = "You may be connected using an internet provider from outside Australia. This could happen when using international data roaming on a non-Australian SIM card.\n\nPlease connect to an Australian network or use a local Wi-Fi internet connection to continue.";
 "geoblock_rego_error" = "Note: You can only complete registration once you’ve arrived in Australia.";
+"global_OK" = "OK";
 "global_back" = "Back";
 "global_close" = "Close";
 "global_double_tap" = "double tap to edit";
-"global_OK" = "OK";
 "hide" = "Hide";
 "home_app_permission_status_subtitle" = "COVIDSafe won't work without the right settings. ";
 "home_app_permission_status_title" = "Check your settings";
@@ -302,9 +326,12 @@
 /* Home */
 "home_header_active_title" = "COVIDSafe is active.";
 /* Home */
+"home_header_active_title" = "COVIDSafe is active.";
+/* Home */
 "home_header_active_title_thanks" = "Thanks, COVIDSafe is now active.";
 "home_header_inactive_check_your_permissions" = "Check your settings.";
 "home_header_inactive_title" = "COVIDSafe is not active";
+"home_header_inactive_title" = "COVIDSafe is not active";
 "home_header_uploaded_on_date_ios" = "Your information was uploaded on %@.";
 "home_set_complete_external_link_app_content" = "Download the government app for the latest news and advice.";
 "home_set_complete_external_link_app_title" = "Get the Coronavirus app";
@@ -352,8 +379,6 @@
 "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.";
 /* OnBoarding Intro */
 "intro_headline" = "Together we can stop the spread of COVID-19";
-/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
-"IntroLabel" = "Help stop the spread\nand save lives.";
 "invalid_australian_phone_number_error_prompt" = "Australian mobile numbers contain a maximum of 10 digits.";
 "invalid_norfolk_island_phone_number_error_prompt" = "Mobile numbers in Norfolk Island contain 5 to 6 digits.";
 "is_snoozed" = "COVIDSafe is snoozed";
@@ -389,26 +414,22 @@
 "no_handshakes_item3" = "Restart your phone and open the app again.";
 "no_handshakes_item4" = "Check if you have the right settings for <a href=\"https://www.covidsafe.gov.au/help-topics.html#location-services\">Location Services</a>.";
 "no_handshakes_link" = "Read more on how to check if COVIDSafe is working correctly";
+"non_consent_button" = "I do not agree";
+"non_consent_popup" = "You cannot continue with the registration process without parent or guardian consent.\n\nPlease exit and delete the app.";
 /* Figma page Android Screens (05/06) */
 "norfolk_hint" = "For example: 51234";
 "northern_territory" = "Northern Territory";
 "notification_bluetooth" = "Turn on Bluetooth for COVIDSafe to work.";
 "notification_internet_content" = "Open the app and check your internet connection for COVIDSafe to work.";
+"notification_internet_content" = "Open the app and check your internet connection.";
 "notification_not_active_title" = "COVIDSafe is not active";
 "notification_settings" = "Open the app to check your settings.";
 "notification_update_content" = "Update your app to access the latest improvements.";
 "notification_update_heading" = "COVIDSafe update available ";
-/* Figma page iOS Screens (05/06) */
-"NotificationsBlurbLink" = "Change notifications settings";
-/* Figma page iOS Screens (05/06) */
-"NotificationsDisabledBlurb" = "You will not receive a notification if COVIDSafe is not active.\nChange notifications settings";
-/* Figma page iOS Screens (05/06) */
-"NotificationsEnabledBlurb" = "You will receive a notification if COVIDSafe is not active.\nChange notifications settings";
 "numbers_error" = "Unable to check for updated numbers.";
 "numbers_no_internet" = "Connect to the internet to ensure you get updated numbers.";
 "numbers_refresh" = "Refresh now";
 "options_for_australia" = "Options for Australia";
-"OS2b_Item_4" = "4. Your iPhone requires Location permission for COVIDSafe to work. *COVIDSafe does NOT collect, store or use your location data*";
 "overseas_acquired" = "%@ acquired overseas";
 "permission_button" = "Proceed";
 /* Figma page iOS Screens (05/06) */
@@ -432,30 +453,19 @@
 "personal_details_name_title" = "Full name (or pseudonym)";
 "personal_details_post_code" = "Postcode in Australia";
 "personal_details_post_code_error_prompt" = "Your Australian postcode number must contain 4 digits. ";
-"PINNumber_VO_Label" = "PIN number";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusBody" = "Make sure it’s active before you leave home and when in public places by enabling Bluetooth®.";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusTitle" = "COVIDSafe is not active";
-"PN_MobileNumber_VOLabel" = "Mobile number";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderBody" = "Open COVIDSafe to ensure it is running.";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderTitle" = "No encounters detected for 48 hours";
 "postcode_api_error" = "There was an error. Check your internet connection and try again.";
 "postcode_change_label" = "Current postcode in Australia ";
 "postcode_success" = "Your postcode has been updated";
-"PostcodeValidationErrorMessage" = "Please enter a valid Australian postcode.";
 "privacy_policy" = "Privacy policy";
 "privacy_policy_description" = "Read the privacy policy for COVIDSafe app";
 "queensland" = "Queensland";
 "recovered" = "Total cases recovered";
-"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:";
-"registration_consent_diagnostic" = "information to ensure that COVIDSafe is working properly on my device";
-"registration_consent_first_paragraph" = "my registration information";
+"registration_consent_content" = "I consent to the Department of Health as data store administrator, under the <i>Privacy Act 1988</i>, collecting:";
+"registration_consent_diagnostic" = "information to ensure that COVIDSafe is working properly on my device.";
+"registration_consent_first_paragraph" = "registration information,";
 /* Onboarding Registration Consent */
 "registration_consent_headline" = "Registration consent";
-"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";
+"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, and";
 "restrictions_accommodation" = "Accommodation";
 "restrictions_activity" = "Activity";
 "restrictions_cafes" = "Cafes and Restaurants";
@@ -481,8 +491,6 @@
 "scheduled" = "You scheduled COVIDSafe to snooze from %@ to %@.";
 /* OnBoarding Enter Number */
 "select_country_or_region" = "Select country or region";
-/* Figma page Android Screens (05/06) */
-"Select_country_or_region_headline" = "Select country or region";
 "select_state_territory_button" = "Select state or territory";
 "select_state_territory_heading" = "Select state or territory";
 "set_snooze_time" = "Set snooze time";
@@ -514,7 +522,6 @@
 "stepCounter" = "Step %d of %d";
 "support" = "Support";
 "support_content" = "For assistance on issues not covered by Help topics";
-"Support_VOLabel" = "Support. For assistance on issues not covered by Help topics";
 "tasmania" = "Tasmania";
 /* Example: "From 22 to 28 January 2021" */
 "to" = "to";
@@ -524,17 +531,16 @@
 "total_per_state" = "Total confirmed cases by state and territory";
 "twenty_eight_days" = "28 days";
 "type_in_time" = "Type in time";
-"UILaunchStoryboardName" = "LaunchScreen_en";
+/* Figma page Android Screens (05/06) */
+"under-sixteen_consent_call_for_action" = "Select 'I agree' to confirm consent, or ‘I do not agree’ if you cannot confirm parent or guardian consent. ";
 "under_investigation" = "%@ under investigation";
-"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:";
-"under_sixteen_first_paragraph" = "my registration information";
+"under_sixteen_content" = "I confirm my parent or guardian consents to the Department of Health, as data store administrator under the <i>Privacy Act 1988</i>, collecting:";
+"under_sixteen_first_paragraph" = "registration information,";
 /* OnBoarding Under Sixteen */
 "under_sixteen_headline" = "You need the consent of your parent/guardian to proceed";
 /* Figma page Android Screens (05/06) */
-"under_sixteen_registration_consent_first_paragraph" = "my registration information";
-"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";
-/* Figma page Android Screens (05/06) */
-"under-sixteen_consent_call_for_action" = "Select 'I agree' to confirm consent. ";
+"under_sixteen_registration_consent_first_paragraph" = "registration information,";
+"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, and";
 "update_available_app_store_btn" = "Go to App Store";
 "update_available_dismiss_btn" = "Remind me later";
 "update_available_message_ios" = "We’ve been making improvements to COVIDSafe. Update through the App Store";
@@ -557,7 +563,7 @@
 "upload_step_verify_pin_header" = "Upload your information";
 "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.";
 "us_consent_button" = "I agree";
-"us_registration_consent_diagnostic" = "information to ensure that COVIDSafe is working properly on my device";
+"us_registration_consent_diagnostic" = "information to ensure that COVIDSafe is working properly on my device.";
 "victoria" = "Victoria";
 "western_australia" = "Western Australia";
 "wrong_ping_number" = " Wrong PIN entered";
@@ -572,38 +578,16 @@
 "Done" = "Done";
 /* Feedback */
 "EmailPlaceholder" = "Enter your email address (required)";
+"EnterPINSent" = "Enter the PIN sent to %@";
 /* Phone number and PIN */
 "EnterPhoneReVerify" = "Enter your mobile number to re-verify";
-"EnterPINSent" = "Enter the PIN sent to %@";
-/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_message" = "Hello mate, how would you like to proceed?";
-/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_title" = "Feedback Box";
-/* Title for button that launches new feedback flow. */
-"entryPrompt_newFeedback_button_title" = "New Feedback";
 "FoundIssueWithApp" = "Found an issue in the COVIDSafe app?";
-/* *** Feedback localised strings *** */
-"global_cancel_button_title" = "Cancel";
-"global_send_button_title" = "Send";
-"global_sending_indication_title" = "Sending";
-"global_success_indication_title" = "Success";
 /* upload */
 "InformationUploaded" = "Your information was uploaded on %@";
 "InvalidOTP" = "Must be a 6-digit code";
 "IssueDescPlaceholder" = "Please describe the issue";
 "IssueFooter" = "We may contact you for further details about your feedback. Your email address won’t be used for any other purpose.";
 "IssueThankYou" = "Thank you! We have received your feedback.";
-/* Delete screenshot action sheet action button title. */
-"newFeedback_deleteScreenshot_actionTitle" = "Delete Screenshot";
-/* Messsage shown to user asking to confirm screenshot deletion. */
-"newFeedback_deleteScreenshotConfirmation_message" = "This screenshot will be deleted permanently.";
-"newFeedback_invalidEmail_errorMessage" = "Please enter a valid email address!";
-/* Error message displayed to users when feedback has empty description */
-"newFeedback_noMessage_errorMessage" = "Tell us something before sending.";
-/* Error message displayed to users when feedback fails to send. */
-"newFeedback_send_errorMessage" = "Error Sending Feedback";
-/* Navigation Bar title shown during new feedback flow. */
-"newFeedbackFlow_navigationTitle" = "Report an issue";
 "Next" = "Next";
 /* registration succcess */
 "OS2b_Item1" = "1. When you leave home, keep your phone with you and make sure COVIDSafe is active.";
@@ -611,6 +595,7 @@
 "OS2b_Item2_VOLabel" = "2. Bluetooth should be kept ON.";
 "OS2b_Item3" = "3. COVIDSafe does not send pairing requests. Learn more.";
 "OS2b_Item3Underline" = "Learn more";
+"PINWillExpire" = "Your PIN will expire in %@";
 /* home */
 "PairingRequestsInfo" = "COVIDSafe does not send pairing requests.";
 "PairingRequestsInfoUnderline" = "pairing requests";
@@ -618,7 +603,6 @@
 "PhoneNumberFormatErrorTitle" = "Wrong number format";
 "PhoneVerificationErrorMessage" = "Please check your details and try again.";
 "PhoneVerificationErrorTitle" = "Error verifying phone number";
-"PINWillExpire" = "Your PIN will expire in %@";
 "ReceivePinIssue" = "Issues receiving your PIN?";
 /* help */
 "ReportAnIssue" = "Report an issue";
@@ -627,13 +611,35 @@
 "UploadFailed" = "Upload failed. Please try again later.";
 "UploadFailedErrorMessage" = "Please try again later.";
 "ValidationError" = "Validation error";
+/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_message" = "Hello mate, how would you like to proceed?";
+/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_title" = "Feedback Box";
+/* Title for button that launches new feedback flow. */
+"entryPrompt_newFeedback_button_title" = "New Feedback";
+/* *** Feedback localised strings *** */
+"global_cancel_button_title" = "Cancel";
+"global_send_button_title" = "Send";
+"global_sending_indication_title" = "Sending";
+"global_success_indication_title" = "Success";
+/* Navigation Bar title shown during new feedback flow. */
+"newFeedbackFlow_navigationTitle" = "Report an issue";
+/* Messsage shown to user asking to confirm screenshot deletion. */
+"newFeedback_deleteScreenshotConfirmation_message" = "This screenshot will be deleted permanently.";
+/* Delete screenshot action sheet action button title. */
+"newFeedback_deleteScreenshot_actionTitle" = "Delete Screenshot";
+"newFeedback_invalidEmail_errorMessage" = "Please enter a valid email address!";
+/* Error message displayed to users when feedback has empty description */
+"newFeedback_noMessage_errorMessage" = "Tell us something before sending.";
+/* Error message displayed to users when feedback fails to send. */
+"newFeedback_send_errorMessage" = "Error Sending Feedback";
 "GetCoronaVirusApp_VOLabel" = "Get the Coronavirus app. Download the government app for the latest news and advice.";
 "HelpTopics_VOLabel" = "Help topics. Guidance on how to troubleshoot and fix technical issues";
 "LatestNews_VOLabel" = "Latest news and updates. Head to aus.gov.au for the latest Coronavirus news.";
 "NotificationsDisabled_VOLabel" = "Notifications are disabled. You will not receive a notification if COVIDSafe is not active.\nChange notification settings";
 "NotificationsEnabled_VOLabel" = "Notifications are enabled. You will receive a notification if COVIDSafe is not active.\nChange notification settings";
 "OS1b_TopParagraph_VOLabel" = "Bluetooth signals are used to determine when you're near another COVIDSafe user.\nEvery instance of close contact between you and other COVIDSafe users is noted to create close contact information. This information is encrypted and only stored in your phone.\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 close contact information to a highly secure information storage system.\nState or territory health officials can also contact you if you came in close contact with another COVIDSafe user who tested positive.\nFor more information please refer to the Help Topics page.";
-"permission_content_iOS_2_VOLabel" = "1. Bluetooth\n2. Notifications\n3. Location Services";
-"permission_content_iOS_VOLabel" = "COVIDSafe needs Bluetooth enabled to work. COVIDSafe does not send pairing requests.\n\nBy enabling Notifications, you get updates to remind you when COVIDSafe is not active. \n\nYour iPhone requires Location permission for COVIDSafe to work. *COVIDSafe does NOT track or store your location data*\n\nSelect ‘Proceed' to enable:";
 "ShareCovidSafe_VOLabel" = "Share COVIDSafe. Invite others to help. Together, we're stronger.";
 "UploadData_VOLabel" = "Has a health official contacted you? You can only upload your information if you have tested positive.";
+"permission_content_iOS_2_VOLabel" = "1. Bluetooth\n2. Notifications\n3. Location Services";
+"permission_content_iOS_VOLabel" = "COVIDSafe needs Bluetooth enabled to work. COVIDSafe does not send pairing requests.\n\nBy enabling Notifications, you get updates to remind you when COVIDSafe is not active. \n\nYour iPhone requires Location permission for COVIDSafe to work. *COVIDSafe does NOT track or store your location data*\n\nSelect ‘Proceed' to enable:";
\ No newline at end of file
diff --git a/CovidSafe/it.lproj/Localizable.strings b/CovidSafe/it.lproj/Localizable.strings
index 48a5f7c..7e2445d 100644
--- a/CovidSafe/it.lproj/Localizable.strings
+++ b/CovidSafe/it.lproj/Localizable.strings
@@ -1,3 +1,38 @@
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothOFF" = "Accesso al Bluetooth®: OFF";
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothON" = "Accesso al Bluetooth®: ON";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF" = "Bluetooth®: OFF";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF_content" = "Attiva il Bluetooth® sul cellulare. Seleziona \"Consenti nuove connessioni\" se visualizzato.";
+/* Figma page iOS Screens (05/06) */
+"BluetoothON" = "Bluetooth®: ON";
+/* Figma page Android Screens (05/06) */
+"Enter_your_mobile_number_label" = "Inserisci il numero di cellulare";
+/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
+"IntroLabel" = "Aiuta a fermare la diffusione\ne salvare vite umane.";
+/* Figma page iOS Screens (05/06) */
+"NotificationsBlurbLink" = "Modifica le impostazioni di notifica";
+/* Figma page iOS Screens (05/06) */
+"NotificationsDisabledBlurb" = "Non riceverai una notifica se COVIDSafe non è attiva. \nModifica le impostazioni di notifica";
+/* Figma page iOS Screens (05/06) */
+"NotificationsEnabledBlurb" = "Riceverai una notifica se il COVIDSafe non è attivo. \nModifica le impostazioni di notifica";
+"OS2b_Item_4" = "Il tuo iPhone richiede l'autorizzazione di localizzazione affinché COVIDSafe funzioni. COVIDSafe NON memorizza né utilizza i dati relativi alla tua posizione.";
+"PINNumber_VO_Label" = "Codice PIN";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusBody" = "Assicurati che COVIDSafe sia attivo prima di uscire e quando ti trovi in luoghi pubblici abilitando il Bluetooth®.";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusTitle" = "COVIDSafe non è attivo";
+"PN_MobileNumber_VOLabel" = "Numero di cellulare";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderBody" = "Apri COVIDSafe per assicurarti che sia in funzione.\n";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderTitle" = "Nessun incontro rilevato per 48 ore";
+"PostcodeValidationErrorMessage" = "Inserisci un codice postale australiano valido.";
+/* Figma page Android Screens (05/06) */
+"Select_country_or_region_headline" = "Seleziona il paese o la regione";
+"Support_VOLabel" = "Supporto. Per assistenza su questioni non trattate dagli argomenti della Guida";
 "action_continue" = "Continua";
 "action_report_an_issue" = "Segnala un problema";
 "action_upload_done" = "Eseguito";
@@ -11,20 +46,10 @@
 "activity_intro_2" = "";
 /* Figma page iOS Screens (05/06) */
 "allow_bluetooth_call" = "Consenti al COVIDSafe di accedere al Bluetooth®";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothOFF" = "Accesso al Bluetooth®: OFF";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothON" = "Accesso al Bluetooth®: ON";
 "app_activity_bluetooth_handshakes_heading" = "";
 "australian_capital_territory" = "Australian Capital Territory";
 "ble_handshakes_yesterday" = "";
 "bluetooth_handshakes" = "Strette di mano Bluetooth";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF" = "Bluetooth®: OFF";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF_content" = "Attiva il Bluetooth® sul cellulare. Seleziona \"Consenti nuove connessioni\" se visualizzato.";
-/* Figma page iOS Screens (05/06) */
-"BluetoothON" = "Bluetooth®: ON";
 "cancel_snooze" = "Annulla lo snooze";
 "cases_28_days" = "Nuovi casi negli ultimi 28 giorni";
 "cases_7_days" = "Nuovi casi negli ultimi 7 giorni";
@@ -250,8 +275,9 @@
 "country_region_name_zw" = "Zimbabwe";
 "customise_days" = "Personalizza i giorni";
 "data_privacy_button" = "Avanti";
-"data_privacy_content" = "Leggi *l'informativa sulla privacy* prima di eseguire la registrazione a COVIDSafe. \n\nCOVIDSafe raccoglie, utilizza, o divulga le tue informazioni personali esclusivamente in conformità a queste norme e alla Legge sulla Privacy del 1988.\n\n*L'informativa sulla privacy* deve essere letta anche dai genitori/chi fa le veci dei minori di 16 anni.\n\nL'uso di COVIDSafe è volontario. È possibile installare o rimuovere l'applicazione in qualsiasi momento. Se si elimina COVIDSafe, si può anche richiedere la rimozione delle proprie informazioni dal server protetto. \n\nPer registrarti a COVIDSafe, inserisci un nome (o pseudonimo), numero di cellulare, fascia di età e codice postale. \n\nLe informazioni inviate al momento della registrazione e quelle sull'utilizzo di COVIDSafe vengono raccolte e archiviate su un server a elevata sicurezza. \n\nLe informazioni vengono raccolte anche per assicurarsi che COVIDSafe stia funzionando sul tuo cellulare. Le informazioni riguardano il sistema operativo, la versione App installata, la lingua selezionata sul dispositivo, il funzionamento del Bluetooth e se sono stati registrati dei contatti negli ultimi sette giorni.\n\nCOVIDSafe non raccoglie informazioni sulla tua posizione. \n\nCOVIDSafe annota sul tuo dispositivo il giorno e l'ora del contatto, il codice ID anonimo degli altri utenti di COVIDSafe con cui sei entrato/a in contatto,  l'intensità del segnale Bluetooth, e il loro modello di cellulare. \n\nGli utenti di COVIDSafe con cui sei entrato/a in contatto vedranno sul loro dispositivo il tuo codice ID anonimo, la data e l'ora del contatto, l'intensità del segnale Bluetooth e il modello del tuo cellulare. \n\nSe un utente che risulta positivo al COVID-19 carica le proprie informazioni di contatto, potresti essere contattato/a da un funzionario sanitario dello stato o territorio australiano interessato per ragioni di tracciabilità dei contatti. \n\nI tuoi dati di registrazione verranno utilizzati o divulgati esclusivamente per ragioni di tracciabilità dei contatti e per il corretto e legittimo funzionamento di COVIDSafe. \n\nUlteriori informazioni sono disponibili sul sito covidsafe.gov.au.\n\nPer ulteriori informazioni sui diritti dell'utente e la gestione e condivisione dei dati consultare *l'informativa sulla privacy* di COVIDSafe.";
-"data_privacy_content_VO" = "Leggi *l'informativa sulla privacy* prima di eseguire la registrazione a COVIDSafe. \n\nCOVIDSafe raccoglie, utilizza, o divulga le tue informazioni personali esclusivamente in conformità a queste norme e alla Legge sulla Privacy del 1988.\n\n*L'informativa sulla privacy* deve essere letta anche dai genitori/chi fa le veci dei minori di 16 anni.\n\nL'uso di COVIDSafe è volontario. È possibile installare o rimuovere l'applicazione in qualsiasi momento. Se si elimina COVIDSafe, si può anche richiedere la rimozione delle proprie informazioni dal server protetto. \n\nPer registrarti a COVIDSafe, inserisci un nome (o pseudonimo), numero di cellulare, fascia di età e codice postale. \n\nLe informazioni inviate al momento della registrazione e quelle sull'utilizzo di COVIDSafe vengono raccolte e archiviate su un server a elevata sicurezza. \n\nLe informazioni vengono raccolte anche per assicurarsi che COVIDSafe stia funzionando sul tuo cellulare. Le informazioni riguardano il sistema operativo, la versione App installata, la lingua selezionata sul dispositivo, il funzionamento del Bluetooth e se sono stati registrati dei contatti negli ultimi sette giorni.\n\nCOVIDSafe non raccoglie informazioni sulla tua posizione. \n\nCOVIDSafe annota sul tuo dispositivo il giorno e l'ora del contatto, il codice ID anonimo degli altri utenti di COVIDSafe con cui sei entrato/a in contatto,  l'intensità del segnale Bluetooth, e il loro modello di cellulare. \n\nGli utenti di COVIDSafe con cui sei entrato/a in contatto vedranno sul loro dispositivo il tuo codice ID anonimo, la data e l'ora del contatto, l'intensità del segnale Bluetooth e il modello del tuo cellulare. \n\nSe un utente che risulta positivo al COVID-19 carica le proprie informazioni di contatto, potresti essere contattato/a da un funzionario sanitario dello stato o territorio australiano interessato per ragioni di tracciabilità dei contatti. \n\nI tuoi dati di registrazione verranno utilizzati o divulgati esclusivamente per ragioni di tracciabilità dei contatti e per il corretto e legittimo funzionamento di COVIDSafe. \n\nUlteriori informazioni sono disponibili sul sito covidsafe.gov.au.\n\nPer ulteriori informazioni sui diritti dell'utente e la gestione e condivisione dei dati consultare *l'informativa sulla privacy* di COVIDSafe.";
+"data_privacy_content" = "È importante che tu legga l'informativa sulla privacy di COVIDSafe prima di registrarti su COVIDSafe. COVIDSafe raccoglierà, utilizzerà o divulgherà le tue informazioni personali solo nel rispetto della presente informativa e del Privacy Act 1988.\n\nSe hai meno di 16 anni, anche il tuo genitore/tutore dovrà leggere l'informativa sulla privacy. \n\nL'uso di COVIDSafe è completamente volontario. Puoi installare o eliminare l'applicazione in qualsiasi momento. Se elimini COVIDSafe, puoi anche chiedere che i tuoi dati vengano eliminati dal server sicuro. Se non fornirai i tuoi dati personali, l'app COVIDSafe non potrà funzionare come previsto.\n\nPer registrarti su 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 di COVIDSafe vengono archiviati su un server altamente sicuro. \n\nInoltre, i dati vengono raccolti per garantire il corretto funzionamento di COVIDSafe sul tuo dispositivo. Tra questi dati rientrano sistema operativo, versione dell'app installata, lingua del dispositivo, informazioni sul funzionamento del Bluetooth® e possibili incontri registrati dall'app nei sette giorni precedenti.\n\nCOVIDSafe non raccoglierà dati sulla tua posizione. \n\nCOVIDSafe annoterà sul tuo dispositivo la data e l'ora del contatto, un codice ID crittografato degli altri utenti COVIDSafe con cui entri in contatto, l'intensità del segnale Bluetooth® e il modello di cellulare degli altri utenti. \n\nAnche gli altri utenti COVIDSafe con cui entri in contatto annoteranno sul loro dispositivo il tuo codice ID crittografato, la data e l'ora del contatto con te, l'intensità del segnale Bluetooth® e il modello del tuo cellulare. \n\nSe un altro utente risulta positivo al COVID-19, può caricare i propri dati di contatto per consentire a un funzionario sanitario statale o del territorio di contattarti per il tracciamento dei contatti. \n\nI tuoi dati di registrazione verranno utilizzati o divulgati esclusivamente per il tracciamento dei contatti e per il corretto e legittimo funzionamento di COVIDSafe. \n\nMaggiori informazioni sono disponibili sul sito web covidsafe.gov.au. \n\nL'informativa sulla privacy di COVIDSafe fornisce ulteriori dettagli sui tuoi diritti in merito ai tuoi dati e su come verranno gestiti e condivisi.\n\nI dati di contatto per richieste e reclami relativi alla privacy di COVIDSafe sono indicati nell'informativa sulla privacy, sotto Contattaci.";
+"data_privacy_content_VO" = "È importante che tu legga l'informativa sulla privacy di COVIDSafe prima di registrarti su COVIDSafe. COVIDSafe raccoglierà, utilizzerà o divulgherà le tue informazioni personali solo nel rispetto della presente informativa e del Privacy Act 1988.\n\nSe hai meno di 16 anni, anche il tuo genitore/tutore dovrà leggere l'informativa sulla privacy. \n\nL'uso di COVIDSafe è completamente volontario. Puoi installare o eliminare l'applicazione in qualsiasi momento. Se elimini COVIDSafe, puoi anche chiedere che i tuoi dati vengano eliminati dal server sicuro. Se non fornirai i tuoi dati personali, l'app COVIDSafe non potrà funzionare come previsto.\n\nPer registrarti su 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 di COVIDSafe vengono archiviati su un server altamente sicuro. \n\nInoltre, i dati vengono raccolti per garantire il corretto funzionamento di COVIDSafe sul tuo dispositivo. Tra questi dati rientrano sistema operativo, versione dell'app installata, lingua del dispositivo, informazioni sul funzionamento del Bluetooth® e possibili incontri registrati dall'app nei sette giorni precedenti.\n\nCOVIDSafe non raccoglierà dati sulla tua posizione. \n\nCOVIDSafe annoterà sul tuo dispositivo la data e l'ora del contatto, un codice ID crittografato degli altri utenti COVIDSafe con cui entri in contatto, l'intensità del segnale Bluetooth® e il modello di cellulare degli altri utenti. \n\nAnche gli altri utenti COVIDSafe con cui entri in contatto annoteranno sul loro dispositivo il tuo codice ID crittografato, la data e l'ora del contatto con te, l'intensità del segnale Bluetooth® e il modello del tuo cellulare. \n\nSe un altro utente risulta positivo al COVID-19, può caricare i propri dati di contatto per consentire a un funzionario sanitario statale o del territorio di contattarti per il tracciamento dei contatti. \n\nI tuoi dati di registrazione verranno utilizzati o divulgati esclusivamente per il tracciamento dei contatti e per il corretto e legittimo funzionamento di COVIDSafe. \n\nMaggiori informazioni sono disponibili sul sito web covidsafe.gov.au. \n\nL'informativa sulla privacy di COVIDSafe fornisce ulteriori dettagli sui tuoi diritti in merito ai tuoi dati e su come verranno gestiti e condivisi.\n\nI dati di contatto per richieste e reclami relativi alla privacy di COVIDSafe sono indicati nell'informativa sulla privacy, sotto Contattaci.";
+"data_privacy_content_android" = "È importante che tu legga *l'informativa sulla privacy* di COVIDSafe prima di registrarti su COVIDSafe. COVIDSafe raccoglierà, utilizzerà o divulgherà le tue informazioni personali solo nel rispetto della presente informativa e del <i>Privacy Act 1988</i>.\n\nSe hai meno di 16 anni, anche il tuo genitore/tutore dovrà leggere *l'informativa sulla privacy*. \n\nL'uso di COVIDSafe è completamente volontario. Puoi installare o eliminare l'applicazione in qualsiasi momento. Se elimini COVIDSafe, *puoi anche chiedere che i tuoi dati vengano eliminati* dal server sicuro. \n\nPer registrarti su COVIDSafe, dovrai inserire un nome (o pseudonimo), un numero di cellulare, una fascia di età e un codice postale. Se non fornisci i tuoi dati personali, l'app COVIDSafe non potrà funzionare come previsto.\n\nI dati trasmessi al momento della registrazione e i dati sul tuo utilizzo di COVIDSafe vengono archiviati su un server altamente sicuro. \n\nInoltre, i dati vengono raccolti per garantire il corretto funzionamento di COVIDSafe sul tuo dispositivo. Tra questi dati rientrano sistema operativo, versione dell'app installata, lingua del dispositivo, informazioni sul funzionamento del Bluetooth® e possibili incontri registrati dall'app nei sette giorni precedenti.\n\nSui dispositivi Android, l'app registra anche se l'ottimizzazione della batteria è disabilitata e se i servizi di localizzazione sono abilitati.\n\nCOVIDSafe non raccoglierà dati sulla tua posizione. \n\nCOVIDSafe annoterà sul tuo dispositivo la data e l'ora del contatto, un codice ID crittografato degli altri utenti COVIDSafe con cui entri in contatto, l'intensità del segnale Bluetooth® e il modello di cellulare degli altri utenti. \n\nAnche gli altri utenti COVIDSafe con cui entri in contatto annoteranno sul loro dispositivo il tuo codice ID crittografato, la data e l'ora del contatto con te, l'intensità del segnale Bluetooth® e il modello del tuo cellulare. \n\nSe un altro utente risulta positivo al COVID-19, può caricare i propri dati di contatto per consentire a un funzionario sanitario statale o del territorio di contattarti per il tracciamento dei contatti. \n\nI tuoi dati di registrazione verranno utilizzati o divulgati esclusivamente per il tracciamento dei contatti e per il corretto e legittimo funzionamento di COVIDSafe. \n\nMaggiori informazioni sono disponibili sul sito web *covidsafe.gov.au*. \n\n*L'informativa sulla privacy* di COVIDSafe fornisce ulteriori dettagli sui tuoi diritti in merito ai tuoi dati e su come verranno gestiti e condivisi.\n\nI dati di contatto per richieste e reclami relativi alla privacy di COVIDSafe sono indicati nell'informativa sulla privacy, sotto *Contattaci*.";
 /* OnBoarding Data Privacy */
 "data_privacy_headline" = "Registrazione e privacy";
 "deaths" = "Decessi";
@@ -272,8 +298,6 @@
 "enter_pin_resend_pin" = "Invia di nuovo il PIN";
 "enter_pin_timer_expire" = "Il tuo codice PIN scadrà tra";
 "enter_pin_wrong_number" = "Questo numero di cellulare è sbagliato?";
-/* Figma page Android Screens (05/06) */
-"Enter_your_mobile_number_label" = "Inserisci il numero di cellulare";
 "every_day" = "Ogni giorno";
 "factors_dotpoint1" = "numero di utenti COVIDSafe nel raggio d'azione";
 "factors_dotpoint2" = "modello ed età del dispositivo";
@@ -289,10 +313,10 @@
 /* Error message for when a user tries to signup outside of Australia. */
 "geoblock_error_message" = "";
 "geoblock_rego_error" = "";
+"global_OK" = "OK";
 "global_back" = "Indietro";
 "global_close" = "Chiudi";
 "global_double_tap" = "Fai un doppio click per modificare";
-"global_OK" = "OK";
 "hide" = "Nascondi";
 "home_app_permission_status_subtitle" = "COVIDSafe non funziona senza le impostazioni corrette. ";
 "home_app_permission_status_title" = "Controlla le impostazioni";
@@ -302,9 +326,12 @@
 /* Home */
 "home_header_active_title" = "COVIDSafe è attiva";
 /* Home */
+"home_header_active_title" = "COVIDSafe è attiva";
+/* Home */
 "home_header_active_title_thanks" = "Grazie, COVIDSafe è ora attiva.";
 "home_header_inactive_check_your_permissions" = "Controlla le impostazioni";
 "home_header_inactive_title" = "COVIDSafe non è attiva";
+"home_header_inactive_title" = "COVIDSafe non è attiva";
 "home_header_uploaded_on_date_ios" = "I tuoi dati sono stati caricati su %@";
 "home_set_complete_external_link_app_content" = "Scarica l'app governativa per le ultime notizie e consigli.";
 "home_set_complete_external_link_app_title" = "Scarica l'app Coronavirus";
@@ -352,8 +379,6 @@
 "intro_content" = "COVIDSafe è stata sviluppata dal Governo australiano per aiutare a proteggere la comunità dalla diffusione del coronavirus. \n\nCOVIDSafe rileva in modo sicuro i contatti che avete con altri utenti dell'app e consente ai funzionari sanitari statali e del territorio di contattarvi, se siete stati in stretto contatto con qualcuno risultato positivo al virus. \n\nInsieme possiamo aiutare a fermare la diffusione e rimanere sani.";
 /* OnBoarding Intro */
 "intro_headline" = "Insieme possiamo fermare la diffusione del COVID-19";
-/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
-"IntroLabel" = "Aiuta a fermare la diffusione\ne salvare vite umane.";
 "invalid_australian_phone_number_error_prompt" = "I numeri di cellulare australiani hanno un massimo di 10 cifre.";
 "invalid_norfolk_island_phone_number_error_prompt" = "I numeri di cellulare nell'Isola di Norfolk contengono da 5 a 6 cifre.";
 "is_snoozed" = "COVIDSafe non è attiva";
@@ -389,26 +414,22 @@
 "no_handshakes_item3" = "Riavvia il telefono e apri di nuovo l'app.";
 "no_handshakes_item4" = "";
 "no_handshakes_link" = "Per saperne di più su come controllare se COVIDSafe funziona correttamente";
+"non_consent_button" = "Non sono d'accordo";
+"non_consent_popup" = "Impossibile proseguire con la procedura di registrazione senza il consenso del genitore o del tutore.\n\nEsci ed elimina l'app.";
 /* Figma page Android Screens (05/06) */
 "norfolk_hint" = "Per esempio: 51234";
 "northern_territory" = "Northern Territory";
 "notification_bluetooth" = "Attiva il Bluetooth per far funzionare COVIDSafe.";
 "notification_internet_content" = "Apri l'app e controlla la connessione Internet per far funzionare COVIDSafe.";
+"notification_internet_content" = "Apri l'app e controlla la connessione Internet.";
 "notification_not_active_title" = "COVIDSafe non è attivo";
 "notification_settings" = "Apri l'app per controllare le impostazioni.";
 "notification_update_content" = "Aggiorna l'app per accedere agli ultimi miglioramenti.";
 "notification_update_heading" = "Aggiornamento COVIDSafe disponibile";
-/* Figma page iOS Screens (05/06) */
-"NotificationsBlurbLink" = "Modifica le impostazioni di notifica";
-/* Figma page iOS Screens (05/06) */
-"NotificationsDisabledBlurb" = "Non riceverai una notifica se COVIDSafe non è attiva. \nModifica le impostazioni di notifica";
-/* Figma page iOS Screens (05/06) */
-"NotificationsEnabledBlurb" = "Riceverai una notifica se il COVIDSafe non è attivo. \nModifica le impostazioni di notifica";
 "numbers_error" = "Impossibile controllare i numeri aggiornati.";
 "numbers_no_internet" = "Connettiti a Internet per ricevere notifiche sui numeri aggiornati.";
 "numbers_refresh" = "Aggiorna ora";
 "options_for_australia" = "Opzioni per l'Australia";
-"OS2b_Item_4" = "Il tuo iPhone richiede l'autorizzazione di localizzazione affinché COVIDSafe funzioni. COVIDSafe NON memorizza né utilizza i dati relativi alla tua posizione.";
 "overseas_acquired" = "%@ contratto all'estero";
 "permission_button" = "Procedi";
 /* Figma page iOS Screens (05/06) */
@@ -432,30 +453,19 @@
 "personal_details_name_title" = "Nome e cognome (o pseudonimo)";
 "personal_details_post_code" = "CAP in Australia";
 "personal_details_post_code_error_prompt" = "Il codice postale australiano deve contenere 4 cifre.";
-"PINNumber_VO_Label" = "Codice PIN";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusBody" = "Assicurati che COVIDSafe sia attivo prima di uscire e quando ti trovi in luoghi pubblici abilitando il Bluetooth®.";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusTitle" = "COVIDSafe non è attivo";
-"PN_MobileNumber_VOLabel" = "Numero di cellulare";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderBody" = "Apri COVIDSafe per assicurarti che sia in funzione.\n";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderTitle" = "Nessun incontro rilevato per 48 ore";
 "postcode_api_error" = "Si è verificato un errore. Controlla la tua connessione internet e riprova.";
 "postcode_change_label" = "Codice postale attuale in Australia";
 "postcode_success" = "Il tuo codice postale è stato aggiornato";
-"PostcodeValidationErrorMessage" = "Inserisci un codice postale australiano valido.";
 "privacy_policy" = "";
 "privacy_policy_description" = "";
 "queensland" = "Queensland";
 "recovered" = "Totale guarigioni";
-"registration_consent_content" = "Acconsento alla raccolta di dati da parte della Digital Transformation Agency nel ruolo di amministratore dell'archivio dati, in base alle disposizioni legali stabilite dal segretario del Dipartimento della sanità del governo australiano per:";
-"registration_consent_diagnostic" = "Informazioni per garantire il corretto funzionamento di COVIDSafe sul mio dispositivo.";
-"registration_consent_first_paragraph" = "I miei dati di registrazione.";
+"registration_consent_content" = "Confermo che fornisco il mio consenso al Dipartimento della salute, in qualità di amministratore della banca dati ai sensi del Privacy Act 1988, per la raccolta dei seguenti dati:";
+"registration_consent_diagnostic" = "informazioni per garantire il corretto funzionamento di COVIDSafe sul mio dispositivo.";
+"registration_consent_first_paragraph" = "dati di registrazione,";
 /* Onboarding Registration Consent */
 "registration_consent_headline" = "Consenso alla registrazione";
-"registration_consent_second_paragraph" = "Informazioni sul contatto con altri utenti di COVIDSafe, se un utente con cui sono entrato in contatto risulta positivo al COVID-19 e carica i suoi dati.";
+"registration_consent_second_paragraph" = "informazioni sul contatto tra me e altri utenti di COVIDSafe, se un altro utente con cui sono entrato in contatto risulta positivo al COVID-19 e carica i suoi dati di contatto, e";
 "restrictions_accommodation" = "Alloggio";
 "restrictions_activity" = "Attività";
 "restrictions_cafes" = "Caffè e ristoranti";
@@ -481,8 +491,6 @@
 "scheduled" = "Hai programmato COVIDSafe su snooze da %@ a %@ ";
 /* OnBoarding Enter Number */
 "select_country_or_region" = "Seleziona il paese o la regione";
-/* Figma page Android Screens (05/06) */
-"Select_country_or_region_headline" = "Seleziona il paese o la regione";
 "select_state_territory_button" = "Seleziona lo stato o il territorio";
 "select_state_territory_heading" = "Seleziona lo stato o il territorio";
 "set_snooze_time" = "Imposta il tempo di snooze";
@@ -514,7 +522,6 @@
 "stepCounter" = "Passo %d di %d";
 "support" = "Supporto";
 "support_content" = "Per assistenza su questioni non trattate dagli argomenti della Guida";
-"Support_VOLabel" = "Supporto. Per assistenza su questioni non trattate dagli argomenti della Guida";
 "tasmania" = "Tasmania";
 /* Example: "From 22 to 28 January 2021" */
 "to" = "";
@@ -524,17 +531,16 @@
 "total_per_state" = "Totale casi confermati per stato e territorio";
 "twenty_eight_days" = "28 giorni";
 "type_in_time" = "Digita l'ora";
-"UILaunchStoryboardName" = "LaunchScreen_it_IT";
+/* Figma page Android Screens (05/06) */
+"under-sixteen_consent_call_for_action" = "Seleziona \"Sono d'accordo\" per confermare il consenso oppure \"Non sono d'accordo\" se non puoi confermare il consenso del genitore o tutore. ";
 "under_investigation" = "";
-"under_sixteen_content" = "Confermo il consenso dei miei genitori o del mio tutore a Digital Transformation Agency nel suo ruolo di amministratore della banca dati, in base alle disposizioni legali stabilite dal segretario del Dipartimento della sanità del governo australiano:";
-"under_sixteen_first_paragraph" = "I miei dati di registrazione.";
+"under_sixteen_content" = "Confermo che il mio genitore o tutore fornisce il consenso al Dipartimento della salute, in qualità di amministratore della banca dati ai sensi del Privacy Act 1988, per la raccolta dei seguenti dati:";
+"under_sixteen_first_paragraph" = "dati di registrazione,";
 /* OnBoarding Under Sixteen */
 "under_sixteen_headline" = "È necessario il consenso di un genitore o di un tutore per procedere";
 /* Figma page Android Screens (05/06) */
-"under_sixteen_registration_consent_first_paragraph" = "I miei dati di registrazione.";
-"under_sixteen_second_paragraph" = "Informazioni sul contatto tra me e altri utenti di COVIDSafe, se un altro utente con cui sono entrato in contatto risulta positivo al COVID-19 e carica i suoi dati.";
-/* Figma page Android Screens (05/06) */
-"under-sixteen_consent_call_for_action" = "Seleziona \"Sono d'accordo\" per confermare il consenso.";
+"under_sixteen_registration_consent_first_paragraph" = "dati di registrazione,";
+"under_sixteen_second_paragraph" = "informazioni sul contatto tra me e altri utenti di COVIDSafe, se un altro utente con cui sono entrato in contatto risulta positivo al COVID-19 e carica i suoi dati di contatto, e";
 "update_available_app_store_btn" = "Vai all'App Store";
 "update_available_dismiss_btn" = "Ricordamelo più tardi";
 "update_available_message_ios" = "Abbiamo apportato dei miglioramenti a COVIDSafe. Aggiorna tramite l'App Store";
@@ -557,7 +563,7 @@
 "upload_step_verify_pin_header" = "Carica i tuoi dati";
 "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.";
 "us_consent_button" = "Sono d'accordo";
-"us_registration_consent_diagnostic" = "Informazioni per garantire il corretto funzionamento di COVIDSafe sul mio dispositivo.";
+"us_registration_consent_diagnostic" = "informazioni per garantire il corretto funzionamento di COVIDSafe sul mio dispositivo.";
 "victoria" = "Victoria";
 "western_australia" = "Western Australia";
 "wrong_ping_number" = "PIN errato ";
@@ -572,38 +578,16 @@
 "Done" = "Fatto";
 /* Feedback */
 "EmailPlaceholder" = "Inserisci l'indirizzo email (obbligatorio)";
+"EnterPINSent" = "Inserisci il PIN inviato a %@";
 /* Phone number and PIN */
 "EnterPhoneReVerify" = "Inserisci il numero di cellulare per effettuare una nuova verifica";
-"EnterPINSent" = "Inserisci il PIN inviato a %@";
-/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_message" = "Ciao, come vorresti procedere?";
-/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_title" = "Casella di Feedback";
-/* Title for button that launches new feedback flow. */
-"entryPrompt_newFeedback_button_title" = "Nuovo Feedback";
 "FoundIssueWithApp" = "Hai riscontrato un problema nell'app COVIDSafe?";
-/* *** Feedback localised strings *** */
-"global_cancel_button_title" = "Annulla";
-"global_send_button_title" = "Invia";
-"global_sending_indication_title" = "Invio";
-"global_success_indication_title" = "Successo";
 /* upload */
 "InformationUploaded" = "I dati sono stati caricati su %@";
 "InvalidOTP" = "Il codice deve avere 6 cifre";
 "IssueDescPlaceholder" = "Descrivi il problema";
 "IssueFooter" = "Potremmo contattarvi per ulteriori dettagli sul vostro feedback. Il vostro indirizzo email non verrà utilizzato per nessun altro scopo.";
 "IssueThankYou" = "Grazie! Abbiamo ricevuto il feedback";
-/* Delete screenshot action sheet action button title. */
-"newFeedback_deleteScreenshot_actionTitle" = "Elimina Screenshot";
-/* Messsage shown to user asking to confirm screenshot deletion. */
-"newFeedback_deleteScreenshotConfirmation_message" = "Questo screenshot verrà eliminato definitivamente.";
-"newFeedback_invalidEmail_errorMessage" = "Inserisci un indirizzo email valido!";
-/* Error message displayed to users when feedback has empty description */
-"newFeedback_noMessage_errorMessage" = "Dicci qualcosa prima di inviare.";
-/* Error message displayed to users when feedback fails to send. */
-"newFeedback_send_errorMessage" = "Errore durante l'invio del Feedback";
-/* Navigation Bar title shown during new feedback flow. */
-"newFeedbackFlow_navigationTitle" = "Segnala un problema";
 "Next" = "Avanti";
 /* registration succcess */
 "OS2b_Item1" = "1. Quando esci di casa, porta il cellulare con te e assicurati che COVIDSafe sia attiva.";
@@ -611,6 +595,7 @@
 "OS2b_Item2_VOLabel" = "2. Il Bluetooth deve rimanere ON.";
 "OS2b_Item3" = "3. COVIDSafe non invia richieste di accoppiamento. Per saperne di più.";
 "OS2b_Item3Underline" = "Per saperne di più";
+"PINWillExpire" = "Il codice PIN scade tra %@";
 /* home */
 "PairingRequestsInfo" = "COVIDSafe non invia richieste di accoppiamento.";
 "PairingRequestsInfoUnderline" = "richieste di accoppiamento";
@@ -618,7 +603,6 @@
 "PhoneNumberFormatErrorTitle" = "Formato numerico errato";
 "PhoneVerificationErrorMessage" = "Controlla i tuoi dati e riprova";
 "PhoneVerificationErrorTitle" = "Errore nella verifica del numero di cellulare";
-"PINWillExpire" = "Il codice PIN scade tra %@";
 "ReceivePinIssue" = "Problemi nel ricevere il PIN?";
 /* help */
 "ReportAnIssue" = "Segnala un problema";
@@ -627,13 +611,35 @@
 "UploadFailed" = "Caricamento non riuscito. Riprova più tardi.";
 "UploadFailedErrorMessage" = "Riprova più tardi.";
 "ValidationError" = "Errore di convalida";
+/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_message" = "Ciao, come vorresti procedere?";
+/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_title" = "Casella di Feedback";
+/* Title for button that launches new feedback flow. */
+"entryPrompt_newFeedback_button_title" = "Nuovo Feedback";
+/* *** Feedback localised strings *** */
+"global_cancel_button_title" = "Annulla";
+"global_send_button_title" = "Invia";
+"global_sending_indication_title" = "Invio";
+"global_success_indication_title" = "Successo";
+/* Navigation Bar title shown during new feedback flow. */
+"newFeedbackFlow_navigationTitle" = "Segnala un problema";
+/* Messsage shown to user asking to confirm screenshot deletion. */
+"newFeedback_deleteScreenshotConfirmation_message" = "Questo screenshot verrà eliminato definitivamente.";
+/* Delete screenshot action sheet action button title. */
+"newFeedback_deleteScreenshot_actionTitle" = "Elimina Screenshot";
+"newFeedback_invalidEmail_errorMessage" = "Inserisci un indirizzo email valido!";
+/* Error message displayed to users when feedback has empty description */
+"newFeedback_noMessage_errorMessage" = "Dicci qualcosa prima di inviare.";
+/* Error message displayed to users when feedback fails to send. */
+"newFeedback_send_errorMessage" = "Errore durante l'invio del Feedback";
 "GetCoronaVirusApp_VOLabel" = "Scarica l'app Coronavirus. Scarica l'app governativa per le ultime notizie e consigli.";
 "HelpTopics_VOLabel" = "Argomenti della Guida su come individuare e risolvere problemi tecnici.";
 "LatestNews_VOLabel" = "Ultime notizie e aggiornamenti. Visita aus.gov.au per le ultime notizie sul Coronavirus.";
 "NotificationsDisabled_VOLabel" = "Le notifiche sono disabilitate. Non si ricevono notifiche se COVIDSafe non è attiva. \nCambia le impostazioni di notifica";
 "NotificationsEnabled_VOLabel" = "Le notifiche sono abilitate. Riceverai una notifica se COVIDSafe non è attivo. \nModifica le impostazioni di notifica";
 "OS1b_TopParagraph_VOLabel" = "I segnali Bluetooth vengono utilizzati per determinare la vicinanza ad altri utenti di COVIDSafe. \nOgni istanza di stretto contatto tra te e gli altri utenti di COVIDSafe viene annotata per creare informazioni sui contatti. Queste informazioni sono crittografate e memorizzate solo sul tuo cellulare. \nSe risulti positivo al COVID-19, come utente di COVIDSafe sarai contattato da un funzionario sanitario statale o del territorio per assisterti con il caricamento volontario delle tue informazioni di stretto contatto in un sistema di archiviazione di informazioni altamente sicuro. \nI funzionari sanitari statali o territoriali possono anche contattarti se sei stato in stretto contatto con un altro utente di COVIDSafe risultato positivo. \nPer ulteriori informazioni, consulta la pagina Argomenti della Guida.";
-"permission_content_iOS_2_VOLabel" = "1. Bluetooth®\n2. Notifiche\n3. Servizi di localizzazione\n";
-"permission_content_iOS_VOLabel" = "COVIDSafe richiede che il Bluetooth sia abilitato per funzionare. COVIDSafe non invia richieste di accoppiamento. \n\nAbilitando le notifiche, ricevi aggiornamenti per ricordarti quando COVIDSafe non è attivo. \n\nIl tuo iPhone richiede l'autorizzazione di localizzazione affinché COVIDSafe funzioni. *COVIDSafe NON memorizza né utilizza i dati relativi alla tua posizione. * \n\nSeleziona \"Procedi\" per abilitare:";
 "ShareCovidSafe_VOLabel" = "Condividi COVIDSafe. Invita altri ad collaborare. Insieme, siamo più forti.";
 "UploadData_VOLabel" = "Sei stato contattato da un funzionario sanitario? Puoi caricare le tue informazioni solo se sei risultato positivo.";
+"permission_content_iOS_2_VOLabel" = "1. Bluetooth®\n2. Notifiche\n3. Servizi di localizzazione\n";
+"permission_content_iOS_VOLabel" = "COVIDSafe richiede che il Bluetooth sia abilitato per funzionare. COVIDSafe non invia richieste di accoppiamento. \n\nAbilitando le notifiche, ricevi aggiornamenti per ricordarti quando COVIDSafe non è attivo. \n\nIl tuo iPhone richiede l'autorizzazione di localizzazione affinché COVIDSafe funzioni. *COVIDSafe NON memorizza né utilizza i dati relativi alla tua posizione. * \n\nSeleziona \"Procedi\" per abilitare:";
\ No newline at end of file
diff --git a/CovidSafe/ko.lproj/Localizable.strings b/CovidSafe/ko.lproj/Localizable.strings
index 8b00da5..5768f86 100644
--- a/CovidSafe/ko.lproj/Localizable.strings
+++ b/CovidSafe/ko.lproj/Localizable.strings
@@ -1,3 +1,38 @@
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothOFF" = "블루투스® 접속: 꺼짐";
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothON" = "블루투스® 접속: 켜짐";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF" = "블루투스®: 꺼짐";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF_content" = "휴대폰의 블루투스®를 켜십시오. '새 연결 허용'이 표시되면 선택하십시오.";
+/* Figma page iOS Screens (05/06) */
+"BluetoothON" = "블루투스®: 켜짐";
+/* Figma page Android Screens (05/06) */
+"Enter_your_mobile_number_label" = "본인의 휴대폰 번호를 입력하세요";
+/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
+"IntroLabel" = "바이러스 확산을 방지해서 \n생명을 구합시다.";
+/* Figma page iOS Screens (05/06) */
+"NotificationsBlurbLink" = "알림 설정 변경";
+/* Figma page iOS Screens (05/06) */
+"NotificationsDisabledBlurb" = "COVIDSafe가 비활성화되어 있으면 알림을 받을 것입니다.";
+/* Figma page iOS Screens (05/06) */
+"NotificationsEnabledBlurb" = "COVIDSafe가 비활성화되어 있으면 알림을 받을 것입니다.\n알림 설정 변경하기";
+"OS2b_Item_4" = "4. COVIDSafe가 제대로 실행되기 위해서는 여러분의 아이폰에서 위치 서비스 기능을 허용해야 합니다. *COVIDSafe는 여러분의 위치 정보를 수집, 저장하거나 사용하지 않습니다*";
+"PINNumber_VO_Label" = "핀 번호";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusBody" = "블루투스®를 켜서 외출 시 혹은 공공 장소에 있을 때 COVIDSafe가 활성화되어 있도록 하세요.";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusTitle" = "COVIDSafe가 활성화되어 있지 않습니다.";
+"PN_MobileNumber_VOLabel" = "휴대폰 번호";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderBody" = "COVIDSafe를 열어 실행 중인지 확인하세요.";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderTitle" = "48시간 동안 접촉이 감지되지 않음";
+"PostcodeValidationErrorMessage" = "유효한 호주 우편번호를 입력하세요.";
+/* Figma page Android Screens (05/06) */
+"Select_country_or_region_headline" = "국가 또는 지역을 선택하세요";
+"Support_VOLabel" = "지원. 도움말 항목에서 다루지 않는 문제에 대한 지원";
 "action_continue" = "계속";
 "action_report_an_issue" = "문제 신고하기";
 "action_upload_done" = "완료";
@@ -11,20 +46,10 @@
 "activity_intro_2" = "블루투스 악수의 갯수는 다른 COVIDSafe 사용자와 가까운 거리에 있었음을 보여줍니다. COVID-19에 양성반응을 보인 사용자와 접촉했다는 의미는 아닙니다. ";
 /* Figma page iOS Screens (05/06) */
 "allow_bluetooth_call" = "COVIDSafe의 블루투스® 접속을 허용해 주세요";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothOFF" = "블루투스® 접속: 꺼짐";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothON" = "블루투스® 접속: 켜짐";
 "app_activity_bluetooth_handshakes_heading" = "여러분의 장치에 기록된 블루투스 악수";
 "australian_capital_territory" = "호주 수도 테리토리";
 "ble_handshakes_yesterday" = "어제 여러분의 장치에 기록된 블루투스 악수";
 "bluetooth_handshakes" = "블루투스 악수";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF" = "블루투스®: 꺼짐";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF_content" = "휴대폰의 블루투스®를 켜십시오. '새 연결 허용'이 표시되면 선택하십시오.";
-/* Figma page iOS Screens (05/06) */
-"BluetoothON" = "블루투스®: 켜짐";
 "cancel_snooze" = "일시중지 취소";
 "cases_28_days" = "지난 28일간 신규 확진 건수";
 "cases_7_days" = "지난 7일간 신규 확진 건";
@@ -250,8 +275,9 @@
 "country_region_name_zw" = "짐바브웨";
 "customise_days" = "요일 맞춤 설정";
 "data_privacy_button" = "다음";
-"data_privacy_content" = "COVIDSafe에 등록하기 전에 COVIDSafe *개인 정보 보호 정책*을 읽는 것이 중요합니다. \n\nCOVIDSafe는 본 정책과 개인정보보호법(1988)이 허용하는 범위에 한해 여러분의 개인 정보를 수집하거나 사용, 공개할 것입니다.\n\n16세 미만인 경우, 여러분의 부모 및 보호자도 반드시 *개인 정보 보호 정책*을 읽어야 합니다. \n\nCOVIDSafe를 사용하는 것은 전적으로 자발적인 선택입니다. 여러분은 언제든지 앱을 설치 또는 삭제할 수 있습니다. COVIDSafe를 삭제하는 경우, *여러분은 본인의 정보가 보안 서버에서도 삭제되도록 요청*할 수 있습니다. \n\nCOVIDSafe에 등록하려면, 성명 (또는 가명), 휴대폰 번호, 연령대 및 우편번호를 입력해야 합니다. \n\n등록시 제출한 정보 및 COVIDSafe 사용에 관한 정보는 높은 보안성을 갖춘 서버에 저장됩니다. \n\nCOVIDSafe가 여러분의 기기에서 제대로 작동하는 지 확인하기 위한 정보도 수집됩니다. 여기에는 여러분 기기의 운영 체제, 설치한 앱 버전, 기기 내 언어 설정, 블루투스 작동 여부 및 지난 7일 간의 근거리 접촉자 기록 여부가 포함됩니다.\n\nCOVIDSafe는 여러분의 위치 정보를 수집하지 않습니다. \n\nCOVIDSafe는 접촉 날짜와 시간, 여러분이 근거리에서 접촉한 다른 COVIDSafe 사용자의 익명 ID 코드, 블루투스 신호 강도, 다른 사용자의 휴대폰 모델을 여러분의 기기에 기록합니다. \n\n여러분이 근거리에서 접촉한 다른 COVIDSafe 사용자는 여러분의 익명 ID 코드, 접촉 날짜와 시간, 블루투스 신호 강도 및 여러분의 휴대폰 모델을 해당 사용자의 기기에 기록하게 됩니다. \n\n다른 사용자가 COVID-19 양성 판정을 받은 경우, 해당 사용자는 본인의 연락처 정보를 업로드 할 수 있으며, 주 또는 테리토리 보건 당국이 접촉자 추적 목적으로 여러분에게 연락할 수 있습니다. \n\n여러분의 등록정보는 접촉자 추적 및 COVIDSafe의 적절하고 합법적인 기능을 위해서만 사용 또는 공개됩니다. \n\n자세한 정보는 *covidsafe.gov.au* 홈페이지에서 확인할 수 있습니다. \n\n개인 정보에 대한 여러분의 권리와 정보 취급 및 공유 방법에 대한 자세한 내용은 COVIDSafe *개인 정보 보호 정책*을 참조하십시오.";
-"data_privacy_content_VO" = "COVIDSafe에 등록하기 전에 COVIDSafe 개인 정보 보호 정책을 읽는 것이 중요합니다.\n\nCOVIDSafe는 본 정책과 개인정보보호법(1988)이 허용하는 범위에 한해 여러분의 개인 정보를 수집하거나 사용, 공개할 것입니다.\n\n16 세 미만인 경우, 여러분의 부모나 보호자도 반드시 개인 정보 보호 정책을 읽어야 합니다. \n\nCOVIDSafe를 사용하는 것은 전적으로 자발적인 선택입니다. 여러분은 언제든지 앱을 설치하거나 삭제할 수 있습니다. COVIDSafe를 삭제하는 경우, 보안 서버에서도 여러분의 정보가 삭제되도록 요청할 수 있습니다. \n\nCOVIDSafe에 등록하려면 이름(혹은 가명), 휴대폰 번호, 연령대 및 우편번호를 입력해야 합니다. \n\n등록시 제출한 정보 및 COVIDSafe 사용에 관한 정보는 높은 보안성을 갖춘 서버에 저장됩니다. \n\nCOVIDSafe가 여러분의 기기에서 제대로 작동하는 지 확인하기 위한 정보도 수집됩니다. 여기에는 여러분 기기의 운영 체제, 설치한 앱 버전, 기기 내 언어 설정, 블루투스 작동 여부 및 지난 7일 간의 근거리 접촉자 기록 여부가 포함됩니다. \n\nCOVIDSafe는 여러분의 위치 정보를 수집하지 않습니다. \n\nCOVIDSafe는 접촉 날짜와 시간, 여러분이 근거리에서 접촉한 다른 COVIDSafe 사용자의 익명 ID 코드, 블루투스 신호 강도, 다른 사용자의 휴대폰 모델을 여러분의 기기에 기록합니다. \n\n여러분이 근거리에서 접촉한 다른 COVIDSafe 사용자는 여러분의 익명 ID 코드, 접촉 날짜와 시간, 블루투스 신호 강도 및 여러분의 휴대폰 모델을 해당 사용자의 기기에 기록하게 됩니다. \n\n다른 사용자가 COVID-19 양성 판정을 받은 경우, 해당 사용자는 본인의 연락처 정보를 업로드 할 수 있으며, 주 또는 테리토리 보건 당국이 접촉자 추적 목적으로 여러분에게 연락할 수 있습니다. \n\n여러분의 등록정보는 접촉자 추적 및 COVIDSafe의 적절하고 합법적인 기능을 위해서만 사용 또는 공개됩니다. \n\n자세한 정보는 covidsafe.gov.au 홈페이지에서 확인할 수 있습니다. \n\n개인 정보에 대한 여러분의 권리와 정보 취급 및 공유 방법에 대한 자세한 내용은 COVIDSafe 개인 정보 보호 정책을 참조하십시오.";
+"data_privacy_content" = "COVIDSafe에 등록하기 전에 COVIDSafe 개인정보 보호정책을 읽는 것이 중요합니다. COVIDSafe는 본 정책 및 1988년 개인정보보호법에 따라서만 귀하의 개인정보를 수집, 사용 또는 공개합니다.\n\n16세 미만인 경우, 부모나 보호자도 반드시 개인정보 보호정책을 읽어야 합니다. \n\nCOVIDSafe의 사용은 전적으로 자발적입니다. 귀하는 언제든지 앱을 설치 또는 삭제할 수 있습니다. COVIDSafe를 삭제할 경우 보안 서버에 있는 자신의 정보 삭제도 요청할 수 있습니다. 개인 정보를 제공하지 않으면 COVIDSafe 앱이 올바르게 작동하지 않습니다.\n\nCOVIDSafe에 등록하려면, 성명(또는 가명), 휴대폰 번호, 연령대 및 우편번호를 입력해야 합니다.\n\n등록 시 제출한 정보 및 사용자의 COVIDSafe 사용 정보는 보안 수준이 높은 서버에 저장됩니다. \n\n또한 COVIDSafe가 장치에서 제대로 작동하는지 확인하기 위한 정보도 수집됩니다. 여기에는 운영 체제, 설치한 앱 버전, 장치 설정 언어, Bluetooth® 작동 여부, 앱이 지난 7일 동안 발견한 것이 기록된 경우 등이 포함됩니다. \n\nCOVIDSafe는 사용자의 위치 정보를 수집하지 않습니다.\n\nCOVIDSafe는 사용자의 장치에 접촉일 및 시각, 접촉하는 다른 COVIDSafe 사용자의 암호화된 ID 코드, Bluetooth 신호 강도 및 다른 사용자의 휴대전화 모델을 기록합니다.\n\n귀하와 접촉한 다른 COVIDSafe 사용자의 장치에도 귀하의 암호화된 ID 코드 및 접촉일과 시각, Bluetooth 신호 강도 및 다른 휴대전화 모델 등이 기록됩니다.  \n\n다른 사용자의 코로나19 검사 결과가 양성일 경우, 자신의 접촉 정보를 업로드할 수 있으며 주 또는 구역 보건 담당자가 접촉 추적 목적으로 귀하에게 연락을 취할 수 있습니다. \n\n귀하의 등록 정보는 접촉 추적 및 COVIDSafe의 적절하고 합법적인 기능을 위해서만 사용 또는 공개됩니다. \n\n자세한 정보는 covidsafe.gov.au 웹사이트에서 확인할 수 있습니다. \n\nCOVIDSafe 개인정보 보호정책은 사용자의 정보에 대한 권한과 해당 정보의 처리 및 공유 방법에 대한 자세한 정보를 제공합니다.\n\nCOVIDSafe 개인정보 보호 관련 문의 및 불만 사항은 문의하기의 개인정보 보호정책에 나와 있습니다.";
+"data_privacy_content_VO" = "COVIDSafe에 등록하기 전에 COVIDSafe 개인정보 보호정책을 읽는 것이 중요합니다. COVIDSafe는 본 정책 및 1988년 개인정보보호법에 따라서만 귀하의 개인정보를 수집, 사용 또는 공개합니다.\n\n16세 미만인 경우, 부모나 보호자도 반드시 개인정보 보호정책을 읽어야 합니다. \n\nCOVIDSafe의 사용은 전적으로 자발적입니다. 귀하는 언제든지 앱을 설치 또는 삭제할 수 있습니다. COVIDSafe를 삭제할 경우 보안 서버에 있는 자신의 정보 삭제도 요청할 수 있습니다. 개인 정보를 제공하지 않으면 COVIDSafe 앱이 올바르게 작동하지 않습니다.\n\nCOVIDSafe에 등록하려면, 성명(또는 가명), 휴대폰 번호, 연령대 및 우편번호를 입력해야 합니다.\n\n등록 시 제출한 정보 및 사용자의 COVIDSafe 사용 정보는 보안 수준이 높은 서버에 저장됩니다. \n\n또한 COVIDSafe가 장치에서 제대로 작동하는지 확인하기 위한 정보도 수집됩니다. 여기에는 운영 체제, 설치한 앱 버전, 장치 설정 언어, Bluetooth® 작동 여부, 앱이 지난 7일 동안 발견한 것이 기록된 경우 등이 포함됩니다. \n\nCOVIDSafe는 사용자의 위치 정보를 수집하지 않습니다.\n\nCOVIDSafe는 사용자의 장치에 접촉일 및 시각, 접촉하는 다른 COVIDSafe 사용자의 암호화된 ID 코드, Bluetooth 신호 강도 및 다른 사용자의 휴대전화 모델을 기록합니다.\n\n귀하와 접촉한 다른 COVIDSafe 사용자의 장치에도 귀하의 암호화된 ID 코드 및 접촉일과 시각, Bluetooth 신호 강도 및 다른 휴대전화 모델 등이 기록됩니다.  \n\n다른 사용자의 코로나19 검사 결과가 양성일 경우, 자신의 접촉 정보를 업로드할 수 있으며 주 또는 구역 보건 담당자가 접촉 추적 목적으로 귀하에게 연락을 취할 수 있습니다. \n\n귀하의 등록 정보는 접촉 추적 및 COVIDSafe의 적절하고 합법적인 기능을 위해서만 사용 또는 공개됩니다. \n\n자세한 정보는 covidsafe.gov.au 웹사이트에서 확인할 수 있습니다. \n\nCOVIDSafe 개인정보 보호정책은 사용자의 정보에 대한 권한과 해당 정보의 처리 및 공유 방법에 대한 자세한 정보를 제공합니다.\n\nCOVIDSafe 개인정보 보호 관련 문의 및 불만 사항은 문의하기의 개인정보 보호정책에 나와 있습니다.";
+"data_privacy_content_android" = "COVIDSafe에 등록하기 전에 COVIDSafe *개인정보 보호정책*을 읽는 것이 중요합니다. COVIDSafe는 본 정책 및 <i>1988년 개인정보보호법</i>에 따라서만 귀하의 개인정보를 수집, 사용 또는 공개합니다.\n\n16세 미만인 경우, 부모나 보호자도 반드시 *개인정보 보호정책*을 읽어야 합니다. \n\nCOVIDSafe의 사용은 전적으로 자발적입니다. 귀하는 언제든지 앱을 설치 또는 삭제할 수 있습니다. COVIDSafe를 삭제할 경우 *보안 서버에 있는 자신의 정보 삭제*도 요청할 수 있습니다. \n\nCOVIDSafe에 등록하려면, 성명(또는 가명), 휴대폰 번호, 연령대 및 우편번호를 입력해야 합니다. 개인 정보를 제공하지 않으면 COVIDSafe 앱이 올바르게 작동하지 않습니다.\n\n등록 시 제출한 정보 및 사용자의 COVIDSafe 사용 정보는 보안 수준이 높은 서버에 저장됩니다. \n\n또한 COVIDSafe가 장치에서 제대로 작동하는지 확인하기 위한 정보도 수집됩니다. 여기에는 운영 체제, 설치한 앱 버전, 장치 설정 언어, Bluetooth® 작동 여부, 앱이 지난 7일 동안 발견한 것이 기록된 경우 등이 포함됩니다. \n\nAndroid 장치에서는 배터리 최적화 비활성화 및 위치 서비스 활성화 여부에 대한 정보도 포함되어 있습니다.\n\nCOVIDSafe는 사용자의 위치 정보를 수집하지 않습니다.\n\nCOVIDSafe는 사용자의 장치에 접촉일 및 시각, 접촉하는 다른 COVIDSafe 사용자의 암호화된 ID 코드, Bluetooth 신호 강도 및 다른 사용자의 휴대전화 모델을 기록합니다.\n\n귀하와 접촉한 다른 COVIDSafe 사용자의 장치에도 귀하의 암호화된 ID 코드 및 접촉일과 시각, Bluetooth 신호 강도 및 다른 휴대전화 모델 등이 기록됩니다.  \n\n다른 사용자의 코로나19 검사 결과가 양성일 경우, 자신의 접촉 정보를 업로드할 수 있으며 주 또는 구역 보건 담당자가 접촉 추적 목적으로 귀하에게 연락을 취할 수 있습니다. \n\n귀하의 등록 정보는 접촉 추적 및 COVIDSafe의 적절하고 합법적인 기능을 위해서만 사용 또는 공개됩니다. \n\n자세한 정보는 *covidsafe.gov.au* 웹사이트에서 확인할 수 있습니다. \n\nCOVIDSafe *개인정보 보호정책*은 사용자의 정보에 대한 권한과 해당 정보의 처리 및 공유 방법에 대한 자세한 정보를 제공합니다.\n\nCOVIDSafe 개인정보 보호 관련 문의 및 불만 사항은 *문의하기*의 개인정보 보호정책에 나와 있습니다.";
 /* OnBoarding Data Privacy */
 "data_privacy_headline" = "등록 및 개인정보 보호";
 "deaths" = "사망자";
@@ -272,8 +298,6 @@
 "enter_pin_resend_pin" = "PIN 다시 보내기";
 "enter_pin_timer_expire" = "비밀 번호가 ~ 후에 만료됩니다";
 "enter_pin_wrong_number" = "잘못된 휴대폰 번호입니까?";
-/* Figma page Android Screens (05/06) */
-"Enter_your_mobile_number_label" = "본인의 휴대폰 번호를 입력하세요";
 "every_day" = "매일";
 "factors_dotpoint1" = "근접 범위 내 COVIDSafe 사용자 수";
 "factors_dotpoint2" = "기기 모델 및 연식";
@@ -289,10 +313,10 @@
 /* Error message for when a user tries to signup outside of Australia. */
 "geoblock_error_message" = "";
 "geoblock_rego_error" = "";
+"global_OK" = "확인";
 "global_back" = "뒤로";
 "global_close" = "닫기";
 "global_double_tap" = "두 번 탭해서 수정하세요";
-"global_OK" = "확인";
 "hide" = "숨기기";
 "home_app_permission_status_subtitle" = "COVIDSafe는 올바른 설정없이는 작동되지 않습니다.";
 "home_app_permission_status_title" = "설정을 확인하세요.";
@@ -300,11 +324,14 @@
 "home_data_uploaded_message" = "COVID-19의 확산방지에 협조하고 자신의 증상을 추적하세요.";
 "home_header_active_no_action_required" = "추가 조치가 필요하지 않습니다.";
 /* Home */
+"home_header_active_title" = "COVIDSafe가 활성화 되었습니다.";
+/* Home */
 "home_header_active_title" = "COVIDSafe가 활성화되어 있습니다.";
 /* Home */
 "home_header_active_title_thanks" = "감사합니다. 이제 COVIDSafe가 활성화 되었습니다.";
 "home_header_inactive_check_your_permissions" = "설정을 확인하세요.";
 "home_header_inactive_title" = "COVIDSafe가 활성화되어 있지 않습니다";
+"home_header_inactive_title" = "COVIDSafe가 활성화되어 있지 않습니다";
 "home_header_uploaded_on_date_ios" = "당신의 정보가 %@에 업로드 되었습니다.";
 "home_set_complete_external_link_app_content" = "최신 뉴스 및 조언을 보려면 정부 앱을 다운로드하세요.";
 "home_set_complete_external_link_app_title" = "코로나 바이러스 앱 받기";
@@ -352,8 +379,6 @@
 "intro_content" = "COVIDSafe는 코로나 바이러스 확산으로부터 지역사회를 보호하기 위해 호주 정부에 의해 개발되었습니다. \n\nCOVIDSafe는 당신과 다른 앱 사용자와의 접촉을 안전하게 기록합니다. 바이러스 양성 결과가 나온 사람과 당신이 근거리 접촉을 한 경우 주 및 테리토리 보건 담당자가 당신에게 연락을 취할 수 있습니다. \n\n다함께 바이러스 확산을 막고 건강을 유지할 수 있습니다.";
 /* OnBoarding Intro */
 "intro_headline" = "함께 할 때 우리는 COVID-19의 확산을 막을 수 있습니다";
-/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
-"IntroLabel" = "바이러스 확산을 방지해서 \n생명을 구합시다.";
 "invalid_australian_phone_number_error_prompt" = "호주 휴대폰 번호는 최대 10자리입니다.";
 "invalid_norfolk_island_phone_number_error_prompt" = "노퍽 섬의 휴대폰 번호는 5-6자리입니다.";
 "is_snoozed" = "COVIDSafe가 일시중지되었습니다.";
@@ -389,26 +414,22 @@
 "no_handshakes_item3" = "휴대폰을 재시작하고 앱을 다시 실행하세요.";
 "no_handshakes_item4" = "<a href=\"https://www.covidsafe.gov.au/help-topics.html#location-services\">위치 서비스</a> 설정이 맞게 되어있는지 확인하세요.";
 "no_handshakes_link" = "COVIDSafe가 올바르게 작동하는지 확인하는 방법에 대한 자세한 정보 보기";
+"non_consent_button" = "동의 안 함";
+"non_consent_popup" = "부모 또는 보호자의 동의 없이 등록 절차를 계속할 수 없습니다.\n\n종료 후 앱을 삭제해 주십시오.";
 /* Figma page Android Screens (05/06) */
 "norfolk_hint" = "예: 51234";
 "northern_territory" = "노던 테리토리";
 "notification_bluetooth" = "COVIDSafe 작동을 위해 블루투스를 켜 주세요.";
 "notification_internet_content" = "COVIDSafe 작동을 위해 앱을 열고 인터넷 연결을 확인해 주세요.";
+"notification_internet_content" = "앱을 열고 인터넷 연결을 확인하십시오.";
 "notification_not_active_title" = "COVIDSafe가 활성화되어 있지 않습니다.";
 "notification_settings" = "앱을 열어 여러분의 설정을 확인하십시오.";
 "notification_update_content" = "최신 개선 사항에 접근하려면 앱을 업데이트 하십시오.";
 "notification_update_heading" = "COVIDSafe 업데이트 가능";
-/* Figma page iOS Screens (05/06) */
-"NotificationsBlurbLink" = "알림 설정 변경";
-/* Figma page iOS Screens (05/06) */
-"NotificationsDisabledBlurb" = "COVIDSafe가 비활성화되어 있으면 알림을 받을 것입니다.";
-/* Figma page iOS Screens (05/06) */
-"NotificationsEnabledBlurb" = "COVIDSafe가 비활성화되어 있으면 알림을 받을 것입니다.\n알림 설정 변경하기";
 "numbers_error" = "업데이트된 번호를 확인할 수 없습니다.";
 "numbers_no_internet" = "업데이트된 번호를 얻으려면 인터넷에 연결하십시오.";
 "numbers_refresh" = "지금 새로 고침";
 "options_for_australia" = "호주 관련 옵션";
-"OS2b_Item_4" = "4. COVIDSafe가 제대로 실행되기 위해서는 여러분의 아이폰에서 위치 서비스 기능을 허용해야 합니다. *COVIDSafe는 여러분의 위치 정보를 수집, 저장하거나 사용하지 않습니다*";
 "overseas_acquired" = "%@ 해외 유입";
 "permission_button" = "진행";
 /* Figma page iOS Screens (05/06) */
@@ -432,30 +453,19 @@
 "personal_details_name_title" = "성명 (또는 가명)";
 "personal_details_post_code" = "호주의 우편번호";
 "personal_details_post_code_error_prompt" = "호주 우편번호는 반드시 4자리 숫자여야 합니다.";
-"PINNumber_VO_Label" = "핀 번호";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusBody" = "블루투스®를 켜서 외출 시 혹은 공공 장소에 있을 때 COVIDSafe가 활성화되어 있도록 하세요.";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusTitle" = "COVIDSafe가 활성화되어 있지 않습니다.";
-"PN_MobileNumber_VOLabel" = "휴대폰 번호";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderBody" = "COVIDSafe를 열어 실행 중인지 확인하세요.";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderTitle" = "48시간 동안 접촉이 감지되지 않음";
 "postcode_api_error" = "오류가 발생하였습니다. 인터넷 연결상태를 확인한 후 다시 시도하세요.";
 "postcode_change_label" = "호주 내 현재 거주 지역 우편번호";
 "postcode_success" = "우편번호가 업데이트 되었습니다.";
-"PostcodeValidationErrorMessage" = "유효한 호주 우편번호를 입력하세요.";
 "privacy_policy" = "";
 "privacy_policy_description" = "";
 "queensland" = "퀸즐랜드";
 "recovered" = "회복된 총 확진자 수";
-"registration_consent_content" = "본인은 호주 정부 보건부 장관의 법적 결정에 따라, 데이터 저장소 관리자로서 Digital Transformation Agency가 다음 정보를 수집하는 것에 동의합니다.";
-"registration_consent_diagnostic" = "COVIDSafe가 내 장치에서 제대로 작동하도록 하기 위한 정보.";
-"registration_consent_first_paragraph" = "나의 등록 정보";
+"registration_consent_content" = "본인은 1988년 개인정보보호법에 따라 데이터 저장소 관리자로서 다음과 같은 정보를 수집하는 데 동의함을 확인합니다.";
+"registration_consent_diagnostic" = "COVIDSafe가 장치에서 제대로 작동하는지 확인하는 정보입니다.";
+"registration_consent_first_paragraph" = "등록 정보,";
 /* Onboarding Registration Consent */
 "registration_consent_headline" = "등록 동의";
-"registration_consent_second_paragraph" = "다른 COVIDSafe 사용자가 COVID-19 양성 결과를 받고 자신의 접촉 데이터를 업로드한 경우, 다른 COVIDSafe 사용자들과의 본인의 접촉 정보.";
+"registration_consent_second_paragraph" = "다른 COVIDSafe 사용자가 코로나19 양성 결과를 받고 자신의 접촉 데이터를 업로드한 경우, 다른 COVIDSafe 사용자들과 나와의 접촉에 대한 정보 및";
 "restrictions_accommodation" = "숙박 시설";
 "restrictions_activity" = "활동";
 "restrictions_cafes" = "카페 및 음식점";
@@ -481,8 +491,6 @@
 "scheduled" = "%@부터 %@까지 COVIDsafe를 일시중지해놓았습니다.";
 /* OnBoarding Enter Number */
 "select_country_or_region" = "국가 또는 지역을 선택하세요";
-/* Figma page Android Screens (05/06) */
-"Select_country_or_region_headline" = "국가 또는 지역을 선택하세요";
 "select_state_territory_button" = "주 또는 테리토리 선택";
 "select_state_territory_heading" = "주 또는 테리토리 선택";
 "set_snooze_time" = "일시중지 시간 설정";
@@ -514,7 +522,6 @@
 "stepCounter" = "%d개의 단계 중 %d 단계";
 "support" = "지원";
 "support_content" = "도움말 항목에서 다루지 않는 문제에 대한 지원";
-"Support_VOLabel" = "지원. 도움말 항목에서 다루지 않는 문제에 대한 지원";
 "tasmania" = "태즈매니아";
 /* Example: "From 22 to 28 January 2021" */
 "to" = "까지";
@@ -524,17 +531,16 @@
 "total_per_state" = "주 및 테리토리 별 총 확진자";
 "twenty_eight_days" = "28일";
 "type_in_time" = "시간 입력";
-"UILaunchStoryboardName" = "LaunchScreen_ko";
+/* Figma page Android Screens (05/06) */
+"under-sixteen_consent_call_for_action" = "동의를 확인하려면 '동의'를 선택하고, 부모 또는 보호자 동의를 확인할 수 없는 경우 '동의 안 함'을 선택하십시오.";
 "under_investigation" = "";
-"under_sixteen_content" = "본인은 호주 정부 보건부 장관의 법적 결정에 따라, 데이터 저장소 관리자로서 다음 정보를 수집하는 것에 대해 본인 부모 또는 보호자가 Digital Transformation Agency에 동의한다는 것을 확인합니다:";
-"under_sixteen_first_paragraph" = "나의 등록 정보";
+"under_sixteen_content" = "본인은 부모님 또는 보호자가 1988년 개인정보보호법에 따라 데이터 저장소 관리자로서 다음과 같은 정보를 수집하는 데 동의함을 확인합니다.";
+"under_sixteen_first_paragraph" = "등록 정보,";
 /* OnBoarding Under Sixteen */
 "under_sixteen_headline" = "계속 진행하려면 부모 혹은 보호자의 동의가 필요합니다";
 /* Figma page Android Screens (05/06) */
-"under_sixteen_registration_consent_first_paragraph" = "나의 등록 정보.";
-"under_sixteen_second_paragraph" = "다른 COVIDSafe 사용자가 COVID-19 양성 결과를 받고 자신의 접촉 데이타를 업로드한 경우, 다른 COVIDSafe 사용자들과 나와의 접촉에 대한 정보.";
-/* Figma page Android Screens (05/06) */
-"under-sixteen_consent_call_for_action" = "동의 확인을 위해 '동의'를 선택하세요.";
+"under_sixteen_registration_consent_first_paragraph" = "등록 정보,";
+"under_sixteen_second_paragraph" = "다른 COVIDSafe 사용자가 코로나19 양성 결과를 받고 자신의 접촉 데이터를 업로드한 경우, 다른 COVIDSafe 사용자들과 나와의 접촉에 대한 정보 및";
 "update_available_app_store_btn" = "앱 스토어 가기";
 "update_available_dismiss_btn" = "나중에 다시 알려 주세요";
 "update_available_message_ios" = "저희는 COVIDSafe의 기능을 향상시키고 있습니다. 앱 스토어를 통해 업데이트 하십시오.";
@@ -557,7 +563,7 @@
 "upload_step_verify_pin_header" = "본인의 정보를 업로드하세요";
 "upload_step_verify_pin_sub_header" = "주 또는 테리토리 보건 담당자가 당신의 장치에 문자 메시지로 PIN을 보낼 것입니다. 본인의 정보를 업로드하려면 아래에 그 번호를 입력하십시오.";
 "us_consent_button" = "동의";
-"us_registration_consent_diagnostic" = "COVIDSafe가 내 장치에서 제대로 작동하도록 하기 위한 정보.";
+"us_registration_consent_diagnostic" = "COVIDSafe가 장치에서 제대로 작동하는지 확인하는 정보입니다.";
 "victoria" = "빅토리아";
 "western_australia" = "서호주";
 "wrong_ping_number" = "잘못된 PIN 입력";
@@ -572,38 +578,16 @@
 "Done" = "완료";
 /* Feedback */
 "EmailPlaceholder" = "이메일 주소를 입력하십시오 (필수)";
+"EnterPINSent" = "%@로 보낸 PIN을 입력하세요";
 /* Phone number and PIN */
 "EnterPhoneReVerify" = "재확인을 위해 휴대폰 전화번호를 입력하세요";
-"EnterPINSent" = "%@로 보낸 PIN을 입력하세요";
-/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_message" = "안녕하세요, 어떻게 진행하시겠습니까?";
-/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_title" = "피드백 박스";
-/* Title for button that launches new feedback flow. */
-"entryPrompt_newFeedback_button_title" = "새로운 피드백";
 "FoundIssueWithApp" = "COVIDSafe 앱에 문제가 있습니까?";
-/* *** Feedback localised strings *** */
-"global_cancel_button_title" = "취소";
-"global_send_button_title" = "보내기";
-"global_sending_indication_title" = "보내는 중";
-"global_success_indication_title" = "성공";
 /* upload */
 "InformationUploaded" = "여러분의 정보가 %@에 업로드 되었습니다.";
 "InvalidOTP" = "반드시 6자리 코드여야 합니다";
 "IssueDescPlaceholder" = "문제를 설명해 주세요.";
 "IssueFooter" = "여러분의 피드백에 대한 자세한 내용에 대해 연락을 드릴 수도 있습니다. 여러분의 이메일 주소는 다른 목적으로 사용되지 않습니다.";
 "IssueThankYou" = "감사합니다! 여러분의 피드백을 받았습니다.";
-/* Delete screenshot action sheet action button title. */
-"newFeedback_deleteScreenshot_actionTitle" = "스크린 샷 삭제하기";
-/* Messsage shown to user asking to confirm screenshot deletion. */
-"newFeedback_deleteScreenshotConfirmation_message" = "이 스크린 샷은 영구적으로 삭제됩니다.";
-"newFeedback_invalidEmail_errorMessage" = "유효한 이메일 주소를 입력하세요!";
-/* Error message displayed to users when feedback has empty description */
-"newFeedback_noMessage_errorMessage" = "보내기 전에 저희에게 피드백을 주십시오.";
-/* Error message displayed to users when feedback fails to send. */
-"newFeedback_send_errorMessage" = "피드백 보내기 오류";
-/* Navigation Bar title shown during new feedback flow. */
-"newFeedbackFlow_navigationTitle" = "문제 신고하기";
 "Next" = "다음";
 /* registration succcess */
 "OS2b_Item1" = "1. 외출 시 휴대폰을 소지하고, COVIDSafe가 활성화되어 있도록 하세요. ";
@@ -611,6 +595,7 @@
 "OS2b_Item2_VOLabel" = "2. 블루투스가 켜져 있어야 합니다.";
 "OS2b_Item3" = "3. COVIDSafe는 페어링 요청을 보내지 않습니다. 더 알아보세요.";
 "OS2b_Item3Underline" = "더 알아보세요";
+"PINWillExpire" = "PIN이 %@후에 만료됩니다";
 /* home */
 "PairingRequestsInfo" = "COVIDSafe는 *페어링 요청*을 보내지 않습니다.";
 "PairingRequestsInfoUnderline" = "페어링 요청";
@@ -618,7 +603,6 @@
 "PhoneNumberFormatErrorTitle" = "잘못된 전화번호 형식";
 "PhoneVerificationErrorMessage" = "여러분의 정보를 확인한 후 다시 시도하세요.";
 "PhoneVerificationErrorTitle" = "전화번호 확인 중 오류";
-"PINWillExpire" = "PIN이 %@후에 만료됩니다";
 "ReceivePinIssue" = "PIN을 받는 데 문제가 있습니까?";
 /* help */
 "ReportAnIssue" = "문제 신고하기";
@@ -627,13 +611,35 @@
 "UploadFailed" = "업로드에 실패했습니다. 나중에 다시 시도하세요.";
 "UploadFailedErrorMessage" = "나중에 다시 시도하세요.";
 "ValidationError" = "인증 오류";
+/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_message" = "안녕하세요, 어떻게 진행하시겠습니까?";
+/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_title" = "피드백 박스";
+/* Title for button that launches new feedback flow. */
+"entryPrompt_newFeedback_button_title" = "새로운 피드백";
+/* *** Feedback localised strings *** */
+"global_cancel_button_title" = "취소";
+"global_send_button_title" = "보내기";
+"global_sending_indication_title" = "보내는 중";
+"global_success_indication_title" = "성공";
+/* Navigation Bar title shown during new feedback flow. */
+"newFeedbackFlow_navigationTitle" = "문제 신고하기";
+/* Messsage shown to user asking to confirm screenshot deletion. */
+"newFeedback_deleteScreenshotConfirmation_message" = "이 스크린 샷은 영구적으로 삭제됩니다.";
+/* Delete screenshot action sheet action button title. */
+"newFeedback_deleteScreenshot_actionTitle" = "스크린 샷 삭제하기";
+"newFeedback_invalidEmail_errorMessage" = "유효한 이메일 주소를 입력하세요!";
+/* Error message displayed to users when feedback has empty description */
+"newFeedback_noMessage_errorMessage" = "보내기 전에 저희에게 피드백을 주십시오.";
+/* Error message displayed to users when feedback fails to send. */
+"newFeedback_send_errorMessage" = "피드백 보내기 오류";
 "GetCoronaVirusApp_VOLabel" = "코로나 바이러스 앱을 다운로드하세요. 최신 뉴스 및 조언을 보려면 정부 앱을 다운로드하세요.";
 "HelpTopics_VOLabel" = "도움말 항목. 기술 문제를 해결하고 수정하는 방법에 대한 안내";
 "LatestNews_VOLabel" = "최신 뉴스 및 업데이트. 최신 코로나 바이러스 뉴스를 보려면 aus.gov.au를 방문하세요.";
 "NotificationsDisabled_VOLabel" = "알림이 꺼졌습니다. COVIDSafe가 활성화되어 있지 않으면 알림을 받을 수 없습니다.  \n알림 설정 변경하기";
 "NotificationsEnabled_VOLabel" = "알림이 켜졌습니다. COVIDSafe가 활성화되어 있지 않으면 알림을 받게 됩니다.  \n알림 설정 변경하기";
 "OS1b_TopParagraph_VOLabel" = "블루투스 신호는 당신이 다른 COVIDSafe 사용자 근처에 있을 때를 확인하는 데 사용됩니다. \n당신과 다른 COVIDSafe 사용자 간의 모든 근거리 접촉 상황들이 근거리 접촉정보로 기록됩니다. 이 정보는 암호화되어 당신의 휴대폰에만 저장됩니다. \nCOVIDSafe 사용자로서 당신이 COVID-19에 양성 결과가 나오면, 주 또는 테리토리 보건 담당자가 당신에게 연락할 것입니다. 당신이 자신의 근거리 접촉정보를 보안성 높은 정보 저장 체계에 자발적으로 업로드할 수 있도록 도와줄 것입니다. \n또한 양성 결과가 나온 다른 COVIDSafe 사용자와 당신이 가까이 접촉한 경우, 주 또는 테리토리 보건 담당자가 당신에게 연락을 취할 수 있습니다. \n자세한 내용은 *도움말 항목* 페이지를 참조하세요.";
-"permission_content_iOS_2_VOLabel" = "1. 블루투스\n2. 알림\n3. 위치 서비스";
-"permission_content_iOS_VOLabel" = "COVIDSafe가 제대로 실행되기 위해서는 블루투스가 활성화되어야 합니다. COVIDSafe는 페어링 요청을 보내지 않습니다.\n\n알림 기능을 활성화하면, COVIDSafe가 비활성화되어 있을 때 알림을 받게 됩니다.\n\nCOVIDSafe가 제대로 실행되기 위해서는 당신의 아이폰에서 위치 서비스 허용이 필요합니다. *COVIDSafe는 당신의 위치 정보를 추적하거나 저장하지 않습니다*\n\n활성화하려면 '진행'을 선택하세요.";
 "ShareCovidSafe_VOLabel" = "COVIDSafe를 공유하세요. 다른 이들에게 참여를 권유하세요. 우리는 함께할 때 더 강해집니다.";
 "UploadData_VOLabel" = "보건 담당자가 여러분에게 연락했습니까? 양성 검사 결과를 받은 경우에만 여러분의 정보를 업로드할 수 있습니다.";
+"permission_content_iOS_2_VOLabel" = "1. 블루투스\n2. 알림\n3. 위치 서비스";
+"permission_content_iOS_VOLabel" = "COVIDSafe가 제대로 실행되기 위해서는 블루투스가 활성화되어야 합니다. COVIDSafe는 페어링 요청을 보내지 않습니다.\n\n알림 기능을 활성화하면, COVIDSafe가 비활성화되어 있을 때 알림을 받게 됩니다.\n\nCOVIDSafe가 제대로 실행되기 위해서는 당신의 아이폰에서 위치 서비스 허용이 필요합니다. *COVIDSafe는 당신의 위치 정보를 추적하거나 저장하지 않습니다*\n\n활성화하려면 '진행'을 선택하세요.";
\ No newline at end of file
diff --git a/CovidSafe/pa-IN.lproj/Localizable.strings b/CovidSafe/pa-IN.lproj/Localizable.strings
index cec07d2..57dffda 100644
--- a/CovidSafe/pa-IN.lproj/Localizable.strings
+++ b/CovidSafe/pa-IN.lproj/Localizable.strings
@@ -1,3 +1,38 @@
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothOFF" = "Bluetooth ਤੱਕ ਪਹੁੰਚ: ਔਫ";
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothON" = "Bluetooth ਤੱਕ ਪਹੁੰਚ: ਔਨ";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF" = "Bluetooth: ਔਫ";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF_content" = "ਆਪਣੇ ਫ਼ੋਨ ਦੇ Bluetooth® ਨੂੰ  ਔਨ ਕਰੋ। ਜੇਕਰ ਡਿਸਪਲੇਅ ਹੈ ਤਾਂ ' ਅਲਉ ਨਿਉ ਕੁਨੈਕਸ਼ਨਜ਼' (Allow New Connections) ਚੁਣੋ ।";
+/* Figma page iOS Screens (05/06) */
+"BluetoothON" = "Bluetooth®: ਔਨ";
+/* Figma page Android Screens (05/06) */
+"Enter_your_mobile_number_label" = "ਆਪਣਾ ਮੋਬਾਈਲ ਨੰਬਰ ਭਰੋ";
+/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
+"IntroLabel" = "ਫੈਲਣ ਨੂੰ ਰੋਕਣ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰੋ ਅਤੇ ਜ਼ਿੰਦਗੀਆਂ  ਬਚਾਓ।";
+/* Figma page iOS Screens (05/06) */
+"NotificationsBlurbLink" = "ਨੋਟੀਫਿਕੇਸ਼ਨਜ਼ ਸੈਟਿੰਗਜ਼ ਬਦਲੋ";
+/* Figma page iOS Screens (05/06) */
+"NotificationsDisabledBlurb" = "ਜੇ COVIDSafe ਸਰਗਰਮ ਨਹੀਂ  ਤਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾ ਨਹੀਂ ਮਿਲੇਗੀ| \nਨੋਟੀਫਿਕੇਸ਼ਨਜ਼ ਸੈਟਿੰਗਜ਼ ਬਦਲੋ";
+/* Figma page iOS Screens (05/06) */
+"NotificationsEnabledBlurb" = "ਜੇ COVIDSafe ਸਰਗਰਮ ਨਹੀਂ  ਤਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾ ਮਿਲੇਗੀ| \nਨੋਟੀਫਿਕੇਸ਼ਨਜ਼ ਸੈਟਿੰਗਜ਼ ਬਦਲੋ";
+"OS2b_Item_4" = "4. COVIDSafe ਕੰਮ ਕਰ ਸਕੇ, ਇਸ ਦੇ ਲਈ ਤੁਹਾਡੇ iPhone ਨੂੰ ਲੋਕੇਸ਼ਨ ਆਗਿਆ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। *COVIDSafe ਤੁਹਾਡੇ ਸਥਾਨਕ ਅੰਕੜਿਆਂ ਨੂੰ ਇਕੱਤਰ ਨਹੀਂ ਕਰਦਾ, ਸਟੋਰ ਨਹੀਂ ਕਰਦਾ ਜਾਂ ਵਰਤੋਂ ਨਹੀਂ ਕਰਦਾ*";
+"PINNumber_VO_Label" = "ਪਿੰਨ ਨੰਬਰ";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusBody" = "ਤੁਸੀਂ ਘਰੋਂ ਬਾਹਰ  ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਜਾਂ ਜਨਤਕ ਸਥਾਨਾਂ 'ਤੇ ਹੁੰਦੇ ਹੋ ਤਾਂ Bluetooth® ਨੂੰ ਚਾਲੂ (ਐਨੇਬਲਡ) ਕਰਕੇ ਇਹ ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਇਹ ਸਰਗਰਮ ਹੈ|";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusTitle" = "COVIDSafe ਸਰਗਰਮ ਨਹੀਂ ਹੈ|";
+"PN_MobileNumber_VOLabel" = "ਮੋਬਾਈਲ ਨੰਬਰ";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderBody" = "COVIDSafe ਨੂੰ ਖੋਲ੍ਹੋ, ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਕਿ ਇਹ ਚੱਲ ਰਿਹਾ ਹੈ।";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderTitle" = "48 ਘੰਟਿਆਂ ਦਰਮਿਆਨ ਕਿਸੇ ਨਾਲ ਟਾਕਰਾ ਹੋਇਆ -- ਸੂਹ ਨਹੀਂ ਮਿਲੀ";
+"PostcodeValidationErrorMessage" = "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਉਚਿੱਤ (ਵੈਲਿਡ) ਆੱਸਟ੍ਰਲੀਅਨ ਪੋਸਟਕੋਡ ਭਰੋ|";
+/* Figma page Android Screens (05/06) */
+"Select_country_or_region_headline" = "ਦੇਸ਼ ਜਾਂ ਇਲਾਕਾ ਚੁਣੋ";
+"Support_VOLabel" = "ਸਹਾਇਤਾ। ਜੋ ਮੁੱਦੇ ਹੈਲਪ ਟੌਪਿਕਸ ਦੁਆਰਾ ਕਵਰ ਨਹੀਂ ਹੁੰਦੇ, ਉਨ੍ਹਾਂ ਦੀ ਸਹਾਇਤਾ ਵਾਸਤੇ";
 "action_continue" = "ਜਾਰੀ ਰੱਖੋ";
 "action_report_an_issue" = "ਮੁੱਦੇ/ਮਸਲੇ ਬਾਰੇ ਰਿਪੋਰਟ ਕਰੋ|";
 "action_upload_done" = "ਕਰ ਦਿੱਤਾ";
@@ -11,20 +46,10 @@
 "activity_intro_2" = "ਹੱਥ ਮਿਲਾਉਣ ਦੀਆਂ ਗਿਣਤੀਆਂ ਦਰਸਾਉਂਦੀਆਂ ਹਨ ਕਿ ਤੁਸੀਂ ਕਿਸੇ ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰ ਨਾਲ ਨੇੜਲੇ ਸੰਪਰਕ ਵਿੱਚ ਸੀ। ਇਸ ਦਾ ਮਤਲਬ ਇਹ ਨਹੀਂ ਕਿ ਤੁਸੀਂ ਉਸ ਵਰਤੋਂਕਾਰ ਦੇ ਸੰਪਰਕ ਵਿੱਚ ਰਹੇ ਹੋ, ਜਿਸ ਦੀ ਕੋਵਿਡ-19 ਦੀ ਜਾਂਚ ਪਾਜ਼ੇਟਿਵ ਆਈ ਸੀ।";
 /* Figma page iOS Screens (05/06) */
 "allow_bluetooth_call" = "COVIDSafe ਨੂੰ Bluetooth ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿਓ";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothOFF" = "Bluetooth ਤੱਕ ਪਹੁੰਚ: ਔਫ";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothON" = "Bluetooth ਤੱਕ ਪਹੁੰਚ: ਔਨ";
 "app_activity_bluetooth_handshakes_heading" = "ਤੁਹਾਡੇ ਉਪਕਰਨ ਦੁਆਰਾ ਦਰਜ ਕੀਤੇ Bluetooth ਹੈਂਡਸ਼ੇਕਸ";
 "australian_capital_territory" = "ਆੱਸਟ੍ਰੇਲੀਅਨ ਕੈਪੀਟਲ ਟੈਰੀਟਰੀ";
 "ble_handshakes_yesterday" = "ਕੱਲ੍ਹ ਤੁਹਾਡੇ ਉਪਕਰਨ ਦੁਆਰਾ ਦਰਜ ਕੀਤੇ Bluetooth ਹੈਂਡਸ਼ੇਕਸ";
 "bluetooth_handshakes" = "Bluetooth ਦੇ ਹੈਂਡਸ਼ੇਕਸ";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF" = "Bluetooth: ਔਫ";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF_content" = "ਆਪਣੇ ਫ਼ੋਨ ਦੇ Bluetooth® ਨੂੰ  ਔਨ ਕਰੋ। ਜੇਕਰ ਡਿਸਪਲੇਅ ਹੈ ਤਾਂ ' ਅਲਉ ਨਿਉ ਕੁਨੈਕਸ਼ਨਜ਼' (Allow New Connections) ਚੁਣੋ ।";
-/* Figma page iOS Screens (05/06) */
-"BluetoothON" = "Bluetooth®: ਔਨ";
 "cancel_snooze" = "ਸਨੂਜ਼ ਰੱਦ ਕਰੋ";
 "cases_28_days" = "ਪਿਛਲੇ 28 ਦਿਨਾਂ ਵਿੱਚ ਨਵੇਂ ਮਾਮਲੇ";
 "cases_7_days" = "ਪਿਛਲੇ 7 ਦਿਨਾਂ ਵਿੱਚ ਨਵੇਂ ਮਾਮਲੇ";
@@ -250,8 +275,9 @@
 "country_region_name_zw" = "ਜ਼ਿੰਮਬਾਬਵੇ";
 "customise_days" = "ਆਪਣੀ ਮਰਜ਼ੀ ਮੁਤਾਬਕ ਦਿਨ ਚੁਣੋ";
 "data_privacy_button" = "ਅੱਗੇ";
-"data_privacy_content" = "COVIdSafe ਦੀ ਰਜਿਸਟ੍ਰੇਸ਼ਨ ਤੋਂ ਪਹਿਲਾਂ ਇਹ ਮਹੱਤਵਪੂਰਨ ਹੈ ਕਿ ਤੁਸੀਂ COVIDSafe *ਪ੍ਰਾਈਵੇਸੀ ਪਾੱਲਿਸੀ* ਪੜ੍ਹੋ।\n\nCOVIDSafe ਸਿਰਫ ਇਸ ਨੀਤੀ ਅਤੇ ਪ੍ਰਾਈਵੇਸੀ ਐਕਟ 1988 ਦੇ ਅਨੁਸਾਰ ਤੁਹਾਡੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਨੂੰ ਇਕੱਤਰ ਕਰੇਗਾ, ਇਸਤੇਮਾਲ ਕਰੇਗਾ ਜਾਂ ਖੁਲਾਸਾ ਕਰੇਗਾ।\n\nਜੇ ਤੁਸੀਂ 16 ਸਾਲ ਤੋਂ ਘੱਟ ਉਮਰ ਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਮਾਪੇ/ਸਰਪ੍ਰਸਤ ਨੂੰ ਵੀ *ਪ੍ਰਾਈਵੇਸੀ ਪਾੱਲਿਸੀ* ਜ਼ਰੂਰ ਪੜ੍ਹਨੀ ਚਾਹੀਦੀ ਹੈ। \n\nCOVIDSafe ਦੀ ਵਰਤੋਂ ਪੂਰੀ ਤਰ੍ਹਾਂ ਸਵੈ-ਇੱਛਤ ਹੈ। ਤੁਸੀਂ ਕਿਸੇ ਵੀ ਸਮੇਂ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਇੰਸਟਾੱਲ ਜਾਂ ਡਿਲੀਟ ਕਰ ਸਕਦੇ ਹੋ। ਜੇ ਤੁਸੀਂ COVIDSafe ਨੂੰ ਡਿਲੀਟ ਕਰ ਦਿੰਦੇ ਹੋ, *ਤੁਸੀਂ ਆਪਣੀ ਜਾਣਕਾਰੀ* ਨੂੰ ਵੀ ਸੁਰੱਖਿਅਤ ਸਰਵਰ ਤੋਂ ਡਿਲੀਟ ਕਰਨ ਲਈ ਕਹਿ ਸਕਦੇ ਹੋ।\n\n\nCOVIDSafe ਰਜਿਸਟ੍ਰੇਸ਼ਨ ਲਈ, ਤੁਹਾਨੂੰ ਅਪਣਾ ਨਾਮ (ਜਾਂ ਫਰਜੀ ਨਾਮ), ਮੋਬਾਈਲ ਨੰਬਰ, ਉਮਰ ਸੀਮਾ ਅਤੇ ਪੋਸਟਕੋਡ ਭਰਨ ਦੀ ਲੋੜ ਪਵੇਗੀ।\n\nਰਜਿਸਟ੍ਰੇਸ਼ਨ  ਵੇਲੇ ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਅਤੇ COVIDSafe ਦੀ ਤੁਹਾਡੇ ਦੁਆਰਾ ਵਰਤੋਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਨੂੰ ਇੱਕ ਬੇਹੱਦ ਸੁਰੱਖਿਅਤ ਸਰਵਰ 'ਤੇ ਸੰਭਾਲਿਆ ਜਾਂਦਾ ਹੈ।\n\nਇਹ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਵੀ ਜਾਣਕਾਰੀ  ਇਕੱਤਰ ਕੀਤੀ ਜਾਂਦੀ ਹੈ ਕਿ COVIDSafe ਤੁਹਾਡੀ ਡਿਵਾਈਸ 'ਤੇ ਉਚਿਤ ਤਰੀਕੇ ਨਾਲ ਕੰਮ ਕਰ ਰਿਹਾ ਹੈ। ਇਸ ਵਿੱਚ ਤੁਹਾਡਾ ਆਪਰੇਟਿੰਗ ਸਿਸਟਮ, ਤੁਹਾਡੇ ਵੱਲੋਂ ਇੰਸਟਾੱਲ ਕੀਤੀ ਐਪ ਦਾ ਵਰਜ਼ਨ, ਤੁਹਾਡੀ ਡਿਵਾਈਸ 'ਤੇ ਸੈੱਟ ਕੀਤੀ ਗਈ ਭਾਸ਼ਾ, ਕੀ Bluetooth® ਕੰਮ ਕਰ ਰਿਹਾ ਹੈ ਅਤੇ ਕੀ ਤੁਹਾਡੀ ਐਪ ਨੇ ਪਿਛਲੇ ਸੱਤ ਦਿਨਾਂ ਵਿੱਚ ਕੋਈ ਵੀ ਟਾਕਰੇ ਨੂੰ ਰਿਕਾਰਡ ਕੀਤਾ ਹੈ।\n\nCOVIDSafe ਤੁਹਾਡੇ ਸਥਾਨ ਦੀ ਜਾਣਕਾਰੀ ਇਕੱਤਰ ਨਹੀਂ ਕਰੇਗਾ।\n\nCOVIDSafe ਤੁਹਾਡੇ ਸੰਪਰਕ ਵਿੱਚ ਆਉਣ ਵਾਲੇ ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰਾਂ ਦੀ ਤਾਰੀਖ਼ ਅਤੇ ਸਮਾਂ, ਗੁੰਮਨਾਮ ID ਕੋਡ, Bluetooth ਸਿਗਨਲ ਸ਼ਕਤੀ ਅਤੇ ਫੋਨ ਮਾੱਡਲ ਤੁਹਾਡੇ ਡਿਵਾਈਸ 'ਤੇ ਨੋਟ ਕਰੇਗਾ।\n\nਦੂਜੇ COVIDSafe ਵਰਤੋਂਕਾਰ ਜਿੰਨ੍ਹਾਂ ਦੇ ਸੰਪਰਕ ਵਿੱਚ ਤੁਸੀਂ ਆਉਂਦੇ ਹੋ, ਤੁਹਾਡਾ ਗੁੰਮਨਾਮ ID ਕੋਡ ਅਤੇ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਦੀ ਤਾਰੀਖ਼ ਅਤੇ ਸਮਾਂ, Bluetooth ਸਿਗਨਲ ਸ਼ਕਤੀ ਅਤੇ ਤੁਹਾਡਾ ਫੋਨ ਮਾੱਡਲ ਆਪਣੇ ਡਿਵਾਈਸ 'ਤੇ ਨੋਟ ਕਰਨਗੇ।\n\nਜੇ ਕੋਈ ਹੋਰ ਵਰਤੋਂਕਾਰ ਦਾ COVID-19 ਟੈਸਟ ਪਾੱਜ਼ੇਟਿਵ ਆਉਂਦਾ ਹੈ, ਤਾਂ ਉਹ ਆਪਣੀ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਨੂੰ ਅੱਪਲੋਡ ਕਰ ਸਕਦੇ ਹਨ ਅਤੇ ਕੋਈ  ਪ੍ਰਾਂਤਿਕ ਜਾਂ ਇਲਾਕਾ ਸਿਹਤ ਅਧਿਕਾਰੀ ਸੰਪਰਕ ਢੂੰਡਣ ਲਈ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰ ਸਕਦਾ ਹੈ। \n\nਤੁਹਾਡੀ ਰਜਿਸਟ੍ਰੇਸ਼ਨ ਦੇ ਵੇਰਵਿਆਂ ਨੂੰ ਕੇਵਲ ਸੰਪਰਕ ਢੂੰਡਣ ਲਈ ਅਤੇ COVIDSafe ਦੇ ਉਚਿਤ ਅਤੇ ਕਨੂੰਨੀ ਕਾਰਜ ਲਈ ਵਰਤਿਆ ਜਾਂ ਇਸਦਾ ਖੁਲਾਸਾ ਕੀਤਾ ਜਾਵੇਗਾ। \n\nਵਧੇਰੇ ਜਾਣਕਾਰੀ *covidsafe.go.au* 'ਤੇ ਉਪਲਬਧ ਹੈ।\n\nਤੁਹਾਡੀ ਜਾਣਕਾਰੀ ਅਤੇ ਇਹਨਾਂ ਨਾਲ ਕਿਵੇਂ ਨਿਪਟਿਆ ਅਤੇ ਸਾਂਝਾ ਕੀਤਾ ਜਾਵੇਗਾ ਇਸ ਬਾਰੇ ਤੁਹਾਡੇ ਅਧਿਕਾਰਾਂ ਦੀ ਹੋਰ ਵੇਰਵਿਆਂ ਲਈ COVIDSafe *ਪ੍ਰਾਈਵੇਸੀ ਪਾੱਲਿਸੀ* ਦੇਖੋ।";
-"data_privacy_content_VO" = "COVIdSafe ਨਾਲ ਰਜਿਸਟ੍ਰੇਸ਼ਨ ਤੋਂ ਪਹਿਲਾਂ ਇਹ ਮਹੱਤਵਪੂਰਨ ਹੈ ਕਿ ਤੁਸੀਂ COVIDSafe ਗੁਪਤਤਾ ਨੀਤੀ ਪੜ੍ਹੋ।\n\nCOVIDSafe, ਸਿਰਫ ਇਸ ਨੀਤੀ ਅਤੇ ਪ੍ਰਾਈਵੇਸੀ ਐਕਟ 1988 ਦੇ ਅਨੁਸਾਰ ਹੀ ਤੁਹਾਡੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਨੂੰ ਇਕੱਤਰ, ਇਸਤੇਮਾਲ ਜਾਂ ਇਸਦਾ  ਖੁਲਾਸਾ ਕਰੇਗਾ।\n\nਜੇ ਤੁਸੀਂ 16 ਸਾਲ ਤੋਂ ਘੱਟ ਉਮਰ ਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਮਾਪੇ/ਸਰਪ੍ਰਸਤ ਨੂੰ ਵੀ ਗੁਪਤਤਾ ਨੀਤੀ ਜ਼ਰੂਰ ਪੜ੍ਹਨੀ ਚਾਹੀਦੀ ਹੈ।\n\nCOVIDSafe ਦੀ ਵਰਤੋਂ ਪੂਰੀ ਤਰ੍ਹਾਂ ਸਵੈ-ਇੱਛਤ ਹੈ। ਤੁਸੀਂ ਕਿਸੇ ਵੀ ਸਮੇਂ ਇਸ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਇੰਸਟਾੱਲ ਜਾਂ ਡਿਲੀਟ ਕਰ ਸਕਦੇ ਹੋ। ਜੇ ਤੁਸੀਂ COVIDSafe ਨੂੰ ਡਿਲੀਟ ਕਰਦੇ  ਹੋ, ਤਾਂ ਤੁਸੀਂ ਆਪਣੀ ਜਾਣਕਾਰੀ ਨੂੰ ਸੁਰੱਖਿਅਤ ਸਰਵਰ ਤੋਂ ਡਿਲੀਟ ਕਰਨ ਲਈ ਵੀ ਕਹਿ ਸਕਦੇ ਹੋ।\n\nCOVIDSafe ਲਈ ਰਜਿਸਟ੍ਰੇਸ਼ਨ ਵਾਸਤੇ, ਤੁਹਾਨੂੰ ਅਪਣਾ ਨਾਮ (ਜਾਂ ਨਕਲੀ ਨਾਮ), ਮੋਬਾਈਲ ਨੰਬਰ, ਉਮਰ ਸੀਮਾ ਅਤੇ ਪੋਸਟਕੋਡ ਭਰਨਾ ਪਵੇਗਾ|\n\nਦਰਜ ਕਰਨ ਉਪਰੰਤ, ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਅਤੇ COVIDSafe ਦੀ ਤੁਹਾਡੇ ਦੁਆਰਾ ਵਰਤੋਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਨੂੰ, ਇੱਕ ਬੇਹੱਦ ਸੁਰੱਖਿਅਤ ਸਰਵਰ 'ਤੇ ਸਟੋਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।\n\nਇਹ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਵੀ ਜਾਣਕਾਰੀ ਇਕੱਤਰ ਕੀਤੀ ਜਾਂਦੀ ਹੈ ਕਿ COVIDSafe ਤੁਹਾਡੇ ਡਿਵਾਈਸ 'ਤੇ ਸਹੀ ਤਰ੍ਹਾਂ ਕੰਮ ਕਰ ਰਿਹਾ ਹੈ। ਇਸ ਵਿੱਚ ਤੁਹਾਡਾ ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ, ਤੁਹਾਡੇ ਦੁਆਰਾ ਇੰਸਟਾਲ ਕੀਤੇ ਗਏ ਐਪ ਦਾ ਸੰਸਕਰਣ, ਤੁਹਾਡੀ ਡਿਵਾਈਸ ਜਿਸ ਭਾਸ਼ਾ 'ਤੇ ਸੈਟ ਕੀਤੀ ਗਈ ਹੈ, ਕੀ Bluetooth ਕੰਮ ਕਰ ਰਿਹਾ ਹੈ ਅਤੇ ਜੇ ਤੁਹਾਡੀ ਐਪ ਵਿੱਚ ਪਿਛਲੇ ਸੱਤ ਦਿਨਾਂ ਵਿੱਚ ਕੋਈ ਟਾਕਰਾ ਦਰਜ ਹੋਇਆ ਹੈ, ਸ਼ਾਮਲ ਹੈ।\n\nCOVIDSafe ਤੁਹਾਡੇ ਸਥਾਨ ਸਬੰਧੀ ਜਾਣਕਾਰੀ ਇਕੱਠੀ ਨਹੀਂ ਕਰੇਗਾ।\n\nCOVIDSafe ਤੁਹਾਡੇ ਸੰਪਰਕ ਵਿੱਚ ਆਉਣ ਵਾਲੇ ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰਾਂ ਦੀ ਤਾਰੀਖ਼ ਅਤੇ ਸਮਾਂ, ਗੁੰਮਨਾਮ ID ਕੋਡ, Bluetooth ਸਿਗਨਲ ਸ਼ਕਤੀ ਅਤੇ ਫੋਨ ਮਾੱਡਲ ਤੁਹਾਡੇ ਡਿਵਾਈਸ 'ਤੇ ਨੋਟ ਕਰੇਗਾ।\n\nਦੂਜੇ COVIDSafe ਵਰਤੋਂਕਾਰ, ਜਿੰਨ੍ਹਾਂ ਦੇ ਸੰਪਰਕ ਵਿੱਚ ਤੁਸੀਂ ਆਉਂਦੇ ਹੋ, ਤੁਹਾਡਾ ਗੁੰਮਨਾਮ ID ਕੋਡ ਅਤੇ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਦੀ ਤਾਰੀਖ਼ ਅਤੇ ਸਮਾਂ, Bluetooth ਦੀ ਸਿਗਨਲ ਸ਼ਕਤੀ ਅਤੇ ਤੁਹਾਡਾ ਫੋਨ ਮਾੱਡਲ, ਆਪਣੀ ਡਿਵਾਈਸ 'ਤੇ ਨੋਟ ਕਰਨਗੇ।\n\nਜੇ ਕੋਈ ਹੋਰ ਵਰਤੋਂਕਾਰ ਦਾ COVID-19 ਟੈਸਟ ਪਾਜ਼ੇਟਿਵ ਆਉਂਦਾ ਹੈ, ਤਾਂ ਉਹ ਆਪਣੀ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਨੂੰ ਅੱਪਲੋਡ ਕਰ ਸਕਦੇ ਹਨ ਅਤੇ ਕੋਈ ਪ੍ਰਾਂਤਿਕ ਜਾਂ ਇਲਾਕਾ ਸਿਹਤ ਅਧਿਕਾਰੀ, ਸੰਪਰਕ ਢੂੰਡਣ ਦੇ ਉਦੇਸ਼ ਲਈ, ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰ ਸਕਦਾ ਹੈ। \n\nਤੁਹਾਡੀ ਰਜਿਸਟ੍ਰੇਸ਼ਨ ਦੇ ਵੇਰਵੇ, ਕੇਵਲ ਸੰਪਰਕ ਢੂੰਡਣ ਲਈ ਅਤੇ COVIDSafe ਦੇ ਉਚਿਤ ਅਤੇ ਕਨੂੰਨੀ ਕਾਰਜ ਲਈ ਵਰਤੇ ਜਾਣਗੇ ਜਾਂ ਉਹਨਾਂ ਦਾ ਖੁਲਾਸਾ ਕੀਤਾ ਜਾਵੇਗਾ। \n\nਵਧੇਰੇ ਜਾਣਕਾਰੀ covidsafre.gov.au website 'ਤੇ ਉਪਲਬਧ ਹੈ।\n\nਤੁਹਾਡੀ ਜਾਣਕਾਰੀ ਸਬੰਧੀ ਅਧਿਕਾਰ, ਅਤੇ ਇਹਨਾਂ ਨਾਲ ਕਿਵੇਂ ਨਿਪਟਿਆ ਅਤੇ ਸਾਂਝਾ ਕੀਤਾ ਜਾਵੇਗਾ, ਇਸ ਬਾਰੇ ਹੋਰ ਵੇਰਵਿਆਂ ਲਈ COVIDSafe ਗੁਪਤਤਾ ਨੀਤੀ ਦੇਖੋ।";
+"data_privacy_content" = "ਇਹ ਮਹੱਤਵਪੂਰਨ ਹੈ ਕਿ ਤੁਸੀਂ COVIDSafe ਲਈ ਪੰਜੀਕਰਨ ਤੋਂ ਪਹਿਲਾਂ COVIDSafe *ਗੋਪਨੀਯਤਾ ਨੀਤੀ* ਨੂੰ ਪੜ੍ਹੋ। COVIDSafe ਤੁਹਾਡੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਨੂੰ ਸਿਰਫ਼ ਇਸ ਨੀਤੀ ਅਤੇ ਨਿੱਜਤਾ ਅਧਿਨਿਯਮ 1988 ਦੇ ਅਨੁਸਾਰ ਇਕੱਤਰ ਕਰੇਗੀ, ਵਰਤੇਗੀ ਜਾਂ ਪ੍ਰਗਟ ਕਰੇਗੀ। \n\nਜੇਕਰ ਤੁਹਾਡੀ ਉਮਰ 16 ਸਾਲ ਤੋਂ ਘੱਟ ਹੈ, ਤਾਂ ਤੁਹਾਡੇ ਮਾਤਾ-ਪਿਤਾ/ਸਰਪ੍ਰਸਤ ਨੂੰ ਵੀ *ਗੋਪਨੀਯਤਾ ਨੀਤੀ* ਨੂੰ ਪੜ੍ਹਨਾ ਚਾਹੀਦਾ ਹੈ। \n\nCOVIDSafe ਦੀ ਵਰਤੋਂ ਪੂਰੀ ਤਰ੍ਹਾਂ ਸਵੈਇੱਛਤ ਹੈ। ਤੁਸੀਂ ਕਿਸੇ ਵੀ ਸਮੇਂ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਇੰਸਟਾਲ ਜਾਂ ਮਿਟਾ ਸਕਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ COVIDSafe ਨੂੰ ਮਿਟਾ ਦਿੰਦੇ ਹੋ, ਤਾਂ *ਤੁਸੀਂ ਆਪਣੀ ਜਾਣਕਾਰੀ* ਨੂੰ ਸੁਰੱਖਿਅਤ ਸਰਵਰ ਤੋਂ ਮਿਟਾਉਣ ਲਈ ਵੀ ਕਹਿ ਸਕਦੇ ਹੋ।  ਜੇਕਰ ਤੁਸੀਂ ਆਪਣੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਪ੍ਰਦਾਨ ਨਹੀਂ ਕਰਦੇ, ਤਾਂ COVIDSafe ਐਪ ਉਦੇਸ਼ ਅਨੁਸਾਰ ਕੰਮ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ ਹੈ। \n\nCOVIDSafe ਲਈ ਪੰਜੀਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਨਾਮ (ਜਾਂ ਉਪਨਾਮ), ਮੋਬਾਈਲ ਨੰਬਰ, ਉਮਰ ਸੀਮਾ ਅਤੇ ਪੋਸਟਕੋਡ ਦਰਜ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ।\n\nਤੁਹਾਡੇ ਦੁਆਰਾ ਪੰਜੀਕਰਨ ਵੇਲੇ ਤੁਹਾਡੇ ਦੁਆਰਾ ਜਮ੍ਹਾਂ ਕੀਤੀ ਗਈ ਜਾਣਕਾਰੀ ਅਤੇ ਤੁਹਾਡੀ COVIDSafe ਦੀ ਵਰਤੋਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਇੱਕ ਬਹੁਤ ਹੀ ਸੁਰੱਖਿਅਤ ਸਰਵਰ 'ਤੇ ਸਟੋਰ ਕੀਤੀ ਜਾਂਦੀ ਹੈ। \n\nਇਹ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਵੀ ਜਾਣਕਾਰੀ ਇਕੱਤਰ ਕੀਤੀ ਜਾਂਦੀ ਹੈ ਕਿ COVIDSafe ਤੁਹਾਡੇ ਉਪਕਰਣ 'ਤੇ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਕਰ ਰਹੀ ਹੈ। ਇਸ ਵਿੱਚ ਤੁਹਾਡਾ ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ, ਤੁਹਾਡੇ ਦੁਆਰਾ ਸਥਾਪਿਤ ਕੀਤੀ ਐਪ ਦਾ ਸੰਸਕਰਣ, ਤੁਹਾਡਾ ਉਪਕਰਣ ਜਿਸ ਭਾਸ਼ਾ ਲਈ ਸੈੱਟ ਕੀਤਾ ਗਿਆ ਹੈ, ਕੀ ਬਲੂਟੁੱਥ® ਕੰਮ ਕਰ ਰਿਹਾ ਹੈ ਜਾਂ ਨਹੀਂ ਅਤੇ ਕੀ ਤੁਹਾਡੀ ਐਪ ਨੇ ਪਿਛਲੇ ਸੱਤ ਦਿਨਾਂ ਵਿੱਚ ਕਿਸੇ ਭਿਡੰਤਾਂ ਨੂੰ ਰਿਕਾਰਡ ਕੀਤਾ ਹੈ, ਸ਼ਾਮਲ ਹਨ।\n  \nCOVIDSafe ਤੁਹਾਡੀ ਲੋਕੇਸ਼ਨ ਜਾਣਕਾਰੀ ਇਕੱਤਰ ਨਹੀਂ ਕਰੇਗੀ।\n\nCOVIDSafe ਤੁਹਾਡੇ ਉਪਕਰਣ 'ਤੇ ਸੰਪਰਕ ਦੀ ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ, ਤੁਹਾਡੇ ਸੰਪਰਕ ਵਿੱਚ ਆਏ ਹੋਰ COVIDSafe ਉਪਯੋਗਕਰਤਾਵਾਂ ਦਾ ਐਨਕ੍ਰਿਪਟਡ ਆਈਡੀ ਕੋਡ, ਬਲੂਟੁੱਥ ਸਿਗਨਲ ਤਾਕਤ ਅਤੇ ਹੋਰ ਉਪਯੋਗਕਰਤਾਵਾਂ ਦੇ ਫ਼ੋਨ ਮਾਡਲ ਨੂੰ ਨੋਟ ਕਰੇਗੀ। \n\nਹੋਰ COVIDSafe ਉਪਯੋਗਕਰਤਾ ਜਿਨ੍ਹਾਂ ਦੇ ਸੰਪਰਕ ਵਿੱਚ ਤੁਸੀਂ ਆਉਂਦੇ ਹੋ, ਆਪਣੇ ਉਪਕਰਣ 'ਤੇ ਤੁਹਾਡੇ ਐਨਕ੍ਰਿਪਟਡ ਆਈਡੀ ਕੋਡ, ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰਨ ਦੀ ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ, ਬਲੂਟੁੱਥ ਸਿਗਨਲ ਤਾਕਤ ਅਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ ਮਾਡਲ ਨੂੰ ਨੋਟ ਕਰਨਗੇ। \n\nਜੇਕਰ ਕੋਈ ਹੋਰ ਉਪਯੋਗਕਰਤਾ ਕੋਵਿਡ-19 ਲਈ ਟੈਸਟ ਵਿੱਚ ਸਕਾਰਾਤਮਕ ਆਉਂਦੇ  ਹਨ, ਤਾਂ ਉਹ ਆਪਣੀ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਅੱਪਲੋਡ ਕਰ ਸਕਦੇ ਹਨ ਅਤੇ ਇੱਕ ਰਾਜ ਜਾਂ ਖੇਤਰੀ ਸਿਹਤ ਅਧਿਕਾਰੀ ਸੰਪਰਕ ਟਰੇਸਿੰਗ ਦੇ ਉਦੇਸ਼ਾਂ ਲਈ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰ ਸਕਦਾ ਹੈ। \n\nਤੁਹਾਡੇ ਪੰਜੀਕਰਨ ਵੇਰਵਿਆਂ ਦੀ ਵਰਤੋਂ ਅਤੇ ਖੁਲਾਸਾ ਸਿਰਫ ਸੰਪਰਕ ਟਰੇਸਿੰਗ ਅਤੇ COVIDSafe ਦੇ ਸਹੀ ਅਤੇ ਕਾਨੂੰਨੀ ਕੰਮਕਾਜ ਲਈ ਕੀਤੀ ਜਾਵੇਗੀ। \n\nਵਧੇਰੇ ਜਾਣਕਾਰੀ *covidsafe.gov.au* ਵੈੱਬਸਾਈਟ 'ਤੇ ਉਪਲਬਧ ਹੈ। \n\nCOVIDSafe ਗੋਪਨੀਯਤਾ ਨੀਤੀ ਤੁਹਾਡੀ ਜਾਣਕਾਰੀ ਬਾਰੇ ਤੁਹਾਡੇ ਅਧਿਕਾਰਾਂ ਅਤੇ ਇਸ ਨੂੰ ਕਿਵੇਂ ਸੰਭਾਲਿਆ ਅਤੇ ਸਾਂਝਾ ਕੀਤਾ ਜਾਵੇਗਾ, ਬਾਰੇ ਅੱਗੇ ਹੋਰ ਵੇਰਵੇ ਪ੍ਰਦਾਨ ਕਰਦੀ ਹੈ। \n\n\nCOVIDSafe ਗੋਪਨੀਯਤਾ ਪੁੱਛਗਿੱਛਾਂ ਅਤੇ ਸ਼ਿਕਾਇਤਾਂ ਨਾਲ ਸਬੰਧਤ ਸੰਪਰਕ ਵੇਰਵੇ *ਸਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰੋ* ਦੇ ਅਧੀਨ ਗੋਪਨੀਯਤਾ ਨੀਤੀ ਵਿੱਚ ਪ੍ਰਦਾਨ ਕੀਤੇ ਗਏ ਹਨ।";
+"data_privacy_content_VO" = "ਇਹ ਮਹੱਤਵਪੂਰਨ ਹੈ ਕਿ ਤੁਸੀਂ COVIDSafe ਲਈ ਪੰਜੀਕਰਨ ਤੋਂ ਪਹਿਲਾਂ COVIDSafe *ਗੋਪਨੀਯਤਾ ਨੀਤੀ* ਨੂੰ ਪੜ੍ਹੋ। COVIDSafe ਤੁਹਾਡੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਨੂੰ ਸਿਰਫ਼ ਇਸ ਨੀਤੀ ਅਤੇ ਨਿੱਜਤਾ ਅਧਿਨਿਯਮ 1988 ਦੇ ਅਨੁਸਾਰ ਇਕੱਤਰ ਕਰੇਗੀ, ਵਰਤੇਗੀ ਜਾਂ ਪ੍ਰਗਟ ਕਰੇਗੀ। \n\nਜੇਕਰ ਤੁਹਾਡੀ ਉਮਰ 16 ਸਾਲ ਤੋਂ ਘੱਟ ਹੈ, ਤਾਂ ਤੁਹਾਡੇ ਮਾਤਾ-ਪਿਤਾ/ਸਰਪ੍ਰਸਤ ਨੂੰ ਵੀ *ਗੋਪਨੀਯਤਾ ਨੀਤੀ* ਨੂੰ ਪੜ੍ਹਨਾ ਚਾਹੀਦਾ ਹੈ। \n\nCOVIDSafe ਦੀ ਵਰਤੋਂ ਪੂਰੀ ਤਰ੍ਹਾਂ ਸਵੈਇੱਛਤ ਹੈ। ਤੁਸੀਂ ਕਿਸੇ ਵੀ ਸਮੇਂ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਇੰਸਟਾਲ ਜਾਂ ਮਿਟਾ ਸਕਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ COVIDSafe ਨੂੰ ਮਿਟਾ ਦਿੰਦੇ ਹੋ, ਤਾਂ *ਤੁਸੀਂ ਆਪਣੀ ਜਾਣਕਾਰੀ* ਨੂੰ ਸੁਰੱਖਿਅਤ ਸਰਵਰ ਤੋਂ ਮਿਟਾਉਣ ਲਈ ਵੀ ਕਹਿ ਸਕਦੇ ਹੋ।  ਜੇਕਰ ਤੁਸੀਂ ਆਪਣੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਪ੍ਰਦਾਨ ਨਹੀਂ ਕਰਦੇ, ਤਾਂ COVIDSafe ਐਪ ਉਦੇਸ਼ ਅਨੁਸਾਰ ਕੰਮ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ ਹੈ। \n\nCOVIDSafe ਲਈ ਪੰਜੀਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਨਾਮ (ਜਾਂ ਉਪਨਾਮ), ਮੋਬਾਈਲ ਨੰਬਰ, ਉਮਰ ਸੀਮਾ ਅਤੇ ਪੋਸਟਕੋਡ ਦਰਜ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ।\n\nਤੁਹਾਡੇ ਦੁਆਰਾ ਪੰਜੀਕਰਨ ਵੇਲੇ ਤੁਹਾਡੇ ਦੁਆਰਾ ਜਮ੍ਹਾਂ ਕੀਤੀ ਗਈ ਜਾਣਕਾਰੀ ਅਤੇ ਤੁਹਾਡੀ COVIDSafe ਦੀ ਵਰਤੋਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਇੱਕ ਬਹੁਤ ਹੀ ਸੁਰੱਖਿਅਤ ਸਰਵਰ 'ਤੇ ਸਟੋਰ ਕੀਤੀ ਜਾਂਦੀ ਹੈ। \n\nਇਹ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਵੀ ਜਾਣਕਾਰੀ ਇਕੱਤਰ ਕੀਤੀ ਜਾਂਦੀ ਹੈ ਕਿ COVIDSafe ਤੁਹਾਡੇ ਉਪਕਰਣ 'ਤੇ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਕਰ ਰਹੀ ਹੈ। ਇਸ ਵਿੱਚ ਤੁਹਾਡਾ ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ, ਤੁਹਾਡੇ ਦੁਆਰਾ ਸਥਾਪਿਤ ਕੀਤੀ ਐਪ ਦਾ ਸੰਸਕਰਣ, ਤੁਹਾਡਾ ਉਪਕਰਣ ਜਿਸ ਭਾਸ਼ਾ ਲਈ ਸੈੱਟ ਕੀਤਾ ਗਿਆ ਹੈ, ਕੀ ਬਲੂਟੁੱਥ® ਕੰਮ ਕਰ ਰਿਹਾ ਹੈ ਜਾਂ ਨਹੀਂ ਅਤੇ ਕੀ ਤੁਹਾਡੀ ਐਪ ਨੇ ਪਿਛਲੇ ਸੱਤ ਦਿਨਾਂ ਵਿੱਚ ਕਿਸੇ ਭਿਡੰਤਾਂ ਨੂੰ ਰਿਕਾਰਡ ਕੀਤਾ ਹੈ, ਸ਼ਾਮਲ ਹਨ।\n  \nCOVIDSafe ਤੁਹਾਡੀ ਲੋਕੇਸ਼ਨ ਜਾਣਕਾਰੀ ਇਕੱਤਰ ਨਹੀਂ ਕਰੇਗੀ।\n\nCOVIDSafe ਤੁਹਾਡੇ ਉਪਕਰਣ 'ਤੇ ਸੰਪਰਕ ਦੀ ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ, ਤੁਹਾਡੇ ਸੰਪਰਕ ਵਿੱਚ ਆਏ ਹੋਰ COVIDSafe ਉਪਯੋਗਕਰਤਾਵਾਂ ਦਾ ਐਨਕ੍ਰਿਪਟਡ ਆਈਡੀ ਕੋਡ, ਬਲੂਟੁੱਥ ਸਿਗਨਲ ਤਾਕਤ ਅਤੇ ਹੋਰ ਉਪਯੋਗਕਰਤਾਵਾਂ ਦੇ ਫ਼ੋਨ ਮਾਡਲ ਨੂੰ ਨੋਟ ਕਰੇਗੀ। \n\nਹੋਰ COVIDSafe ਉਪਯੋਗਕਰਤਾ ਜਿਨ੍ਹਾਂ ਦੇ ਸੰਪਰਕ ਵਿੱਚ ਤੁਸੀਂ ਆਉਂਦੇ ਹੋ, ਆਪਣੇ ਉਪਕਰਣ 'ਤੇ ਤੁਹਾਡੇ ਐਨਕ੍ਰਿਪਟਡ ਆਈਡੀ ਕੋਡ, ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰਨ ਦੀ ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ, ਬਲੂਟੁੱਥ ਸਿਗਨਲ ਤਾਕਤ ਅਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ ਮਾਡਲ ਨੂੰ ਨੋਟ ਕਰਨਗੇ। \n\nਜੇਕਰ ਕੋਈ ਹੋਰ ਉਪਯੋਗਕਰਤਾ ਕੋਵਿਡ-19 ਲਈ ਟੈਸਟ ਵਿੱਚ ਸਕਾਰਾਤਮਕ ਆਉਂਦੇ  ਹਨ, ਤਾਂ ਉਹ ਆਪਣੀ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਅੱਪਲੋਡ ਕਰ ਸਕਦੇ ਹਨ ਅਤੇ ਇੱਕ ਰਾਜ ਜਾਂ ਖੇਤਰੀ ਸਿਹਤ ਅਧਿਕਾਰੀ ਸੰਪਰਕ ਟਰੇਸਿੰਗ ਦੇ ਉਦੇਸ਼ਾਂ ਲਈ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰ ਸਕਦਾ ਹੈ। \n\nਤੁਹਾਡੇ ਪੰਜੀਕਰਨ ਵੇਰਵਿਆਂ ਦੀ ਵਰਤੋਂ ਅਤੇ ਖੁਲਾਸਾ ਸਿਰਫ ਸੰਪਰਕ ਟਰੇਸਿੰਗ ਅਤੇ COVIDSafe ਦੇ ਸਹੀ ਅਤੇ ਕਾਨੂੰਨੀ ਕੰਮਕਾਜ ਲਈ ਕੀਤੀ ਜਾਵੇਗੀ। \n\nਵਧੇਰੇ ਜਾਣਕਾਰੀ *covidsafe.gov.au* ਵੈੱਬਸਾਈਟ 'ਤੇ ਉਪਲਬਧ ਹੈ। \n\nCOVIDSafe ਗੋਪਨੀਯਤਾ ਨੀਤੀ ਤੁਹਾਡੀ ਜਾਣਕਾਰੀ ਬਾਰੇ ਤੁਹਾਡੇ ਅਧਿਕਾਰਾਂ ਅਤੇ ਇਸ ਨੂੰ ਕਿਵੇਂ ਸੰਭਾਲਿਆ ਅਤੇ ਸਾਂਝਾ ਕੀਤਾ ਜਾਵੇਗਾ, ਬਾਰੇ ਅੱਗੇ ਹੋਰ ਵੇਰਵੇ ਪ੍ਰਦਾਨ ਕਰਦੀ ਹੈ। \n\nCOVIDSafe ਗੋਪਨੀਯਤਾ ਪੁੱਛਗਿੱਛਾਂ ਅਤੇ ਸ਼ਿਕਾਇਤਾਂ ਨਾਲ ਸਬੰਧਤ ਸੰਪਰਕ ਵੇਰਵੇ *ਸਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰੋ* ਦੇ ਅਧੀਨ ਗੋਪਨੀਯਤਾ ਨੀਤੀ ਵਿੱਚ ਪ੍ਰਦਾਨ ਕੀਤੇ ਗਏ ਹਨ।";
+"data_privacy_content_android" = "ਇਹ ਮਹੱਤਵਪੂਰਨ ਹੈ ਕਿ ਤੁਸੀਂ COVIDSafe ਲਈ ਪੰਜੀਕਰਨ ਤੋਂ ਪਹਿਲਾਂ COVIDSafe *ਗੋਪਨੀਯਤਾ ਨੀਤੀ* ਨੂੰ ਪੜ੍ਹੋ। COVIDSafe ਤੁਹਾਡੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਨੂੰ ਸਿਰਫ਼ ਇਸ ਨੀਤੀ ਅਤੇ ਨਿੱਜਤਾ <i>ਅਧਿਨਿਯਮ 1988</i> ਦੇ ਅਨੁਸਾਰ ਇਕੱਤਰ ਕਰੇਗੀ, ਵਰਤੇਗੀ ਜਾਂ ਪ੍ਰਗਟ ਕਰੇਗੀ। \n\nਜੇਕਰ ਤੁਹਾਡੀ ਉਮਰ 16 ਸਾਲ ਤੋਂ ਘੱਟ ਹੈ, ਤਾਂ ਤੁਹਾਡੇ ਮਾਤਾ-ਪਿਤਾ/ਸਰਪ੍ਰਸਤ ਨੂੰ ਵੀ *ਗੋਪਨੀਯਤਾ ਨੀਤੀ* ਨੂੰ ਪੜ੍ਹਨਾ ਚਾਹੀਦਾ ਹੈ। \n\nCOVIDSafe ਦੀ ਵਰਤੋਂ ਪੂਰੀ ਤਰ੍ਹਾਂ ਸਵੈਇੱਛਤ ਹੈ। ਤੁਸੀਂ ਕਿਸੇ ਵੀ ਸਮੇਂ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਇੰਸਟਾਲ ਜਾਂ ਮਿਟਾ ਸਕਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ COVIDSafe ਨੂੰ ਮਿਟਾ ਦਿੰਦੇ ਹੋ, ਤਾਂ *ਤੁਸੀਂ ਆਪਣੀ ਜਾਣਕਾਰੀ* ਨੂੰ ਸੁਰੱਖਿਅਤ ਸਰਵਰ ਤੋਂ ਮਿਟਾਉਣ ਲਈ ਵੀ ਕਹਿ ਸਕਦੇ ਹੋ। \n\nCOVIDSafe ਲਈ ਪੰਜੀਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਨਾਮ (ਜਾਂ ਉਪਨਾਮ), ਮੋਬਾਈਲ ਨੰਬਰ, ਉਮਰ ਸੀਮਾ ਅਤੇ ਪੋਸਟਕੋਡ ਦਰਜ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਜੇਕਰ ਤੁਸੀਂ ਆਪਣੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਪ੍ਰਦਾਨ ਨਹੀਂ ਕਰਦੇ, ਤਾਂ COVIDSafe ਐਪ ਉਦੇਸ਼ ਅਨੁਸਾਰ ਕੰਮ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ ਹੈ। \n\nਤੁਹਾਡੇ ਦੁਆਰਾ ਪੰਜੀਕਰਨ ਵੇਲੇ ਤੁਹਾਡੇ ਦੁਆਰਾ ਜਮ੍ਹਾਂ ਕੀਤੀ ਗਈ ਜਾਣਕਾਰੀ ਅਤੇ ਤੁਹਾਡੀ COVIDSafe ਦੀ ਵਰਤੋਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਇੱਕ ਬਹੁਤ ਹੀ ਸੁਰੱਖਿਅਤ ਸਰਵਰ 'ਤੇ ਸਟੋਰ ਕੀਤੀ ਜਾਂਦੀ ਹੈ। ਇਹ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਵੀ ਜਾਣਕਾਰੀ ਇਕੱਤਰ ਕੀਤੀ ਜਾਂਦੀ ਹੈ ਕਿ COVIDSafe ਤੁਹਾਡੇ ਉਪਕਰਣ 'ਤੇ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਕਰ ਰਹੀ ਹੈ। ਇਸ ਵਿੱਚ ਤੁਹਾਡਾ ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ, ਤੁਹਾਡੇ ਦੁਆਰਾ ਸਥਾਪਿਤ ਕੀਤੀ ਐਪ ਦਾ ਸੰਸਕਰਣ, ਤੁਹਾਡਾ ਉਪਕਰਣ ਜਿਸ ਭਾਸ਼ਾ ਲਈ ਸੈੱਟ ਕੀਤਾ ਗਿਆ ਹੈ, ਕੀ ਬਲੂਟੁੱਥ® ਕੰਮ ਕਰ ਰਿਹਾ ਹੈ ਜਾਂ ਨਹੀਂ ਅਤੇ ਕੀ ਤੁਹਾਡੀ ਐਪ ਨੇ ਪਿਛਲੇ ਸੱਤ ਦਿਨਾਂ ਵਿੱਚ ਕਿਸੇ ਭਿਡੰਤਾਂ ਨੂੰ ਰਿਕਾਰਡ ਕੀਤਾ ਹੈ, ਸ਼ਾਮਲ ਹਨ।\n  \nਐਂਡਰੌਇਡ ਉਪਕਰਣਾਂ 'ਤੇ, ਇਸ ਵਿੱਚ ਇਹ ਵੀ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਹੁੰਦੀ ਹੈ ਕਿ ਕੀ ਬੈਟਰੀ ਓਪਟੀਮਾਈਜੇਸ਼ਨ ਅਸਮਰੱਥ ਹੈ ਅਤੇ ਲੋਕੇਸ਼ਨ ਸੇਵਾਵਾਂ ਨੂੰ ਸਮਰੱਥ ਬਣਾਇਆ ਗਿਆ ਹੈ। \n\nCOVIDSafe ਤੁਹਾਡੀ ਲੋਕੇਸ਼ਨ ਜਾਣਕਾਰੀ ਇਕੱਤਰ ਨਹੀਂ ਕਰੇਗੀ।\n\nCOVIDSafe ਤੁਹਾਡੇ ਉਪਕਰਣ 'ਤੇ ਸੰਪਰਕ ਦੀ ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ, ਤੁਹਾਡੇ ਸੰਪਰਕ ਵਿੱਚ ਆਏ ਹੋਰ COVIDSafe ਉਪਯੋਗਕਰਤਾਵਾਂ ਦਾ ਐਨਕ੍ਰਿਪਟਡ ਆਈਡੀ ਕੋਡ, ਬਲੂਟੁੱਥ ਸਿਗਨਲ ਤਾਕਤ ਅਤੇ ਹੋਰ ਉਪਯੋਗਕਰਤਾਵਾਂ ਦੇ ਫ਼ੋਨ ਮਾਡਲ ਨੂੰ ਨੋਟ ਕਰੇਗੀ। \n\nਹੋਰ COVIDSafe ਉਪਯੋਗਕਰਤਾ ਜਿਨ੍ਹਾਂ ਦੇ ਸੰਪਰਕ ਵਿੱਚ ਤੁਸੀਂ ਆਉਂਦੇ ਹੋ, ਆਪਣੇ ਉਪਕਰਣ 'ਤੇ ਤੁਹਾਡੇ ਐਨਕ੍ਰਿਪਟਡ ਆਈਡੀ ਕੋਡ, ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰਨ ਦੀ ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ, ਬਲੂਟੁੱਥ ਸਿਗਨਲ ਤਾਕਤ ਅਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ ਮਾਡਲ ਨੂੰ ਨੋਟ ਕਰਨਗੇ। \n\nਜੇਕਰ ਕੋਈ ਹੋਰ ਉਪਯੋਗਕਰਤਾ ਕੋਵਿਡ-19 ਲਈ ਟੈਸਟ ਵਿੱਚ ਸਕਾਰਾਤਮਕ ਆਉਂਦੇ  ਹਨ, ਤਾਂ ਉਹ ਆਪਣੀ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਅੱਪਲੋਡ ਕਰ ਸਕਦੇ ਹਨ ਅਤੇ ਇੱਕ ਰਾਜ ਜਾਂ ਖੇਤਰੀ ਸਿਹਤ ਅਧਿਕਾਰੀ ਸੰਪਰਕ ਟਰੇਸਿੰਗ ਦੇ ਉਦੇਸ਼ਾਂ ਲਈ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰ ਸਕਦਾ ਹੈ। \n\nਤੁਹਾਡੇ ਪੰਜੀਕਰਨ ਵੇਰਵਿਆਂ ਦੀ ਵਰਤੋਂ ਅਤੇ ਖੁਲਾਸਾ ਸਿਰਫ ਸੰਪਰਕ ਟਰੇਸਿੰਗ ਅਤੇ COVIDSafe ਦੇ ਸਹੀ ਅਤੇ ਕਾਨੂੰਨੀ ਕੰਮਕਾਜ ਲਈ ਕੀਤੀ ਜਾਵੇਗੀ। \n\nਵਧੇਰੇ ਜਾਣਕਾਰੀ *covidsafe.gov.au* ਵੈੱਬਸਾਈਟ 'ਤੇ ਉਪਲਬਧ ਹੈ। \n\nCOVIDSafe *ਗੋਪਨੀਯਤਾ ਨੀਤੀ* ਤੁਹਾਡੀ ਜਾਣਕਾਰੀ ਬਾਰੇ ਤੁਹਾਡੇ ਅਧਿਕਾਰਾਂ ਅਤੇ ਇਸ ਨੂੰ ਕਿਵੇਂ ਸੰਭਾਲਿਆ ਅਤੇ ਸਾਂਝਾ ਕੀਤਾ ਜਾਵੇਗਾ, ਬਾਰੇ ਅੱਗੇ ਹੋਰ ਵੇਰਵੇ ਪ੍ਰਦਾਨ ਕਰਦੀ ਹੈ। \n\nCOVIDSafe ਗੋਪਨੀਯਤਾ ਪੁੱਛਗਿੱਛਾਂ ਅਤੇ ਸ਼ਿਕਾਇਤਾਂ ਨਾਲ ਸਬੰਧਤ ਸੰਪਰਕ ਵੇਰਵੇ *ਸਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰੋ* ਦੇ ਅਧੀਨ ਗੋਪਨੀਯਤਾ ਨੀਤੀ ਵਿੱਚ ਪ੍ਰਦਾਨ ਕੀਤੇ ਗਏ ਹਨ।";
 /* OnBoarding Data Privacy */
 "data_privacy_headline" = "ਰਜਿਸਟ੍ਰੇਸ਼ਨ ਅਤੇ ਪ੍ਰਾਈਵੇਸੀ";
 "deaths" = "ਮੌਤਾਂ";
@@ -272,8 +298,6 @@
 "enter_pin_resend_pin" = "ਪਿੰਨ ਦੁਬਾਰਾ ਭੇਜੋ";
 "enter_pin_timer_expire" = "ਤੁਹਾਡਾ ਪਿੰਨ ਦੀ ਮਿਆਦ .... ਵਿੱਚ ਪੁੱਗ ਜਾਵੇਗੀ";
 "enter_pin_wrong_number" = "ਕੀ ਇਹ ਮੋਬਾਈਲ ਨੰਬਰ ਗਲਤ ਹੈ ?";
-/* Figma page Android Screens (05/06) */
-"Enter_your_mobile_number_label" = "ਆਪਣਾ ਮੋਬਾਈਲ ਨੰਬਰ ਭਰੋ";
 "every_day" = "ਹਰ ਰੋਜ਼";
 "factors_dotpoint1" = "COVIDSafe ਦੇ ਵਰਤੋਂਕਾਰਾਂ ਦੀ ਸੰਖਿਆ, ਜੋ ਕਿ ਦਾਇਰੇ ਵਿੱਚ ਹਨ";
 "factors_dotpoint2" = "ਉਪਕਰਨ ਦਾ ਮਾੱਡਲ ਅਤੇ ਇਹ ਕਿੰਨਾ ਪੁਰਾਣਾ ਹੈ";
@@ -289,10 +313,10 @@
 /* Error message for when a user tries to signup outside of Australia. */
 "geoblock_error_message" = "";
 "geoblock_rego_error" = "";
+"global_OK" = "ਠੀਕ ਹੈ";
 "global_back" = "ਪਿੱਛੇ";
 "global_close" = "ਬੰਦ ਕਰੋ";
 "global_double_tap" = "ਸੋਧਣ ਲਈ ਡਬਲ ਟੈਪ ਕਰੋ";
-"global_OK" = "ਠੀਕ ਹੈ";
 "hide" = "ਛੁਪਾਉ";
 "home_app_permission_status_subtitle" = "COVIDSafe ਸਹੀ ਸੈਟਿੰਗਜ਼ ਤੋਂ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰੇਗਾ।";
 "home_app_permission_status_title" = "ਆਪਣੀਆਂ ਸੈਟਿੰਗਜ਼ ਦੀ ਜਾਂਚ ਕਰੋ";
@@ -302,9 +326,12 @@
 /* Home */
 "home_header_active_title" = "COVIDSafe ਸਰਗਰਮ ਹੈ|";
 /* Home */
+"home_header_active_title" = "COVIDSafe ਸਰਗਰਮ ਹੈ|";
+/* Home */
 "home_header_active_title_thanks" = "ਧੰਨਵਾਦ,  COVIDSafe ਹੁਣ ਸਰਗਰਮ ਹੈ।";
 "home_header_inactive_check_your_permissions" = "ਆਪਣੀਆਂ ਸੈਟਿੰਗਜ਼ ਦੀ ਜਾਂਚ ਕਰੋ|";
 "home_header_inactive_title" = "COVIDSafe ਸਰਗਰਮ ਨਹੀਂ ਹੈ|";
+"home_header_inactive_title" = "COVIDSafe ਸਰਗਰਮ ਨਹੀਂ ਹੈ|";
 "home_header_uploaded_on_date_ios" = "ਤੁਹਾਡੀ ਜਾਣਕਾਰੀ %@  'ਤੇ  ਅੱਪਲੋਡ ਕੀਤੀ ਗਈ ਸੀ।";
 "home_set_complete_external_link_app_content" = "ਤਾਜ਼ਾ ਖ਼ਬਰਾਂ ਅਤੇ ਸਲਾਹ ਲਈ ਸਰਕਾਰੀ ਐਪ ਡਾਊਨਲੋਡ ਕਰੋ।";
 "home_set_complete_external_link_app_title" = "ਕੋਰੋਨਾਵਾਇਰਸ ਐਪ ਪ੍ਰਾਪਤ ਕਰੋ";
@@ -352,8 +379,6 @@
 "intro_content" = "COVIDSafe ਨੂੰ ਆੱਸਟ੍ਰੇਲੀਅਨ ਸਰਕਾਰ ਦੁਆਰਾ ਵਿਕਸਤ ਕੀਤਾ ਗਿਆ ਹੈ ਤਾਂ ਜੋ ਭਾਈਚਾਰੇ ਨੂੰ ਕੋਰੋਨਾਵਾਇਰਸ ਦੇ ਫੈਲਾਅ ਤੋਂ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਵਿੱਚ ਸਹਾਇਤਾ ਮਿਲ ਸਕੇ।\n\nCOVIDSafe, ਐਪ ਦੇ ਹੋਰ ਵਰਤੋਂਕਾਰਾਂ ਨਾਲ ਤੁਹਾਡੇ ਸੰਪਰਕ ਨੂੰ ਸੁਰੱਖਿਅਤ ਤਰੀਕੇ ਨਾਲ ਨੋਟ ਕਰੇਗਾ। ਜੇ ਤੁਸੀਂ ਕਿਸੇ ਅਜਿਹੇ ਵਿਅਕਤੀ ਦੇ ਸੰਪਰਕ ਵਿੱਚ ਆਏ ਹੋ ਜਿਸਦਾ ਵਾਇਰਸ ਟੈਸਟ ਪਾੱਜ਼ੇਟਿਵ ਆਇਆ ਹੈ ਤਾਂ ਇਹ ਰਾਜ ਅਤੇ ਹਲਕਾ ਸਿਹਤ ਅਧਿਕਾਰੀਆਂ ਨੂੰ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰਨ ਦੀ ਆਗਿਆ ਦੇਵੇਗਾ।\n\nਇਕੱਠੇ ਅਸੀਂ ਫੈਲਾਅ ਨੂੰ ਰੋਕਣ ਅਤੇ ਸਿਹਤਮੰਦ ਬਣੇ ਰਹਿਣ ਵਿੱਚ ਸਹਾਈ ਹੋ ਸਕਦੇ ਹਾਂ।";
 /* OnBoarding Intro */
 "intro_headline" = "ਇਕੱਠੇ ਅਸੀਂ ਕੋਵਿਡ-19 ਦੇ ਫੈਲਾਅ ਨੂੰ ਰੋਕ ਸਕਦੇ ਹਾਂ।";
-/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
-"IntroLabel" = "ਫੈਲਣ ਨੂੰ ਰੋਕਣ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰੋ ਅਤੇ ਜ਼ਿੰਦਗੀਆਂ  ਬਚਾਓ।";
 "invalid_australian_phone_number_error_prompt" = "ਆੱਸਟ੍ਰੇਲੀਅਨ ਮੋਬਾਈਲ ਨੰਬਰ ਵਿੱਚ ਅਧਿਕਤਮ 10 ਅੰਕ ਹੁੰਦੇ ਹਨ।";
 "invalid_norfolk_island_phone_number_error_prompt" = "ਨੋਰਫੋਕ ਆਈਲੈਂਡਜ਼ ਵਿਖੇ  ਮੋਬਾਈਲ ਨੰਬਰ ਦੇ 5 ਤੋਂ 6 ਅੰਕ ਹੁੰਦੇ ਹਨ।";
 "is_snoozed" = "COVIDSafe ਇਸ ਵਕਤ ਅਸਥਾਈ ਤੌਰ ਤੇ ਬੰਦ ਹੈ (snoozed)";
@@ -389,26 +414,22 @@
 "no_handshakes_item3" = "ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਮੁੜ ਚਾਲੂ ਕਰੋ ਅਤੇ ਐਪ ਨੂੰ ਦੁਬਾਰਾ ਖੋਲ੍ਹੋ।";
 "no_handshakes_item4" = "ਜਾਂਚ ਕਰੋ ਕਿ <a href=\"https://www.covidsafe.gov.au/help-topics.html#location-services\">ਸਥਾਨਕ ਸੇਵਾਵਾਂ </a>ਲਈ, ਕੀ ਤੁਹਾਡੇ ਕੋਲ ਸਹੀ ਸੈਟਿੰਗਜ਼ ਹਨ";
 "no_handshakes_link" = "ਜਾਂਚ ਕਿਵੇਂ ਕਰਨੀ ਹੈ, ਦੇ ਬਾਰੇ ਹੋਰ ਪੜ੍ਹੋ ਕਿ ਕੀ COVIDSafe ਸਹੀ ਤਰੀਕੇ ਨਾਲ ਕੰਮ ਕਰ ਰਿਹਾ ਹੈ";
+"non_consent_button" = "ਮੈਂ ਸਹਿਮਤ ਨਹੀਂ ਹਾਂ";
+"non_consent_popup" = "ਤੁਸੀਂ ਮਾਤਾ-ਪਿਤਾ ਜਾਂ ਸਰਪ੍ਰਸਤ ਦੀ ਸਹਿਮਤੀ ਤੋਂ ਬਿਨਾਂ ਰਜਿਸਟ੍ਰੇਸ਼ਨ ਪ੍ਰਕਿਰਿਆ ਨਾਲ ਜਾਰੀ ਨਹੀਂ ਰਹਿ ਸਕਦੇ।\n\nਕਿਰਪਾ ਕਰਕੇ ਐਪ ਤੋਂ ਬਾਹਰ ਜਾਓ ਅਤੇ ਇਸਨੂੰ ਮਿਟਾਓ।";
 /* Figma page Android Screens (05/06) */
 "norfolk_hint" = "ਉਦਾਹਰਣ ਵਜੋਂ: 51234";
 "northern_territory" = "ਨੌਰਦ੍ਰਨ ਟੈਰੀਟਰੀ";
 "notification_bluetooth" = "COVIDSafe ਨੂੰ ਕੰਮ ਕਰਨ ਦੇਣ ਲਈ Bluetooth ਚਾਲੂ ਕਰੋ।";
 "notification_internet_content" = "COVIDSafe ਨੂੰ ਕੰਮ ਸ਼ੁਰੂ ਕਰਨ ਦੇਣ ਲਈ, ਇਸਦੀ ਐਪ ਖੋਲ੍ਹੋ ਅਤੇ ਆਪਣੇ ਇੰਟਰਨੈੱਟ ਕੁਨੈਕਸ਼ਨ ਦੀ ਜਾਂਚ ਕਰੋ।";
+"notification_internet_content" = "ਐਪ ਖੋਲ੍ਹੋ ਅਤੇ ਆਪਣੇ ਇੰਟਰਨੈੱਟ ਕੁਨੈਕਸ਼ਨ ਦੀ ਜਾਂਚ ਕਰੋ।";
 "notification_not_active_title" = "COVIDSafe ਸਰਗਰਮ ਨਹੀਂ ਹੈ|";
 "notification_settings" = "ਆਪਣੀਆਂ ਸੈਟਿੰਗਜ਼ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਐਪ ਖੋਲ੍ਹੋ।";
 "notification_update_content" = "ਤਾਜ਼ਾ ਸੋਧਾਂ ਤੱਕ ਪਹੁੰਚ ਲਈ, ਆਪਣੀ ਐਪ ਨੂੰ ਅੱਪਡੇਟ ਕਰੋ।";
 "notification_update_heading" = "COVIDSafe ਅੱਪਡੇਟ ਉਪਲਬਧ ਹੈ|";
-/* Figma page iOS Screens (05/06) */
-"NotificationsBlurbLink" = "ਨੋਟੀਫਿਕੇਸ਼ਨਜ਼ ਸੈਟਿੰਗਜ਼ ਬਦਲੋ";
-/* Figma page iOS Screens (05/06) */
-"NotificationsDisabledBlurb" = "ਜੇ COVIDSafe ਸਰਗਰਮ ਨਹੀਂ  ਤਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾ ਨਹੀਂ ਮਿਲੇਗੀ| \nਨੋਟੀਫਿਕੇਸ਼ਨਜ਼ ਸੈਟਿੰਗਜ਼ ਬਦਲੋ";
-/* Figma page iOS Screens (05/06) */
-"NotificationsEnabledBlurb" = "ਜੇ COVIDSafe ਸਰਗਰਮ ਨਹੀਂ  ਤਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾ ਮਿਲੇਗੀ| \nਨੋਟੀਫਿਕੇਸ਼ਨਜ਼ ਸੈਟਿੰਗਜ਼ ਬਦਲੋ";
 "numbers_error" = "ਅੱਪਡੇਟ ਕੀਤੇ ਨੰਬਰਾਂ ਦੀ ਜਾਂਚ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ।";
 "numbers_no_internet" = "ਇਹ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ  ਕਿ ਤੁਹਾਨੂੰ ਅੱਪਡੇਟਿਡ ਨੰਬਰ ਪ੍ਰਾਪਤ ਹੋਣ, ਇੰਟਰਨੈੱਟ ਨਾਲ ਜੁੜੋ |";
 "numbers_refresh" = "ਹੁਣ ਰਿਫਰੈਸ਼ ਕਰੋ";
 "options_for_australia" = "ਆੱਸਟ੍ਰੇਲੀਆ ਲਈ ਵਿਕਲਪ";
-"OS2b_Item_4" = "4. COVIDSafe ਕੰਮ ਕਰ ਸਕੇ, ਇਸ ਦੇ ਲਈ ਤੁਹਾਡੇ iPhone ਨੂੰ ਲੋਕੇਸ਼ਨ ਆਗਿਆ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। *COVIDSafe ਤੁਹਾਡੇ ਸਥਾਨਕ ਅੰਕੜਿਆਂ ਨੂੰ ਇਕੱਤਰ ਨਹੀਂ ਕਰਦਾ, ਸਟੋਰ ਨਹੀਂ ਕਰਦਾ ਜਾਂ ਵਰਤੋਂ ਨਹੀਂ ਕਰਦਾ*";
 "overseas_acquired" = "%@ ਵਿਦੇਸ਼ਾਂ ਤੋਂ ਲੱਗੀ ਲਾਗ";
 "permission_button" = "ਅੱਗੇ ਵਧੋ";
 /* Figma page iOS Screens (05/06) */
@@ -432,30 +453,19 @@
 "personal_details_name_title" = "ਪੂਰਾ ਨਾਮ (ਜਾਂ ਫਰਜੀ ਨਾਮ)";
 "personal_details_post_code" = "ਆੱਸਟ੍ਰੇਲੀਆ ਵਿੱਚ ਪੋਸਟਕੋਡ";
 "personal_details_post_code_error_prompt" = "ਤੁਹਾਡੇ ਆੱਸਟ੍ਰੇਲੀਅਨ ਪੋਸਟਕੋਡ ਨੰਬਰ ਵਿੱਚ ਲਾਜ਼ਮੀ ਤੌਰ 'ਤੇ 4 ਅੰਕ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ।";
-"PINNumber_VO_Label" = "ਪਿੰਨ ਨੰਬਰ";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusBody" = "ਤੁਸੀਂ ਘਰੋਂ ਬਾਹਰ  ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਜਾਂ ਜਨਤਕ ਸਥਾਨਾਂ 'ਤੇ ਹੁੰਦੇ ਹੋ ਤਾਂ Bluetooth® ਨੂੰ ਚਾਲੂ (ਐਨੇਬਲਡ) ਕਰਕੇ ਇਹ ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਇਹ ਸਰਗਰਮ ਹੈ|";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusTitle" = "COVIDSafe ਸਰਗਰਮ ਨਹੀਂ ਹੈ|";
-"PN_MobileNumber_VOLabel" = "ਮੋਬਾਈਲ ਨੰਬਰ";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderBody" = "COVIDSafe ਨੂੰ ਖੋਲ੍ਹੋ, ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਕਿ ਇਹ ਚੱਲ ਰਿਹਾ ਹੈ।";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderTitle" = "48 ਘੰਟਿਆਂ ਦਰਮਿਆਨ ਕਿਸੇ ਨਾਲ ਟਾਕਰਾ ਹੋਇਆ -- ਸੂਹ ਨਹੀਂ ਮਿਲੀ";
 "postcode_api_error" = "ਇੱਕ ਗਲਤੀ ਦੇਖਣ ਵਿੱਚ ਆਈ ਸੀ। ਆਪਣੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਦੀ ਜਾਂਚ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।";
 "postcode_change_label" = "ਆੱਸਟ੍ਰੇਲੀਆ ਵਿੱਚ ਮੌਜੂਦਾ ਪੋਸਟਕੋਡ";
 "postcode_success" = "ਤੁਹਾਡੇ ਪੋਸਟਕੋਡ ਨੂੰ ਅੱਪਡੇਟ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ";
-"PostcodeValidationErrorMessage" = "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਉਚਿੱਤ (ਵੈਲਿਡ) ਆੱਸਟ੍ਰਲੀਅਨ ਪੋਸਟਕੋਡ ਭਰੋ|";
 "privacy_policy" = "";
 "privacy_policy_description" = "";
 "queensland" = "ਕੁਈਨਜ਼ਲੈਂਡ";
 "recovered" = "ਠੀਕ ਹੋਏ ਕੁੱਲ ਮਾਮਲੇ";
-"registration_consent_content" = "ਮੈਂ ਆੱਸਟ੍ਰੇਲੀਅਨ ਸਰਕਾਰ ਦੇ ਸਿਹਤ ਵਿਭਾਗ ਦੇ ਸਕੱਤਰ ਦੁਆਰਾ ਕੀਤੇ ਕਨੂੰਨੀ ਨਿਰਣੇ ਦੇ ਤਹਿਤ, ਡੇਟਾ ਸਟੋਰ ਪ੍ਰਸ਼ਾਸਕ ਵਜੋਂ, ਡਿਜੀਟਲ ਟ੍ਰਾਂਸਫੋਰਮੇਸ਼ਨ ਏਜੰਸੀ ਨੂੰ ਸਹਿਮਤੀ ਦਿੰਦਾ/ਦਿੰਦੀ ਹਾਂ, ਜੋ ਇਕੱਤਰ ਕਰ ਰਹੇ ਹਨ :";
-"registration_consent_diagnostic" = "ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਇਹ ਜਾਣਕਾਰੀ ਕਿ COVIDSafe, ਮੇਰੇ ਡਿਵਾਈਸ 'ਤੇ  ਠੀਕ ਕੰਮ ਕਰ ਰਹੀ ਹੈ";
+"registration_consent_content" = "ਗੋਪਨਿਯਤਾ ਐਕਟ 1988 ਹੇਠ ਮੈਂ ਡੇਟਾ ਸਟੋਰ ਪ੍ਰਸ਼ਾਸ਼ਕ ਵਜੋਂ ਸਿਹਤ ਵਿਭਾਗ ਨੂੰ ਆਪਣੇ ਮਾਪਿਆਂ ਜਾਂ ਸਰਪ੍ਰਸਤ ਦੀਆਂ ਸਹਿਮਤੀਆਂ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦਾ(ਦੀ) ਹਾਂ, ਜੋ:";
+"registration_consent_diagnostic" = "ਇਹ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਜਾਣਕਾਰੀ ਕਿ COVIDSafe, ਮੇਰੇ ਉਪਕਰਣ 'ਤੇ  ਠੀਕ ਕੰਮ ਕਰ ਰਹੀ ਹੈ।";
 "registration_consent_first_paragraph" = "ਮੇਰੀ ਰਜਿਸਟ੍ਰੇਸ਼ਨ ਬਾਰੇ ਜਾਣਕਾਰੀ।";
 /* Onboarding Registration Consent */
 "registration_consent_headline" = "ਰਜਿਸਟ੍ਰੇਸ਼ਨ ਲਈ ਸਹਿਮਤੀ";
-"registration_consent_second_paragraph" = "ਕਿਸੇ ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰਾਂ ਨਾਲ ਮੇਰੇ ਸੰਪਰਕ ਬਾਰੇ ਜਾਣਕਾਰੀ : ਜੇ ਕੋਈ ਹੋਰ ਵਰਤੋਂਕਾਰ ਮੇਰੇ ਸੰਪਰਕ ਵਿੱਚ ਆਇਆ ਹੈ ਅਤੇ ਕੋਵਿਡ-19 ਪਾੱਜ਼ੇਟਿਵ ਟੈਸਟ ਹੁੰਦਾ ਹੈ ਅਤੇ ਅਪਣਾ ਸੰਪਰਕ ਡੇਟਾ ਅੱਪਲੋਡ ਕਰਦਾ ਹੈ";
+"registration_consent_second_paragraph" = "ਕਿਸੇ ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰਾਂ ਨਾਲ ਮੇਰੇ ਸੰਪਰਕ ਬਾਰੇ ਜਾਣਕਾਰੀ ਇਕਤਰ ਕਰਦਾ ਹੈ : ਜੇ ਕੋਈ ਹੋਰ ਵਰਤੋਂਕਾਰ ਮੇਰੇ ਸੰਪਰਕ ਵਿੱਚ ਆਇਆ ਹੈ ਅਤੇ ਕੋਵਿਡ-19 ਪਾਜੀਟਿਵ ਟੈਸਟ ਹੁੰਦਾ ਹੈ ਅਤੇ ਅਪਣਾ ਸੰਪਰਕ ਡੇਟਾ ਅੱਪਲੋਡ ਕਰਦਾ ਹੈ,";
 "restrictions_accommodation" = "ਰਿਹਾਇਸ਼";
 "restrictions_activity" = "ਸਰਗਰਮੀ";
 "restrictions_cafes" = "ਕੈਫੇ ਅਤੇ ਰੈਸਟੋਰੈਂਟ";
@@ -481,8 +491,6 @@
 "scheduled" = "ਤੁਸੀਂ %@ ਤੋਂ %@ ਤੱਕ COVIDSafe ਨੂੰ ਅਸਥਾਈ ਤੌਰ 'ਤੇ ਬੰਦ ਕਰ (snoozed) ਦਿੱਤਾ ਹੈ।";
 /* OnBoarding Enter Number */
 "select_country_or_region" = "ਦੇਸ਼ ਜਾਂ ਇਲਾਕਾ ਚੁਣੋ";
-/* Figma page Android Screens (05/06) */
-"Select_country_or_region_headline" = "ਦੇਸ਼ ਜਾਂ ਇਲਾਕਾ ਚੁਣੋ";
 "select_state_territory_button" = "ਪ੍ਰਾਂਤ ਜਾਂ ਖੇਤਰ ਚੁਣੋ";
 "select_state_territory_heading" = "ਪ੍ਰਾਂਤ ਜਾਂ ਖੇਤਰ ਚੁਣੋ";
 "set_snooze_time" = "ਸਨੂਜ਼ ਦਾ ਸਮਾਂ ਸੈੱਟ ਕਰੋ";
@@ -514,7 +522,6 @@
 "stepCounter" = "ਸਟੈਪ %d ਦਾ%d";
 "support" = "ਸਹਾਇਤਾ";
 "support_content" = "ਜੋ ਮੁੱਦੇ ਹੈਲਪ ਟੌਪਿਕਸ ਦੁਆਰਾ ਕਵਰ ਨਹੀਂ ਹੁੰਦੇ, ਉਨ੍ਹਾਂ ਦੀ ਸਹਾਇਤਾ ਵਾਸਤੇ";
-"Support_VOLabel" = "ਸਹਾਇਤਾ। ਜੋ ਮੁੱਦੇ ਹੈਲਪ ਟੌਪਿਕਸ ਦੁਆਰਾ ਕਵਰ ਨਹੀਂ ਹੁੰਦੇ, ਉਨ੍ਹਾਂ ਦੀ ਸਹਾਇਤਾ ਵਾਸਤੇ";
 "tasmania" = "ਤਸਮਾਨੀਆ";
 /* Example: "From 22 to 28 January 2021" */
 "to" = "ਵੱਲ";
@@ -524,17 +531,16 @@
 "total_per_state" = "ਪ੍ਰਾਂਤ ਅਤੇ ਖਿੱਤੇ ਅਨੁਸਾਰ ਪੁਸ਼ਟੀ ਕੀਤੇ ਕੁਲ ਮਾਮਲੇ";
 "twenty_eight_days" = "28 ਦਿਨ";
 "type_in_time" = "ਸਮਾਂ ਭਰੋ";
-"UILaunchStoryboardName" = "";
+/* Figma page Android Screens (05/06) */
+"under-sixteen_consent_call_for_action" = "ਸਹਿਮਤੀ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ 'ਮੈਂ ਸਹਿਮਤ ਹਾਂ' ਜਾਂ ਜੇਕਰ ਤੁਸੀਂ ਮਾਤਾ-ਪਿਤਾ ਜਾਂ ਸਰਪ੍ਰਸਤ ਦੀ ਸਹਿਮਤੀ ਦੀ ਪੁਸ਼ਟੀ ਨਹੀਂ ਕਰ ਸਕਦੇ ਤਾਂ 'ਮੈਂ ਸਹਿਮਤ ਨਹੀਂ ਹਾਂ' ਨੂੰ ਚੁਣੋ।";
 "under_investigation" = "";
-"under_sixteen_content" = "ਮੈਂ ਆੱਸਟ੍ਰੇਲੀਅਨ ਸਰਕਾਰ ਦੇ ਸਿਹਤ ਵਿਭਾਗ ਦੇ ਸਕੱਤਰ ਦੁਆਰਾ ਕੀਤੇ ਕਨੂੰਨੀ ਨਿਰਣੇ ਦੇ ਤਹਿਤ, ਡੇਟਾ ਸਟੋਰ ਪ੍ਰਸ਼ਾਸ਼ਕ ਵਜੋਂ ਡਿਜੀਟਲ ਟ੍ਰਾਂਸਫੋਰਮੇਸ਼ਨ ਏਜੰਸੀ ਨੂੰ ਆਪਣੇ ਮਾਪੇ ਜਾਂ ਸਰਪ੍ਰਸਤ ਦੀਆਂ ਸਹਿਮਤੀਆਂ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦਾ/ਦੀ ਹਾਂ, ਜੋ ਇਕੱਤਰ ਕਰ ਰਹੇ ਹਨ :";
-"under_sixteen_first_paragraph" = "ਮੇਰੀ ਰਜਿਸਟ੍ਰੇਸ਼ਨ ਸਬੰਧੀ ਜਾਣਕਾਰੀ।";
+"under_sixteen_content" = "ਗੋਪਨਿਯਤਾ ਐਕਟ 1988 ਹੇਠ ਮੈਂ ਡੇਟਾ ਸਟੋਰ ਪ੍ਰਸ਼ਾਸ਼ਕ ਵਜੋਂ ਸਿਹਤ ਵਿਭਾਗ ਨੂੰ ਆਪਣੇ ਮਾਪਿਆਂ ਜਾਂ ਸਰਪ੍ਰਸਤ ਦੀਆਂ ਸਹਿਮਤੀਆਂ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦਾ(ਦੀ) ਹਾਂ, ਜੋ:";
+"under_sixteen_first_paragraph" = "ਰਜਿਸਟ੍ਰੇਸ਼ਨ ਜਾਣਕਾਰੀ ਅਪਲੋਡ ਕਰਦਾ(ਦੀ) ਹੈ।";
 /* OnBoarding Under Sixteen */
 "under_sixteen_headline" = "ਅੱਗੇ ਵਧਣ ਲਈ ਤੁਹਾਨੂੰ ਆਪਣੇ ਮਾਪੇ/ਸਰਪ੍ਰਸਤ ਦੀ ਸਹਿਮਤੀ ਦੀ ਲੋੜ ਹੈ";
 /* Figma page Android Screens (05/06) */
-"under_sixteen_registration_consent_first_paragraph" = "ਮੇਰੀ ਰਜਿਸਟ੍ਰੇਸ਼ਨ ਬਾਰੇ ਜਾਣਕਾਰੀ।";
-"under_sixteen_second_paragraph" = "ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰਾਂ ਨਾਲ ਮੇਰੇ ਸੰਪਰਕ ਬਾਰੇ ਜਾਣਕਾਰੀ: ਜੇ ਕੋਈ ਹੋਰ ਵਰਤੋਂਕਾਰ ਮੇਰੇ ਸੰਪਰਕ ਵਿੱਚ ਆਇਆ ਹੈ ਜਿਸਦਾ ਕੋਵਿਡ-19 ਟੈਸਟ ਪਾੱਜ਼ੇਟਿਵ  ਆਇਆ ਹੈ ਅਤੇ ਉਹ ਆਪਣਾ ਸੰਪਰਕ ਡੇਟਾ ਅੱਪਲੋਡ ਕਰਦਾ ਹੈ|";
-/* Figma page Android Screens (05/06) */
-"under-sixteen_consent_call_for_action" = "ਸਹਿਮਤੀ ਲਈ 'ਮੈਂ ਸਹਿਮਤ ਹਾਂ' ਚੁਣੋ|";
+"under_sixteen_registration_consent_first_paragraph" = "ਰਜਿਸਟ੍ਰੇਸ਼ਨ ਜਾਣਕਾਰੀ,";
+"under_sixteen_second_paragraph" = "ਹੋਰ COVIDSafe ਉਪਯੋਗਕਰਤਾਵਾਂ ਨਾਲ ਮੇਰੇ ਸੰਪਰਕ ਬਾਰੇ ਜਾਣਕਾਰੀ, ਜੇਕਰ ਕੋਈ ਹੋਰ ਉਪਯੋਗਕਰਤਾ ਜਿਸ ਨਾਲ ਮੈਂ ਸੰਪਰਕ ਵਿੱਚ ਆਇਆ(ਆਈ) ਹਾਂ ਕੋਵਿਡ-19 ਲਈ ਸਕਾਰਾਤਮਕ ਟੈਸਟ ਹੁੰਦਾ ਹੈ ਅਤੇ ਆਪਣਾ ਸੰਪਰਕ ਡੇਟਾ ਅਤੇ";
 "update_available_app_store_btn" = "ਐਪ ਸਟੋਰ 'ਤੇ ਜਾਓ";
 "update_available_dismiss_btn" = "ਮੈਨੂੰ ਬਾਅਦ ਵਿੱਚ ਯਾਦ ਕਰਵਾਓ";
 "update_available_message_ios" = "ਅਸੀਂ COVIDSafe ਵਿੱਚ ਸੁਧਾਰ ਕਰਦੇ ਆ ਰਹੇ ਹਾਂ।  ਐਪ ਸਟੋਰ ਰਾਹੀਂ ਅਪਡੇਟ ਕਰੋ।";
@@ -557,7 +563,7 @@
 "upload_step_verify_pin_header" = "ਆਪਣੀ ਜਾਣਕਾਰੀ ਅੱਪਲੋਡ ਕਰੋ";
 "upload_step_verify_pin_sub_header" = "ਕੋਈ ਰਾਜ ਜਾਂ ਹਲਕਾ ਸਿਹਤ ਅਧਿਕਾਰੀ ਲਿਖਤੀ ਸੰਦੇਸ਼ ਰਾਹੀਂ ਤੁਹਾਡੀ ਡਿਵਾਈਸ 'ਤੇ ਪਿੰਨ ਭੇਜੇਗਾ। ਆਪਣੀ ਜਾਣਕਾਰੀ ਨੂੰ ਅੱਪਲੋਡ ਕਰਨ ਲਈ ਹੇਠਾਂ ਦਰਜ ਕਰੋ।";
 "us_consent_button" = "ਮੈਂ ਸਹਿਮਤ ਹਾਂ";
-"us_registration_consent_diagnostic" = "ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਇਹ ਜਾਣਕਾਰੀ ਕਿ COVIDSafe, ਮੇਰੇ ਡਿਵਾਈਸ 'ਤੇ  ਠੀਕ ਕੰਮ ਕਰ ਰਹੀ ਹੈ";
+"us_registration_consent_diagnostic" = "ਇਹ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਜਾਣਕਾਰੀ ਕਿ COVIDSafe, ਮੇਰੇ ਉਪਕਰਣ 'ਤੇ  ਠੀਕ ਕੰਮ ਕਰ ਰਹੀ ਹੈ।";
 "victoria" = "ਵਿਕਟੋਰੀਆ";
 "western_australia" = "ਪੱਛਮੀ ਆੱਸਟ੍ਰੇਲੀਆ";
 "wrong_ping_number" = "ਗਲਤ ਪਿੰਨ ਦਰਜ ਕੀਤਾ";
@@ -572,38 +578,16 @@
 "Done" = "ਕਰ ਦਿੱਤਾ";
 /* Feedback */
 "EmailPlaceholder" = "ਆਪਣਾ ਈਮੇਲ ਪਤਾ ਦਰਜ ਕਰੋ (ਲੋੜੀਂਦਾ ਹੈ)";
+"EnterPINSent" = "%@ 'ਤੇ ਭੇਜਿਆ ਪਿੰਨ ਭਰੋ";
 /* Phone number and PIN */
 "EnterPhoneReVerify" = "ਮੁੜ-ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਆਪਣਾ ਮੋਬਾਈਲ ਨੰਬਰ ਭਰੋ";
-"EnterPINSent" = "%@ 'ਤੇ ਭੇਜਿਆ ਪਿੰਨ ਭਰੋ";
-/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_message" = "ਹਾਂ ਜੀ, ਤੁਸੀਂ ਅੱਗੇ ਕਿਵੇਂ ਵਧਣਾ ਚਾਹੋਗੇ ?";
-/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_title" = "ਫੀਡ-ਬੈਕ ਬਾੱਕਸ";
-/* Title for button that launches new feedback flow. */
-"entryPrompt_newFeedback_button_title" = "ਨਵਾਂ ਫੀਡ-ਬੈਕ";
 "FoundIssueWithApp" = "COVIDSafe ਐਪ ਤੇ ਇੱਕ ਮੁੱਦਾ ਲੱਭਿਆ ?";
-/* *** Feedback localised strings *** */
-"global_cancel_button_title" = "ਰੱਦ";
-"global_send_button_title" = "ਭੇਜੋ";
-"global_sending_indication_title" = "ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ";
-"global_success_indication_title" = "ਕਾਮਯਾਬ";
 /* upload */
 "InformationUploaded" = "ਤੁਹਾਡੀ ਜਾਣਕਾਰੀ %@ 'ਤੇ ਅੱਪਲੋਡ ਕੀਤੀ ਗਈ ਸੀ|";
 "InvalidOTP" = "6-ਅੰਕਾਂ ਦਾ ਕੋਡ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ";
 "IssueDescPlaceholder" = "ਕਿਰਪਾ ਕਰਕੇ ਮੁੱਦੇ/ਮਸਲੇ ਦਾ ਵਰਣਨ ਕਰੋ";
 "IssueFooter" = "ਤੁਹਾਡੇ ਫੀਡ-ਬੈਕ ਬਾਰੇ ਹੋਰ ਵੇਰਵਿਆਂ ਲਈ ਅਸੀਂ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰ ਸਕਦੇ ਹਾਂ। ਤੁਹਾਡੇ ਈਮੇਲ ਪਤੇ ਦੀ ਵਰਤੋਂ ਕਿਸੇ ਹੋਰ ਉਦੇਸ਼ ਲਈ ਨਹੀਂ ਕੀਤੀ ਜਾਵੇਗੀ।";
 "IssueThankYou" = "ਧੰਨਵਾਦ, ਸਾਨੂੰ ਤੁਹਾਡਾ ਫੀਡ-ਬੈਕ ਮਿਲ ਗਿਆ ਹੈ।";
-/* Delete screenshot action sheet action button title. */
-"newFeedback_deleteScreenshot_actionTitle" = "ਸਕ੍ਰੀਨ-ਸ਼ਾੱਟ ਡਿਲੀਟ ਕਰੋ";
-/* Messsage shown to user asking to confirm screenshot deletion. */
-"newFeedback_deleteScreenshotConfirmation_message" = "ਇਸ ਸਕ੍ਰੀਨ-ਸ਼ਾੱਟ ਨੂੰ ਪੱਕੇ ਤੌਰ 'ਤੇ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।";
-"newFeedback_invalidEmail_errorMessage" = "ਕਿਰਪਾ ਕਰਕੇ ਉਚਿੱਤ (ਵੈਲਿਡ) ਈਮੇਲ ਪਤਾ ਭਰੋ|";
-/* Error message displayed to users when feedback has empty description */
-"newFeedback_noMessage_errorMessage" = "ਭੇਜਣ ਤੋਂ ਪਹਿਲਾਂ ਸਾਨੂੰ ਕੁਝ ਦੱਸੋ।";
-/* Error message displayed to users when feedback fails to send. */
-"newFeedback_send_errorMessage" = "ਫੀਡਬੈਕ ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ";
-/* Navigation Bar title shown during new feedback flow. */
-"newFeedbackFlow_navigationTitle" = "ਸਮੱਸਿਆ ਬਾਰੇ ਸੂਚਿਤ ਕਰੇ";
 "Next" = "ਅੱਗੇ";
 /* registration succcess */
 "OS2b_Item1" = "1. ਜਦੋਂ ਤੁਸੀਂ ਘਰੋਂ ਬਾਹਰ ਜਾਂਦੇ ਹੋ, ਤਾਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਨਾਲ ਰੱਖੋ ਅਤੇ ਯਕੀਨੀ ਬਣਾਓ ਕਿ COVIDSafe ਸਰਗਰਮ ਹੈ।";
@@ -611,6 +595,7 @@
 "OS2b_Item2_VOLabel" = "2. Bluetooth® ਚਾਲੂ ਰੱਖਣਾ ਚਾਹੀਦਾ ਹੈ।";
 "OS2b_Item3" = "3. COVIDSafe ਪੇਅਰਿੰਗ ਦੀਆਂ ਬੇਨਤੀਆਂ ਨਹੀਂ ਭੇਜਦੀ।";
 "OS2b_Item3Underline" = "ਹੋਰ ਸਿੱਖੋ।";
+"PINWillExpire" = "ਤੁਹਾਡਾ ਪਿੰਨ  %@ ਵਿੱਚ ਸਮਾਪਤ ਹੋ ਜਾਵੇਗਾ";
 /* home */
 "PairingRequestsInfo" = "COVIDSafe ਪੇਅਰਿੰਗ ਦੀਆਂ ਬੇਨਤੀਆਂ ਨਹੀਂ ਭੇਜਦੀ।";
 "PairingRequestsInfoUnderline" = "ਪੇਅਰਿੰਗ ਵਾਸਤੇ ਬੇਨਤੀਆਂ";
@@ -618,7 +603,6 @@
 "PhoneNumberFormatErrorTitle" = "ਗਲਤ ਨੰਬਰ ਫਾੱਰਮੈਟ";
 "PhoneVerificationErrorMessage" = "ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੇ ਵੇਰਵਿਆਂ ਦੀ ਜਾਂਚ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।";
 "PhoneVerificationErrorTitle" = "ਫੋਨ ਨੰਬਰ ਦੀ ਜਾਂਚ ਦੌਰਾਨ ਗ਼ਲਤੀ";
-"PINWillExpire" = "ਤੁਹਾਡਾ ਪਿੰਨ  %@ ਵਿੱਚ ਸਮਾਪਤ ਹੋ ਜਾਵੇਗਾ";
 "ReceivePinIssue" = "ਤੁਹਾਡੇ ਪਿੰਨ ਪ੍ਰਾਪਤ ਕਰਨ ਸਬੰਧੀ ਮੁੱਦੇ ?";
 /* help */
 "ReportAnIssue" = "ਮੁੱਦੇ/ਮਸਲੇ ਬਾਰੇ ਰਿਪੋਰਟ ਕਰੋ|";
@@ -627,13 +611,35 @@
 "UploadFailed" = "ਅੱਪਲੋਡ ਅਸਫਲ। ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।";
 "UploadFailedErrorMessage" = "ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।";
 "ValidationError" = "ਵੈਧਤਾ/ਉਚਿੱਤ ਹੋਣ ਸਬੰਧੀ ਗਲਤੀ";
+/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_message" = "ਹਾਂ ਜੀ, ਤੁਸੀਂ ਅੱਗੇ ਕਿਵੇਂ ਵਧਣਾ ਚਾਹੋਗੇ ?";
+/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_title" = "ਫੀਡ-ਬੈਕ ਬਾੱਕਸ";
+/* Title for button that launches new feedback flow. */
+"entryPrompt_newFeedback_button_title" = "ਨਵਾਂ ਫੀਡ-ਬੈਕ";
+/* *** Feedback localised strings *** */
+"global_cancel_button_title" = "ਰੱਦ";
+"global_send_button_title" = "ਭੇਜੋ";
+"global_sending_indication_title" = "ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ";
+"global_success_indication_title" = "ਕਾਮਯਾਬ";
+/* Navigation Bar title shown during new feedback flow. */
+"newFeedbackFlow_navigationTitle" = "ਸਮੱਸਿਆ ਬਾਰੇ ਸੂਚਿਤ ਕਰੇ";
+/* Messsage shown to user asking to confirm screenshot deletion. */
+"newFeedback_deleteScreenshotConfirmation_message" = "ਇਸ ਸਕ੍ਰੀਨ-ਸ਼ਾੱਟ ਨੂੰ ਪੱਕੇ ਤੌਰ 'ਤੇ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।";
+/* Delete screenshot action sheet action button title. */
+"newFeedback_deleteScreenshot_actionTitle" = "ਸਕ੍ਰੀਨ-ਸ਼ਾੱਟ ਡਿਲੀਟ ਕਰੋ";
+"newFeedback_invalidEmail_errorMessage" = "ਕਿਰਪਾ ਕਰਕੇ ਉਚਿੱਤ (ਵੈਲਿਡ) ਈਮੇਲ ਪਤਾ ਭਰੋ|";
+/* Error message displayed to users when feedback has empty description */
+"newFeedback_noMessage_errorMessage" = "ਭੇਜਣ ਤੋਂ ਪਹਿਲਾਂ ਸਾਨੂੰ ਕੁਝ ਦੱਸੋ।";
+/* Error message displayed to users when feedback fails to send. */
+"newFeedback_send_errorMessage" = "ਫੀਡਬੈਕ ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ";
 "GetCoronaVirusApp_VOLabel" = "ਕੋਰੋਨਾਵਾਇਰਸ ਐਪ ਪ੍ਰਾਪਤ ਕਰੋ। ਤਾਜ਼ਾ ਖ਼ਬਰਾਂ ਅਤੇ ਸਲਾਹ ਲਈ ਸਰਕਾਰੀ ਐਪ ਡਾਊਨਲੋਡ ਕਰੋ।";
 "HelpTopics_VOLabel" = "ਹੈਲਪ ਟੌਪਿਕਸ। ਤਕਨੀਕੀ ਸਮੱਸਿਆਵਾਂ ਨੂੰ ਟ੍ਰਬਲਸ਼ੂਟ ਅਤੇ ਸੁਲਝਾਉਣ ਬਾਰੇ ਦਿਸ਼ਾ-ਨਿਰਦੇਸ਼";
 "LatestNews_VOLabel" = "ਤਾਜ਼ਾ ਖ਼ਬਰਾਂ ਅਤੇ ਅੱਪਡੇਟਸ। ਤਾਜ਼ਾ ਕੋਰੋਨਾਵਾਇਰਸ ਖ਼ਬਰਾਂ ਵਾਸਤੇ aus.gov.au ਵੱਲ ਜਾਓ।";
 "NotificationsDisabled_VOLabel" = "'ਨੋਟੀਫਿਕੇਸ਼ਨਜ਼' ਬੰਦ (ਡਿਸ-ਏਬਲਡ) ਹਨ। ਜੇ COVIDSafe ਸਰਗਰਮ ਨਹੀਂ ਤਾਂ ਤੁਹਾਨੂੰ ਕੋਈ ਸੂਚਨਾ ਨਹੀਂ ਮਿਲੇਗੀ|\n'ਨੋਟੀਫਿਕੇਸ਼ਨਜ਼' ਸੈਟਿੰਗਜ਼ ਨੂੰ ਬਦਲੋ";
 "NotificationsEnabled_VOLabel" = "'ਨੋਟੀਫਿਕੇਸ਼ਨਜ਼' ਚਾਲੂ (ਐਨੇਬਲਡ) ਹਨ। ਜੇ COVIDSafe ਸਰਗਰਮ ਨਹੀਂ ਤਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾ ਮਿਲੇਗੀ|\n'ਨੋਟੀਫਿਕੇਸ਼ਨਜ਼' ਸੈਟਿੰਗਜ਼ ਨੂੰ ਬਦਲੋ";
 "OS1b_TopParagraph_VOLabel" = "Bluetooth ਸੰਕੇਤਾਂ ਦੀ ਵਰਤੋਂ ਇਹ ਪਤਾ ਲਾਉਣ ਲਈ ਕੀਤੀ ਜਾਂਦੀ ਹੈ ਜਦੋਂ ਤੁਸੀਂ ਕਿਸੇ ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰ ਦੇ ਨੇੜੇ ਹੁੰਦੇ ਹੋ।\nਤੁਹਾਡੇ ਅਤੇ ਹੋਰ COVIDSafe ਵਰਤੋਂਕਾਰਾਂ ਵਿਚਕਾਰ ਨਜ਼ਦੀਕੀ ਸੰਪਰਕ ਦੇ ਹਰੇਕ ਪਰਿਮਾਣ ਨੂੰ, ਨਜ਼ਦੀਕੀ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਸਿਰਜਣ ਲਈ ਨੋਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਇਹ ਜਾਣਕਾਰੀ ਐਨਕ੍ਰਿਪਟਿਡ ਹੁੰਦੀ ਹੈ ਅਤੇ ਕੇਵਲ ਤੁਹਾਡੇ ਫ਼ੋਨ ਵਿੱਚ ਹੀ ਸਟੋਰ ਕੀਤੀ ਜਾਂਦੀ ਹੈ।\nਜੇ COVIDSafe ਵਰਤੋਂਕਾਰ ਵਜੋਂ  ਕੋਵਿਡ-19 ਲਈ ਤੁਹਾਡਾ ਟੈਸਟ ਪਾਜ਼ੇਟਿਵ ਆਉਂਦਾ ਹੈ, ਤਾਂ ਕੋਈ ਰਾਜ ਜਾਂ ਹਲਕਾ ਸਿਹਤ ਅਧਿਕਾਰੀ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰੇਗਾ। ਉਹ ਤੁਹਾਡੀ ਨਜ਼ਦੀਕੀ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਨੂੰ ਇੱਕ ਬੇਹੱਦ ਸੁਰੱਖਿਅਤ ਜਾਣਕਾਰੀ ਸਟੋਰੇਜ ਸਿਸਟਮ ਵਿੱਚ, ਸਵੈ-ਇੱਛਤ ਅੱਪਲੋਡ ਕਰਨ ਵਾਸਤੇ ਸਹਾਇਤਾ ਕਰਨਗੇ।\nਜੇ ਤੁਸੀਂ ਕਿਸੇ ਹੋਰ  COVIDSafe ਵਰਤੋਂਕਾਰ, ਜਿਸਦਾ ਟੈਸਟ ਪਾਜ਼ੇਟਿਵ ਆਇਆ ਸੀ, ਦੇ ਸੰਪਰਕ ਵਿੱਚ ਆਏ ਹੋ ਤਾਂ ਵੀ ਰਾਜ ਜਾਂ ਹਲਕਾ ਸਿਹਤ ਅਧਿਕਾਰੀ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕਰ ਸਕਦੇ ਹਨ|\nਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ ਕਿਰਪਾ ਕਰਕੇ ਹੈਲਪ ਟੌਪਿਕਸ ਪੰਨਾ  ਦੇਖੋ।";
-"permission_content_iOS_2_VOLabel" = "1. Bluetooth®\n2. ਸੂਚਨਾਵਾਂ (ਨੋਟੀਫਿਕੇਸ਼ਨਜ਼)\n3. ਲੋਕੇਸ਼ਨ ਸੇਵਾਵਾਂ";
-"permission_content_iOS_VOLabel" = "COVIDSafe ਨੂੰ ਸਰਗਰਮ ਰੱਖਣ ਲਈ, ਬਲੂਟੁਥ ਚੱਲਦਾ ਰੱਖਣਾ ਚਾਹੀਦਾ ਹੈ। COVIDSafe ਪੇਅਰਿੰਗ ਦੀਆਂ ਬੇਨਤੀਆਂ ਨਹੀਂ ਭੇਜਦਾ।\n\n'ਨੋਟੀਫਿਕੇਸ਼ਨਜ਼' ਨੂੰ ਚਾਲੂ ਰੱਖ ਕੇ, ਤੁਹਾਨੂੰ ਅੱਪਡੇਟ ਮਿਲਦੇ ਹਨ ਜੋ ਤੁਹਾਨੂੰ ਯਾਦ ਦਿਵਾਉਂਦੇ ਹਨ ਕਿ COVIDSafe ਸਰਗਰਮ ਨਹੀਂ ਹੈ।\n\nਤੁਹਾਡੇ iPhone ਨੂੰ ਲੋਕੇਸ਼ਨ ਪਰਮਿਸ਼ਨ ਚਾਹੀਦੀ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਜੋ COVIDSafe ਚੱਲ ਸਕੇ। *COVIDSafe ਤੁਹਾਡੀ ਲੋਕੇਸ਼ਨ ਨੂੰ ਨਹੀਂ ਢੂੰਡਦਾ, ਨਾ ਹੀ ਲੋਕੇਸ਼ਨ ਡੇਟਾ ਸੰਭਾਲਦਾ ਹੈ*\n\nਇਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ 'Proceed' ਦੀ ਚੋਣ ਕਰੋ:";
 "ShareCovidSafe_VOLabel" = "COVIDSafe ਸਾਂਝਾ ਕਰੋ। ਹੋਰਨਾਂ ਨੂੰ ਸਹਾਇਤਾ ਲਈ ਬੁਲਾਓ । ਇਕੱਠੇ ਅਸੀਂ ਵਧੇਰੇ ਮਜ਼ਬੂਤ ਹਾਂ।";
 "UploadData_VOLabel" = "ਕੀ ਕਿਸੇ ਸਿਹਤ ਅਧਿਕਾਰੀ ਨੇ ਤੁਹਾਡੇ ਨਾਲ ਸੰਪਰਕ ਕੀਤਾ ਹੈ? ਤੁਸੀਂ ਆਪਣੀ ਜਾਣਕਾਰੀ ਨੂੰ ਕੇਵਲ ਤਾਂ ਹੀ ਅੱਪਲੋਡ ਕਰ ਸਕਦੇ ਹੋ ਜੇਕਰ ਤੁਹਾਡਾ ਟੈਸਟ ਪਾੱਜ਼ੇਟਿਵ ਆਇਆ ਹੋਵੇ|";
+"permission_content_iOS_2_VOLabel" = "1. Bluetooth®\n2. ਸੂਚਨਾਵਾਂ (ਨੋਟੀਫਿਕੇਸ਼ਨਜ਼)\n3. ਲੋਕੇਸ਼ਨ ਸੇਵਾਵਾਂ";
+"permission_content_iOS_VOLabel" = "COVIDSafe ਨੂੰ ਸਰਗਰਮ ਰੱਖਣ ਲਈ, ਬਲੂਟੁਥ ਚੱਲਦਾ ਰੱਖਣਾ ਚਾਹੀਦਾ ਹੈ। COVIDSafe ਪੇਅਰਿੰਗ ਦੀਆਂ ਬੇਨਤੀਆਂ ਨਹੀਂ ਭੇਜਦਾ।\n\n'ਨੋਟੀਫਿਕੇਸ਼ਨਜ਼' ਨੂੰ ਚਾਲੂ ਰੱਖ ਕੇ, ਤੁਹਾਨੂੰ ਅੱਪਡੇਟ ਮਿਲਦੇ ਹਨ ਜੋ ਤੁਹਾਨੂੰ ਯਾਦ ਦਿਵਾਉਂਦੇ ਹਨ ਕਿ COVIDSafe ਸਰਗਰਮ ਨਹੀਂ ਹੈ।\n\nਤੁਹਾਡੇ iPhone ਨੂੰ ਲੋਕੇਸ਼ਨ ਪਰਮਿਸ਼ਨ ਚਾਹੀਦੀ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਜੋ COVIDSafe ਚੱਲ ਸਕੇ। *COVIDSafe ਤੁਹਾਡੀ ਲੋਕੇਸ਼ਨ ਨੂੰ ਨਹੀਂ ਢੂੰਡਦਾ, ਨਾ ਹੀ ਲੋਕੇਸ਼ਨ ਡੇਟਾ ਸੰਭਾਲਦਾ ਹੈ*\n\nਇਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ 'Proceed' ਦੀ ਚੋਣ ਕਰੋ:";
\ No newline at end of file
diff --git a/CovidSafe/tr.lproj/Localizable.strings b/CovidSafe/tr.lproj/Localizable.strings
index d5a9b2d..2c42ac7 100644
--- a/CovidSafe/tr.lproj/Localizable.strings
+++ b/CovidSafe/tr.lproj/Localizable.strings
@@ -1,3 +1,38 @@
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothOFF" = "Bluetooth®'a erişim: KAPALI";
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothON" = "Bluetooth®'a erişim: AÇIK";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF" = "Bluetooth®: KAPALI";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF_content" = "Telefonunuzun Bluetooth® özelliğini açın. Görüntüleniyorsa 'Yeni Bağlantılara İzin Ver'i seçin.";
+/* Figma page iOS Screens (05/06) */
+"BluetoothON" = "Bluetooth®: AÇIK";
+/* Figma page Android Screens (05/06) */
+"Enter_your_mobile_number_label" = "Cep telefonu numaranızı giriniz";
+/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
+"IntroLabel" = "Yayılmayı durdurmaya yardımcı olun \nve hayatları kurtarın.";
+/* Figma page iOS Screens (05/06) */
+"NotificationsBlurbLink" = "Bildirim ayarlarını değiştir";
+/* Figma page iOS Screens (05/06) */
+"NotificationsDisabledBlurb" = "COVIDSafe aktif olmadığında bildirim almayacaksınız.\nBildirim ayarlarını değiştir";
+/* Figma page iOS Screens (05/06) */
+"NotificationsEnabledBlurb" = "COVIDSafe aktif olmadığında bildirim alacaksınız.\nBildirim ayarlarını değiştir";
+"OS2b_Item_4" = "4. COVIDSafe'in çalışması için iPhone'unuzun  Konum iznine ihtiyacı vardır. *COVIDSafe, konum verilerinizi TOPLAMAZ, SAKLAMAZ veya KULLANMAZ*";
+"PINNumber_VO_Label" = "PIN numarası";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusBody" = "Bluetooth®'u etkinleştirerek evden çıkmadan önce ve halka açık yerlerde aktif olduğundan emin olun.";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusTitle" = "COVIDSafe aktif değil";
+"PN_MobileNumber_VOLabel" = "Cep telefonu numarası";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderBody" = "Çalıştığından emin olmak için COVIDSafe'i açın.";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderTitle" = "48 saat boyunca karşılaşma tespit edilmedi";
+"PostcodeValidationErrorMessage" = "Lütfen geçerli bir Avustralya posta kodu giriniz.";
+/* Figma page Android Screens (05/06) */
+"Select_country_or_region_headline" = "Ülke veya bölge seçiniz";
+"Support_VOLabel" = "Destek. Yardım konuları bölümünde belirtilmemiş hususlarda destek için";
 "action_continue" = "Devam";
 "action_report_an_issue" = "Sorun bildir";
 "action_upload_done" = "Bitti";
@@ -11,20 +46,10 @@
 "activity_intro_2" = "";
 /* Figma page iOS Screens (05/06) */
 "allow_bluetooth_call" = "COVIDSafe'in Bluetooth®'a erişmesine izin verin";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothOFF" = "Bluetooth®'a erişim: KAPALI";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothON" = "Bluetooth®'a erişim: AÇIK";
 "app_activity_bluetooth_handshakes_heading" = "";
 "australian_capital_territory" = "Avustralya Başkent Bölgesi";
 "ble_handshakes_yesterday" = "";
 "bluetooth_handshakes" = "Bluetooth el sıkışmaları";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF" = "Bluetooth®: KAPALI";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF_content" = "Telefonunuzun Bluetooth® özelliğini açın. Görüntüleniyorsa 'Yeni Bağlantılara İzin Ver'i seçin.";
-/* Figma page iOS Screens (05/06) */
-"BluetoothON" = "Bluetooth®: AÇIK";
 "cancel_snooze" = "Ertelemeyi iptal et";
 "cases_28_days" = "Son 28 gündeki yeni vakalar";
 "cases_7_days" = "Son 7 gündeki yeni vakalar";
@@ -250,8 +275,9 @@
 "country_region_name_zw" = "Zimbabve";
 "customise_days" = "Günleri isteğe göre uyarlayın";
 "data_privacy_button" = "Sonraki";
-"data_privacy_content" = "COVIDSafe'a kaydolmadan önce COVIDSafe *gizlilik ilkesini* okumanız önemlidir.\n\nCOVIDSafe, kişisel bilgilerinizi yalnızca bu ilkeye ve 1988 Gizlilik yasasına uygun şekilde toplar, kullanır veya açıklar.\n\n16 yaşından küçükseniz, ebeveyniniz/veliniz de *gizlilik ilkesini* okumalıdır. \n\nCOVIDSafe kullanımı tamamen isteğe bağlıdır. Uygulamayı istediğiniz zaman yükleyebilir veya silebilirsiniz. COVIDSafe'i silerseniz *bilgilerinizin güvenli sunucudan silinmesini de isteyebilirsiniz*. \n\nCOVIDSafe'e kaydolmak için bir ad (veya takma ad), cep telefonu numarası, yaş aralığı ve posta kodu girmeniz gerekir. \n\nKayıt olurken gönderdiğiniz bilgiler ve COVIDSafe kullanımınızla ilgili bilgiler yüksek düzeyde güvenli bir sunucuda saklanacaktır.\n\nCOVIDSafe'in cihazınızda düzgün çalıştığından emin olmak için de bilgiler toplanmaktadır. Buna işletim sisteminiz, yüklediğiniz uygulamanın sürümü, cihazınızda ayarlanmış olan dil, Bluetooth®'un çalışıp çalışmadığı ve uygulamanızın son yedi günde herhangi bir karşılaşma kaydedip kaydetmediği dahildir.\n\nCOVIDSafe konum bilgilerinizi toplamaz. \n\nCOVIDSafe temas tarihini ve saatini, temas ettiğiniz diğer COVIDSafe kullanıcılarının kişiye özel kimlik kodunu, Bluetooth sinyal gücünü ve diğer kullanıcıların telefon modelini cihazınıza kaydeder. \n\nTemas ettiğiniz diğer COVIDSafe kullanıcıları kişiye özel  kimlik kodunuzu, sizinle temas tarih ve saatini, Bluetooth sinyal gücünü ve telefon modelinizi kendi cihazlarında kaydedecektir. \n\nBaşka bir kullanıcının COVID-19 testinin pozitif çıkması halinde kendi iletişim bilgilerini sisteme yükleyebilir ve bu durumda bir eyalet veya bölge sağlık yetkilisi temas takibi amacıyla sizinle temasa geçebilir. \n\nKayıt bilgileriniz yalnızca temas takibi ve COVIDSafe'in düzgün ve yasalara uygun çalışması için kullanılacak ya da açıklanacaktır. \n\nDaha fazla bilgiyi *covidsafe.gov.au* web sitesinde bulabilirsiniz. \n\nBilgileriniz ve bu bilgilerin nasıl işleneceği ve paylaşılacağına dair haklarınızla ilgili daha fazla bilgi için COVIDSafe *gizlilik ilkesine* bakın.";
-"data_privacy_content_VO" = "COVIDSafe'a kaydolmadan önce COVIDSafe gizlilik ilkesini okumanız önemlidir. \n\nCOVIDSafe, kişisel bilgilerinizi yalnızca bu ilkeye ve 1988 Gizlilik yasasına uygun şekilde toplar, kullanır veya açıklar.\n\n16 yaşından küçükseniz, ebeveyniniz/veliniz de gizlilik ilkesini okumalıdır. \n\nCOVIDSafe kullanımı tamamen isteğe bağlıdır. Uygulamayı istediğiniz zaman yükleyebilir veya silebilirsiniz. COVIDSafe'i silerseniz bilgilerinizin güvenli sunucudan silinmesini de isteyebilirsiniz. \n\nCOVIDSafe'e kaydolmak için bir ad (veya takma ad), cep telefonu numarası, yaş aralığı ve posta kodu girmeniz gerekir. \n\nKayıt olurken gönderdiğiniz bilgiler ve COVIDSafe kullanımınızla ilgili bilgiler yüksek düzeyde güvenli bir sunucuda saklanır.\n\nCOVIDSafe'in cihazınızda düzgün çalıştığından emin olmak için de bilgiler toplanmaktadır. Buna işletim sisteminiz, yüklediğiniz uygulamanın sürümü, cihazınızda ayarlanmış olan dil, Bluetooth'un çalışıp çalışmadığı ve uygulamanızın son yedi günde herhangi bir karşılaşma kaydedip kaydetmediği dahildir.\n\nCOVIDSafe konum bilgilerinizi toplamaz. \n\nCOVIDSafe temas tarihini ve saatini, temas ettiğiniz diğer COVIDSafe kullanıcılarının kişiye özel kimlik kodunu, Bluetooth sinyal gücünü ve diğer kullanıcıların telefon modelini cihazınıza kaydeder. \n\nTemas ettiğiniz diğer COVIDSafe kullanıcıları sizin kişiye özel kimlik kodunuzu, sizinle temas tarih ve saatini, Bluetooth sinyal gücünü ve telefon modelinizi kendi cihazlarında kaydedecektir. \n\nBaşka bir kullanıcının COVID-19 testinin pozitif çıkması halinde kendi iletişim bilgilerini sisteme yükleyebilir ve bu durumda bir eyalet veya bölge sağlık yetkilisi temas takibi amacıyla sizinle temasa geçebilir. \n\nKayıt bilgileriniz yalnızca temas takibi ve COVIDSafe'in düzgün ve yasalara uygun çalışması için kullanılacak ya da açıklanacaktır. \n\nDaha fazla bilgiyi covidsafe.gov.au web sitesinde bulabilirsiniz. \n\nBilgileriniz ve bu bilgilerin nasıl işleneceği ve paylaşılacağına dair haklarınızla ilgili daha fazla bilgi için COVIDSafe gizlilik ilkesine bakın.";
+"data_privacy_content" = "COVIDSafe'e kaydolmadan önce COVIDSafe gizlilik politikasını okumanız önemlidir. COVIDSafe, kişisel bilgilerinizi yalnızca bu politika ve 1988 tarihli Gizlilik Yasası uyarınca toplar, kullanır veya açıklar. \n\n16 yaşından küçükseniz, ebeveyniniz/veliniz de gizlilik politikasını okumalıdır. \n\nCOVIDSafe kullanımı tamamen isteğe bağlıdır. Uygulamayı istediğiniz zaman yükleyebilir veya silebilirsiniz. COVIDSafe'i silerseniz bilgilerinizin güvenli sunucudan silinmesini de talep edebilirsiniz. Kişisel bilgilerinizi girmezseniz, COVIDSafe uygulaması istenilen şekilde çalışamaz. \n\nCOVIDSafe'e kaydolmak için bir ad (veya takma ad), cep telefonu numarası, yaş aralığı ve posta kodu girmeniz gerekir. \n\nKayıt olurken gönderdiğiniz bilgiler ve COVIDSafe kullanımınızla ilgili bilgiler yüksek güvenlikli bir sunucuda depolanır. \n\nCOVIDSafe'in cihazınızda düzgün çalıştığından emin olmak için de bilgiler toplanır. Bu bilgiler, işletim sisteminizi, yüklediğiniz uygulama sürümünü, cihazınızın ayarlı dilini, Bluetooth'un çalışıp çalışmadığını ve uygulamanızın önceki yedi gün içinde herhangi bir sorunla karşılaşıp karşılaşmadığının kaydını içerir.\n\nCOVIDSafe konum bilgilerinizi almaz.\n\nCOVIDSafe, temas tarih ve saatini, temas kurduğunuz diğer COVIDSafe kullanıcılarının şifreli kimlik kodunu, Bluetooth sinyal gücünü ve telefon modelini cihazınıza kaydeder.\n\nTemasa geçtiğiniz diğer COVIDSafe kullanıcılarının cihazlarına da, sizin şifrelenmiş kimlik kodunuz, sizinle temas ettikleri tarih ve saat, Bluetooth sinyal gücünüz ve telefon modeliniz kaydedilir.\n\nDiğer kullanıcılardan birinin COVID-19 testi pozitif çıkarsa, bu kişi temas bilgilerini yükleyebilir ve bunun üzerine bir eyalet veya bölge sağlık görevlisi, temas takibi için sizinle iletişime geçebilir.\n\nKayıt bilgileriniz yalnızca temas takibi ve COVIDSafe'in düzgün ve yasal işleyişi için kullanılacak veya açıklanacaktır.\n\nDaha fazla bilgi için covidsafe.gov.au web sitesini ziyaret edebilirsiniz.\n\nCOVIDSafe gizlilik politikası metninde bilgileriniz ve bunların nasıl ele alınıp paylaşılacağı ile ilgili haklarınıza dair daha ayrıntılı bilgi bulabilirsiniz.\n\nCOVIDSafe gizlilik uygulamasına ilişkin soru ve şikayetlerinizi iletebileceğiniz iletişim bilgileri, gizlilik politikasının Bize Ulaşın başlıklı bölümünde mevcuttur.";
+"data_privacy_content_VO" = "COVIDSafe'e kaydolmadan önce COVIDSafe gizlilik politikasını okumanız önemlidir. COVIDSafe, kişisel bilgilerinizi yalnızca bu politika ve 1988 tarihli Gizlilik Yasası uyarınca toplar, kullanır veya açıklar. \n\n16 yaşından küçükseniz, ebeveyniniz/veliniz de gizlilik politikasını okumalıdır. \n\nCOVIDSafe kullanımı tamamen isteğe bağlıdır. Uygulamayı istediğiniz zaman yükleyebilir veya silebilirsiniz. COVIDSafe'i silerseniz bilgilerinizin güvenli sunucudan silinmesini de talep edebilirsiniz. Kişisel bilgilerinizi girmezseniz, COVIDSafe uygulaması istenilen şekilde çalışamaz. \n\nCOVIDSafe'e kaydolmak için bir ad (veya takma ad), cep telefonu numarası, yaş aralığı ve posta kodu girmeniz gerekir. \n\nKayıt olurken gönderdiğiniz bilgiler ve COVIDSafe kullanımınızla ilgili bilgiler yüksek güvenlikli bir sunucuda depolanır. \n\nCOVIDSafe'in cihazınızda düzgün çalıştığından emin olmak için de bilgiler toplanır. Bu bilgiler, işletim sisteminizi, yüklediğiniz uygulama sürümünü, cihazınızın ayarlı dilini, Bluetooth'un çalışıp çalışmadığını ve uygulamanızın önceki yedi gün içinde herhangi bir sorunla karşılaşıp karşılaşmadığının kaydını içerir.\n\nCOVIDSafe konum bilgilerinizi almaz.\n\nCOVIDSafe, temas tarih ve saatini, temas kurduğunuz diğer COVIDSafe kullanıcılarının şifreli kimlik kodunu, Bluetooth sinyal gücünü ve telefon modelini cihazınıza kaydeder.\n\nTemasa geçtiğiniz diğer COVIDSafe kullanıcılarının cihazlarına da, sizin şifrelenmiş kimlik kodunuz, sizinle temas ettikleri tarih ve saat, Bluetooth sinyal gücünüz ve telefon modeliniz kaydedilir.\n\nDiğer kullanıcılardan birinin COVID-19 testi pozitif çıkarsa, bu kişi temas bilgilerini yükleyebilir ve bunun üzerine bir eyalet veya bölge sağlık görevlisi, temas takibi için sizinle iletişime geçebilir.\n\nKayıt bilgileriniz yalnızca temas takibi ve COVIDSafe'in düzgün ve yasal işleyişi için kullanılacak veya açıklanacaktır.\n\nDaha fazla bilgi için covidsafe.gov.au web sitesini ziyaret edebilirsiniz.\n\nCOVIDSafe gizlilik politikası metninde bilgileriniz ve bunların nasıl ele alınıp paylaşılacağı ile ilgili haklarınıza dair daha ayrıntılı bilgi bulabilirsiniz.\n\nCOVIDSafe gizlilik uygulamasına ilişkin soru ve şikayetlerinizi iletebileceğiniz iletişim bilgileri, gizlilik politikasının Bize Ulaşın başlıklı bölümünde mevcuttur.";
+"data_privacy_content_android" = "COVIDSafe'e kaydolmadan önce COVIDSafe *gizlilik politikasını* okumanız önemlidir. COVIDSafe, kişisel bilgilerinizi yalnızca bu politika ve <i>1988 tarihli Gizlilik Yasası</i> uyarınca toplar, kullanır veya açıklar. \n\n16 yaşından küçükseniz, ebeveyniniz/veliniz de *gizlilik politikasını* okumalıdır. \n\nCOVIDSafe kullanımı tamamen isteğe bağlıdır. Uygulamayı istediğiniz zaman yükleyebilir veya silebilirsiniz. COVIDSafe'i silerseniz *bilgilerinizin güvenli sunucudan silinmesini de talep edebilirsiniz*. \n\nCOVIDSafe'e kaydolmak için bir ad (veya takma ad), cep telefonu numarası, yaş aralığı ve posta kodu girmeniz gerekir. Kişisel bilgilerinizi girmezseniz, COVIDSafe uygulaması istenilen şekilde çalışamaz. \n\nKayıt olurken gönderdiğiniz bilgiler ve COVIDSafe kullanımınızla ilgili bilgiler yüksek güvenlikli bir sunucuda depolanır. \n\nCOVIDSafe'in cihazınızda düzgün çalıştığından emin olmak için de bilgiler toplanır. Bu bilgiler, işletim sisteminizi, yüklediğiniz uygulama sürümünü, cihazınızın ayarlı dilini, Bluetooth®'un çalışıp çalışmadığını ve uygulamanızın önceki yedi gün içinde herhangi bir sorunla karşılaşıp karşılaşmadığının kaydını içerir.\n\nAndroid cihazlarda ayrıca pil optimizasyonunun devre dışı bırakılıp bırakılmadığı ve konum servislerinin etkinleştirilip etkinleştirilmediği bilgisi de toplanır.\n\nCOVIDSafe konum bilgilerinizi almaz.\n\nCOVIDSafe, temas tarih ve saatini, temas kurduğunuz diğer COVIDSafe kullanıcılarının şifreli kimlik kodunu, Bluetooth sinyal gücünü ve telefon modelini cihazınıza kaydeder.\n\nTemasa geçtiğiniz diğer COVIDSafe kullanıcılarının cihazlarına da, sizin şifrelenmiş kimlik kodunuz, sizinle temas ettikleri tarih ve saat, Bluetooth sinyal gücünüz ve telefon modeliniz kaydedilir.\n\nDiğer kullanıcılardan birinin COVID-19 testi pozitif çıkarsa, bu kişi temas bilgilerini yükleyebilir ve bunun üzerine bir eyalet veya bölge sağlık görevlisi, temas takibi için sizinle iletişime geçebilir.\n\nKayıt bilgileriniz yalnızca temas takibi ve COVIDSafe'in düzgün ve yasal işleyişi için kullanılacak veya açıklanacaktır.\n\nDaha fazla bilgi için *covidsafe.gov.au* web sitesini ziyaret edebilirsiniz.\n\nCOVIDSafe *gizlilik politikası* metninde bilgileriniz ve bunların nasıl ele alınıp paylaşılacağı ile ilgili haklarınıza dair daha ayrıntılı bilgi bulabilirsiniz.\n\nCOVIDSafe gizlilik uygulamasına ilişkin soru ve şikayetlerinizi iletebileceğiniz iletişim bilgileri, gizlilik politikasının *Bize Ulaşın* başlıklı bölümünde mevcuttur.";
 /* OnBoarding Data Privacy */
 "data_privacy_headline" = "Kayıt ve gizlilik";
 "deaths" = "Ölümler";
@@ -272,8 +298,6 @@
 "enter_pin_resend_pin" = "PIN'i yeniden gönder";
 "enter_pin_timer_expire" = "PIN sürenizin bitişi:";
 "enter_pin_wrong_number" = "Bu cep telefonu numarası yanlış mı?";
-/* Figma page Android Screens (05/06) */
-"Enter_your_mobile_number_label" = "Cep telefonu numaranızı giriniz";
 "every_day" = "Her gün";
 "factors_dotpoint1" = "alanda COVIDSafe kullanıcıları sayısı";
 "factors_dotpoint2" = "cihazın modeli ve yaşı";
@@ -289,10 +313,10 @@
 /* Error message for when a user tries to signup outside of Australia. */
 "geoblock_error_message" = "";
 "geoblock_rego_error" = "";
+"global_OK" = "Tamam";
 "global_back" = "Geri";
 "global_close" = "Kapat";
 "global_double_tap" = "düzeltme yapmak için iki defa tıklayınız";
-"global_OK" = "Tamam";
 "hide" = "Gizle";
 "home_app_permission_status_subtitle" = "COVIDSafe doğru ayarlar olmadan çalışmaz. ";
 "home_app_permission_status_title" = "Ayarlarınızı kontrol edin";
@@ -300,11 +324,14 @@
 "home_data_uploaded_message" = "COVID-19'un yayılmasını durdurmaya ve belirtilerinizin takibine yardımcı olun.";
 "home_header_active_no_action_required" = "Başka bir eylem gerekmez.";
 /* Home */
+"home_header_active_title" = "COVIDSafe aktif durumdadır";
+/* Home */
 "home_header_active_title" = "COVIDSafe aktif durumdadır.";
 /* Home */
 "home_header_active_title_thanks" = "Teşekkürler, COVIDSafe artık aktif durumdadır";
 "home_header_inactive_check_your_permissions" = "Ayarlarınızı kontrol edin.";
 "home_header_inactive_title" = "COVIDSafe aktif değil";
+"home_header_inactive_title" = "COVIDSafe aktif değil";
 "home_header_uploaded_on_date_ios" = "Bilgileriniz sisteme %@ tarihinde yüklendi.";
 "home_set_complete_external_link_app_content" = "En son haberler ve tavsiyeler için hükümet uygulamasını indirin.";
 "home_set_complete_external_link_app_title" = "Coronavirus uygulamasını edinin";
@@ -352,8 +379,6 @@
 "intro_content" = "COVIDSafe, toplumu koronavirüsün yayılmasından korumaya yardımcı olmak amacıyla Avustralya Hükümeti tarafından geliştirildi. \n\nCOVIDSafe, uygulamanın diğer kullanıcılarıyla olan temasınızı güvenli bir şekilde kaydeder. Bu, virüs testi pozitif çıkan biriyle yakın temasta bulunduğunuz durumda eyalet ve bölge sağlık görevlilerinin sizinle iletişime geçmesine izin verir. \n\nYayılmayı durdurmaya ve sağlıklı kalmaya birlikte yardımcı olabiliriz.";
 /* OnBoarding Intro */
 "intro_headline" = "COVID-19'un yayılmasını birlikte durdurabiliriz";
-/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
-"IntroLabel" = "Yayılmayı durdurmaya yardımcı olun \nve hayatları kurtarın.";
 "invalid_australian_phone_number_error_prompt" = "Avustralya cep telefonu numaraları en fazla 10 rakam içerir.";
 "invalid_norfolk_island_phone_number_error_prompt" = "Norfolk Adası'ndaki cep telefonu numaraları 5 ila 6 rakam içerir.";
 "is_snoozed" = "COVIDSafe ertelendi";
@@ -389,26 +414,22 @@
 "no_handshakes_item3" = "Telefonunuzu yeniden başlatın ve uygulamayı tekrar açın.";
 "no_handshakes_item4" = "";
 "no_handshakes_link" = "COVIDSafe'in doğru çalışıp çalışmadığının nasıl kontrol edileceği hakkında daha fazlasını okuyun";
+"non_consent_button" = "Kabul etmiyorum";
+"non_consent_popup" = "Ebeveyn ya da veli izni olmadan kayıt sürecine devam edemezsiniz. \n\nLütfen çıkış yapın ve uygulamayı silin.";
 /* Figma page Android Screens (05/06) */
 "norfolk_hint" = "Örneğin: 51234";
 "northern_territory" = "Kuzey Bölgesi";
 "notification_bluetooth" = "COVIDSafe'in çalışması için Bluetooth'u açınız.";
 "notification_internet_content" = "Uygulamayı açınız ve COVIDSafe'in çalışması için internet bağlantınızı kontrol ediniz.";
+"notification_internet_content" = "Uygulamayı açın ve internet bağlantınızı kontrol edin.";
 "notification_not_active_title" = "COVIDSafe aktif değil";
 "notification_settings" = "Ayarlarınızı kontrol etmek için uygulamayı açın.";
 "notification_update_content" = "En son gelişmelere erişmek için uygulamanızı güncelleyinız.";
 "notification_update_heading" = "COVIDSafe güncellemesi mevcut ";
-/* Figma page iOS Screens (05/06) */
-"NotificationsBlurbLink" = "Bildirim ayarlarını değiştir";
-/* Figma page iOS Screens (05/06) */
-"NotificationsDisabledBlurb" = "COVIDSafe aktif olmadığında bildirim almayacaksınız.\nBildirim ayarlarını değiştir";
-/* Figma page iOS Screens (05/06) */
-"NotificationsEnabledBlurb" = "COVIDSafe aktif olmadığında bildirim alacaksınız.\nBildirim ayarlarını değiştir";
 "numbers_error" = "Güncellenen sayılar kontrol edilemiyor.";
 "numbers_no_internet" = "Güncellenen sayıları aldığınızdan emin olmak için internete bağlanın.";
 "numbers_refresh" = "Şimdi yenile";
 "options_for_australia" = "Avustralya için seçenekler";
-"OS2b_Item_4" = "4. COVIDSafe'in çalışması için iPhone'unuzun  Konum iznine ihtiyacı vardır. *COVIDSafe, konum verilerinizi TOPLAMAZ, SAKLAMAZ veya KULLANMAZ*";
 "overseas_acquired" = "%@ yurtdışında edinilen";
 "permission_button" = "İlerle";
 /* Figma page iOS Screens (05/06) */
@@ -432,30 +453,19 @@
 "personal_details_name_title" = "Tam ad (veya takma ad)";
 "personal_details_post_code" = "Avustralya'da posta kodu";
 "personal_details_post_code_error_prompt" = "Avustralya posta kodu numaranız 4 rakam içermelidir. ";
-"PINNumber_VO_Label" = "PIN numarası";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusBody" = "Bluetooth®'u etkinleştirerek evden çıkmadan önce ve halka açık yerlerde aktif olduğundan emin olun.";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusTitle" = "COVIDSafe aktif değil";
-"PN_MobileNumber_VOLabel" = "Cep telefonu numarası";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderBody" = "Çalıştığından emin olmak için COVIDSafe'i açın.";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderTitle" = "48 saat boyunca karşılaşma tespit edilmedi";
 "postcode_api_error" = "Bir hata oluştu. İnternet bağlantınızı kontrol edin ve tekrar deneyin.";
 "postcode_change_label" = "Avustralya'daki mevcut posta kodu ";
 "postcode_success" = "Posta kodunuz güncellendi";
-"PostcodeValidationErrorMessage" = "Lütfen geçerli bir Avustralya posta kodu giriniz.";
 "privacy_policy" = "";
 "privacy_policy_description" = "";
 "queensland" = "Queensland";
 "recovered" = "Toplam iyileşen vakalar";
-"registration_consent_content" = "Avustralya Hükümeti Sağlık Bakanının yasal olarak belirlediğine uygun olarak aşağıdaki bilgileri toplayan Dijital Dönüşüm Ajansı'nı veri deposu yöneticisi olarak onaylıyorum:";
+"registration_consent_content" = "Sağlık Bakanlığı'nın 1988 tarihli Gizlilik Yasası uyarınca veri deposu yöneticisi olarak aşağıdaki bilgileri toplamasına rıza gösteriyorum:";
 "registration_consent_diagnostic" = "COVIDSafe'in cihazımda düzgün çalıştığından emin olmak için gereken bilgiler.";
-"registration_consent_first_paragraph" = "Kayıt bilgilerim.";
+"registration_consent_first_paragraph" = "kayıt bilgileri,";
 /* Onboarding Registration Consent */
 "registration_consent_headline" = "Kayıt onayı";
-"registration_consent_second_paragraph" = "Başka bir kullanıcının COVID-19 testi pozitif çıkması ve temas verilerini sisteme yüklemesi halinde diğer COVIDSafe kullanıcıları ile paylaşılacak şahsıma ait temas bilgileri.";
+"registration_consent_second_paragraph" = "temaslı olduğum başka bir kullanıcının COVID-19 testinin pozitif çıkması ve temas verilerini sisteme yüklemesi halinde diğer COVIDSafe kullanıcıları ile paylaşılacak şahsıma ait temas bilgileri, ve";
 "restrictions_accommodation" = "Konaklama";
 "restrictions_activity" = "Etkinlik";
 "restrictions_cafes" = "Kafe ve Restoranlar";
@@ -481,8 +491,6 @@
 "scheduled" = "COVIDSafe'i %@ ile %@ arasında ertelemeye programladınız .";
 /* OnBoarding Enter Number */
 "select_country_or_region" = "Ülke veya bölge seçin";
-/* Figma page Android Screens (05/06) */
-"Select_country_or_region_headline" = "Ülke veya bölge seçiniz";
 "select_state_territory_button" = "Eyaleti veya bölgeyi seçin";
 "select_state_territory_heading" = "Eyaleti veya bölgeyi seçin";
 "set_snooze_time" = "Erteleme süresini ayarlayın";
@@ -514,7 +522,6 @@
 "stepCounter" = "Adım %d / %d";
 "support" = "Destek";
 "support_content" = "Yardım konuları bölümünde belirtilmemiş hususlarda destek  için";
-"Support_VOLabel" = "Destek. Yardım konuları bölümünde belirtilmemiş hususlarda destek için";
 "tasmania" = "Tazmanya";
 /* Example: "From 22 to 28 January 2021" */
 "to" = "";
@@ -524,17 +531,16 @@
 "total_per_state" = "Eyalet ve bölgelere göre toplam doğrulanmış vakalar";
 "twenty_eight_days" = "28 gün";
 "type_in_time" = "Zamanı yazın";
-"UILaunchStoryboardName" = "";
+/* Figma page Android Screens (05/06) */
+"under-sixteen_consent_call_for_action" = "Onay vermek için 'Kabul ediyorum'u, ebeveyn ya da veli onayını teyit edemiyorsanız 'Kabul etmiyorum'u seçiniz.";
 "under_investigation" = "";
-"under_sixteen_content" = "Ebeveynimin ya da vasimin aşağıdaki bilgileri toplayan Dijital Dönüşüm Ajansı'na veri deposu yöneticisi olarak Avustralya Hükümeti Sağlık Bakanının yasal olarak belirlediğine uygun olarak rızası olduğunu onaylıyorum:";
-"under_sixteen_first_paragraph" = "Kayıt bilgilerim.";
+"under_sixteen_content" = "Ebeveynimin ya da velimin, Sağlık Bakanlığı'nın 1988 tarihli Gizlilik Yasası uyarınca veri deposu yöneticisi olarak aşağıdaki bilgileri toplamasına rızası olduğunu onaylıyorum:";
+"under_sixteen_first_paragraph" = "kayıt bilgileri,";
 /* OnBoarding Under Sixteen */
 "under_sixteen_headline" = "Devam etmek için ebeveyninizin/vasinizin rızası gereklidir";
 /* Figma page Android Screens (05/06) */
-"under_sixteen_registration_consent_first_paragraph" = "Kayıt bilgilerim.";
-"under_sixteen_second_paragraph" = "Başka bir kullanıcının COVID-19 testi pozitif çıkması ve temas verilerini sisteme yüklemesi halinde diğer COVIDSafe kullanıcıları ile paylaşılacak şahsıma ait temas bilgileri.";
-/* Figma page Android Screens (05/06) */
-"under-sixteen_consent_call_for_action" = "Rızanızı onaylamak için 'Kabul ediyorum'u seçiniz. ";
+"under_sixteen_registration_consent_first_paragraph" = "kayıt bilgileri,";
+"under_sixteen_second_paragraph" = "temaslı olduğum başka bir kullanıcının COVID-19 testinin pozitif çıkması ve temas verilerini sisteme yüklemesi halinde diğer COVIDSafe kullanıcıları ile paylaşılacak şahsıma ait temas bilgileri, ve";
 "update_available_app_store_btn" = "App Store'a git";
 "update_available_dismiss_btn" = "Daha sonra hatırlat";
 "update_available_message_ios" = "COVIDSafe'de iyileştirmeler yapmaktayız. App Store üzerinden güncelleme yapın.";
@@ -572,38 +578,16 @@
 "Done" = "Bitti";
 /* Feedback */
 "EmailPlaceholder" = "E-posta adresinizi giriniz (gerekli)";
+"EnterPINSent" = "%@ adresine gönderilen PIN'i girin";
 /* Phone number and PIN */
 "EnterPhoneReVerify" = "Yeniden doğrulamak için cep telefonu numaranızı giriniz";
-"EnterPINSent" = "%@ adresine gönderilen PIN'i girin";
-/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_message" = "Merhaba dostum, nasıl devam etmek istersin?";
-/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_title" = "Geri Bildirim Kutusu";
-/* Title for button that launches new feedback flow. */
-"entryPrompt_newFeedback_button_title" = "Yeni Geri Bildirim";
 "FoundIssueWithApp" = "COVIDSafe uygulamasında bir sorun mu buldunuz?";
-/* *** Feedback localised strings *** */
-"global_cancel_button_title" = "İptal";
-"global_send_button_title" = "Gönder";
-"global_sending_indication_title" = "Gönderiliyor";
-"global_success_indication_title" = "Başarılı";
 /* upload */
 "InformationUploaded" = "Bilgileriniz sisteme %@ tarihinde yüklendi.";
 "InvalidOTP" = "6 basamaklı bir kod olmalı";
 "IssueDescPlaceholder" = "Lütfen sorunu açıklayın";
 "IssueFooter" = "Geri bildiriminiz hakkında daha fazla bilgi için sizinle iletişime geçebiliriz. E-posta adresiniz başka hiçbir amaçla kullanılmayacaktır.";
 "IssueThankYou" = "Teşekkür ederiz! Geri bildiriminizi alınmıştır.";
-/* Delete screenshot action sheet action button title. */
-"newFeedback_deleteScreenshot_actionTitle" = "Ekran Görüntüsünü Sil";
-/* Messsage shown to user asking to confirm screenshot deletion. */
-"newFeedback_deleteScreenshotConfirmation_message" = "Bu ekran görüntüsü kalıcı olarak silinecektir.";
-"newFeedback_invalidEmail_errorMessage" = "Lütfen geçerli bir e-posta adresi girin!";
-/* Error message displayed to users when feedback has empty description */
-"newFeedback_noMessage_errorMessage" = "Göndermeden önce bize bir yorumda bulunun.";
-/* Error message displayed to users when feedback fails to send. */
-"newFeedback_send_errorMessage" = "Geri Bildirim Gönderme Hatası";
-/* Navigation Bar title shown during new feedback flow. */
-"newFeedbackFlow_navigationTitle" = "Sorun bildir";
 "Next" = "Sonraki";
 /* registration succcess */
 "OS2b_Item1" = "1. Evden çıkarken telefonunuzu yanınıza alın ve COVIDSafe'in aktif olduğundan emin olun.";
@@ -611,6 +595,7 @@
 "OS2b_Item2_VOLabel" = "2. Bluetooth AÇIK tutulmalıdır.";
 "OS2b_Item3" = "3. COVIDSafe eşleştirme istekleri göndermez. Daha fazla bilgi edinin.";
 "OS2b_Item3Underline" = "Daha fazla bilgi edinin";
+"PINWillExpire" = "PIN'inizin dolma süresi %@ ";
 /* home */
 "PairingRequestsInfo" = "COVIDSafe eşleştirme istekleri göndermez.";
 "PairingRequestsInfoUnderline" = "eşleştirme istekleri";
@@ -618,7 +603,6 @@
 "PhoneNumberFormatErrorTitle" = "Yanlış sayı formatı";
 "PhoneVerificationErrorMessage" = "Lütfen bilgilerinizi kontrol edip tekrar deneyiniz.";
 "PhoneVerificationErrorTitle" = "Telefon numarasını doğrulama hatası";
-"PINWillExpire" = "PIN'inizin dolma süresi %@ ";
 "ReceivePinIssue" = "PIN alma sorunu mu yaşıyorsunuz?";
 /* help */
 "ReportAnIssue" = "Sorun bildir";
@@ -627,13 +611,35 @@
 "UploadFailed" = "Sisteme yükleme başarısız. Lütfen daha sonra tekrar deneyiniz.";
 "UploadFailedErrorMessage" = "Lütfen daha sonra tekrar deneyiniz.";
 "ValidationError" = "Doğrulama hatası";
+/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_message" = "Merhaba dostum, nasıl devam etmek istersin?";
+/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_title" = "Geri Bildirim Kutusu";
+/* Title for button that launches new feedback flow. */
+"entryPrompt_newFeedback_button_title" = "Yeni Geri Bildirim";
+/* *** Feedback localised strings *** */
+"global_cancel_button_title" = "İptal";
+"global_send_button_title" = "Gönder";
+"global_sending_indication_title" = "Gönderiliyor";
+"global_success_indication_title" = "Başarılı";
+/* Navigation Bar title shown during new feedback flow. */
+"newFeedbackFlow_navigationTitle" = "Sorun bildir";
+/* Messsage shown to user asking to confirm screenshot deletion. */
+"newFeedback_deleteScreenshotConfirmation_message" = "Bu ekran görüntüsü kalıcı olarak silinecektir.";
+/* Delete screenshot action sheet action button title. */
+"newFeedback_deleteScreenshot_actionTitle" = "Ekran Görüntüsünü Sil";
+"newFeedback_invalidEmail_errorMessage" = "Lütfen geçerli bir e-posta adresi girin!";
+/* Error message displayed to users when feedback has empty description */
+"newFeedback_noMessage_errorMessage" = "Göndermeden önce bize bir yorumda bulunun.";
+/* Error message displayed to users when feedback fails to send. */
+"newFeedback_send_errorMessage" = "Geri Bildirim Gönderme Hatası";
 "GetCoronaVirusApp_VOLabel" = "Coronavirus uygulamasını  edinin. En son haberler ve tavsiyeler için hükümet uygulamasını indirin.";
 "HelpTopics_VOLabel" = "Yardım konuları. Teknik sorunların nasıl giderileceği ve düzeltileceği konusunda yol gösterme";
 "LatestNews_VOLabel" = "En son haberler ve güncellemeler. En son Coronavirus haberleri için aus.gov.au'ya gidiniz.";
 "NotificationsDisabled_VOLabel" = "Bildirimler devre dışı bırakıldı. COVIDSafe aktif olmadığında bildirim almayacaksınız. \nBildirim ayarlarını değiştirin";
 "NotificationsEnabled_VOLabel" = "Bildirimler etkinleştirildi. COVIDSafe aktif olmadığı durumda bildirim alacaksınız. \nBildirim ayarlarını değiştirin";
 "OS1b_TopParagraph_VOLabel" = "Bluetooth sinyalleri başka bir COVIDSafe kullanıcısının yakınınızda olduğunuzu belirlemek için kullanılır. \nSizinle diğer COVIDSafe kullanıcıları arasındaki her yakın temas, yakın temas bilgileri oluşturmak için not edilir. Bu bilgiler şifrelenir ve yalnızca telefonunuzda saklanır. \nCOVIDSafe kullanıcısı olarak COVID-19 testinizin pozitif çıkması durumunda eyalet veya bölge sağlık yetkilisi sizinle iletişime geçecektir. Yakın iletişim bilgilerinizin son derece güvenli bir bilgi depolama sistemine gönüllü olarak yüklemenize yardımcı olacaklardır. \nEyalet veya bölge sağlık yetkilileri testi pozitif çıkan başka bir COVIDSafe kullanıcısıyla yakın temas kurdugunuz durumda  yine sizinle iletişime geçebilir. \nDaha fazla bilgi için lütfen Yardım Konuları sayfasına bakınız.";
-"permission_content_iOS_2_VOLabel" = "1. Bluetooth\n2. Bildirimler \n3. Konum Hizmetleri";
-"permission_content_iOS_VOLabel" = "COVIDSafe‘in çalışması için Bluetooth‘un etkinleştirilmesi gerekir. COVIDSafe, eşleştirme istekleri göndermez. \n\nBildirimleri etkinleştirerek, COVIDSafe etkin olmadığında  hatırlatmak amaçlı güncellemeler alırsınız. \n\nİPhone‘unuzun COVIDSafe‘in çalışması için Konum iznine ihtiyacı vardır. *COVIDSafe konum verilerinizi İZLEMEZ veya SAKLAMAZ* \n\nEtkinleştirmek için ‘Devam Et‘i seçin:";
 "ShareCovidSafe_VOLabel" = "COVIDSafe'i paylaşın. Başkalarını yardıma davet edin. Birlikte daha da güçlüyüz.";
 "UploadData_VOLabel" = "Bir sağlık yetkilisi sizinle iletişime geçti mi? Bilgilerinizi yalnızca testiniz pozitifse sisteme yükleyebilirsiniz.";
+"permission_content_iOS_2_VOLabel" = "1. Bluetooth\n2. Bildirimler \n3. Konum Hizmetleri";
+"permission_content_iOS_VOLabel" = "COVIDSafe‘in çalışması için Bluetooth‘un etkinleştirilmesi gerekir. COVIDSafe, eşleştirme istekleri göndermez. \n\nBildirimleri etkinleştirerek, COVIDSafe etkin olmadığında  hatırlatmak amaçlı güncellemeler alırsınız. \n\nİPhone‘unuzun COVIDSafe‘in çalışması için Konum iznine ihtiyacı vardır. *COVIDSafe konum verilerinizi İZLEMEZ veya SAKLAMAZ* \n\nEtkinleştirmek için ‘Devam Et‘i seçin:";
\ No newline at end of file
diff --git a/CovidSafe/vi.lproj/Localizable.strings b/CovidSafe/vi.lproj/Localizable.strings
index 7252507..c165828 100644
--- a/CovidSafe/vi.lproj/Localizable.strings
+++ b/CovidSafe/vi.lproj/Localizable.strings
@@ -1,3 +1,38 @@
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothOFF" = "Truy cập Bluetooth®: TẮT";
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothON" = "Truy cập Bluetooth®: BẬT";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF" = "Bluetooth®: TẮT";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF_content" = "Bật Bluetooth® trên điện thoại của bạn. Chọn ‘Cho phép Kết nối mới’ nếu có hiển thị.";
+/* Figma page iOS Screens (05/06) */
+"BluetoothON" = "Bluetooth®: BẬT";
+/* Figma page Android Screens (05/06) */
+"Enter_your_mobile_number_label" = "Nhập số điện thoại di động của bạn";
+/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
+"IntroLabel" = "Giúp ngăn chặn sự lây lan\nvà cứu mạng sống.";
+/* Figma page iOS Screens (05/06) */
+"NotificationsBlurbLink" = "Thay đổi cài đặt thông báo";
+/* Figma page iOS Screens (05/06) */
+"NotificationsDisabledBlurb" = "Bạn sẽ không nhận được thông báo nếu COVIDSafe không hoạt động. \nThay đổi cài đặt thông báo";
+/* Figma page iOS Screens (05/06) */
+"NotificationsEnabledBlurb" = "Bạn sẽ nhận được thông báo nếu COVIDSafe không hoạt động. \nThay đổi cài đặt thông báo";
+"OS2b_Item_4" = "4. iPhone của bạn yêu cầu quyền truy cập Vị trí để COVIDSafe hoạt động. * COVIDSafe KHÔNG thu thập, lưu trữ hoặc sử dụng dữ liệu vị trí của bạn*";
+"PINNumber_VO_Label" = "Mã số PIN";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusBody" = "Bật Bluetooth® để đảm bảo COVIDsafe hoạt động trước khi bạn rời khỏi nhà và khi ở những nơi công cộng.";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusTitle" = "COVIDSafe không hoạt động";
+"PN_MobileNumber_VOLabel" = "Số điện thoại di động";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderBody" = "Mở COVIDSafe để đảm bảo ứng dụng đang hoạt động";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderTitle" = "Không phát hiện có tiếp xúc trong 48 giờ";
+"PostcodeValidationErrorMessage" = "Vui lòng nhập mã bưu điện Úc hợp lệ.";
+/* Figma page Android Screens (05/06) */
+"Select_country_or_region_headline" = "Chọn quốc gia hoặc khu vực";
+"Support_VOLabel" = "Hỗ trợ. Để được trợ giúp về các vấn đề không có trong chủ đề Trợ giúp";
 "action_continue" = "Tiếp tục";
 "action_report_an_issue" = "Báo cáo sự cố";
 "action_upload_done" = "Hoàn tất";
@@ -11,20 +46,10 @@
 "activity_intro_2" = "";
 /* Figma page iOS Screens (05/06) */
 "allow_bluetooth_call" = "Cho phép COVIDSafe truy cập vào Bluetooth®";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothOFF" = "Truy cập Bluetooth®: TẮT";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothON" = "Truy cập Bluetooth®: BẬT";
 "app_activity_bluetooth_handshakes_heading" = "";
 "australian_capital_territory" = "Lãnh thổ Thủ đô Úc";
 "ble_handshakes_yesterday" = "";
 "bluetooth_handshakes" = "Bắt tay Bluetooth";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF" = "Bluetooth®: TẮT";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF_content" = "Bật Bluetooth® trên điện thoại của bạn. Chọn ‘Cho phép Kết nối mới’ nếu có hiển thị.";
-/* Figma page iOS Screens (05/06) */
-"BluetoothON" = "Bluetooth®: BẬT";
 "cancel_snooze" = "Hủy tạm ngưng hoạt động";
 "cases_28_days" = "Các ca nhiễm mới trong 28 ngày qua";
 "cases_7_days" = "Các ca nhiễm mới trong 7 ngày qua";
@@ -250,8 +275,9 @@
 "country_region_name_zw" = "Zimbabwe";
 "customise_days" = "Tùy chỉnh ngày";
 "data_privacy_button" = "Tiếp theo";
-"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\n COVIDSafe sẽ chỉ thu thập, sử dụng hoặc tiết lộ thông tin cá nhân của bạn theo chính sách này và Đạo luật Bảo mật 1988. \n\n Nế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\n Việc sử 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 kỳ lúc nào. Nếu bạn xóa COVIDSafe, *bạn cũng có thể yêu cầu thông tin của mình* được xóa khỏi máy chủ an toàn. \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\n Thông tin bạn gửi khi đăng ký và thông tin về việc bạn sử dụng COVIDSafe được lưu trữ trên một máy chủ có độ bảo mật cao. \n\n Thông tin cũng được thu thập để đảm bảo rằng COVIDSafe đang hoạt động bình thường trên thiết bị của bạn. Điều này bao gồm hệ điều hành, phiên bản Ứng dụng đã cài đặt, ngôn ngữ cài đặt trên thiết bị, Bluetooth® có hoạt động hay không và nếu Ứng dụng của bạn đã ghi lại bất kỳ cuộc gặp gỡ nào trong bảy ngày trước đó. \n\n COVIDSafe sẽ không thu thập thông tin vị trí của bạn. \n\n COVIDSafe sẽ ghi chú ngày và giờ liên hệ, 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 những người dùng khác trên thiết bị của bạn. \n\n Những người dùng COVIDSafe khác mà bạn tiếp xúc sẽ ghi lại mã ID ẩn danh, ngày và giờ liên hệ với bạn, 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\n Nếu một người dùng khác có kết quả dương tính với COVID-19, họ có thể tải lên thông tin liên hệ của mình và nhân viên y tế của tiểu bang hoặc vùng lãnh thổ có thể liên hệ với bạn nhằm mục đích truy vết. \n\n Các chi tiết đăng ký của bạn sẽ chỉ được sử dụng hoặc tiết lộ để ttruy vết và để COVIDSafe hoạt động đúng cách và hợp pháp. \n\n Thông tin thêm có tại trang mạng *covidsafe.gov.au*. \n\n Xem *chính sách bảo mật* COVIDSafe để biết thêm chi tiết về quyền của bạn đối với thông tin của mình và cách nó sẽ được xử lý và chia sẻ như thế nào.";
-"data_privacy_content_VO" = "Đ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\n COVIDSafe sẽ chỉ thu thập, sử dụng hoặc tiết lộ thông tin cá nhân của bạn theo chính sách này và Đạo luật Bảo mật 1988. \n\n Nế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\n Việc sử 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 kỳ 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ủ an toàn. \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\n Thông tin bạn gửi khi đăng ký và thông tin về việc bạn sử dụng COVIDSafe được lưu trữ trên một máy chủ có độ bảo mật cao. \n\n Thông tin cũng được thu thập để đảm bảo rằng COVIDSafe đang hoạt động bình thường trên thiết bị của bạn. Điều này bao gồm hệ điều hành, phiên bản Ứng dụng đã cài đặt, ngôn ngữ được cài đặt thiết bị, Bluetooth có hoạt động hay không và liệu Ứng dụng của bạn có ghi lại bất kỳ cuộc gặp gỡ nào trong bảy ngày trước đó hay không. \n\n COVIDSafe sẽ không thu thập thông tin vị trí của bạn. \n\n COVIDSafe sẽ ghi chú ngày và giờ liên hệ, 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 những người dùng khác trên thiết bị của bạn. \n\n Những người dùng COVIDSafe khác mà bạn tiếp xúc sẽ ghi lại mã ID ẩn danh, ngày và giờ liên hệ với bạn, 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\n Nếu một người dùng khác có kết quả dương tính với COVID-19, họ có thể đăng tải thông tin tiếp xúc của mình và nhân viên y tế của tiểu bang hoặc vùng lãnh thổ có thể liên hệ với bạn nhằm mục đích truy vết. \n\n Các chi tiết đăng ký của bạn sẽ chỉ được sử dụng hoặc tiết lộ để ttruy vết và để COVIDSafe hoạt động đúng cách và hợp pháp. \n\nTìm hiểu thêm thông tin tại trang mạng covidsafe.gov.au. \n\n Xem chính sách bảo mật của COVIDSafe để biết thêm chi tiết về các quyền của bạn đối với thông tin của mình và cách nó sẽ được xử lý và chia sẻ như thế nào.";
+"data_privacy_content" = "Điều quan trọng là bạn phải đọc chính sách về quyền riêng tư của COVIDSafe trước khi đăng ký COVIDSafe. COVIDSafe sẽ chỉ thu thập, sử dụng hoặc tiết lộ thông tin cá nhân của bạn theo chính sách này và Đạo luật về Quyền riêng tư năm 1988.\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 về quyền riêng tư.\n\nViệc sử 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 kỳ 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ếu bạn không cung cấp thông tin cá nhân của mình, ứng dụng COVIDSafe không thể hoạt động như dự kiến.\n\nĐể đăng ký COVIDSafe, bạn sẽ cần nhập tên (hoặc biệt hiệu), số điện thoại di động, độ tuổi và mã bưu chính.\n\nThông tin bạn gửi khi đăng ký và thông tin về việc bạn sử dụng COVIDSafe được lưu trữ trên một máy chủ có độ bảo mật cao.\n\nThông tin cũng được thu thập để đảm bảo rằng COVIDSafe đang hoạt động bình thường trên thiết bị của bạn. Điều này bao gồm hệ điều hành của bạn, phiên bản ứng dụng bạn đã cài đặt, ngôn ngữ mà thiết bị của bạn được đặt, Bluetooth có hoạt động hay không và liệu ứng dụng có ghi lại bất kỳ cuộc gặp gỡ nào trong bảy ngày trước đó hay không.\n\nCOVIDSafe sẽ không thu thập thông tin vị trí của bạn.\n\nCOVIDSafe sẽ ghi chú ngày và giờ tiếp xúc, mã ID được mã hóa 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à model điện thoại của những 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 sẽ ghi chú mã ID được mã hóa của bạn, ngày và giờ tiếp xúc với bạn, cường độ tín hiệu Bluetooth và model điện thoại của bạn trên thiết bị của họ.\n\nNếu một người dùng khác có kết quả xét nghiệm dương tính với COVID-19, họ có thể tải lên thông tin tiếp xúc của mình và quan chức y tế của tiểu bang hoặc vùng lãnh thổ có thể liên hệ với bạn cho mục đích truy vết 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ộ để truy vết tiếp xúc và cho hoạt động thích hợp và hợp pháp của COVIDSafe.\n\nBạn có thể tìm hiểu thêm thông tin tại trang web covidsafe.gov.au.\n\nChính sách về quyền riêng tư của COVIDSafe cung cấp thêm chi tiết về quyền của bạn đối với thông tin của bạn và cách thông tin sẽ được xử lý và chia sẻ.\n\nBạn có thể tìm hiểu chi tiết liên hệ liên quan đến các thắc mắc và khiếu nại về quyền riêng tư của COVIDSafe trong chính sách về quyền riêng tư dưới phần Liên hệ với chúng tôi.";
+"data_privacy_content_VO" = "Điều quan trọng là bạn phải đọc chính sách về quyền riêng tư của COVIDSafe trước khi đăng ký COVIDSafe. COVIDSafe sẽ chỉ thu thập, sử dụng hoặc tiết lộ thông tin cá nhân của bạn theo chính sách này và Đạo luật về Quyền riêng tư năm 1988.\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 về quyền riêng tư.\n\nViệc sử 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 kỳ 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ếu bạn không cung cấp thông tin cá nhân của mình, ứng dụng COVIDSafe không thể hoạt động như dự kiến.\n\nĐể đăng ký COVIDSafe, bạn sẽ cần nhập tên (hoặc biệt hiệu), số điện thoại di động, độ tuổi và mã bưu chính.\n\nThông tin bạn gửi khi đăng ký và thông tin về việc bạn sử dụng COVIDSafe được lưu trữ trên một máy chủ có độ bảo mật cao.\n\nThông tin cũng được thu thập để đảm bảo rằng COVIDSafe đang hoạt động bình thường trên thiết bị của bạn. Điều này bao gồm hệ điều hành của bạn, phiên bản ứng dụng bạn đã cài đặt, ngôn ngữ mà thiết bị của bạn được đặt, Bluetooth có hoạt động hay không và liệu ứng dụng có ghi lại bất kỳ cuộc gặp gỡ nào trong bảy ngày trước đó hay không.\n\nCOVIDSafe sẽ không thu thập thông tin vị trí của bạn.\n\nCOVIDSafe sẽ ghi chú ngày và giờ tiếp xúc, mã ID được mã hóa 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à model điện thoại của những 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 sẽ ghi chú mã ID được mã hóa của bạn, ngày và giờ tiếp xúc với bạn, cường độ tín hiệu Bluetooth và model điện thoại của bạn trên thiết bị của họ.\n\nNếu một người dùng khác có kết quả xét nghiệm dương tính với COVID-19, họ có thể tải lên thông tin tiếp xúc của mình và quan chức y tế của tiểu bang hoặc vùng lãnh thổ có thể liên hệ với bạn cho mục đích truy vết 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ộ để truy vết tiếp xúc và cho hoạt động thích hợp và hợp pháp của COVIDSafe.\n\nBạn có thể tìm hiểu thêm thông tin tại trang web covidsafe.gov.au.\n\nChính sách về quyền riêng tư của COVIDSafe cung cấp thêm chi tiết về quyền của bạn đối với thông tin của bạn và cách thông tin sẽ được xử lý và chia sẻ.\n\nBạn có thể tìm hiểu chi tiết liên hệ liên quan đến các thắc mắc và khiếu nại về quyền riêng tư của COVIDSafe trong chính sách về quyền riêng tư dưới phần Liên hệ với chúng tôi.";
+"data_privacy_content_android" = "Điều quan trọng là bạn phải đọc *chính sách về quyền riêng tư* của COVIDSafe trước khi đăng ký COVIDSafe. COVIDSafe sẽ chỉ thu thập, sử dụng hoặc tiết lộ thông tin cá nhân của bạn theo chính sách này và <i>Đạo luật về Quyền riêng tư năm 1988</i>.\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 về quyền riêng tư*.\n\nViệc sử 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 kỳ 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 hiệu), số điện thoại di động, độ tuổi và mã bưu chính. Nếu bạn không cung cấp thông tin cá nhân của mình, ứng dụng COVIDSafe không thể hoạt động như dự kiến.\n\nThông tin bạn gửi khi đăng ký và thông tin về việc bạn sử dụng COVIDSafe được lưu trữ trên một máy chủ có độ bảo mật cao.\n\nThông tin cũng được thu thập để đảm bảo rằng COVIDSafe đang hoạt động bình thường trên thiết bị của bạn. Điều này bao gồm hệ điều hành của bạn, phiên bản ứng dụng bạn đã cài đặt, ngôn ngữ mà thiết bị của bạn được đặt, Bluetooth® có hoạt động hay không và liệu ứng dụng có ghi lại bất kỳ cuộc gặp gỡ nào trong bảy ngày trước đó hay không.\n\nTrên các thiết bị Android, điều đó cũng bao gồm thông tin về việc liệu tính năng tối ưu hóa pin có bị tắt và dịch vụ dựa trên vị trí có được bật hay không.\n\nCOVIDSafe sẽ không thu thập thông tin vị trí của bạn.\n\nCOVIDSafe sẽ ghi chú ngày và giờ tiếp xúc, mã ID được mã hóa 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à model điện thoại của những 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 sẽ ghi chú mã ID được mã hóa của bạn, ngày và giờ tiếp xúc với bạn, cường độ tín hiệu Bluetooth và model điện thoại của bạn trên thiết bị của họ.\n\nNếu một người dùng khác có kết quả xét nghiệm dương tính với COVID-19, họ có thể tải lên thông tin tiếp xúc của mình và quan chức y tế của tiểu bang hoặc vùng lãnh thổ có thể liên hệ với bạn cho mục đích truy vết 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ộ để truy vết tiếp xúc và cho hoạt động thích hợp và hợp pháp của COVIDSafe.\n\nBạn có thể tìm hiểu thêm thông tin tại trang web *covidsafe.gov.au*.\n\n*Chính sách về quyền riêng tư* của COVIDSafe cung cấp thêm chi tiết về quyền của bạn đối với thông tin của bạn và cách thông tin sẽ được xử lý và chia sẻ.\n\nBạn có thể tìm hiểu chi tiết liên hệ liên quan đến các thắc mắc và khiếu nại về quyền riêng tư của COVIDSafe trong chính sách về quyền riêng tư dưới phần *Liên hệ với chúng tôi*.";
 /* OnBoarding Data Privacy */
 "data_privacy_headline" = "Đăng ký và bảo mật";
 "deaths" = "Tử vong";
@@ -272,8 +298,6 @@
 "enter_pin_resend_pin" = "Gửi lại mã PIN";
 "enter_pin_timer_expire" = "Mã PIN của bạn sẽ hết hạn trong";
 "enter_pin_wrong_number" = "Số điện thoại này có sai không?";
-/* Figma page Android Screens (05/06) */
-"Enter_your_mobile_number_label" = "Nhập số điện thoại di động của bạn";
 "every_day" = "Hằng ngày";
 "factors_dotpoint1" = "số lượng người dùng COVIDSafe trong phạm vi";
 "factors_dotpoint2" = "kiểu thiết bị và độ tuổi";
@@ -289,10 +313,10 @@
 /* Error message for when a user tries to signup outside of Australia. */
 "geoblock_error_message" = "";
 "geoblock_rego_error" = "";
+"global_OK" = "Đồng ý";
 "global_back" = "Trở lại";
 "global_close" = "Đóng";
 "global_double_tap" = "nhấn đúp để chỉnh sửa";
-"global_OK" = "Đồng ý";
 "hide" = "Ẩn";
 "home_app_permission_status_subtitle" = "COVIDSafe sẽ không hoạt động nếu không có cài đặt phù hợp.";
 "home_app_permission_status_title" = "Kiểm tra cài đặt của bạn";
@@ -302,9 +326,12 @@
 /* Home */
 "home_header_active_title" = "COVIDSafe đang hoạt động.";
 /* Home */
+"home_header_active_title" = "COVIDSafe đang hoạt động.";
+/* Home */
 "home_header_active_title_thanks" = "Cảm ơn, COVIDSafe hiện đang hoạt động.";
 "home_header_inactive_check_your_permissions" = "Kiểm tra cài đặt của bạn.";
 "home_header_inactive_title" = "COVIDSafe không hoạt động";
+"home_header_inactive_title" = "COVIDSafe không hoạt động";
 "home_header_uploaded_on_date_ios" = "Thông tin của bạn đã được đăng tải lên %@ .";
 "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.";
 "home_set_complete_external_link_app_title" = "Tải ứng dụng Coronavirus";
@@ -352,8 +379,6 @@
 "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 những người dùng ứng dụng COVIDSafe 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.";
 /* OnBoarding Intro */
 "intro_headline" = "Cùng nhau, chúng ta có thể ngăn chặn sự lây lan của COVID-19";
-/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
-"IntroLabel" = "Giúp ngăn chặn sự lây lan\nvà cứu mạng sống.";
 "invalid_australian_phone_number_error_prompt" = "Số điện thoại di động ở Úc chứa tối đa 10 chữ số.";
 "invalid_norfolk_island_phone_number_error_prompt" = "Số điện thoại di động ở Đảo Norfolk chứa từ 5 đến 6 chữ số.";
 "is_snoozed" = "COVIDSafe đang tạm ngưng hoạt động";
@@ -389,26 +414,22 @@
 "no_handshakes_item3" = "Khởi động lại điện thoại của bạn và mở lại ứng dụng.";
 "no_handshakes_item4" = "";
 "no_handshakes_link" = "Đọc thêm về cách kiểm tra xem COVIDSafe có hoạt động đúng cách không";
+"non_consent_button" = "Tôi không đồng ý";
+"non_consent_popup" = "Bạn không thể tiếp tục quy trình đăng ký mà không có sự chấp thuận của cha mẹ hoặc người giám hộ.\n\nVui lòng thoát và xóa ứng dụng.";
 /* Figma page Android Screens (05/06) */
 "norfolk_hint" = "Ví dụ: 51234";
 "northern_territory" = "Lãnh thổ Phía bắc";
 "notification_bluetooth" = "Bật Bluetooth để COVIDSafe hoạt động";
 "notification_internet_content" = "Mở ứng dụng và kiểm tra kết nối internet của bạn để COVIDSafe hoạt động.";
+"notification_internet_content" = "Mở ứng dụng và kiểm tra kết nối internet của bạn.";
 "notification_not_active_title" = "COVIDSafe không hoạt động";
 "notification_settings" = "Mở ứng dụng để kiểm tra cài đặt của bạn.";
 "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.";
 "notification_update_heading" = "Cập nhật COVIDSafe có sẵn";
-/* Figma page iOS Screens (05/06) */
-"NotificationsBlurbLink" = "Thay đổi cài đặt thông báo";
-/* Figma page iOS Screens (05/06) */
-"NotificationsDisabledBlurb" = "Bạn sẽ không nhận được thông báo nếu COVIDSafe không hoạt động. \nThay đổi cài đặt thông báo";
-/* Figma page iOS Screens (05/06) */
-"NotificationsEnabledBlurb" = "Bạn sẽ nhận được thông báo nếu COVIDSafe không hoạt động. \nThay đổi cài đặt thông báo";
 "numbers_error" = "Không thể kiểm tra các số đã cập nhật.";
 "numbers_no_internet" = "Kết nối với internet để đảm bảo bạn nhận được các số cập nhật.";
 "numbers_refresh" = "Làm mới ngay";
 "options_for_australia" = "Tùy chọn cho Úc";
-"OS2b_Item_4" = "4. iPhone của bạn yêu cầu quyền truy cập Vị trí để COVIDSafe hoạt động. * COVIDSafe KHÔNG thu thập, lưu trữ hoặc sử dụng dữ liệu vị trí của bạn*";
 "overseas_acquired" = "%@ ca nhiễm bệnh từ nước ngoài";
 "permission_button" = "Kích hoạt";
 /* Figma page iOS Screens (05/06) */
@@ -432,30 +453,19 @@
 "personal_details_name_title" = "Tên đầy đủ (hoặc biệt danh)";
 "personal_details_post_code" = "Mã bưu điện ở Úc";
 "personal_details_post_code_error_prompt" = "Số mã bưu điện Úc phải gồm 4 chữ số.";
-"PINNumber_VO_Label" = "Mã số PIN";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusBody" = "Bật Bluetooth® để đảm bảo COVIDsafe hoạt động trước khi bạn rời khỏi nhà và khi ở những nơi công cộng.";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusTitle" = "COVIDSafe không hoạt động";
-"PN_MobileNumber_VOLabel" = "Số điện thoại di động";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderBody" = "Mở COVIDSafe để đảm bảo ứng dụng đang hoạt động";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderTitle" = "Không phát hiện có tiếp xúc trong 48 giờ";
 "postcode_api_error" = "Có lỗi. Kiểm tra kết nối internet của bạn và thử lại.";
 "postcode_change_label" = "Mã bưu điện hiện tại ở Úc";
 "postcode_success" = "Mã bưu điện của bạn đã được cập nhật";
-"PostcodeValidationErrorMessage" = "Vui lòng nhập mã bưu điện Úc hợp lệ.";
 "privacy_policy" = "";
 "privacy_policy_description" = "";
 "queensland" = "Queensland";
 "recovered" = "Tổng số ca phục hồi";
-"registration_consent_content" = "Tôi đồng ý cho Cơ quan Chuyển đổi Kỹ thuật số với tư cách là nhà quản trị kho dữ liệu, theo quyết định pháp lý của Bộ trưởng Bộ Y tế Chính phủ Úc thu thập:";
-"registration_consent_diagnostic" = "Thông tin để đảm bảo rằng COVIDSafe đang hoạt động bình thường trên thiết bị của tôi.";
-"registration_consent_first_paragraph" = "Thông tin đăng ký của tôi.";
+"registration_consent_content" = "Tôi đồng ý cho Bộ Y Tế với tư cách là nhà quản trị lưu trữ dữ liệu, theo Đạo luật về Quyền riêng tư năm 1988, được thu thập:";
+"registration_consent_diagnostic" = "thông tin của tôi để đảm bảo rằng COVIDSafe đang hoạt động bình thường trên thiết bị của tôi.";
+"registration_consent_first_paragraph" = "thông tin đăng ký của tôi,";
 /* Onboarding Registration Consent */
 "registration_consent_headline" = "Đồng ý đăng ký";
-"registration_consent_second_paragraph" = "Thông tin về việc tiếp xúc của tôi với những người dùng COVIDSafe khác, nếu một người dùng COVIDSafe khác mà tôi đã tiếp xúc xét nghiệm dương tính với COVID-19 và đăng tải dữ liệu tiếp xúc của họ.";
+"registration_consent_second_paragraph" = "thông tin về việc tiếp xúc của tôi với những người dùng COVIDSafe khác, nếu một người dùng COVIDSafe khác mà tôi đã tiếp xúc xét nghiệm dương tính với COVID-19 và tải lên dữ liệu tiếp xúc của họ và";
 "restrictions_accommodation" = "Chỗ lưu trú";
 "restrictions_activity" = "Hoạt động";
 "restrictions_cafes" = "Quán cà phê và Nhà hàng";
@@ -481,8 +491,6 @@
 "scheduled" = "Bạn đã lên lịch trình cho COVIDSafe tạm ngưng hoạt động từ %@ đến %@ .";
 /* OnBoarding Enter Number */
 "select_country_or_region" = "Chọn quốc gia hoặc khu vực";
-/* Figma page Android Screens (05/06) */
-"Select_country_or_region_headline" = "Chọn quốc gia hoặc khu vực";
 "select_state_territory_button" = "Chọn tiểu bang hoặc lãnh thổ";
 "select_state_territory_heading" = "Chọn tiểu bang hoặc lãnh thổ";
 "set_snooze_time" = "Đặt thời gian tạm ngưng hoạt động";
@@ -514,7 +522,6 @@
 "stepCounter" = "Bước %d của %d";
 "support" = "Hỗ trợ";
 "support_content" = "Để được trợ giúp về các vấn đề không có trong chủ đề Trợ giúp";
-"Support_VOLabel" = "Hỗ trợ. Để được trợ giúp về các vấn đề không có trong chủ đề Trợ giúp";
 "tasmania" = "Tasmania";
 /* Example: "From 22 to 28 January 2021" */
 "to" = "";
@@ -524,17 +531,16 @@
 "total_per_state" = "Tổng số ca nhiễm theo tiểu bang và lãnh thổ";
 "twenty_eight_days" = "28 ngày";
 "type_in_time" = "Nhập thời gian";
-"UILaunchStoryboardName" = "LaunchScreen_vi";
+/* Figma page Android Screens (05/06) */
+"under-sixteen_consent_call_for_action" = "Chọn \"Tôi đồng ý\" để xác nhận sự chấp thuận hoặc \"Tôi không đồng ý\" nếu bạn không thể xác nhận sự chấp thuận của cha mẹ hoặc người giám hộ. ";
 "under_investigation" = "";
-"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:";
-"under_sixteen_first_paragraph" = "Thông tin đăng ký của tôi.";
+"under_sixteen_content" = "Tôi xác nhận rằng cha mẹ hoặc người giám hộ của tôi đồng ý cho Bộ Y Tế với tư cách là nhà quản trị lưu trữ dữ liệu theo Đạo luật về Quyền riêng tư năm 1988 được thu thập:";
+"under_sixteen_first_paragraph" = "thông tin đăng ký của tôi,";
 /* OnBoarding Under Sixteen */
 "under_sixteen_headline" = "Bạn cần có sự đồng ý của cha mẹ/người giám hộ của bạn để tiến hành";
 /* Figma page Android Screens (05/06) */
-"under_sixteen_registration_consent_first_paragraph" = "Thông tin đăng ký của tôi.";
-"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 COVIDSafe khác mà tôi đã tiếp xúc xét nghiệm dương tính với COVID-19 và đăng tải dữ liệu tiếp xúc của họ.";
-/* Figma page Android Screens (05/06) */
-"under-sixteen_consent_call_for_action" = "Chọn 'Tôi đồng ý' để xác nhận sự đồng ý.";
+"under_sixteen_registration_consent_first_paragraph" = "thông tin đăng ký của tôi,";
+"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 COVIDSafe khác mà tôi đã tiếp xúc xét nghiệm dương tính với COVID-19 và tải lên dữ liệu tiếp xúc của họ và";
 "update_available_app_store_btn" = "Vào App Store";
 "update_available_dismiss_btn" = "Nhắc tôi sau";
 "update_available_message_ios" = "Chúng tôi đã và đang cải thiện COVIDSafe. Cập nhật qua Kho Ứng dụng (App Store).";
@@ -557,7 +563,7 @@
 "upload_step_verify_pin_header" = "Đăng tải thông tin của bạn";
 "upload_step_verify_pin_sub_header" = "Nhân viên y tế của tiểu bang hoặc lãnh thổ sẽ gửi mã PIN qua tin nhắn đến thiết bị của bạn. Nhập mã PIN vào đây để đăng tải thông tin của bạn.";
 "us_consent_button" = "Tôi đồng ý";
-"us_registration_consent_diagnostic" = "Thông tin để đảm bảo rằng COVIDSafe đang hoạt động bình thường trên thiết bị của tôi.";
+"us_registration_consent_diagnostic" = "thông tin của tôi để đảm bảo rằng COVIDSafe đang hoạt động bình thường trên thiết bị của tôi.";
 "victoria" = "Victoria";
 "western_australia" = "Tây Úc";
 "wrong_ping_number" = "Nhập sai mã PIN";
@@ -572,38 +578,16 @@
 "Done" = "Hoàn tất";
 /* Feedback */
 "EmailPlaceholder" = "Nhập địa chỉ email của bạn (bắt buộc)";
+"EnterPINSent" = "Nhập mã PIN được gửi đến %@";
 /* Phone number and PIN */
 "EnterPhoneReVerify" = "Nhập số điện thoại của bạn để xác minh lại";
-"EnterPINSent" = "Nhập mã PIN được gửi đến %@";
-/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_message" = "Chào bạn, bạn muốn tiếp tục như thế nào?";
-/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_title" = "Hộp Phản hồi";
-/* Title for button that launches new feedback flow. */
-"entryPrompt_newFeedback_button_title" = "Phản hồi Mới";
 "FoundIssueWithApp" = "Phát hiện sự cố trong ứng dụng COVIDSafe?";
-/* *** Feedback localised strings *** */
-"global_cancel_button_title" = "Hủy bỏ";
-"global_send_button_title" = "Gửi";
-"global_sending_indication_title" = "Đang gửi";
-"global_success_indication_title" = "Thành công";
 /* upload */
 "InformationUploaded" = "Thông tin của bạn đã được đăng tải lên %@ ";
 "InvalidOTP" = "Phải là mã gồm 6 chữ số";
 "IssueDescPlaceholder" = "Hãy mô tả sự cố";
 "IssueFooter" = "Chúng tôi có thể liên lạc với bạn để biết thêm chi tiết về phản hồi của bạn. Địa chỉ email của bạn sẽ không được sử dụng cho bất kỳ mục đích nào khác.";
 "IssueThankYou" = "Cảm ơn! Chúng tôi đã nhận được phản hồi của bạn.";
-/* Delete screenshot action sheet action button title. */
-"newFeedback_deleteScreenshot_actionTitle" = "Xóa ảnh chụp màn hình";
-/* Messsage shown to user asking to confirm screenshot deletion. */
-"newFeedback_deleteScreenshotConfirmation_message" = "Ảnh chụp màn hình này sẽ bị xóa vĩnh viễn.";
-"newFeedback_invalidEmail_errorMessage" = "Vui lòng nhập địa chỉ email hợp lệ!";
-/* Error message displayed to users when feedback has empty description */
-"newFeedback_noMessage_errorMessage" = "Hãy đóng góp ý kiến cho chúng tôi trước khi gửi.";
-/* Error message displayed to users when feedback fails to send. */
-"newFeedback_send_errorMessage" = "Báo Lỗi khi Gửi Phản hồi";
-/* Navigation Bar title shown during new feedback flow. */
-"newFeedbackFlow_navigationTitle" = "Báo cáo sự cố";
 "Next" = "Tiếp theo";
 /* registration succcess */
 "OS2b_Item1" = "Khi bạn rời khỏi nhà, hãy mang theo điện thoại bên mình và chắc chắn rằng COVIDSafe đang hoạt động. ";
@@ -611,6 +595,7 @@
 "OS2b_Item2_VOLabel" = "2. Bluetooth nên luôn giữ ở trạng thái BẬT";
 "OS2b_Item3" = "3. COVIDSafe không gửi yêu cầu ghép nối. Tìm hiểu thêm.";
 "OS2b_Item3Underline" = "Tìm hiểu thêm";
+"PINWillExpire" = "Mã PIN của bạn sẽ hết hạn trong %@";
 /* home */
 "PairingRequestsInfo" = "COVIDSafe không gửi yêu cầu kết nối.";
 "PairingRequestsInfoUnderline" = "yêu cầu kết nối";
@@ -618,7 +603,6 @@
 "PhoneNumberFormatErrorTitle" = "Định dạng số sai";
 "PhoneVerificationErrorMessage" = "Vui lòng kiểm tra thông tin của bạn và thử lại.";
 "PhoneVerificationErrorTitle" = "Lỗi xác minh số điện thoại";
-"PINWillExpire" = "Mã PIN của bạn sẽ hết hạn trong %@";
 "ReceivePinIssue" = "Có vấn đề với việc nhận mã PIN?";
 /* help */
 "ReportAnIssue" = "Báo cáo sự cố";
@@ -627,13 +611,35 @@
 "UploadFailed" = "Đăng tải thất bại. Vui lòng thử lại sau.";
 "UploadFailedErrorMessage" = "Vui lòng thử lại sau.";
 "ValidationError" = "Lỗi xác nhận";
+/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_message" = "Chào bạn, bạn muốn tiếp tục như thế nào?";
+/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_title" = "Hộp Phản hồi";
+/* Title for button that launches new feedback flow. */
+"entryPrompt_newFeedback_button_title" = "Phản hồi Mới";
+/* *** Feedback localised strings *** */
+"global_cancel_button_title" = "Hủy bỏ";
+"global_send_button_title" = "Gửi";
+"global_sending_indication_title" = "Đang gửi";
+"global_success_indication_title" = "Thành công";
+/* Navigation Bar title shown during new feedback flow. */
+"newFeedbackFlow_navigationTitle" = "Báo cáo sự cố";
+/* Messsage shown to user asking to confirm screenshot deletion. */
+"newFeedback_deleteScreenshotConfirmation_message" = "Ảnh chụp màn hình này sẽ bị xóa vĩnh viễn.";
+/* Delete screenshot action sheet action button title. */
+"newFeedback_deleteScreenshot_actionTitle" = "Xóa ảnh chụp màn hình";
+"newFeedback_invalidEmail_errorMessage" = "Vui lòng nhập địa chỉ email hợp lệ!";
+/* Error message displayed to users when feedback has empty description */
+"newFeedback_noMessage_errorMessage" = "Hãy đóng góp ý kiến cho chúng tôi trước khi gửi.";
+/* Error message displayed to users when feedback fails to send. */
+"newFeedback_send_errorMessage" = "Báo Lỗi khi Gửi Phản hồi";
 "GetCoronaVirusApp_VOLabel" = "Tải ứng dụng Coronavirus. Tải ứng dụng của chính phủ để biết những tin tức và lời khuyên mới nhất.";
 "HelpTopics_VOLabel" = "Chủ đề Trợ giúp. Hướng dẫn cách khắc phục và sửa chữa các sự cố kỹ thuật";
 "LatestNews_VOLabel" = "Tin tức và cập nhật mới nhất. Vào trang aus.gov.au để biết tin tức mới nhất về coronavirus.";
 "NotificationsDisabled_VOLabel" = "Thông báo bị vô hiệu hóa. Bạn sẽ không nhận được thông báo nếu COVIDSafe không hoạt động. \nThay đổi cài đặt thông báo";
 "NotificationsEnabled_VOLabel" = "Thông báo được kích hoạt. Bạn sẽ nhận được thông báo nếu COVIDSafe không hoạt động. \nThay đổi cài đặt thông báo";
 "OS1b_TopParagraph_VOLabel" = "Tín hiệu Bluetooth được sử dụng để xác định khi bạn ở gần người dùng COVIDSafe khác. \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ề mối tiếp xúc gần. Thông tin này sẽ được mã hóa và chỉ lưu trữ trong điện thoại của bạ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 \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Để biết thêm thông tin, vui lòng tham khảo trang Chủ đề Trợ giúp";
-"permission_content_iOS_2_VOLabel" = "1. Bluetooth\n 2. Thông báo\n 3. Dịch vụ Vị trí";
-"permission_content_iOS_VOLabel" = "COVIDSafe cần bật Bluetooth để hoạt động. COVIDSafe không gửi yêu cầu ghép nối. \n\nKhi bật Thông báo, bạn sẽ nhận được cập nhật nhắc bạn khi COVIDSafe không hoạt động. \n\n iPhone của bạn yêu cầu quyền truy cập Vị trí để COVIDSafe hoạt động. *COVIDSafe KHÔNG theo dõi hoặc lưu trữ dữ liệu vị trí của bạn* \n\n Chọn 'Kích hoạt' để bật:";
 "ShareCovidSafe_VOLabel" = "Chia sẻ COVIDSafe. Mời người khác giúp đỡ. Cùng nhau, chúng ta mạnh mẽ hơn.";
 "UploadData_VOLabel" = "Nhân viên y tế có liên lạc với bạn không? Bạn chỉ có thể đăng tải thông tin của mình nếu bạn có kết quả xét nghiệm dương tính.";
+"permission_content_iOS_2_VOLabel" = "1. Bluetooth\n 2. Thông báo\n 3. Dịch vụ Vị trí";
+"permission_content_iOS_VOLabel" = "COVIDSafe cần bật Bluetooth để hoạt động. COVIDSafe không gửi yêu cầu ghép nối. \n\nKhi bật Thông báo, bạn sẽ nhận được cập nhật nhắc bạn khi COVIDSafe không hoạt động. \n\n iPhone của bạn yêu cầu quyền truy cập Vị trí để COVIDSafe hoạt động. *COVIDSafe KHÔNG theo dõi hoặc lưu trữ dữ liệu vị trí của bạn* \n\n Chọn 'Kích hoạt' để bật:";
\ No newline at end of file
diff --git a/CovidSafe/zh-Hans.lproj/Localizable.strings b/CovidSafe/zh-Hans.lproj/Localizable.strings
index cd1aa5d..1504514 100644
--- a/CovidSafe/zh-Hans.lproj/Localizable.strings
+++ b/CovidSafe/zh-Hans.lproj/Localizable.strings
@@ -1,3 +1,38 @@
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothOFF" = "访问蓝牙®：关";
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothON" = "访问蓝牙®：开";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF" = "蓝牙®：关";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF_content" = "打开手机蓝牙® 选择「允许新的连接」";
+/* Figma page iOS Screens (05/06) */
+"BluetoothON" = "蓝牙®：开";
+/* Figma page Android Screens (05/06) */
+"Enter_your_mobile_number_label" = "请输入您的手机号码";
+/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
+"IntroLabel" = "阻止传播\n拯救生命";
+/* Figma page iOS Screens (05/06) */
+"NotificationsBlurbLink" = "更改通知设置";
+/* Figma page iOS Screens (05/06) */
+"NotificationsDisabledBlurb" = "如果COVIDSafe未激活，您不会收到任何通知。 \n更改通知设置";
+/* Figma page iOS Screens (05/06) */
+"NotificationsEnabledBlurb" = "如果COVIDSafe未激活，您将收到通知。 \n更改通知设置";
+"OS2b_Item_4" = "4. 您的 iPhone 要求COVIDSafe 获得位置权限才能运行。*COVIDSafe 不会收集、储存或使用您的位置数据*";
+"PINNumber_VO_Label" = "PIN码";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusBody" = "离家之前和在公共场所时，务必开启蓝牙®，使COVIDSafe处于激活状态。";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusTitle" = "COVIDSafe未激活";
+"PN_MobileNumber_VOLabel" = "手机号码";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderBody" = "开启 COVIDSafe，确保其处于运行状态。";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderTitle" = "48 小时内未检测到任何接触";
+"PostcodeValidationErrorMessage" = "请输入有效的澳大利亚邮政编码。";
+/* Figma page Android Screens (05/06) */
+"Select_country_or_region_headline" = "选择国家或地区";
+"Support_VOLabel" = "支持。获取帮助，解决帮助主题未涵盖的问题";
 "action_continue" = "继续";
 "action_report_an_issue" = "报告问题";
 "action_upload_done" = "完成";
@@ -11,20 +46,10 @@
 "activity_intro_2" = "";
 /* Figma page iOS Screens (05/06) */
 "allow_bluetooth_call" = "允许COVIDSafe 访问蓝牙®";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothOFF" = "访问蓝牙®：关";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothON" = "访问蓝牙®：开";
 "app_activity_bluetooth_handshakes_heading" = "";
 "australian_capital_territory" = "澳大利亚首都领地";
 "ble_handshakes_yesterday" = "";
 "bluetooth_handshakes" = "蓝牙握手";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF" = "蓝牙®：关";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF_content" = "打开手机蓝牙® 选择「允许新的连接」";
-/* Figma page iOS Screens (05/06) */
-"BluetoothON" = "蓝牙®：开";
 "cancel_snooze" = "取消休眠";
 "cases_28_days" = "过去28天的新增病例";
 "cases_7_days" = "最近7天内的新增病例";
@@ -250,8 +275,9 @@
 "country_region_name_zw" = "津巴布韦";
 "customise_days" = "自定义日子";
 "data_privacy_button" = "下一步";
-"data_privacy_content" = "注册COVIDSafe之前，请务必阅读COVIDSafe的*隐私政策*。\n\nCOVIDSafe只会在遵守本政策和《1988年隐私法》的情况下收集、使用或披露您的个人信息。\n\n如果您未满16岁，您的父母/监护人也必须阅读*隐私政策*。 \n\n使用COVIDSafe属自愿行为。您可以随时安装或删除该应用程序。如果删除COVIDSafe，*您也可以要求从安全服务器上删除您的信息*。 \n\n您需要输入姓名（或化名）、手机号码、年龄段和邮政编码来注册使用COVIDSafe。 \n\n注册时提交的信息以及有关COVIDSafe的使用信息将被储存在高度安全的服务器上。 \n\n为了确保COVIDSafe可以在您的设备上正常运行，需要收集与您的设备相关的以下信息：操作系统、应用程序版本、语言设置、蓝牙®是否正在运行以及过去7天应用程序上的接触记录。\n\nCOVIDSafe不会收集您的位置信息。 \n\nCOVIDSafe将在您的设备上记录发生接触的日期和时间、与您发生过接触的其他COVIDSafe用户的匿名ID码、蓝牙信号强度以及手机型号。 \n\n与您发生接触的其他COVIDSafe用户的设备上也会记录您的匿名ID代码、与您发生接触的日期和时间、蓝牙信号强度以及您的手机型号。 \n\n如果其他用户的COVID-19检测结果为阳性，他们可能会上传自己的接触者信息，而州或领地的卫生官员可能会出于追踪接触者的目的与您联系。 \n\n您的详细注册信息仅会在追踪接触者以及维持COVIDSafe的合法正常运行时使用或披露。  \n\n更多信息可在*covidsafe.gov.au*网站上查阅。 \n\n如需进一步了解您对个人信息的权利，以及个人信息的处理和共享方式，请参阅COVIDSafe *隐私政策*。";
-"data_privacy_content_VO" = "注册COVIDSafe之前，请务必阅读COVIDSafe的隐私政策。\n\nCOVIDSafe只会在遵守本政策和《1988年隐私法》的情况下收集、使用或披露您的个人信息。\n\n如果您未满16岁，您的父母/监护人也必须阅读隐私政策。 \n\n使用COVIDSafe属自愿行为。您可以随时安装或删除该应用程序。如果删除COVIDSafe，您也可以要求从安全服务器上删除您的信息。 \n\n您需要输入姓名（或化名）、手机号码、年龄段和邮政编码来注册使用COVIDSafe。 \n\n注册时提交的信息以及有关COVIDSafe的使用信息将被储存在高度安全的服务器上。 \n\n为了确保COVIDSafe可以正常运行，需要收集与您的设备相关的以下信息：操作系统、应用程序版本、语言设置、蓝牙是否正在运行以及过去7天应用程序上的接触记录。\n\nCOVIDSafe不会收集您的位置信息。 \n\nCOVIDSafe将在您的设备上记录发生接触的日期和时间、与您发生过接触的其他COVIDSafe用户的匿名ID码、蓝牙信号强度以及手机型号。 \n\n与您发生接触的其他COVIDSafe用户的设备上也会记录您的匿名ID代码、与您发生接触的日期和时间、蓝牙信号强度以及您的手机型号。 \n\n如果其他用户的COVID-19检测结果为阳性，他们可能会上传自己的接触者信息，而州或领地的卫生官员可能会出于追踪接触者的目的与您联系。 \n\n您的详细注册信息仅会在追踪接触者以及维持COVIDSafe的合法正常运行时使用或披露。  \n\n更多信息可在covidsafe.gov.au网站上查阅。 \n\n如需进一步了解您对个人信息的权利，以及个人信息的处理和共享方式，请参阅COVIDSafe 隐私政策。";
+"data_privacy_content" = "注册COVIDSafe之前，请务必阅读COVIDSafe的隐私政策。COVIDSafe只会在遵守本政策和《1988年隐私法》的情况下收集、使用或披露您的个人信息。\n\n如果您未满16岁，您的父母/监护人也必须阅读隐私政策。 \n\n使用COVIDSafe属完全自愿行为。您可以随时安装或删除该应用程序。如果删除COVIDSafe，您也可以要求从安全服务器上删除您的信息。 如果您不提供自己的个人信息， COVIDSafe应用程序可能无法正常工作。\n\n您需要输入姓名（或化名）、手机号码、年龄段和邮政编码来注册使用COVIDSafe。 \n\n注册时提交的信息以及有关COVIDSafe的使用信息将被储存在高度安全的服务器上。 \n\n为了确保COVIDSafe可以在正常运行，需要收集与您的设备相关的以下信息：操作系统、应用程序版本、语言设置、蓝牙是否正在运行以及过去7天应用程序上的接触记录。\n\nCOVIDSafe不会收集您的位置信息。 \n\nCOVIDSafe将在您的设备上记录发生接触的日期和时间、与您发生过接触的其他COVIDSafe用户的匿名ID码、蓝牙信号强度以及手机型号。 \n\n与您发生接触的其他COVIDSafe用户的设备上也会记录您的匿名ID代码、与您发生接触的日期和时间、蓝牙信号强度以及您的手机型号。 \n\n如果其他用户的COVID-19检测结果为阳性，他们可能会上传自己的接触者信息，而州或领地的卫生官员可能会出于追踪接触者的目的与您联系。 \n\n您的详细注册信息仅会在追踪接触者以及维持COVIDSafe的合法正常运行时使用或披露。  \n\n更多信息可在covidsafe.gov.au网站上查阅。 \n\n如需进一步了解您对个人信息的权利，以及个人信息的处理和共享方式，请参阅COVIDSafe隐私政策。\n\n有关COVIDSafe隐私查询和投诉的详细联系方式，请参阅隐私政策的“联系我们”。";
+"data_privacy_content_VO" = "注册COVIDSafe之前，请务必阅读COVIDSafe的隐私政策。COVIDSafe只会在遵守本政策和《1988年隐私法》的情况下收集、使用或披露您的个人信息。\n\n如果您未满16岁，您的父母/监护人也必须阅读隐私政策。 \n\n使用COVIDSafe属完全自愿行为。您可以随时安装或删除该应用程序。如果删除COVIDSafe，您也可以要求从安全服务器上删除您的信息。如果您不提供自己的个人信息， COVIDSafe应用程序可能无法正常工作。 \n\n您需要输入姓名（或化名）、手机号码、年龄段和邮政编码来注册使用COVIDSafe。 \n\n注册时提交的信息以及有关COVIDSafe的使用信息将被储存在高度安全的服务器上。 \n\n为了确保COVIDSafe可以正常运行，需要收集与您的设备相关的以下信息：操作系统、应用程序版本、语言设置、蓝牙是否正在运行以及过去7天应用程序上的接触记录。\n\nCOVIDSafe不会收集您的位置信息。 \n\nCOVIDSafe将在您的设备上记录发生接触的日期和时间、与您发生过接触的其他COVIDSafe用户的匿名ID码、蓝牙信号强度以及手机型号。 \n\n与您发生接触的其他COVIDSafe用户的设备上也会记录您的匿名ID代码、与您发生接触的日期和时间、蓝牙信号强度以及您的手机型号。 \n\n如果其他用户的COVID-19检测结果为阳性，他们可能会上传自己的接触者信息，而州或领地的卫生官员可能会出于追踪接触者的目的与您联系。 \n\n您的详细注册信息仅会在追踪接触者以及维持COVIDSafe的合法正常运行时使用或披露。  \n\n更多信息可在covidsafe.gov.au网站上查阅。 \n\n如需进一步了解您对个人信息的权利，以及个人信息的处理和共享方式，请参阅COVIDSafe 隐私政策。\n\n\n有关COVIDSafe隐私查询和投诉的详细联系方式，请参阅隐私政策的“联系我们”。";
+"data_privacy_content_android" = "注册COVIDSafe之前，请务必阅读COVIDSafe的*隐私政策*。 COVIDSafe只会在遵守本政策和<i>1988年隐私法</i>的情况下收集、使用或披露您的个人信息。\n\n如果您未满16岁，您的父母/监护人也必须阅读*隐私政策*。 \n\n使用COVIDSafe属完全自愿行为。您可以随时安装或删除该应用程序。如果删除COVIDSafe，*您也可以要求从安全服务器上删除您的信息*。 \n\n您需要输入姓名（或化名）、手机号码、年龄段和邮政编码来注册使用COVIDSafe。如果您不提供自己的个人信息， COVIDSafe应用程序可能无法正常工作。\n\n您在注册时提交的信息以及有关您使用COVIDSafe的信息存储在高度安全的服务器上。 \n\n为了确保COVIDSafe可以正常运行，还需要收集与您的设备相关的以下信息：操作系统、应用程序版本、语言设置、蓝牙®是否正在运行以及过去7天应用程序上的接触记录。\n\n在安卓设备上，这还包括电池优化是否禁用和定位服务是否启用的信息。\n\nCOVIDSafe不会收集您的位置信息。\n\nCOVIDSafe将在您的设备上记录发生接触的日期和时间、与您发生过接触的其他COVIDSafe用户的匿名ID码、蓝牙信号强度以及其他用户的手机型号。 \n\n与您发生接触的其他COVIDSafe用户的设备上也会记录您的匿名ID代码、与您发生接触的日期和时间、蓝牙信号强度以及您的手机型号。 \n\n如果其他用户的COVID-19检测结果为阳性，他们可以上传自己的接触者信息，而州或领地的卫生官员可能会出于追踪接触者的目的与您联系。 \n\n您的详细注册信息仅在追踪接触者以及维持COVIDSafe的合法正常运行时使用或披露。  \n\n更多信息可在*covidsafe.gov.au*网站上查阅。 \n\n如需进一步了解您对个人信息的权利，以及个人信息的处理和共享方式，请参阅COVIDSafe*隐私政策*。\n\n有关COVIDSafe隐私查询和投诉的详细联系方式，请参阅隐私政策的*联系我们*。";
 /* OnBoarding Data Privacy */
 "data_privacy_headline" = "注册及隐私";
 "deaths" = "死亡人数";
@@ -272,8 +298,6 @@
 "enter_pin_resend_pin" = "重新发送PIN码";
 "enter_pin_timer_expire" = "您的PIN码将在此时间后失效";
 "enter_pin_wrong_number" = "请确认手机号码是否正确";
-/* Figma page Android Screens (05/06) */
-"Enter_your_mobile_number_label" = "请输入您的手机号码";
 "every_day" = "每天";
 "factors_dotpoint1" = "范围内的COVIDSafe用户数量";
 "factors_dotpoint2" = "设备型号和机龄";
@@ -289,10 +313,10 @@
 /* Error message for when a user tries to signup outside of Australia. */
 "geoblock_error_message" = "";
 "geoblock_rego_error" = "";
+"global_OK" = "确定";
 "global_back" = "返回";
 "global_close" = "关闭";
 "global_double_tap" = "双击进行编辑";
-"global_OK" = "确定";
 "hide" = "隐藏";
 "home_app_permission_status_subtitle" = "若设置不正确，COVIDSafe将无法运行。";
 "home_app_permission_status_title" = "检查您的设置";
@@ -302,9 +326,12 @@
 /* Home */
 "home_header_active_title" = "COVIDSafe已激活。";
 /* Home */
+"home_header_active_title" = "COVIDSafe已激活。";
+/* Home */
 "home_header_active_title_thanks" = "谢谢，COVIDSafe已激活。";
 "home_header_inactive_check_your_permissions" = "检查您的设置";
 "home_header_inactive_title" = "COVIDSafe未激活";
+"home_header_inactive_title" = "COVIDSafe未激活";
 "home_header_uploaded_on_date_ios" = "个人信息已在%@ 上传。";
 "home_set_complete_external_link_app_content" = "下载政府应用程序，了解最新消息和建议。";
 "home_set_complete_external_link_app_title" = "下载冠状病毒应用程序";
@@ -352,8 +379,6 @@
 "intro_content" = "为了避免冠状病毒的传播，澳大利亚政府开发了COVIDSafe。 \n\n COVIDSafe会以保密的方式记录您与其他用户发生的接触。如果您与病毒测试呈阳性的人发生密切接触，州和领地的卫生官员将与您联系。 \n\n让我们齐心协力，阻止病毒传播，保护大众健康。";
 /* OnBoarding Intro */
 "intro_headline" = "齐心协力，阻止COVID-19的传播";
-/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
-"IntroLabel" = "阻止传播\n拯救生命";
 "invalid_australian_phone_number_error_prompt" = "澳大利亚手机号码最多包含10位数。";
 "invalid_norfolk_island_phone_number_error_prompt" = "诺福克岛的手机号码包含5到6位数。";
 "is_snoozed" = "COVIDSafe已休眠";
@@ -389,26 +414,22 @@
 "no_handshakes_item3" = "重新启动手机并再次打开应用。";
 "no_handshakes_item4" = "";
 "no_handshakes_link" = "阅读更多有关如何检查COVIDSafe是否正常运行的信息";
+"non_consent_button" = "我不同意";
+"non_consent_popup" = "没有父母或监护人的同意，你不能继续注册。\n\n请退出并删除本应用程序。";
 /* Figma page Android Screens (05/06) */
 "norfolk_hint" = "例如：51234";
 "northern_territory" = "北领地";
 "notification_bluetooth" = "请开启蓝牙，以便COVIDSafe可以正常运行。";
 "notification_internet_content" = "请打开应用程序并检查网络连接，以便COVIDSafe可以正常运行。";
+"notification_internet_content" = "请打开应用程序并检查网络连接。";
 "notification_not_active_title" = "COVIDSafe未激活";
 "notification_settings" = "请打开应用程序以检查您的设置。";
 "notification_update_content" = "请更新您的应用程序以获得改进后的版本。";
 "notification_update_heading" = "COVIDSafe 更新可用";
-/* Figma page iOS Screens (05/06) */
-"NotificationsBlurbLink" = "更改通知设置";
-/* Figma page iOS Screens (05/06) */
-"NotificationsDisabledBlurb" = "如果COVIDSafe未激活，您不会收到任何通知。 \n更改通知设置";
-/* Figma page iOS Screens (05/06) */
-"NotificationsEnabledBlurb" = "如果COVIDSafe未激活，您将收到通知。 \n更改通知设置";
 "numbers_error" = "无法查询最新统计数字。";
 "numbers_no_internet" = "请连接到互联网，以获取最新统计数字。";
 "numbers_refresh" = "请刷新";
 "options_for_australia" = "澳大利亚选项";
-"OS2b_Item_4" = "4. 您的 iPhone 要求COVIDSafe 获得位置权限才能运行。*COVIDSafe 不会收集、储存或使用您的位置数据*";
 "overseas_acquired" = "%@海外感染";
 "permission_button" = "继续";
 /* Figma page iOS Screens (05/06) */
@@ -432,30 +453,19 @@
 "personal_details_name_title" = "全名（或化名）";
 "personal_details_post_code" = "澳大利亚邮政编码";
 "personal_details_post_code_error_prompt" = "您的澳大利亚邮政编码必须包含4位数。";
-"PINNumber_VO_Label" = "PIN码";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusBody" = "离家之前和在公共场所时，务必开启蓝牙®，使COVIDSafe处于激活状态。";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusTitle" = "COVIDSafe未激活";
-"PN_MobileNumber_VOLabel" = "手机号码";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderBody" = "开启 COVIDSafe，确保其处于运行状态。";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderTitle" = "48 小时内未检测到任何接触";
 "postcode_api_error" = "出现错误。请检查您的互联网连接，然后重试。";
 "postcode_change_label" = "当前的澳大利亚邮政编码";
 "postcode_success" = "您的邮政编码已更新";
-"PostcodeValidationErrorMessage" = "请输入有效的澳大利亚邮政编码。";
 "privacy_policy" = "";
 "privacy_policy_description" = "";
 "queensland" = "昆士兰州";
 "recovered" = "康复患者总数";
-"registration_consent_content" = "我同意数字转换局作为数据存储管理方可以根据澳大利亚政府卫生部常务副部长依法作出的决议，收集以下信息：";
-"registration_consent_diagnostic" = "确保 COVIDSafe 在我的设备上正常运行的信息。";
-"registration_consent_first_paragraph" = "我的注册信息。";
+"registration_consent_content" = "我同意卫生部作为数据存储管理方可以根据《1988年隐私法》收集以下信息：";
+"registration_consent_diagnostic" = "确保COVIDSafe在我的设备上正常运行的信息。";
+"registration_consent_first_paragraph" = "注册信息，";
 /* Onboarding Registration Consent */
 "registration_consent_headline" = "注册同意书";
-"registration_consent_second_paragraph" = "我与其他COVIDSafe用户的接触信息（如果与我发生过接触的其他用户COVID-19检测呈阳性并上传其接触者数据）。";
+"registration_consent_second_paragraph" = "我与其他COVIDSafe用户的接触信息（如果与我发生过接触的其他用户COVID-19检测呈阳性并上传其接触者数据），及";
 "restrictions_accommodation" = "住宿";
 "restrictions_activity" = "活动";
 "restrictions_cafes" = "咖啡厅和餐厅";
@@ -481,8 +491,6 @@
 "scheduled" = "您已将COVIDSafe设置为从%@休眠至%@ 。";
 /* OnBoarding Enter Number */
 "select_country_or_region" = "选择国家或地区";
-/* Figma page Android Screens (05/06) */
-"Select_country_or_region_headline" = "选择国家或地区";
 "select_state_territory_button" = "选择州或领地";
 "select_state_territory_heading" = "选择州或领地";
 "set_snooze_time" = "设置休眠时间";
@@ -514,7 +522,6 @@
 "stepCounter" = "第%d步，共%d步";
 "support" = "支持";
 "support_content" = "获取帮助，解决帮助主题未涵盖的问题";
-"Support_VOLabel" = "支持。获取帮助，解决帮助主题未涵盖的问题";
 "tasmania" = "塔斯马尼亚州";
 /* Example: "From 22 to 28 January 2021" */
 "to" = "";
@@ -524,17 +531,16 @@
 "total_per_state" = "各州和领地确诊病例总数";
 "twenty_eight_days" = "28天";
 "type_in_time" = "输入时间";
-"UILaunchStoryboardName" = "LaunchScreen_zh_Hans";
+/* Figma page Android Screens (05/06) */
+"under-sixteen_consent_call_for_action" = "选择“我同意”确认同意，如果不能确认父母或监护人同意，选择“我不同意”。";
 "under_investigation" = "";
-"under_sixteen_content" = "我确认我的父母或监护人同意数字转换局作为数据存储管理方可以根据澳大利亚政府卫生部常务副部长依法作出的决议，收集以下信息：";
-"under_sixteen_first_paragraph" = "我的注册信息。";
+"under_sixteen_content" = "我确认我的父母或监护人同意卫生部作为数据存储管理方可以根据《1988年隐私法》收集以下信息：";
+"under_sixteen_first_paragraph" = "注册信息，";
 /* OnBoarding Under Sixteen */
 "under_sixteen_headline" = "您需要得到父母/监护人的同意才能继续";
 /* Figma page Android Screens (05/06) */
-"under_sixteen_registration_consent_first_paragraph" = "我的注册信息。";
-"under_sixteen_second_paragraph" = "我与其他COVIDSafe用户的接触信息（如果与我发生过接触的其他用户COVID-19检测呈阳性并上传其接触者数据）。";
-/* Figma page Android Screens (05/06) */
-"under-sixteen_consent_call_for_action" = "选择“我同意”以确认同意。";
+"under_sixteen_registration_consent_first_paragraph" = "注册信息，";
+"under_sixteen_second_paragraph" = "我与其他COVIDSafe用户的接触信息（如果与我发生过接触的其他用户COVID-19检测呈阳性并上传其接触者数据），及";
 "update_available_app_store_btn" = "前往App Store";
 "update_available_dismiss_btn" = "稍后提醒我";
 "update_available_message_ios" = "我们一直在改进 COVIDSafe。请通过应用商店更新。";
@@ -557,7 +563,7 @@
 "upload_step_verify_pin_header" = "上传个人信息";
 "upload_step_verify_pin_sub_header" = "州或领地卫生官员将通过短信向您的手机发送 PIN码。请在下面输入PIN码以上传个人信息。";
 "us_consent_button" = "我同意";
-"us_registration_consent_diagnostic" = "确保 COVIDSafe 在我的设备上正常运行的信息。";
+"us_registration_consent_diagnostic" = "确保COVIDSafe在我的设备上正常运行的信息。";
 "victoria" = "维多利亚州";
 "western_australia" = "西澳大利亚州";
 "wrong_ping_number" = "错误的PIN码";
@@ -572,38 +578,16 @@
 "Done" = "完成";
 /* Feedback */
 "EmailPlaceholder" = "输入您的电子邮件地址（必填）";
+"EnterPINSent" = "输入发送到%@的PIN码";
 /* Phone number and PIN */
 "EnterPhoneReVerify" = "输入您的手机号码以重新验证";
-"EnterPINSent" = "输入发送到%@的PIN码";
-/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_message" = "您好，请选择接下来的操作。";
-/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_title" = "意见箱";
-/* Title for button that launches new feedback flow. */
-"entryPrompt_newFeedback_button_title" = "新的反馈";
 "FoundIssueWithApp" = "在 COVIDSafe 应用程序中发现问题吗？";
-/* *** Feedback localised strings *** */
-"global_cancel_button_title" = "取消";
-"global_send_button_title" = "发送";
-"global_sending_indication_title" = "正在发送";
-"global_success_indication_title" = "成功";
 /* upload */
 "InformationUploaded" = "个人信息已在%@ 上传。";
 "InvalidOTP" = "PIN码为6位数";
 "IssueDescPlaceholder" = "请描述问题";
 "IssueFooter" = "我们可能会与您联系以进一步了解反馈意见。您的电子邮件地址不会被用于其他目的。";
 "IssueThankYou" = "谢谢！反馈已收到。";
-/* Delete screenshot action sheet action button title. */
-"newFeedback_deleteScreenshot_actionTitle" = "删除屏幕截图";
-/* Messsage shown to user asking to confirm screenshot deletion. */
-"newFeedback_deleteScreenshotConfirmation_message" = "此屏幕截图将被永久删除。";
-"newFeedback_invalidEmail_errorMessage" = "请输入有效的电子邮件地址！";
-/* Error message displayed to users when feedback has empty description */
-"newFeedback_noMessage_errorMessage" = "发送前请填写反馈意见。";
-/* Error message displayed to users when feedback fails to send. */
-"newFeedback_send_errorMessage" = "发送反馈意见时出错";
-/* Navigation Bar title shown during new feedback flow. */
-"newFeedbackFlow_navigationTitle" = "报告问题";
 "Next" = "下一步";
 /* registration succcess */
 "OS2b_Item1" = "1.离开家时，请随身携带手机，并确保COVIDSafe处于激活状态。";
@@ -611,6 +595,7 @@
 "OS2b_Item2_VOLabel" = "2.蓝牙®应该保持开启状态。";
 "OS2b_Item3" = "3. COVIDSafe不会发送配对请求。 了解更多信息。";
 "OS2b_Item3Underline" = "了解更多信息";
+"PINWillExpire" = "您的PIN码将在%@失效";
 /* home */
 "PairingRequestsInfo" = "COVIDSafe不会发送配对请求。";
 "PairingRequestsInfoUnderline" = "配对请求";
@@ -618,7 +603,6 @@
 "PhoneNumberFormatErrorTitle" = "号码格式错误";
 "PhoneVerificationErrorMessage" = "请检查个人信息，然后重试。";
 "PhoneVerificationErrorTitle" = "验证电话号码时出错";
-"PINWillExpire" = "您的PIN码将在%@失效";
 "ReceivePinIssue" = "接收PIN码时遇到问题？";
 /* help */
 "ReportAnIssue" = "报告问题";
@@ -627,13 +611,35 @@
 "UploadFailed" = "上传失败。请稍后再试。";
 "UploadFailedErrorMessage" = "请稍后再试。";
 "ValidationError" = "验证出错";
+/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_message" = "您好，请选择接下来的操作。";
+/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_title" = "意见箱";
+/* Title for button that launches new feedback flow. */
+"entryPrompt_newFeedback_button_title" = "新的反馈";
+/* *** Feedback localised strings *** */
+"global_cancel_button_title" = "取消";
+"global_send_button_title" = "发送";
+"global_sending_indication_title" = "正在发送";
+"global_success_indication_title" = "成功";
+/* Navigation Bar title shown during new feedback flow. */
+"newFeedbackFlow_navigationTitle" = "报告问题";
+/* Messsage shown to user asking to confirm screenshot deletion. */
+"newFeedback_deleteScreenshotConfirmation_message" = "此屏幕截图将被永久删除。";
+/* Delete screenshot action sheet action button title. */
+"newFeedback_deleteScreenshot_actionTitle" = "删除屏幕截图";
+"newFeedback_invalidEmail_errorMessage" = "请输入有效的电子邮件地址！";
+/* Error message displayed to users when feedback has empty description */
+"newFeedback_noMessage_errorMessage" = "发送前请填写反馈意见。";
+/* Error message displayed to users when feedback fails to send. */
+"newFeedback_send_errorMessage" = "发送反馈意见时出错";
 "GetCoronaVirusApp_VOLabel" = "获取冠状病毒应用程序。下载政府应用程序以获取最新消息和建议。";
 "HelpTopics_VOLabel" = "帮助主题。排除故障和修复技术问题指南。";
 "LatestNews_VOLabel" = "最新消息及更新。前往aus.gov.au了解冠状病毒的最新消息。";
 "NotificationsDisabled_VOLabel" = "通知已禁用。如果COVIDSafe未激活，您将不会收到通知。 \n更改通知设置";
 "NotificationsEnabled_VOLabel" = "通知已启用。如果COVIDSafe未激活，您将收到通知。 \n更改通知设置";
 "OS1b_TopParagraph_VOLabel" = "COVIDSafe需要使用蓝牙®信号以确定您靠近另一个COVIDSafe用户的时间。 \n\n您与其他COVIDSafe用户之间的每一次密切接触都被记录下来，以创建密切接触信息。该信息经过加密，且仅储存在您的手机中。 \n\n如果您使用COVIDSafe并对COVID-19测试呈阳性，则州或领地卫生官员将与您联系。经您同意，他们会协助您将密切接触者信息上传至高度安全的信息储存系统。\n\n如果您与测试结果呈阳性的其他COVIDSafe用户发生密切接触，则州或领地卫生官员也会与您联系。 \n\n如需更多信息，请参阅*帮助主题*页。";
-"permission_content_iOS_2_VOLabel" = "1. 蓝牙\n2. 通知\n3. 位置服务";
-"permission_content_iOS_VOLabel" = "COVIDSafe需要启用蓝牙才能运行。 COVIDSafe不会发送配对请求。 \n\n通过启用通知，您将在COVIDSafe未激活时收到提示信息。 \n\n您的iPhone要求COVIDSafe获得位置权限才能运行。 * COVIDSafe不会跟踪或存储您的位置数据* \n\n选择“继续”以启用：";
 "ShareCovidSafe_VOLabel" = "共享COVIDSafe。邀请他人助力。万众一心，其利断金。";
 "UploadData_VOLabel" = "是否有卫生官员联系过您？只有在您的病毒检测呈阳性时，才能上传个人信息。";
+"permission_content_iOS_2_VOLabel" = "1. 蓝牙\n2. 通知\n3. 位置服务";
+"permission_content_iOS_VOLabel" = "COVIDSafe需要启用蓝牙才能运行。 COVIDSafe不会发送配对请求。 \n\n通过启用通知，您将在COVIDSafe未激活时收到提示信息。 \n\n您的iPhone要求COVIDSafe获得位置权限才能运行。 * COVIDSafe不会跟踪或存储您的位置数据* \n\n选择“继续”以启用：";
\ No newline at end of file
diff --git a/CovidSafe/zh-Hant.lproj/Localizable.strings b/CovidSafe/zh-Hant.lproj/Localizable.strings
index 09177ec..1b62bcf 100644
--- a/CovidSafe/zh-Hant.lproj/Localizable.strings
+++ b/CovidSafe/zh-Hant.lproj/Localizable.strings
@@ -1,3 +1,38 @@
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothOFF" = "連接藍牙®：關";
+/* Figma page iOS Screens (05/06) */
+"AllowBluetoothON" = "連接藍牙®：開";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF" = "藍牙®：關";
+/* Figma page iOS Screens (05/06) */
+"BluetoothOFF_content" = "請打開手機藍牙®。如有顯示，請選擇「允許新連接」選項。";
+/* Figma page iOS Screens (05/06) */
+"BluetoothON" = "藍牙®：開";
+/* Figma page Android Screens (05/06) */
+"Enter_your_mobile_number_label" = "請輸入你的手機號碼";
+/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
+"IntroLabel" = "請協助遏止病毒擴散\n拯救生命";
+/* Figma page iOS Screens (05/06) */
+"NotificationsBlurbLink" = "更改通知設定";
+/* Figma page iOS Screens (05/06) */
+"NotificationsDisabledBlurb" = "如果 COVIDSafe 尚未處於啟用狀態，你將不會收到通知。 \n更改通知設定";
+/* Figma page iOS Screens (05/06) */
+"NotificationsEnabledBlurb" = "如果 COVIDSafe 尚未處於啟用狀態，你將會收到通知。 \n更改通知設定";
+"OS2b_Item_4" = "4. 你的iPhone要求允許位置許可權才能使COVIDSafe運作。* COVIDSafe不會收集、存儲或者使用你的位置資料*";
+"PINNumber_VO_Label" = "PIN 碼";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusBody" = "在離家前及在公共場所時，務必開啟藍牙®以確保 COVIDSafe 處於啟用狀態。";
+/* Figma page iOS Screens (05/06) */
+"PN_BluetoothStatusTitle" = "COVIDSafe 未在啓用狀態";
+"PN_MobileNumber_VOLabel" = "手機號碼";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderBody" = "開啟 COVIDSafe，確保其處於執行狀態。";
+/* Figma page iOS Screens (05/06) */
+"PN_ReminderTitle" = "48 小時內未探測到任何接觸";
+"PostcodeValidationErrorMessage" = "請輸入有效的澳洲郵遞區號。";
+/* Figma page Android Screens (05/06) */
+"Select_country_or_region_headline" = "選擇國家或地區";
+"Support_VOLabel" = "支持。獲取幫助，解決求助主題未涵蓋的問題。";
 "action_continue" = "繼續";
 "action_report_an_issue" = "報告問題";
 "action_upload_done" = "完成";
@@ -11,20 +46,10 @@
 "activity_intro_2" = "";
 /* Figma page iOS Screens (05/06) */
 "allow_bluetooth_call" = "允許 COVIDSafe 接入藍牙®";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothOFF" = "連接藍牙®：關";
-/* Figma page iOS Screens (05/06) */
-"AllowBluetoothON" = "連接藍牙®：開";
 "app_activity_bluetooth_handshakes_heading" = "";
 "australian_capital_territory" = "澳大利亞首都領地";
 "ble_handshakes_yesterday" = "";
 "bluetooth_handshakes" = "藍牙握手";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF" = "藍牙®：關";
-/* Figma page iOS Screens (05/06) */
-"BluetoothOFF_content" = "請打開手機藍牙®。如有顯示，請選擇「允許新連接」選項。";
-/* Figma page iOS Screens (05/06) */
-"BluetoothON" = "藍牙®：開";
 "cancel_snooze" = "取消休眠。";
 "cases_28_days" = "過去28天的新增病例";
 "cases_7_days" = "過去7天的新增病例";
@@ -250,8 +275,9 @@
 "country_region_name_zw" = "津巴布韋";
 "customise_days" = "自定義日子";
 "data_privacy_button" = "下一步";
-"data_privacy_content" = "在註册 COVIDSafe 之前，請務必閱讀 COVIDSafe *私隱政策*。 \n\nCOVIDSafe僅會在遵守該政策和《1988年隱私法》的情況下收集、使用或披露你的個人資料。 \n\n如果你未滿 16 歲，你的父母/監護人亦必須閱讀*私隱政策*。 \n\n使用 COVIDSafe 純屬自願性質。你可以隨時安裝或刪除本應用程式。如果刪除 COVIDSafe，*你亦可以要求刪除在保密伺服器內的個人資料*。 \n\n要註册使用 COVIDSafe，你需要輸入名字（或者假名）、手機號碼、年齡組别及郵編。 \n\n你註冊時提交的資料以及有關COVIDSafe的使用資料將被儲存在高度安全的伺服器上。 \n\n為了確保COVIDSafe可以正常運行，需要收集有關你的設備的以下資訊：操作系統、應用程式版本、語言設置、藍牙®是否正在運行以及應用程式上過去7天的接觸記錄。 \n\nCOVIDSafe不會收集你的位置資訊。 \n\nCOVIDSafe將在你的設備上記錄發生接觸的日期和時間、與你發生過接觸的其他COVIDSafe用戶的匿名ID碼、藍牙信號強度以及該用戶的手機型號。 \n\n與你發生接觸的其他COVIDSafe用戶的設備上也會記錄你的匿名ID碼、發生接觸的日期和時間、藍牙信號強度以及你的手機型號。 \n\n如果其他用戶的COVID-19檢測結果為陽性，他們可能會上傳自己的接觸者信息，而州或領地的衛生官員可能會出於追蹤接觸者的目的與你聯繫。 \n\n你的註冊詳情僅會在追蹤接觸者以及維持COVIDSafe的合法正常運行時使用或披露。 \n\n更多資訊可在*covidsafe.gov.au*網站上查閱。 \n\n如需進一步了解你對個人資料的權利，以及個人資料的處理和共享方式，請參閱COVIDSafe *隱私政策*。";
-"data_privacy_content_VO" = "在註册 COVIDSafe 之前，請務必閱讀 COVIDSafe 私隱政策。 \n\nCOVIDSafe僅會在遵守該政策和《1988年隱私法》的情況下收集、使用或披露你的個人資料。\n\n如果你未滿 16 歲，你的父母/監護人亦必須閱讀私隱政策。 \n\n使用 COVIDSafe 純屬自願性質。你可以隨時安裝或刪除本應用程式。如果刪除 COVIDSafe，你亦可以要求刪除在保密伺服器內的個人資料。 \n\n要註册使用 COVIDSafe，你需要輸入名字（或者假名）、手機號碼、年齡組别及郵編。 \n\n你註冊時提交的資料以及有關COVIDSafe的使用資料將被儲存在高度安全的伺服器上。 \n\n為了確保COVIDSafe可以正常運行，需要收集有關你的設備的以下信息：操作系統、應用程式版本、語言設置、藍牙是否正在運行以及應用程式上過去7天的接觸記錄。 \n\nCOVIDSafe不會收集你的位置資訊。 \n\nCOVIDSafe將在你的設備上記錄發生接觸的日期和時間、與你發生過接觸的其他COVIDSafe用戶的匿名ID碼、藍牙信號強度以及該用戶的手機型號。 \n\n與你發生接觸的其他COVIDSafe用戶的設備上也會記錄你的匿名ID碼、發生接觸的日期和時間、藍牙信號強度以及你的手機型號。\n\n如果其他用戶的COVID-19檢測結果為陽性，他們可能會上傳自己的接觸者信息，而州或領地的衛生官員可能會出於追蹤接觸者的目的與你聯繫。 \n\n你的註冊詳情僅會在追蹤接觸者以及維持COVIDSafe的合法正常運行時使用或披露。 \n\n更多資訊可在covidsafe.gov.au網站上查閱。 \n\n如需進一步了解你對個人資料的權利，以及個人資料的處理和共享方式，請參閱COVIDSafe 隱私政策。";
+"data_privacy_content" = "註冊 COVIDSafe 之前，請務必閱讀 COVIDSafe 隱私權政策。COVIDSafe 僅根據本政策及《1988 年隱私法》收集、使用或披露您的個人資訊。\n\n如果您未滿 16 歲，您的家長／監護人也必須閱讀本隱私權政策。\n\n使用 COVIDSafe 屬自願性質。您可以隨時安裝或刪除該應用程式。如果您刪除 COVIDSafe，您也可以要求從安全伺服器刪除您的資訊。如果您不提供個人資訊，COVIDSafe 應用程式將無法如預期運行。\n\n要註冊 COVIDSafe，您需要輸入姓名（或化名）、手機號碼、年齡範圍及郵遞區號。\n\n您在註冊時提交的資訊以及有關使用 COVIDSafe 的資訊儲存在高度安全的伺服器。\n\nCOVIDSafe 還會收集資訊以確保在您的裝置正常運行。這包括您的作業系統、安裝的應用程式版本、裝置設定的語言、藍芽是否正常運作以及您的應用程式是否記錄過去 7 天內的任何狀況。\n\nCOVIDSafe 不會收集您的位置資訊。\n\nCOVIDSafe 會在您的裝置上記錄聯絡日期及時間、您接觸的其他 COVIDSafe 使用者的加密 ID 代碼、藍牙信號強度及其他使用者的手機型號。\n\n您接觸的其他 COVIDSafe 使用者會在他們的裝置上記錄您的加密 ID 代碼、與您聯絡的日期及時間、藍牙信號強度及您的手機型號。\n\n如果其他使用者的 COVID-19 檢測呈陽性，他們可能上傳他們的聯絡資訊，並且州或當地衛生官員可能與您聯絡以進行密切追蹤。\n\n您的註冊詳細資料僅用於或披露追蹤接觸者以及 COVIDSafe 的正常及合法運作。\n\n如需更多資訊，請瀏覽 covidsafe.gov.au 網站。\n\nCOVIDSafe 隱私權政策提供有關您的資訊權利以及如何處理及共享資訊的更多詳細資訊。\n\nCOVIDSafe 隱私查詢及投訴相關的聯絡方式請查找「聯絡我們」下的隱私權政策。";
+"data_privacy_content_VO" = "註冊 COVIDSafe 之前，請務必閱讀 COVIDSafe《隱私權政策》。COVIDSafe 僅根據本政策及《1988 年隱私法》收集、使用或披露您的個人資訊。\n\n如果您未滿 16 歲，您的家長／監護人也必須閱讀《隱私權政策》。\n\n使用 COVIDSafe 屬自願性質。您可以隨時安裝或刪除該應用程式。如果您刪除 COVIDSafe，您也可以要求從安全伺服器刪除您的資訊。如果您不提供個人資訊，COVIDSafe 應用程式將無法如預期運行。\n\n要註冊 COVIDSafe，您需要輸入姓名（或化名）、手機號碼、年齡範圍及郵遞區號。\n\n您在註冊時提交的資訊以及有關使用 COVIDSafe 的資訊儲存在高度安全的伺服器。COVIDSafe 還會收集資訊以確保在您的裝置正常運行。這包括您的作業系統、安裝的應用程式版本、裝置設定的語言、藍芽是否正常運作以及您的應用程式是否記錄過去 7 天內的任何狀況。\n\nCOVIDSafe 不會收集您的位置資訊。\n\nCOVIDSafe 會在您的裝置上記錄聯絡日期及時間、您接觸的其他 COVIDSafe 使用者的加密 ID 代碼、藍牙信號強度及其他使用者的手機型號。\n\n您接觸的其他 COVIDSafe 使用者會在他們的裝置上記錄您的加密 ID 代碼、與您聯絡的日期及時間、藍牙信號強度及您的手機型號。\n\n如果其他使用者的 COVID-19 檢測呈陽性，他們可能上傳他們的聯絡資訊，並且州或當地衛生官員可能與您聯絡以進行密切追蹤。\n\n您的註冊詳細資料僅用於或披露追蹤接觸者以及 COVIDSafe 的正常及合法運作。\n\n如需更多資訊，請瀏覽 covidsafe.gov.au 網站。\n\nCOVIDSafe《隱私權政策》提供有關您的資訊權利以及如何處理及共享資訊的更多詳細資訊。\n\nCOVIDSafe 隱私查詢及投訴相關的聯絡方式請查找「聯絡我們」下的隱私權政策。";
+"data_privacy_content_android" = "註冊 COVIDSafe 之前，請務必閱讀 COVIDSafe *隱私權政策*。COVIDSafe 僅根據本政策及<i>《1988 年隱私法》</i>收集、使用或披露您的個人資訊。\n\n如果您未滿 16 歲，您的家長／監護人也必須閱讀 *隱私權政策*。\n\n使用 COVIDSafe 屬自願性質。您可以隨時安裝或刪除該應用程式。如果您刪除 COVIDSafe，*您也可以要求從安全伺服器刪除您的資訊*。\n\n要註冊 COVIDSafe，您需要輸入姓名（或化名）、手機號碼、年齡範圍及郵遞區號。如果您不提供個人資訊，COVIDSafe 應用程式將無法如預期運行。\n\n您在註冊時提交的資訊以及有關使用 COVIDSafe 的資訊儲存在高度安全的伺服器。\n\nCOVIDSafe 還會收集資訊以確保在您的裝置正常運行。這包括您的作業系統、安裝的應用程式版本、裝置設定的語言、Bluetooth® 是否正常運作以及您的應用程式是否記錄過去 7 天內的任何狀況。\n\nAndroid 裝置還包括是否停用電池優化及啟用位置服務的資訊。\n\nCOVIDSafe 不會收集您的位置資訊。\n\nCOVIDSafe 會在您的裝置上記錄聯絡日期及時間、您接觸的其他 COVIDSafe 使用者的加密 ID 代碼、藍牙信號強度及其他使用者的手機型號。\n\n您接觸的其他 COVIDSafe 使用者會在他們的裝置上記錄您的加密 ID 代碼、與您聯絡的日期及時間、藍牙信號強度及您的手機型號。\n\n如果其他使用者的 COVID-19 檢測呈陽性，他們可能上傳他們的聯絡資訊，並且州或當地衛生官員可能與您聯絡以進行密切追蹤。\n\n您的註冊詳細資料僅用於或披露追蹤接觸者以及 COVIDSafe 的正常及合法運作。\n\n如需更多資訊，請瀏覽 *covidsafe.gov.au* 網站。\n\nCOVIDSafe *隱私權政策* 提供有關您的資訊權利以及如何處理及共享資訊的更多詳細資訊。\n\nCOVIDSafe 隱私查詢及投訴相關的聯絡方式請查找 *聯絡我們* 下的隱私權政策。";
 /* OnBoarding Data Privacy */
 "data_privacy_headline" = "註册及私隱權";
 "deaths" = "死亡人數";
@@ -272,8 +298,6 @@
 "enter_pin_resend_pin" = "重新寄出 PIN 碼";
 "enter_pin_timer_expire" = "你的 PIN 碼將在此時間後無效";
 "enter_pin_wrong_number" = "請確認手機號碼是否正確";
-/* Figma page Android Screens (05/06) */
-"Enter_your_mobile_number_label" = "請輸入你的手機號碼";
 "every_day" = "每日";
 "factors_dotpoint1" = "在範圍內的COVIDSafe用戶數量";
 "factors_dotpoint2" = "裝置型號和機齡";
@@ -289,10 +313,10 @@
 /* Error message for when a user tries to signup outside of Australia. */
 "geoblock_error_message" = "";
 "geoblock_rego_error" = "";
+"global_OK" = "確定";
 "global_back" = "返回";
 "global_close" = "關閉";
 "global_double_tap" = "點觸兩次來編輯";
-"global_OK" = "確定";
 "hide" = "隱藏";
 "home_app_permission_status_subtitle" = "若設定錯誤，將無法執行 COVIDSafe。";
 "home_app_permission_status_title" = "檢查你的設定";
@@ -302,9 +326,12 @@
 /* Home */
 "home_header_active_title" = "COVIDSafe 已在啓用狀態";
 /* Home */
+"home_header_active_title" = "COVIDSafe 已在啓用狀態";
+/* Home */
 "home_header_active_title_thanks" = "感謝，COVIDSafe 現在已激活。";
 "home_header_inactive_check_your_permissions" = "檢查你的設定。";
 "home_header_inactive_title" = "COVIDSafe 未在啓用狀態";
+"home_header_inactive_title" = "COVIDSafe 未在啓用狀態";
 "home_header_uploaded_on_date_ios" = "你的資料已在%@上傳 。";
 "home_set_complete_external_link_app_content" = "下載政府應用程式來收取最新資訊及忠告。";
 "home_set_complete_external_link_app_title" = "收取冠狀病毒應用程式";
@@ -352,8 +379,6 @@
 "intro_content" = "爲了避免冠狀病毒在社區擴散，澳洲政府開發了 COVIDSafe。 \n\nCOVIDSafe 會保密地記錄你與其他用戶之間的接觸。如果你曾密切接觸過被驗出病毒陽性的人士，各州和領地的衛生部官員就可以聯絡你。 \n\n讓我們齊心協力，遏止病毒傳播，確保生活健康。";
 /* OnBoarding Intro */
 "intro_headline" = "齊心協力，遏止 COVID-19 的擴散。";
-/* Class = "UILabel"; text = "Help stop the spread\nand save lives."; ObjectID = "Cme-9F-deB"; */
-"IntroLabel" = "請協助遏止病毒擴散\n拯救生命";
 "invalid_australian_phone_number_error_prompt" = "澳洲手機號碼最多有10 個數位。";
 "invalid_norfolk_island_phone_number_error_prompt" = "諾福克島的手機號碼是個5至6位數字。";
 "is_snoozed" = "COVIDSafe已休眠";
@@ -389,26 +414,22 @@
 "no_handshakes_item3" = "重啟你的手機然後打開應用程式。";
 "no_handshakes_item4" = "";
 "no_handshakes_link" = "閱讀更多關於如何檢查COVIDSafe是否正常運作的資訊";
+"non_consent_button" = "我不同意";
+"non_consent_popup" = "未獲得家長或監護人同意，您不能繼續註冊程序。\n\n請退出並刪除應用程式。";
 /* Figma page Android Screens (05/06) */
 "norfolk_hint" = "例如：51234";
 "northern_territory" = "北領地";
 "notification_bluetooth" = "要使COVIDSafe運作，請開啟藍牙。";
 "notification_internet_content" = "要使COVIDSafe運作，請打開應用程式，檢查網絡連接。";
+"notification_internet_content" = "打開應用程式，檢查網絡連接。";
 "notification_not_active_title" = "COVIDSafe 未在啓用狀態";
 "notification_settings" = "打開應用程式以檢查你的設置。";
 "notification_update_content" = "更新你的應用程式來獲取最新的改良。";
 "notification_update_heading" = "COVIDSafe更新可用";
-/* Figma page iOS Screens (05/06) */
-"NotificationsBlurbLink" = "更改通知設定";
-/* Figma page iOS Screens (05/06) */
-"NotificationsDisabledBlurb" = "如果 COVIDSafe 尚未處於啟用狀態，你將不會收到通知。 \n更改通知設定";
-/* Figma page iOS Screens (05/06) */
-"NotificationsEnabledBlurb" = "如果 COVIDSafe 尚未處於啟用狀態，你將會收到通知。 \n更改通知設定";
 "numbers_error" = "無法查詢最新統計數字。";
 "numbers_no_internet" = "請連接到互聯網，以獲取最新統計數字。";
 "numbers_refresh" = "現在刷新";
 "options_for_australia" = "澳洲適用選項";
-"OS2b_Item_4" = "4. 你的iPhone要求允許位置許可權才能使COVIDSafe運作。* COVIDSafe不會收集、存儲或者使用你的位置資料*";
 "overseas_acquired" = "%@海外感染";
 "permission_button" = "繼續";
 /* Figma page iOS Screens (05/06) */
@@ -432,30 +453,19 @@
 "personal_details_name_title" = "全名（或假名）";
 "personal_details_post_code" = "澳洲郵遞區號";
 "personal_details_post_code_error_prompt" = "你的澳洲郵遞區號必須是個 4 位數字。";
-"PINNumber_VO_Label" = "PIN 碼";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusBody" = "在離家前及在公共場所時，務必開啟藍牙®以確保 COVIDSafe 處於啟用狀態。";
-/* Figma page iOS Screens (05/06) */
-"PN_BluetoothStatusTitle" = "COVIDSafe 未在啓用狀態";
-"PN_MobileNumber_VOLabel" = "手機號碼";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderBody" = "開啟 COVIDSafe，確保其處於執行狀態。";
-/* Figma page iOS Screens (05/06) */
-"PN_ReminderTitle" = "48 小時內未探測到任何接觸";
 "postcode_api_error" = "出現錯誤。請檢查你的網絡連接，然後重試。";
 "postcode_change_label" = "當前在澳大利亞的郵編";
 "postcode_success" = "你的郵編已經更新";
-"PostcodeValidationErrorMessage" = "請輸入有效的澳洲郵遞區號。";
 "privacy_policy" = "";
 "privacy_policy_description" = "";
 "queensland" = "昆士蘭州";
 "recovered" = "康復者總數";
-"registration_consent_content" = "我同意數字化轉型局作為數據儲存管理者，根據澳大利亞政府衛生部常務副部長的合法決定，收集以下信息：";
-"registration_consent_diagnostic" = "確保 COVIDSafe 在我的設備上正常運行的資訊。";
-"registration_consent_first_paragraph" = "我的註册資料。";
+"registration_consent_content" = "我同意衛生局根據《1988 年隱私法》之規定作為資料儲存管理員，收集以下資訊：";
+"registration_consent_diagnostic" = "確保 COVIDSafe 在我的裝置上正常運行的資訊。";
+"registration_consent_first_paragraph" = "註册資訊，";
 /* Onboarding Registration Consent */
 "registration_consent_headline" = "註册同意書";
-"registration_consent_second_paragraph" = "我與其他COVIDSafe用戶的接觸資料，如果我接觸過的另一用戶COVID-19測試呈陽性並且上傳了其接觸者數據。";
+"registration_consent_second_paragraph" = "關於我與其他 COVIDSafe 使用者的接觸資訊，如果我曾接觸 COVID-19 檢測呈陽性的其他使用者並上傳他們的聯絡資料，及";
 "restrictions_accommodation" = "住宿";
 "restrictions_activity" = "活動";
 "restrictions_cafes" = "咖啡館和餐館";
@@ -481,8 +491,6 @@
 "scheduled" = "你已將COVIDSafe設置為從%@休眠到%@。";
 /* OnBoarding Enter Number */
 "select_country_or_region" = "選擇國家或地區";
-/* Figma page Android Screens (05/06) */
-"Select_country_or_region_headline" = "選擇國家或地區";
 "select_state_territory_button" = "選擇州或者領地";
 "select_state_territory_heading" = "選擇州或者領地";
 "set_snooze_time" = "設置休眠時間";
@@ -514,7 +522,6 @@
 "stepCounter" = "第%d步，共%d步";
 "support" = "支持";
 "support_content" = "獲取幫助，解決求助主題未涵蓋的問題。";
-"Support_VOLabel" = "支持。獲取幫助，解決求助主題未涵蓋的問題。";
 "tasmania" = "塔斯曼尼亞州";
 /* Example: "From 22 to 28 January 2021" */
 "to" = "";
@@ -524,17 +531,16 @@
 "total_per_state" = "各州和領地確診病例總數";
 "twenty_eight_days" = "28天";
 "type_in_time" = "輸入時間";
-"UILaunchStoryboardName" = "LaunchScreen_zh_Hant";
+/* Figma page Android Screens (05/06) */
+"under-sixteen_consent_call_for_action" = "選擇「我同意」以確認同意，如果您無法確認家長或監護人的同意，請選擇「我不同意」。";
 "under_investigation" = "";
-"under_sixteen_content" = "我確認我的父母或監護人同意數字化轉型局作為數據儲存管理者，根據澳大利亞政府衛生部常務副部長的合法決定，收集以下資訊：";
-"under_sixteen_first_paragraph" = "我的註册資料。";
+"under_sixteen_content" = "我確認我的家長或監護人同意衛生局根據《1988 年隱私法》之規定作為資料儲存管理員，收集以下資訊：";
+"under_sixteen_first_paragraph" = "註册資訊，";
 /* OnBoarding Under Sixteen */
 "under_sixteen_headline" = "你需要經父母/監護人同意才能繼續";
 /* Figma page Android Screens (05/06) */
-"under_sixteen_registration_consent_first_paragraph" = "我的註册資料";
-"under_sixteen_second_paragraph" = "我與其他COVIDSafe用戶的接觸資料，如果我接觸過的另一用戶COVID-19測試呈陽性並且上傳了其接觸者數據。";
-/* Figma page Android Screens (05/06) */
-"under-sixteen_consent_call_for_action" = "選擇 「我同意」以確認同意聲明。";
+"under_sixteen_registration_consent_first_paragraph" = "註册資訊，";
+"under_sixteen_second_paragraph" = "關於我與其他 COVIDSafe 使用者的接觸資訊，如果我曾接觸 COVID-19 檢測呈陽性的其他使用者並上傳他們的聯絡資料，及";
 "update_available_app_store_btn" = "轉往應用程式商店";
 "update_available_dismiss_btn" = "請稍後提醒";
 "update_available_message_ios" = "我們一直都在改良 COVIDSafe。通過App Store更新。";
@@ -557,7 +563,7 @@
 "upload_step_verify_pin_header" = "上傳你的資料";
 "upload_step_verify_pin_sub_header" = "各州或領地的衛生部官員將會透過簡訊傳送一條 PIN 碼到你的設備。請在下面輸入 PIN 碼來上傳個人資料。";
 "us_consent_button" = "我同意";
-"us_registration_consent_diagnostic" = "確保 COVIDSafe 在我的設備上正常運行的資訊。";
+"us_registration_consent_diagnostic" = "確保 COVIDSafe 在我的裝置上正常運行的資訊。";
 "victoria" = "維多利亞州";
 "western_australia" = "西澳";
 "wrong_ping_number" = "輸入了錯誤的 PIN 碼";
@@ -572,38 +578,16 @@
 "Done" = "完成";
 /* Feedback */
 "EmailPlaceholder" = "輸入你的電子郵件（必填）";
+"EnterPINSent" = "輸入傳送到%@的 PIN 碼";
 /* Phone number and PIN */
 "EnterPhoneReVerify" = "輸入你的手機號碼以重新驗證";
-"EnterPINSent" = "輸入傳送到%@的 PIN 碼";
-/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_message" = "你好，想選擇執行那一項呢？";
-/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
-"entryPrompt_alert_title" = "意見箱";
-/* Title for button that launches new feedback flow. */
-"entryPrompt_newFeedback_button_title" = "新的反饋";
 "FoundIssueWithApp" = "發現 COVIDSafe 應用程式有問題嗎？";
-/* *** Feedback localised strings *** */
-"global_cancel_button_title" = "取消";
-"global_send_button_title" = "寄送";
-"global_sending_indication_title" = "正在寄送";
-"global_success_indication_title" = "成功";
 /* upload */
 "InformationUploaded" = "個人資料已在%@ 上傳。";
 "InvalidOTP" = "必須是個 6 位數字";
 "IssueDescPlaceholder" = "請描述該問題";
 "IssueFooter" = "我們可能會聯絡你以進一步了解反饋的詳情。你的電郵地址不會被用於其他目的。";
 "IssueThankYou" = "多謝！我們已經收到你的反饋。";
-/* Delete screenshot action sheet action button title. */
-"newFeedback_deleteScreenshot_actionTitle" = "刪除熒幕截圖";
-/* Messsage shown to user asking to confirm screenshot deletion. */
-"newFeedback_deleteScreenshotConfirmation_message" = "此熒幕截圖會被永久刪除。";
-"newFeedback_invalidEmail_errorMessage" = "請輸入有效的電郵地址！";
-/* Error message displayed to users when feedback has empty description */
-"newFeedback_noMessage_errorMessage" = "請在傳送前向我們提供你的意見。";
-/* Error message displayed to users when feedback fails to send. */
-"newFeedback_send_errorMessage" = "傳送反饋時出錯";
-/* Navigation Bar title shown during new feedback flow. */
-"newFeedbackFlow_navigationTitle" = "報告問題";
 "Next" = "下一步";
 /* registration succcess */
 "OS2b_Item1" = "1. 請在離家時隨身攜帶手機，並確保 COVIDSafe 處於開啟狀態。";
@@ -611,6 +595,7 @@
 "OS2b_Item2_VOLabel" = "2. 應保持藍牙®在開啟狀態。";
 "OS2b_Item3" = "3. COVIDSafe 不會傳送配對請求。了解更多資訊。";
 "OS2b_Item3Underline" = "了解更多資訊";
+"PINWillExpire" = "你的 PIN 碼將在%@無效";
 /* home */
 "PairingRequestsInfo" = "COVIDSafe 不會傳送配對請求。";
 "PairingRequestsInfoUnderline" = "配對請求";
@@ -618,7 +603,6 @@
 "PhoneNumberFormatErrorTitle" = "號碼格式錯誤";
 "PhoneVerificationErrorMessage" = "請檢查個人資料，然後重試。";
 "PhoneVerificationErrorTitle" = "驗證電話號碼時出錯";
-"PINWillExpire" = "你的 PIN 碼將在%@無效";
 "ReceivePinIssue" = "接收 PIN 碼時遇到問題？";
 /* help */
 "ReportAnIssue" = "回報問題";
@@ -627,13 +611,35 @@
 "UploadFailed" = "上傳失敗。請稍後再試。";
 "UploadFailedErrorMessage" = "請稍後再試。";
 "ValidationError" = "驗證出錯";
+/* Message for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_message" = "你好，想選擇執行那一項呢？";
+/* Title for prompt that user sees when opening feeback. Prompt asks user if he/she would like to send new feedback. */
+"entryPrompt_alert_title" = "意見箱";
+/* Title for button that launches new feedback flow. */
+"entryPrompt_newFeedback_button_title" = "新的反饋";
+/* *** Feedback localised strings *** */
+"global_cancel_button_title" = "取消";
+"global_send_button_title" = "寄送";
+"global_sending_indication_title" = "正在寄送";
+"global_success_indication_title" = "成功";
+/* Navigation Bar title shown during new feedback flow. */
+"newFeedbackFlow_navigationTitle" = "報告問題";
+/* Messsage shown to user asking to confirm screenshot deletion. */
+"newFeedback_deleteScreenshotConfirmation_message" = "此熒幕截圖會被永久刪除。";
+/* Delete screenshot action sheet action button title. */
+"newFeedback_deleteScreenshot_actionTitle" = "刪除熒幕截圖";
+"newFeedback_invalidEmail_errorMessage" = "請輸入有效的電郵地址！";
+/* Error message displayed to users when feedback has empty description */
+"newFeedback_noMessage_errorMessage" = "請在傳送前向我們提供你的意見。";
+/* Error message displayed to users when feedback fails to send. */
+"newFeedback_send_errorMessage" = "傳送反饋時出錯";
 "GetCoronaVirusApp_VOLabel" = "收取冠狀病毒應用程式。下載政府應用程式來收取最新資訊及忠告。";
 "HelpTopics_VOLabel" = "求助主題。排除故障和修復技術問題指南。";
 "LatestNews_VOLabel" = "要獲得最新資訊及更新事宜，請到 aus.gov.au 收取最新的冠狀病毒資訊。";
 "NotificationsDisabled_VOLabel" = "「通知傳送」功能已被闗閉。如果 COVIDSafe 尚未處於啟用狀態，你將不會收到通知。更改「通知傳送」設定";
 "NotificationsEnabled_VOLabel" = "「通知傳送」功能已被開啓。如果 COVIDSafe 尚未處於啟用狀態，你將會收到通知。更改「通知傳送」設定";
 "OS1b_TopParagraph_VOLabel" = "藍牙®訊號用於確定你在何時接近另一名 COVIDSafe 用戶。 \n你與其他 COVIDSafe 用戶的每次密切接觸都會被記錄下來，以創建密切接觸者資料。該資料會被加密，並僅儲存在你的手機内。 \n如果你是一名 COVIDSafe 用戶，而又被驗出 COVID-19 陽性，則州或領地衛生官員將會與你聯絡。他們將會協助你自願把你自己的密切接觸者資料上傳到高度保密的資料儲存系統。\n如果你曾密切接觸過另一名化驗結果呈陽性的 COVIDSafe 用戶，則州或領地衛生官員也可能會聯絡你。 \n欲知詳情，請參閱「求助主題」頁。";
-"permission_content_iOS_2_VOLabel" = "1. 藍牙\n2. 通知\n3. 位置服務";
-"permission_content_iOS_VOLabel" = "COVIDSafe需要啟用藍牙才能運作。COVIDSafe不會發出配對請求。\n\n通過允許通知，當COVIDSafe未在啟用狀態時，你會收到提示。\n\n你的iPhone要求COVIDSafe獲得位置許可權才能運作。*COVIDSafe不會跟蹤或者存儲你的位置資料。*\n\n\n選擇 '繼續’來啟用：";
 "ShareCovidSafe_VOLabel" = "分享使用 COVIDSafe，邀請他人參與防疫。團結便是力量！";
 "UploadData_VOLabel" = "曾有衛官員聯絡過你嗎？只有在你被驗出病毒陽性時，才能上傳個人資料。";
+"permission_content_iOS_2_VOLabel" = "1. 藍牙\n2. 通知\n3. 位置服務";
+"permission_content_iOS_VOLabel" = "COVIDSafe需要啟用藍牙才能運作。COVIDSafe不會發出配對請求。\n\n通過允許通知，當COVIDSafe未在啟用狀態時，你會收到提示。\n\n你的iPhone要求COVIDSafe獲得位置許可權才能運作。*COVIDSafe不會跟蹤或者存儲你的位置資料。*\n\n\n選擇 '繼續’來啟用：";
\ No newline at end of file
diff --git a/scripts/lokalise.sh b/scripts/lokalise.sh
index 37806da..933babb 100644
--- a/scripts/lokalise.sh
+++ b/scripts/lokalise.sh
@@ -1,6 +1,6 @@
 LOKALISE_TOKEN=$1
 
-lokalise2 --token $LOKALISE_TOKEN --project-id 961497065ee6ad1e440843.11368444 file download --format strings --dest ../temp --unzip-to ../temp/locales
+lokalise2 --token $LOKALISE_TOKEN --project-id 99670955616fccfa149649.92277036 file download --format strings --dest ../temp --unzip-to ../temp/locales
 
 for directory in `find ../temp/locales -type d`
 do
@@ -37,9 +37,9 @@ do
 			continue
 		fi
 
-		echo "Contatenating $filename to Localizable.strings"
+		echo "Concatenating $filename to Localizable.strings"
 
-		cat "$file" >> "$directory/Localizable.strings"
+		(echo ;cat "$file") >> "$directory/Localizable.strings"
 
 		echo "Deleting $file"
 		rm $file