Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2025 DuckDuckGo
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class SwitchPlanBottomSheetDialog @AssistedInject constructor(
when (switchType) {
SwitchPlanType.UPGRADE_TO_YEARLY -> {
// Configure for upgrade (Monthly → Yearly)
binding.switchBottomSheetDialogTitle.text = context.getString(R.string.switchBottomSheetTitleUpgrade)
binding.switchBottomSheetDialogTitle.text = context.getString(R.string.switchBottomSheetDynamicTitleUpgrade)
binding.switchBottomSheetDialogSubTitle.text = context.getString(
R.string.switchBottomSheetDescriptionUpgrade,
pricingInfo?.yearlyMonthlyEquivalent ?: "",
Expand All @@ -130,7 +130,7 @@ class SwitchPlanBottomSheetDialog @AssistedInject constructor(

SwitchPlanType.DOWNGRADE_TO_MONTHLY -> {
// Configure for downgrade (Yearly → Monthly)
binding.switchBottomSheetDialogTitle.text = context.getString(R.string.switchBottomSheetTitleDowngrade)
binding.switchBottomSheetDialogTitle.text = context.getString(R.string.switchBottomSheetDynamicTitleDowngrade)
binding.switchBottomSheetDialogSubTitle.text = context.getString(
R.string.switchBottomSheetDescriptionDowngrade,
pricingInfo?.yearlyMonthlyEquivalent ?: "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ class SubscriptionSettingsActivity : DuckDuckGoActivity() {
if (viewState.switchPlanAvailable && viewState.platform.lowercase() == "google") {
binding.switchPlan.show()
val switchText = when (viewState.duration) {
Monthly -> getString(string.subscriptionSettingSwitchUpgrade)
Monthly -> getString(string.subscriptionSettingSwitchUpgradeDynamic)
Yearly -> getString(string.subscriptionSettingSwitchDowngrade)
}
binding.switchPlan.setPrimaryText(switchText)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
android:paddingHorizontal="@dimen/keyline_5"
app:textType="primary"
app:typography="h1"
tools:text="@string/switchBottomSheetTitleUpgrade" />
tools:text="@string/switchBottomSheetDynamicTitleUpgrade" />

<com.duckduckgo.common.ui.view.text.DaxTextView
android:id="@+id/switchBottomSheetDialogSubTitle"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<string name="subscriptionSettingSectionHelpAndSupport">Помощ и поддръжка</string>
<string name="subscriptionSettingSendFeedback">Изпратете отзив</string>
<string name="subscriptionSettingActivating">Активиране</string>
<string name="subscriptionSettingSwitchUpgrade">Превключи на годишен план и спести 16%</string>
<string name="subscriptionSettingSwitchUpgradeDynamic" instruction="%1$s is the savings percentage when switching from monthly to yearly (e.g. 16)">Превключи на годишен план и спести %1$s%%</string>
<!-- smartling.character_limit = 10 -->
<string name="subscriptionSettingSwitchUpgradePill">Най-изгодно</string>
<string name="subscriptionSettingSwitchDowngrade">Смяна на плана</string>
Expand Down Expand Up @@ -176,11 +176,6 @@
<string name="activityPir" translatable="false">Privacy Pro</string>
<string name="activitySendFeedback">Изпратете отзив</string>

<!-- Dynamic Switch % -->
<string name="switchBottomSheetDynamicTitleUpgrade" instruction="%1$s is the savings percentage when switching from monthly to yearly (e.g. 16)">Спести %1$s%% с\nгодишен план!</string>
<string name="switchBottomSheetDynamicTitleDowngrade" instruction="%1$s is the savings percentage when using a yearly plan instead of monthly (e.g. 16)">Спестяваш %1$s%% с\nгодишен план!</string>
<string name="subscriptionSettingSwitchUpgradeDynamic" instruction="%1$s is the savings percentage when switching from monthly to yearly (e.g. 16)">Превключи на годишен план и спести %1$s%%</string>

<!-- Privacy Pro Rebranding-->
<string name="subscriptionSettingRebrandingMessage">Privacy Pro вече се нарича просто абонамент за DuckDuckGo</string>

Expand All @@ -198,11 +193,11 @@
<string name="feedbackGeneralSubscription">Абонамент</string>

<!-- Switch plan-->
<string name="switchBottomSheetTitleUpgrade">Спести 16% с\nгодишен план!</string>
<string name="switchBottomSheetDynamicTitleUpgrade" instruction="%1$s is the savings percentage when switching from monthly to yearly (e.g. 16)">Спести %1$s%% с\nгодишен план!</string>
<string name="switchBottomSheetDescriptionUpgrade" instruction="%1$s is the yearly plan monthly equivalent price (e.g. $8.33), %2$s is the current monthly plan price (e.g. $9.99)">Годишният план е само %1$s/месец, в сравнение с текущия ти месечен план от %2$s.</string>
<string name="switchBottomSheetPrimaryButtonUpgrade" instruction="%1$s is the yearly plan price (e.g. $99.99)">Превключи на годишен план (%1$s/година)</string>
<string name="switchBottomSheetSecondaryButtonUpgrade">Запази месечен план</string>
<string name="switchBottomSheetTitleDowngrade">Спестяваш 16% с\nгодишен план!</string>
<string name="switchBottomSheetDynamicTitleDowngrade" instruction="%1$s is the savings percentage when using a yearly plan instead of monthly (e.g. 16)">Спестяваш %1$s%% с\nгодишен план!</string>
<string name="switchBottomSheetDescriptionDowngrade" instruction="%1$s is the yearly plan monthly equivalent price (e.g. $8.33), %2$s is the monthly plan price (e.g. $9.99)">Превключването ще увеличи месечната ти цена от %1$s/месец на %2$s/месец.</string>
<string name="switchBottomSheetPrimaryButtonDowngrade">Запази годишния план</string>
<string name="switchBottomSheetSecondaryButtonDowngrade" instruction="%1$s is the monthly plan price (e.g. $9.99)">Превключи на месечен план (%1$s/месец)</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<string name="subscriptionSettingSectionHelpAndSupport">Nápověda a podpora</string>
<string name="subscriptionSettingSendFeedback">Odeslat zpětnou vazbu</string>
<string name="subscriptionSettingActivating">Aktivuje se</string>
<string name="subscriptionSettingSwitchUpgrade">Přejdi na roční tarif a ušetři 16 %</string>
<string name="subscriptionSettingSwitchUpgradeDynamic" instruction="%1$s is the savings percentage when switching from monthly to yearly (e.g. 16)">Přejdi na roční tarif a ušetři %1$s %%</string>
<!-- smartling.character_limit = 10 -->
<string name="subscriptionSettingSwitchUpgradePill">Top nabídka</string>
<string name="subscriptionSettingSwitchDowngrade">Změnit tarif</string>
Expand Down Expand Up @@ -176,11 +176,6 @@
<string name="activityPir" translatable="false">Privacy Pro</string>
<string name="activitySendFeedback">Odeslat zpětnou vazbu</string>

<!-- Dynamic Switch % -->
<string name="switchBottomSheetDynamicTitleUpgrade" instruction="%1$s is the savings percentage when switching from monthly to yearly (e.g. 16)">Ušetři %1$s %%\ns ročním tarifem!</string>
<string name="switchBottomSheetDynamicTitleDowngrade" instruction="%1$s is the savings percentage when using a yearly plan instead of monthly (e.g. 16)">S ročním tarifem\nušetříš %1$s %%</string>
<string name="subscriptionSettingSwitchUpgradeDynamic" instruction="%1$s is the savings percentage when switching from monthly to yearly (e.g. 16)">Přejdi na roční tarif a ušetři %1$s %%</string>

<!-- Privacy Pro Rebranding-->
<string name="subscriptionSettingRebrandingMessage">Privacy Pro mění název na „předplatné DuckDuckGo“</string>

Expand All @@ -198,11 +193,11 @@
<string name="feedbackGeneralSubscription">Předplatné</string>

<!-- Switch plan-->
<string name="switchBottomSheetTitleUpgrade">Ušetři 16 %\ns ročním tarifem!</string>
<string name="switchBottomSheetDynamicTitleUpgrade" instruction="%1$s is the savings percentage when switching from monthly to yearly (e.g. 16)">Ušetři %1$s %%\ns ročním tarifem!</string>
<string name="switchBottomSheetDescriptionUpgrade" instruction="%1$s is the yearly plan monthly equivalent price (e.g. $8.33), %2$s is the current monthly plan price (e.g. $9.99)">Roční tarif stojí jen %1$s za měsíc oproti tvému současnému měsíčnímu tarifu za %2$s.</string>
<string name="switchBottomSheetPrimaryButtonUpgrade" instruction="%1$s is the yearly plan price (e.g. $99.99)">Přejít na roční tarif (%1$s za rok)</string>
<string name="switchBottomSheetSecondaryButtonUpgrade">Nechat měsíční tarif</string>
<string name="switchBottomSheetTitleDowngrade">S ročním tarifem\nušetříš 16 %!</string>
<string name="switchBottomSheetDynamicTitleDowngrade" instruction="%1$s is the savings percentage when using a yearly plan instead of monthly (e.g. 16)">S ročním tarifem\nušetříš %1$s %%</string>
<string name="switchBottomSheetDescriptionDowngrade" instruction="%1$s is the yearly plan monthly equivalent price (e.g. $8.33), %2$s is the monthly plan price (e.g. $9.99)">Přechodem se tvoje cena za měsíc zvýší z %1$s měsíčně na %2$s měsíčně.</string>
<string name="switchBottomSheetPrimaryButtonDowngrade">Nechat roční tarif</string>
<string name="switchBottomSheetSecondaryButtonDowngrade" instruction="%1$s is the monthly plan price (e.g. $9.99)">Přejít na měsíční tarif (%1$s za měsíc)</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<string name="subscriptionSettingSectionHelpAndSupport">Hjælp og support</string>
<string name="subscriptionSettingSendFeedback">Send tilbagemelding</string>
<string name="subscriptionSettingActivating">Aktiverer</string>
<string name="subscriptionSettingSwitchUpgrade">Skift til årligt og spar 16%</string>
<string name="subscriptionSettingSwitchUpgradeDynamic" instruction="%1$s is the savings percentage when switching from monthly to yearly (e.g. 16)">Skift til årligt og spar %1$s %%</string>
<!-- smartling.character_limit = 10 -->
<string name="subscriptionSettingSwitchUpgradePill">Anbefales</string>
<string name="subscriptionSettingSwitchDowngrade">Skift abonnement</string>
Expand Down Expand Up @@ -176,11 +176,6 @@
<string name="activityPir" translatable="false">Privacy Pro</string>
<string name="activitySendFeedback">Send tilbagemelding</string>

<!-- Dynamic Switch % -->
<string name="switchBottomSheetDynamicTitleUpgrade" instruction="%1$s is the savings percentage when switching from monthly to yearly (e.g. 16)">Spar %1$s %% med\net årligt abonnement!</string>
<string name="switchBottomSheetDynamicTitleDowngrade" instruction="%1$s is the savings percentage when using a yearly plan instead of monthly (e.g. 16)">Du sparer %1$s %% med\net årligt abonnement!</string>
<string name="subscriptionSettingSwitchUpgradeDynamic" instruction="%1$s is the savings percentage when switching from monthly to yearly (e.g. 16)">Skift til årligt og spar %1$s %%</string>

<!-- Privacy Pro Rebranding-->
<string name="subscriptionSettingRebrandingMessage">Privacy Pro kaldes nu bare DuckDuckGo-abonnementet</string>

Expand All @@ -198,11 +193,11 @@
<string name="feedbackGeneralSubscription">Abonnement</string>

<!-- Switch plan-->
<string name="switchBottomSheetTitleUpgrade">Spar 16 % med\net årligt abonnement!</string>
<string name="switchBottomSheetDynamicTitleUpgrade" instruction="%1$s is the savings percentage when switching from monthly to yearly (e.g. 16)">Spar %1$s %% med\net årligt abonnement!</string>
<string name="switchBottomSheetDescriptionUpgrade" instruction="%1$s is the yearly plan monthly equivalent price (e.g. $8.33), %2$s is the current monthly plan price (e.g. $9.99)">En årligt abonnement koster kun %1$s/måned sammenlignet med dit nuværende abonnement til %2$s/måned.</string>
<string name="switchBottomSheetPrimaryButtonUpgrade" instruction="%1$s is the yearly plan price (e.g. $99.99)">Skift til årligt (%1$s/år)</string>
<string name="switchBottomSheetSecondaryButtonUpgrade">Behold månedligt abonnement</string>
<string name="switchBottomSheetTitleDowngrade">Du sparer 16 % med\net årligt abonnement!</string>
<string name="switchBottomSheetDynamicTitleDowngrade" instruction="%1$s is the savings percentage when using a yearly plan instead of monthly (e.g. 16)">Du sparer %1$s %% med\net årligt abonnement!</string>
<string name="switchBottomSheetDescriptionDowngrade" instruction="%1$s is the yearly plan monthly equivalent price (e.g. $8.33), %2$s is the monthly plan price (e.g. $9.99)">Hvis du skifter, vil din månedlige pris stige fra %1$s/md. til %2$s/md.</string>
<string name="switchBottomSheetPrimaryButtonDowngrade">Behold årligt abonnement</string>
<string name="switchBottomSheetSecondaryButtonDowngrade" instruction="%1$s is the monthly plan price (e.g. $9.99)">Skift til månedligt (%1$s/måned)</string>
Expand Down
Loading
Loading