diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/logindetection/BrowserTabFireproofDialogsEventHandlerTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/logindetection/BrowserTabFireproofDialogsEventHandlerTest.kt index d57954d09f3e..dfb9a522c933 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/logindetection/BrowserTabFireproofDialogsEventHandlerTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/logindetection/BrowserTabFireproofDialogsEventHandlerTest.kt @@ -32,7 +32,6 @@ import com.duckduckgo.app.global.events.db.UserEventsStore import com.duckduckgo.app.pixels.AppPixelName import com.duckduckgo.app.runBlocking import com.duckduckgo.app.settings.db.SettingsDataStore -import com.duckduckgo.app.statistics.Variant import com.duckduckgo.app.statistics.VariantManager import com.duckduckgo.app.statistics.pixels.Pixel import com.nhaarman.mockitokotlin2.mock @@ -168,17 +167,14 @@ class BrowserTabFireproofDialogsEventHandlerTest { } @Test - fun whenExpVariantUserDismissedFireproofLoginDialogwThenRegisterEvent() = coroutineRule.runBlocking { - givenFireproofLoginExperimentEnabled() - + fun whenUserDismissedFireproofLoginDialogThenRegisterEvent() = coroutineRule.runBlocking { testee.onUserDismissedFireproofLoginDialog() verify(mockUserEventsStore).registerUserEvent(FIREPROOF_LOGIN_DIALOG_DISMISSED) } @Test - fun whenExpVariantUserDismissedFireproofLoginDialogTwiceInRowThenAskToDisableLoginDetection() = coroutineRule.runBlocking { - givenFireproofLoginExperimentEnabled() + fun whenUserDismissedFireproofLoginDialogTwiceInRowThenAskToDisableLoginDetection() = coroutineRule.runBlocking { givenUserPreviouslyDismissedDialog() testee.onUserDismissedFireproofLoginDialog() @@ -188,8 +184,7 @@ class BrowserTabFireproofDialogsEventHandlerTest { } @Test - fun whenExpVariantUserEnabledFireproofLoginDetectionThenNeverAskToDisableIt() = coroutineRule.runBlocking { - givenFireproofLoginExperimentEnabled() + fun whenUserEnabledFireproofLoginDetectionThenNeverAskToDisableIt() = coroutineRule.runBlocking { givenUserEnabledFireproofLoginDetection() givenUserPreviouslyDismissedDialog() @@ -200,8 +195,7 @@ class BrowserTabFireproofDialogsEventHandlerTest { } @Test - fun whenExpVariantUserDidNotDisableLoginDetectionThenNeverAskToDisableItAgain() = coroutineRule.runBlocking { - givenFireproofLoginExperimentEnabled() + fun whenUserDidNotDisableLoginDetectionThenNeverAskToDisableItAgain() = coroutineRule.runBlocking { givenUserDidNotDisableLoginDetection() givenUserPreviouslyDismissedDialog() @@ -294,16 +288,6 @@ class BrowserTabFireproofDialogsEventHandlerTest { .thenReturn(UserEventEntity(FIREPROOF_LOGIN_DIALOG_DISMISSED)) } - private fun givenFireproofLoginExperimentEnabled() { - whenever(mockVariantManager.getVariant()).thenReturn( - Variant( - key = "", - features = listOf(VariantManager.VariantFeature.LoginDetectionEnabled), - filterBy = { true } - ) - ) - } - private suspend fun givenUserTriedFireButton() { whenever(mockUserEventsStore.getUserEvent(FIRE_BUTTON_EXECUTED)).thenReturn(UserEventEntity(FIRE_BUTTON_EXECUTED)) } diff --git a/app/src/androidTest/java/com/duckduckgo/app/statistics/VariantManagerTest.kt b/app/src/androidTest/java/com/duckduckgo/app/statistics/VariantManagerTest.kt index 6dc963e4d048..ed5ccc69894d 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/statistics/VariantManagerTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/statistics/VariantManagerTest.kt @@ -77,22 +77,6 @@ class VariantManagerTest { } } - // Fireproof Login experiment - @Test - fun fireproofLoginDetectionControlVariantHasExpectedWeightAndFeatures() { - val variant = variants.first { it.key == "zq" } - assertEqualsDouble(1.0, variant.weight) - assertEquals(0, variant.features.size) - } - - @Test - fun fireproofLoginDetectionExperimentVariantHasExpectedWeightAndFeatures() { - val variant = variants.first { it.key == "zw" } - assertEqualsDouble(1.0, variant.weight) - assertEquals(1, variant.features.size) - assertEquals(LoginDetectionEnabled, variant.features[0]) - } - @Suppress("SameParameterValue") private fun assertEqualsDouble(expected: Double, actual: Double) { val comparison = expected.compareTo(actual) diff --git a/app/src/main/java/com/duckduckgo/app/browser/logindetection/FireproofDialogsEventHandler.kt b/app/src/main/java/com/duckduckgo/app/browser/logindetection/FireproofDialogsEventHandler.kt index 15483baf5a69..d977f15576e6 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/logindetection/FireproofDialogsEventHandler.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/logindetection/FireproofDialogsEventHandler.kt @@ -27,7 +27,6 @@ import com.duckduckgo.app.global.events.db.UserEventsStore import com.duckduckgo.app.pixels.AppPixelName import com.duckduckgo.app.settings.db.SettingsDataStore import com.duckduckgo.app.statistics.VariantManager -import com.duckduckgo.app.statistics.loginDetectionExperimentEnabled import com.duckduckgo.app.statistics.pixels.Pixel import kotlinx.coroutines.withContext @@ -111,8 +110,6 @@ class BrowserTabFireproofDialogsEventHandler constructor( @Suppress("UnnecessaryVariable") private suspend fun allowUserToDisableFireproofLoginActive(): Boolean { - if (!variantManager.loginDetectionExperimentEnabled()) return false - val userEnabledLoginDetection = userEventsStore.getUserEvent(UserEventKey.USER_ENABLED_FIREPROOF_LOGIN) != null val userDismissedDisableFireproofLoginDialog = userEventsStore.getUserEvent(UserEventKey.FIREPROOF_DISABLE_DIALOG_DISMISSED) != null if (userEnabledLoginDetection || userDismissedDisableFireproofLoginDialog) return false diff --git a/app/src/main/java/com/duckduckgo/app/settings/db/SettingsDataStore.kt b/app/src/main/java/com/duckduckgo/app/settings/db/SettingsDataStore.kt index 60ee43db16cd..05a8456f6aed 100644 --- a/app/src/main/java/com/duckduckgo/app/settings/db/SettingsDataStore.kt +++ b/app/src/main/java/com/duckduckgo/app/settings/db/SettingsDataStore.kt @@ -26,7 +26,6 @@ import com.duckduckgo.app.settings.clear.ClearWhatOption import com.duckduckgo.app.settings.clear.ClearWhenOption import com.duckduckgo.app.settings.clear.FireAnimation import com.duckduckgo.app.statistics.VariantManager -import com.duckduckgo.app.statistics.loginDetectionExperimentEnabled interface SettingsDataStore { @@ -91,7 +90,7 @@ class SettingsSharedPreferences constructor(private val context: Context, privat set(enabled) = preferences.edit { putBoolean(KEY_AUTOCOMPLETE_ENABLED, enabled) } override var appLoginDetection: Boolean - get() = preferences.getBoolean(KEY_LOGIN_DETECTION_ENABLED, variantManager.loginDetectionExperimentEnabled()) + get() = preferences.getBoolean(KEY_LOGIN_DETECTION_ENABLED, true) set(enabled) = preferences.edit { putBoolean(KEY_LOGIN_DETECTION_ENABLED, enabled) } override var appLocationPermission: Boolean diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 8253246632ba..4751de10cd9c 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1,26 +1,10 @@ - - DuckDuckGo DuckDuckGo  Лого на DuckDuckGo - Privacy, simplified + Постижима поверителност Да Не Отваряне @@ -223,6 +207,7 @@ Все още няма добавени отметки Още опции за отметка %1$s Добавена е отметка + Изтрито <b>%1$s</b> Потвърдете @@ -484,6 +469,11 @@ Не сега Уебсайтове Питай при влизане + Да се деактивира ли напомняне за огнеустойчивост при вход в сайтове? + Можете да промените това предпочитание по всяко време в настройките. + ЗАБРАНИ + ОТМЕНИ + Премахната огнеустойчивост за <b>%1$s</b> Анимация на огнения бутон diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index e75c74208a08..c7975f5562b2 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -231,6 +215,7 @@ Zatím nebyly přidány žádné záložky. Další možnosti záložky %1$s Záložka přidána + Odstraněno <b>%1$s</b> Potvrdit @@ -496,6 +481,11 @@ Teď ne Webové stránky Zeptat se při přihlašování + Zakázat připomenutí ochrany při přihlašování k webovým stránkám? + Tuto předvolbu můžete v Nastavení kdykoli změnit. + VYPNOUT + ZRUŠIT + Ochrana odstraněna pro <b>%1$s</b> Animace tlačítka pro mazání diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 68512cfad14c..18b5c7e59f70 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -223,6 +207,7 @@ Ingen bogmærker tilføjet endnu Flere muligheder for bogmærke %1$s Bogmærke tilføjet + Slettet <b>%1$s</b> Bekræft @@ -484,6 +469,11 @@ Ikke nu Websider Spørg, når der logges ind + Vil du deaktivere brandsikker-påmindelse, når du logger ind på websteder? + Du kan ændre denne præference til enhver tid i Indstillinger. + Deaktiver + Afbestil + Brandsikring fjernet for <b>%1$s</b> Ildknap-animation diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 23885867c089..cfc9c92b41e7 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -223,6 +207,7 @@ Noch keine Lesezeichen hinzugefügt Mehr Optionen für Lesezeichen %1$s Lesezeichen hinzugefügt + <b>%1$s</b> wurde gelöscht Bestätigen @@ -484,6 +469,11 @@ Jetzt nicht Websites Beim Anmelden fragen + Erinnerung zur Feuerfest-Einstellung bei der Anmeldung auf Websites deaktivieren? + Diese Auswahl kann in den Einstellungen jederzeit rückgängig gemacht werden. + DEAKTIVIEREN + ABBRECHEN + Feuerfest-Einstellung für <b>%1$s</b> deaktiviert Animation der Schaltfläche „Feuer“ diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index aed4b88b6eda..0e72be9e0f04 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -223,6 +207,7 @@ Δεν προστέθηκαν σελιδοδείκτες ακόμα Περισσότερες επιλογές για σελιδοδείκτη %1$s Προστέθηκε σελιδοδείκτης + Διαγράφηκε <b>%1$s</b> Επιβεβαίωση @@ -484,6 +469,11 @@ Όχι τώρα Ιστότοποι Ερώτηση κατά τη σύνδεση + Απενεργοποίηση της υπενθύμισης Διαγραφής δραστηριότητας κατά τη σύνδεση σε ιστότοπους; + Μπορείτε να αλλάξετε την προτίμηση αυτή οποιαδήποτε στιγμή από τις Ρυθμίσεις. + ΑΠΕΝΕΡΓΟΠΟΙΗΣΗ + ΑΚΥΡΩΣΗ + Η διαγραφή δραστηριότητας αφαιρέθηκε για το <b>%1$s</b> Κινούμενο κουμπί φωτιάς diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 47c37fb53a2b..165c35a19402 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -223,6 +207,7 @@ Aún no se han añadido marcadores Más opciones para el marcador %1$s Marcador añadido + <b>%1$s</b> eliminado Confirmar @@ -484,6 +469,11 @@ Ahora no Sitios web Preguntar al iniciar sesión + ¿Deshabilitar recordatorio de a prueba de fuego al iniciar sesión en los sitios? + Puedes cambiar esta preferencia en cualquier momento en Ajustes. + DESHABILITAR + CANCELAR + A prueba de fuego desactivado para <b>%1$s</b> Animación del botón Fuego diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 5264cd37146f..de43e49bbf8f 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -223,6 +207,7 @@ Järjehoidjaid pole veel lisatud Veel järjehoidja %1$s valikuid Järjehoidja lisatud + Kustutatud <b>%1$s</b> Kinnita @@ -484,6 +469,11 @@ Mitte praegu Veebilehed Küsi sisselogimisel + Kas keelata tulekindel meeldetuletus saitidele sisselogimisel? + Seda eelistust saate seadetes igal ajal muuta. + KEELA + TÜHISTA + <b>%1$s</b> tulekindlus on eemaldatud Tulenupu animatsioon diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index cdc2e9a333f5..f1e095b1b304 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -223,6 +207,7 @@ Kirjanmerkkejä ei ole vielä lisätty Lisää vaihtoehtoja kirjanmerkille %1$s Kirjanmerkki lisätty + Poistettiin <b>%1$s</b> Vahvista @@ -484,6 +469,11 @@ Ei nyt Verkkosivustot Kysy sisäänkirjautumisen yhteydessä + Poistetaanko palonkestävyyden muistutus käytöstä sivustoille kirjauduttaessa? + Voit muuttaa valintaa milloin tahansa asetuksista. + POISTA KÄYTÖSTÄ + PERUUTA + Palonkestävyys poistettu sivustolta <b>%1$s</b> Liekki-painikkeen animaatio diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a19d1caf75c6..1d4a32183893 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -223,6 +207,7 @@ Aucun signet ajouté pour le moment Plus d\'options pour le signet %1$s Signet ajouté + <b>%1$s</b> supprimé Confirmer @@ -484,6 +469,11 @@ Pas maintenant Sites Web Choisir à la connexion + Désactiver le rappel du mode coupe-feu lors de la connexion aux sites ? + Vous pouvez modifier cette préférence à tout moment dans Paramètres. + DÉSACTIVER + ANNULER + Mode coupe-feu désactivé pour <b>%1$s</b> Animation du bouton en forme de flamme diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 93b0065399d1..b231983b37d2 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -231,6 +215,7 @@ Još nema dodanih knjižnih oznaka Više opcija za knjižnu oznaku %1$s Knjižna je oznaka dodana + Izbrisano <b>%1$s</b> Potvrdi @@ -496,6 +481,11 @@ Ne sada Mrežna mjesta Pitaj pri prijavi + Onemogućiti podsjetnik za označavanje sigurnog web-mjesta prilikom prijave? + Ovu postavku možete promijeniti bilo kada u Postavkama. + ONEMOGUĆI + ODUSTANI + Oznaka sigurnog web-mjesta uklonjena je za <b>%1$s</b> Animacija gumba Vatre diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 6343e966bb22..6ace15097191 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -223,6 +207,7 @@ Még nincsenek könyvjelzők hozzáadva %1$s könyvjelző további lehetőségei Könyvjelző hozzáadva + Törölve: <b>%1$s</b> Megerősítés @@ -484,6 +469,11 @@ Most nem Weboldalak Kérdezze meg bejelentkezéskor + Letiltod a tűzálló emlékeztetőt a weboldalakra történő bejelentkezéskor? + Ezt a beállítást bármikor megváltoztathatod a Beállításokban. + LETILT + MÉGSEM + Tűzállóvá tétel törölve a következőhöz: <b>%1$s</b> Tűz gomb animáció diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index eb078cd3d102..9793cf0b2185 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -223,6 +207,7 @@ Non è ancora stato aggiunto nessun segnalibro Ulteriori opzioni per il segnalibro %1$s Segnalibro aggiunto + <b>%1$s</b> eliminato Conferma @@ -484,6 +469,11 @@ Non adesso Siti web Chiedi al momento dell\'accesso + Disabilitare il promemoria per la protezione quando si accede ai siti? + Puoi modificare questa preferenza in qualsiasi momento nella sezione Impostazioni. + DISABILITA + ANNULLA + Protezione rimossa per <b>%1$s</b> Animazione pulsante fuoco diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 4786c3beef76..b577a26b9dfe 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -231,6 +215,7 @@ Žymių dar nepridėta Daugiau parinkčių žymei %1$s Žymė pridėta + Ištrinta <b>%1$s</b> Patvirtinti @@ -496,6 +481,11 @@ Ne dabar Svetainės Klausti prisijungiant + Išjungti apsaugos priminimą prisijungiant prie svetainių? + Šią nuostatą galite bet kada pakeisti nustatymuose. + IŠJUNGTI + ATŠAUKTI + <b>%1$s</b> apsauga pašalinta Mygtuko „Fire“ animacija diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index fa5215865937..c7755b9512c7 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -227,6 +211,7 @@ Vēl nav pievienota neviena grāmatzīme Vairāk opciju grāmatzīmei %1$s Pievienota grāmatzīme + Dzēsts: <b>%1$s</b> Apstiprināt @@ -490,6 +475,11 @@ Ne tagad Vietnes Jautāt, kad pierakstos + Vai atspējot atgādinājumu par ugunsdrošību, kad pierakstāties vietnēs? + Šo preferenci varēsi jebkurā laikā mainīt iestatījumu sadaļā. + ATSPĒJOT + ATCELT + <b>%1$s</b> ir noņemta ugunsdrošība Uguns pogas animācija diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 236fbe395e82..c269526df225 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -223,6 +207,7 @@ Ingen bokmerker lagt til ennå Flere alternativer for bokmerket %1$s Bokmerke lagt til + Slettet <b>%1$s</b> Bekreft @@ -484,6 +469,11 @@ Ikke nå Nettsteder Spør ved innlogging + Vil du deaktivere påminnelser om brannsikring når du logger inn på nettsteder? + Du kan når som helst endre dette under Innstillinger. + DEAKTIVER + AVBRYT + Brannsikring fjernet for <b>%1$s</b> Animasjon for brannknappen diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index b749dad94190..cfe3af5dd416 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -223,6 +207,7 @@ Nog geen bladwijzers toegevoegd Meer opties voor bladwijzer %1$s Bladwijzer toegevoegd + <b>%1$s</b> verwijderd Bevestigen @@ -484,6 +469,11 @@ Niet nu Websites Vragen bij inloggen + Herinnering voor brandveiligheid uitschakelen bij het inloggen? + Je kunt deze voorkeur op elk moment wijzigen in de instellingen. + UITSCHAKELEN + ANNULEREN + Brandveiligheid verwijderd voor <b>%1$s</b> Animatie vuurknop diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 5c1ffacfd4f2..806037455dc9 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -231,6 +215,7 @@ Nie dodano jeszcze żadnych zakładek Więcej opcji dla zakładki %1$s Dodano zakładkę + Usunięto <b>%1$s</b> Potwierdź @@ -496,6 +481,11 @@ Nie teraz Witryny internetowe Zapytaj przy logowaniu + Wyłączyć przypomnienie o zabezpieczeniach podczas logowania się do witryn internetowych? + W każdej chwili można zmienić ten wybór w Ustawieniach. + WYŁĄCZ + ANULUJ + Usunięto zabezpieczenie dla <b>%1$s</b> Animacja przycisku ognia diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 1b5a10b2f43b..176839f8bc32 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -223,6 +207,7 @@ Ainda não foram adicionados marcadores Mais opções para o marcador %1$s Favorito adicionado + Eliminado: <b>%1$s</b> Confirmar @@ -484,6 +469,11 @@ Agora não Websites Perguntar ao iniciar sessão + Desativar lembrete de barreira de segurança ao iniciar sessão em sites? + Pode alterar esta preferência nas definições em qualquer altura. + DESATIVAR + CANCELAR + Barreira de segurança removida para <b>%1$s</b> Animação do Botão de Fogo diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 3d2233de9850..aecb0b95f6ae 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -227,6 +211,7 @@ Nu s-a adăugat niciun semn de carte Mai multe opțiuni pentru semnul de carte %1$s Semn de carte adăugat + <b>%1$s</b> șters Confirmare @@ -490,6 +475,11 @@ Nu acum Site-uri web Întreabă la conectare + Dezactivezi memento pentru ștergerea activității și istoricului la conectarea la site-uri? + Poți modifica oricând această preferință în Setări. + DEZACTIVARE + ANULARE + Ștergerea activității și istoricului a fost eliminată pentru <b>%1$s</b> Animație buton Foc diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index d3ac05a25f94..a5bef1c76c34 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -231,6 +215,7 @@ Закладок пока нет Другие параметры закладки %1$s Закладка добавлена + Закладка <b>%1$s</b> удалена Подтвердить @@ -496,6 +481,11 @@ Не сейчас Сайты Спрашивать при входе + Отключить напоминание про огнеупорность при входе на сайты? + Это предпочтение можно в любое время изменить в «Настройках». + Выключить + Отменить + С сайта <b>%1$s</b> снята огнеупорность Анимация кнопки «Пожар» diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 2e0632d1ac5f..c72ba259ac1c 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -231,6 +215,7 @@ Zatiaľ neboli pridané žiadne záložky Viac možností pre záložku %1$s Záložka je pridaná + Vymazané: <b>%1$s</b> Potvrdiť @@ -496,6 +481,11 @@ Teraz nie Webové stránky Opýtať sa pri prihlásení + Vypnúť pripomienku na zabezpečenie pri prihlasovaní sa na lokalitách? + Tento výber môžete kedykoľvek zmeniť v Nastaveniach. + VYPNÚŤ + ZRUŠIŤ + Odstránilo sa zabezpečenie pre <b>%1$s</b> Animácia tlačidla ohňa diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 062cf9dde0d4..c57a57b97df7 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -231,6 +215,7 @@ Zaznamki še niso dodani Več možnosti za zaznamek %1$s Zaznamek je dodan + Izbrisano <b>%1$s</b> Potrdi @@ -496,6 +481,11 @@ Ne zdaj Spletna mesta Vprašajte ob prijavi + Onemogoči opomnik o požarni zaščiti pri prijavi na spletna mesta? + To nastavitev lahko kadar koli spremenite v možnosti Nastavitve. + ONEMOGOČI + PREKLIČI + Požarna zaščita odstranjena za <b>%1$s</b> Animacija za gumb ogenj diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index f3439ead9507..048a55ffb4a1 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -223,6 +207,7 @@ Inga bokmärken har lagts till ännu Fler alternativ för bokmärke %1$s Bokmärke sparat + Borttagen <b>%1$s</b> Bekräfta @@ -484,6 +469,11 @@ Inte nu Webbplatser Fråga när du loggar in + Vill du inaktivera påminnelse om brandsäkring när du loggar in på webbplatser? + Du kan när som helst ändra denna inställning i Inställningar. + INAKTIVERA + AVBRYT + Brandsäkring har tagits bort för <b>%1$s</b> Animation för brännarknapp diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index a82e432f0fa7..d76f38aaf632 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1,20 +1,4 @@ - - DuckDuckGo @@ -223,6 +207,7 @@ Henüz yer işareti eklenmedi %1$s yer imi için diğer seçenekler Yer imi eklendi + <b>%1$s</b> silindi Onayla @@ -484,6 +469,11 @@ Şimdi değil Web siteleri Oturum Açarken Sor + Sitelerde oturum açılırken Koruma hatırlatıcısı devre dışı bırakılsın mı? + Bu tercihi istediğiniz zaman Ayarlar\'dan değiştirebilirsiniz. + DEVRE DIŞI BIRAK + İPTAL + <b>%1$s</b> için Koruma kaldırıldı Yangın Düğmesi Animasyonu diff --git a/app/src/main/res/values/string-untranslated.xml b/app/src/main/res/values/string-untranslated.xml index 3dab2891567c..80260c9e6c33 100644 --- a/app/src/main/res/values/string-untranslated.xml +++ b/app/src/main/res/values/string-untranslated.xml @@ -25,15 +25,4 @@ Success! %s has been added to your home screen. Checking your feed in DuckDuckGo is a great alternative to using the Facebook app!<br/><br/>But if the Facebook app is on your phone, it can make requests for data even when you\'re not using it.<br/><br/>Prevent this by deleting it now! - - Fireproofing removed for <b>%s</b> - - - Deleted <b>%s</b> - - - Disable Fireproof reminder when signing in to sites? - You can change this preference anytime in Settings. - DISABLE - CANCEL diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 57591859f77e..a988f13520c1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -208,6 +208,7 @@ No bookmarks added yet More options for bookmark %s Bookmark added + Deleted <b>%s</b> Confirm @@ -469,6 +470,11 @@ Not now Websites Ask When Signing In + Disable Fireproof reminder when signing in to sites? + You can change this preference anytime in Settings. + DISABLE + CANCEL + Fireproofing removed for <b>%s</b> Fire Button Animation diff --git a/statistics/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt b/statistics/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt index a6fbcb31dd97..de82d1df63f0 100644 --- a/statistics/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt +++ b/statistics/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt @@ -30,7 +30,6 @@ interface VariantManager { sealed class VariantFeature { object SerpHeaderQueryReplacement : VariantFeature() object SerpHeaderRemoval : VariantFeature() - object LoginDetectionEnabled : VariantFeature() } companion object { @@ -49,11 +48,7 @@ interface VariantManager { // Single Search Bar Experiments Variant(key = "zg", weight = 0.0, features = emptyList(), filterBy = { noFilter() }), Variant(key = "zh", weight = 0.0, features = listOf(VariantFeature.SerpHeaderQueryReplacement), filterBy = { noFilter() }), - Variant(key = "zi", weight = 0.0, features = listOf(VariantFeature.SerpHeaderRemoval), filterBy = { noFilter() }), - - // Fireproof login Experiment - Variant(key = "zq", weight = 1.0, features = emptyList(), filterBy = { isEnglishLocale() }), - Variant(key = "zw", weight = 1.0, features = listOf(VariantFeature.LoginDetectionEnabled), filterBy = { isEnglishLocale() }), + Variant(key = "zi", weight = 0.0, features = listOf(VariantFeature.SerpHeaderRemoval), filterBy = { noFilter() }) ) val REFERRER_VARIANTS = listOf( @@ -99,8 +94,6 @@ interface VariantManager { fun updateAppReferrerVariant(variant: String) } -fun VariantManager.loginDetectionExperimentEnabled() = this.getVariant().hasFeature(VariantManager.VariantFeature.LoginDetectionEnabled) - class ExperimentationVariantManager( private val store: StatisticsDataStore, private val indexRandomizer: IndexRandomizer