Commit db6a23c0 authored by Jose Blaya's avatar Jose Blaya
Browse files

Update strings

parent be7c0ced
......@@ -319,6 +319,7 @@ You will not be charged during this process.</string>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="QhW-ET-C6S" firstAttribute="top" secondItem="F5C-xr-9h6" secondAttribute="bottom" constant="10" id="5xm-a2-XVJ"/>
<constraint firstItem="J0c-Nr-MRF" firstAttribute="top" secondItem="qIN-O8-oDi" secondAttribute="bottom" constant="19" id="DQF-Iv-Zyb"/>
<constraint firstAttribute="trailing" secondItem="a9c-ON-ogp" secondAttribute="trailing" constant="19" id="DQz-S4-VYT"/>
<constraint firstAttribute="trailing" secondItem="bDc-5S-XeY" secondAttribute="trailing" constant="19" id="DqV-T2-Bo2"/>
<constraint firstAttribute="trailing" secondItem="J0c-Nr-MRF" secondAttribute="trailing" constant="19" id="E2m-Ad-R3y"/>
......@@ -342,7 +343,6 @@ You will not be charged during this process.</string>
<constraint firstItem="F5C-xr-9h6" firstAttribute="leading" secondItem="IY5-Kg-KKQ" secondAttribute="leading" constant="19" id="uqL-JR-FQX"/>
<constraint firstItem="J0c-Nr-MRF" firstAttribute="leading" secondItem="IY5-Kg-KKQ" secondAttribute="leading" constant="19" id="vLA-Sg-quw"/>
<constraint firstAttribute="trailing" secondItem="69O-CO-nH7" secondAttribute="trailing" constant="19" id="vXE-4h-CRl"/>
<constraint firstItem="J0c-Nr-MRF" firstAttribute="top" secondItem="qIN-O8-oDi" secondAttribute="bottom" constant="19" id="wtG-K4-aed"/>
<constraint firstItem="CA4-TV-yNn" firstAttribute="top" secondItem="69O-CO-nH7" secondAttribute="bottom" constant="40" id="yBp-us-Men"/>
<constraint firstItem="bDc-5S-XeY" firstAttribute="top" secondItem="a9c-ON-ogp" secondAttribute="bottom" constant="60" id="yOE-6B-XIC"/>
<constraint firstAttribute="trailing" secondItem="qIN-O8-oDi" secondAttribute="trailing" constant="19" id="znz-UA-x0F"/>
......@@ -350,11 +350,11 @@ You will not be charged during this process.</string>
</view>
</subviews>
<constraints>
<constraint firstItem="IY5-Kg-KKQ" firstAttribute="top" secondItem="u81-NH-vFv" secondAttribute="top" id="7a0-WR-tSL"/>
<constraint firstAttribute="bottom" secondItem="IY5-Kg-KKQ" secondAttribute="bottom" id="8nB-tZ-297"/>
<constraint firstItem="IY5-Kg-KKQ" firstAttribute="width" secondItem="u81-NH-vFv" secondAttribute="width" id="FD4-da-dm9"/>
<constraint firstAttribute="width" secondItem="IY5-Kg-KKQ" secondAttribute="width" id="B9G-cc-UTp"/>
<constraint firstAttribute="trailing" secondItem="IY5-Kg-KKQ" secondAttribute="trailing" id="KeK-GL-BV9"/>
<constraint firstAttribute="bottom" secondItem="IY5-Kg-KKQ" secondAttribute="bottom" id="Kqs-fy-WXp"/>
<constraint firstItem="IY5-Kg-KKQ" firstAttribute="leading" secondItem="u81-NH-vFv" secondAttribute="leading" id="WJd-Zn-gaB"/>
<constraint firstItem="IY5-Kg-KKQ" firstAttribute="top" secondItem="u81-NH-vFv" secondAttribute="top" id="mru-bM-hN5"/>
</constraints>
</scrollView>
</subviews>
......
......@@ -57,7 +57,7 @@
"iap.error.message.unavailable" = "Apple servers currently unavailable. Please try again later.";
"iap.error.title" = "Error";
"agreement.message" = "Payment will be charged to your Apple ID account at the confirmation of purchase. Subscription automatically renews unless it is canceled at least 24 hours before the end of the current period. Your account will be charged for renewal within 24 hours prior to the end of the current period. You can manage and cancel your subscriptions by going to your account settings on the App Store after purchase.\n\nSigning up constitutes acceptance of the $1 and the $2.";
"agreement.message" = "Payment will be charged to your Apple ID account at the confirmation of purchase. Subscription automatically renews unless it is canceled at least 24 hours before the end of the current period. Your account will be charged for renewal within 24 hours prior to the end of the current period. You can manage and cancel your subscriptions by going to your account settings on the App Store after purchase.\n\nCertain Paid Subscriptions may offer a free trial prior to charging your payment method. If you decide to unsubscribe from a Paid Subscription before we start charging your payment method, cancel the subscription at least 24 hours before the free trial ends.\n\nFree trials are only available to new users, and are at our sole discretion, and if you attempt to sign up for an additional free trial, you will be immediately charged with the standard Subscription Fee.\n\nWe reserve the right to revoke your free trial at any time.\n\nAny unused portion of your free trial period will be forfeited upon purchase of a subscription.\n\nSigning up constitutes acceptance of the $1 and the $2.";
"agreement.message.tos" = "Terms of Service";
"agreement.message.privacy" = "Privacy Policy";
......
......@@ -113,7 +113,7 @@ internal enum L10n {
}
internal enum Welcome {
internal enum Agreement {
/// Payment will be charged to your Apple ID account at the confirmation of purchase. Subscription automatically renews unless it is canceled at least 24 hours before the end of the current period. Your account will be charged for renewal within 24 hours prior to the end of the current period. You can manage and cancel your subscriptions by going to your account settings on the App Store after purchase.\n\nSigning up constitutes acceptance of the $1 and the $2.
/// Payment will be charged to your Apple ID account at the confirmation of purchase. Subscription automatically renews unless it is canceled at least 24 hours before the end of the current period. Your account will be charged for renewal within 24 hours prior to the end of the current period. You can manage and cancel your subscriptions by going to your account settings on the App Store after purchase.\n\nCertain Paid Subscriptions may offer a free trial prior to charging your payment method. If you decide to unsubscribe from a Paid Subscription before we start charging your payment method, cancel the subscription at least 24 hours before the free trial ends.\n\nFree trials are only available to new users, and are at our sole discretion, and if you attempt to sign up for an additional free trial, you will be immediately charged with the standard Subscription Fee.\n\nWe reserve the right to revoke your free trial at any time.\n\nAny unused portion of your free trial period will be forfeited upon purchase of a subscription.\n\nSigning up constitutes acceptance of the $1 and the $2.
internal static let message = L10n.tr("Welcome", "agreement.message")
internal enum Message {
/// Privacy Policy
......
......@@ -59,11 +59,11 @@ class PurchaseTrialViewController: AutolayoutViewController, BrandableNavigation
self.navigationItem.leftBarButtonItem?.accessibilityLabel = L10n.Welcome.Redeem.Accessibility.back
headerTitleLabel.text = "Try free for 7 days!"
subtitleLabel.text = "Pay only $74,99/year after"
subtitleLabel.text = "Only $ per year after"
smallTitleLabel.text = "7 day money back guarantee"
protectionTitleLabel.text = "1 year of privacy and identity protection"
protectionSubtitleLabel.text = "Browse anonymously with a hidden ip."
protectionSubtitleLabel.text = "Browse anonymously and hide your ip."
protectionImageView.image = Asset.shieldIcon.image.withRenderingMode(.alwaysTemplate)
devicesTitleLabel.text = "Support 10 devices at once"
......@@ -71,7 +71,7 @@ class PurchaseTrialViewController: AutolayoutViewController, BrandableNavigation
devicesImageView.image = Asset.computerIcon.image.withRenderingMode(.alwaysTemplate)
serversTitleLabel.text = "Connect to any region easily"
serversSubtitleLabel.text = "3341 + Servers in 32 countries"
serversSubtitleLabel.text = "More than 33 servers in 32 countries"
serversImageView.image = Asset.globeIcon.image.withRenderingMode(.alwaysTemplate)
textAgreement.attributedText = Theme.current.agreementText(
......@@ -81,7 +81,6 @@ class PurchaseTrialViewController: AutolayoutViewController, BrandableNavigation
privacy: L10n.Welcome.Agreement.Message.privacy,
privacyUrl: Client.configuration.privacyUrl
)
let nc = NotificationCenter.default
nc.addObserver(self, selector: #selector(productsDidFetch(notification:)), name: .__InAppDidFetchProducts, object: nil)
......@@ -108,10 +107,6 @@ class PurchaseTrialViewController: AutolayoutViewController, BrandableNavigation
self.navigationController?.popViewController(animated: true)
}
override func didRefreshOrientationConstraints() {
scrollView.isScrollEnabled = (traitCollection.verticalSizeClass == .compact)
}
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
if (segue.identifier == StoryboardSegue.Welcome.confirmPurchaseVPNPlanSegue.rawValue) {
if let vc = segue.destination as? ConfirmVPNPlanViewController,
......@@ -144,7 +139,7 @@ class PurchaseTrialViewController: AutolayoutViewController, BrandableNavigation
purchase.detail = L10n.Welcome.Plan.Yearly.detailFormat(currencySymbol, purchase.product.price.description)
purchase.bestValue = true
let price = L10n.Welcome.Plan.Yearly.detailFormat(currencySymbol, purchase.product.price.description)
subtitleLabel.text = "Pay only \(price) after"
subtitleLabel.text = "Only \(price) after"
Theme.current.makeSmallLabelToStandOut(subtitleLabel,
withTextToStandOut: price)
allPlans[0] = purchase
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment