Skip to content

Commit

Permalink
Revert "consolidate "Set as Default Browser" strings"
Browse files Browse the repository at this point in the history
This reverts commit a2ec247.
  • Loading branch information
LukasPaczos committed Dec 18, 2024
1 parent ef97ea0 commit cbe2399
Show file tree
Hide file tree
Showing 31 changed files with 69 additions and 33 deletions.
11 changes: 11 additions & 0 deletions app/lint-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5364,6 +5364,17 @@
column="13"/>
</issue>

<issue
id="UnusedResources"
message="The resource `R.string.settingsDefaultBrowserEnabled` appears to be unused"
errorLine1=" &lt;string name=&quot;settingsDefaultBrowserEnabled&quot;>Set as Default Browser&lt;/string>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/res/values/strings.xml"
line="35"
column="13"/>
</issue>

<issue
id="UnusedResources"
message="The resource `R.string.addFavoriteMenuTitle` appears to be unused"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,15 @@ class DefaultBrowserPage : OnboardingPageFragment(R.layout.content_onboarding_de
headerImage.setImageResource(R.drawable.set_as_default_browser_illustration_dialog)
subtitle.setText(R.string.defaultBrowserDescriptionNoDefault)
title.setText(R.string.onboardingDefaultBrowserTitle)
primaryButton.setText(R.string.setAsDefaultBrowser)
primaryButton.setText(R.string.defaultBrowserLetsDoIt)
setButtonsBehaviour()
}

private fun setUiForSettings() {
headerImage.setImageResource(R.drawable.set_as_default_browser_illustration_settings)
subtitle.setText(R.string.onboardingDefaultBrowserDescription)
title.setText(R.string.onboardingDefaultBrowserTitle)
primaryButton.setText(R.string.setAsDefaultBrowser)
primaryButton.setText(R.string.defaultBrowserLetsDoIt)
setButtonsBehaviour()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="@string/setAsDefaultBrowser"
android:text="@string/defaultBrowserLetsDoIt"
app:buttonSize="large"
app:layout_constraintBottom_toTopOf="@+id/continueButton"
app:layout_constraintEnd_toEndOf="@+id/browserProtectionSubtitle"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
android:layout_marginEnd="@dimen/keyline_5"
android:layout_marginBottom="@dimen/keyline_1"
android:layout_height="wrap_content"
android:text="@string/setAsDefaultBrowser"
android:text="@string/defaultBrowserLetsDoIt"
app:layout_constraintBottom_toTopOf="@+id/continueButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/view_menu_item_default_browser.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/setAsDefaultBrowser"
android:contentDescription="@string/settingsDefaultBrowserEnabled"
android:paddingHorizontal="12dp">

<!--Menu item's style defines horizontal padding as 24dp but we want the accent background
Expand All @@ -31,7 +31,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/keyline_2"
android:text="@string/setAsDefaultBrowser"
android:text="@string/settingsDefaultBrowserEnabled"
android:textColor="?attr/daxColorAccentBlue"
app:typography="body1" />

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Екранът за настройки на приложения по подразбиране не може да бъде стартиран</string>
<string name="setAsDefaultBrowser">Задаване като браузър по подразбиране</string>
<string name="settingsDefaultBrowserEnabled">Задаване като браузър по подразбиране</string>
<string name="defaultBrowserMaybeLater">Може би по-късно</string>
<string name="defaultBrowserLetsDoIt">Задаване като браузър по подразбиране</string>
<string name="defaultBrowserDescriptionNoDefault">Отваряйте връзки без притеснения, всеки път.</string>
<string name="defaultBrowserInstructions">Изберете DuckDuckGo и докоснете <font color="#678fff">Винаги</font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Nelze spustit výchozí obrazovku nastavení aplikace.</string>
<string name="setAsDefaultBrowser">Nastavit jako výchozí prohlížeč</string>
<string name="settingsDefaultBrowserEnabled">Nastavit jako výchozí prohlížeč</string>
<string name="defaultBrowserMaybeLater">Možná později</string>
<string name="defaultBrowserLetsDoIt">Nastavit jako výchozí prohlížeč</string>
<string name="defaultBrowserDescriptionNoDefault">Otevírejte odkazy s klidem mysli, pokaždé.</string>
<string name="defaultBrowserInstructions">Vyberte DuckDuckGo a klepněte na <font color="#678fff">Vždy</font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Det var ikke muligt at starte standard app-indstillingsskærmen</string>
<string name="setAsDefaultBrowser">Angiv som standardbrowser</string>
<string name="settingsDefaultBrowserEnabled">Angiv som standardbrowser</string>
<string name="defaultBrowserMaybeLater">Måske senere</string>
<string name="defaultBrowserLetsDoIt">Angiv som standardbrowser</string>
<string name="defaultBrowserDescriptionNoDefault">Åbne link med ro i sindet, hver gang.</string>
<string name="defaultBrowserInstructions">Vælg DuckDuckGo, og tryk på <font color="#678fff"> Altid </font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Standardmäßiger App-Einstellungsbildschirm kann nicht gestartet werden</string>
<string name="setAsDefaultBrowser">Als Standard-Browser festlegen</string>
<string name="settingsDefaultBrowserEnabled">Als Standard-Browser festlegen</string>
<string name="defaultBrowserMaybeLater">Vielleicht später</string>
<string name="defaultBrowserLetsDoIt">Als Standard-Browser festlegen</string>
<string name="defaultBrowserDescriptionNoDefault">Öffne Links jederzeit sicher und ohne Sorge.</string>
<string name="defaultBrowserInstructions">Wähle DuckDuckGo aus und tippe auf <font color="#678fff">Immer</font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Αδυναμία εκκίνησης προεπιλεγμένης οθόνης ρυθμίσεων εφαρμογής</string>
<string name="setAsDefaultBrowser">Ορισμός ως προεπιλεγμένο πρόγραμμα περιήγησης</string>
<string name="settingsDefaultBrowserEnabled">Ορισμός ως προεπιλεγμένο πρόγραμμα περιήγησης</string>
<string name="defaultBrowserMaybeLater">Ίσως αργότερα</string>
<string name="defaultBrowserLetsDoIt">Ορισμός ως προεπιλεγμένο πρόγραμμα περιήγησης</string>
<string name="defaultBrowserDescriptionNoDefault">Ανοίξτε συνδέσμους με ηρεμία και ασφάλεια, κάθε φορά.</string>
<string name="defaultBrowserInstructions">Επιλέξτε DuckDuckGo και πιέστε <font color="#678fff"> Always </font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">La pantalla de configuración predeterminada de la aplicación no se puede abrir</string>
<string name="setAsDefaultBrowser">Definir como navegador predeterminado</string>
<string name="settingsDefaultBrowserEnabled">Definir como navegador predeterminado</string>
<string name="defaultBrowserMaybeLater">Quizá más tarde</string>
<string name="defaultBrowserLetsDoIt">Definir como navegador predeterminado</string>
<string name="defaultBrowserDescriptionNoDefault">Abre los enlaces con tranquilidad, siempre.</string>
<string name="defaultBrowserInstructions">Selecciona DuckDuckGo y pulsa <font color="#678fff">Siempre</font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-et/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Rakenduse vaikeseadete ekraani ei saa käivitada</string>
<string name="setAsDefaultBrowser">Määrake vaikebrauseriks</string>
<string name="settingsDefaultBrowserEnabled">Määrake vaikebrauseriks</string>
<string name="defaultBrowserMaybeLater">Võib-olla hiljem</string>
<string name="defaultBrowserLetsDoIt">Määrake vaikebrauseriks</string>
<string name="defaultBrowserDescriptionNoDefault">Avage linke igal ajal, rahuliku meelega.</string>
<string name="defaultBrowserInstructions">Valige DuckDuckGo ja koputage valikut <font color="#678fff">Alati</font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Sovelluksen oletusasetusnäyttöä ei voida käynnistää</string>
<string name="setAsDefaultBrowser">Aseta oletusselaimeksi</string>
<string name="settingsDefaultBrowserEnabled">Aseta oletusselaimeksi</string>
<string name="defaultBrowserMaybeLater">Ehkä myöhemmin</string>
<string name="defaultBrowserLetsDoIt">Aseta oletusselaimeksi</string>
<string name="defaultBrowserDescriptionNoDefault">Avaa linkit ilman stressiä, joka kerta.</string>
<string name="defaultBrowserInstructions">Valitse DuckDuckGo ja napauta <font color="#678fff"> Aina </font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Impossible de lancer l\'écran des paramètres par défaut de l\'application</string>
<string name="setAsDefaultBrowser">Définir comme navigateur par défaut</string>
<string name="settingsDefaultBrowserEnabled">Définir comme navigateur par défaut</string>
<string name="defaultBrowserMaybeLater">Peut-être plus tard</string>
<string name="defaultBrowserLetsDoIt">Définir comme navigateur par défaut</string>
<string name="defaultBrowserDescriptionNoDefault">Des liens ouverts en toute tranquillité d\'esprit, à chaque fois.</string>
<string name="defaultBrowserInstructions">Sélectionnez DuckDuckGo et appuyez sur <font color="#678fff">Toujours </font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-hr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Ne mogu pokrenuti zaslon zadanih postavki u aplikaciji</string>
<string name="setAsDefaultBrowser">Postavi kao zadani preglednik</string>
<string name="settingsDefaultBrowserEnabled">Postavi kao zadani preglednik</string>
<string name="defaultBrowserMaybeLater">Možda kasnije</string>
<string name="defaultBrowserLetsDoIt">Postavi kao zadani preglednik</string>
<string name="defaultBrowserDescriptionNoDefault">Svaki put poveznice otvori spokojno.</string>
<string name="defaultBrowserInstructions">Odaberi DuckDuckGo i dodirni <font color="#678fff">Uvijek </font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-hu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Az alkalmazás alapértelmezett beállítású képernyője nem indítható el</string>
<string name="setAsDefaultBrowser">Beállítás alapértelmezett böngészőként</string>
<string name="settingsDefaultBrowserEnabled">Beállítás alapértelmezett böngészőként</string>
<string name="defaultBrowserMaybeLater">Talán később</string>
<string name="defaultBrowserLetsDoIt">Beállítás alapértelmezett böngészőként</string>
<string name="defaultBrowserDescriptionNoDefault">Nyugodtan kattints a linkekre, mindig.</string>
<string name="defaultBrowserInstructions">Válaszd ki a DuckDuckGót, majd koppints a <font color="#678fff"> Mindig </font> elemre.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Impossibile aprire la schermata delle impostazioni predefinite dell\'app</string>
<string name="setAsDefaultBrowser">Imposta come Browser predefinito</string>
<string name="settingsDefaultBrowserEnabled">Imposta come Browser predefinito</string>
<string name="defaultBrowserMaybeLater">Forse più tardi</string>
<string name="defaultBrowserLetsDoIt">Imposta come Browser predefinito</string>
<string name="defaultBrowserDescriptionNoDefault">Apri i collegamenti con la massima tranquillità, ogni volta.</string>
<string name="defaultBrowserInstructions">Seleziona DuckDuckGo e clicca su <font color="#678fff">Sempre</font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-lt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Nepavyko paleisti numatytųjų programos nustatymų ekrano</string>
<string name="setAsDefaultBrowser">Nustatyti kaip numatytąją naršyklę</string>
<string name="settingsDefaultBrowserEnabled">Nustatyti kaip numatytąją naršyklę</string>
<string name="defaultBrowserMaybeLater">Galbūt vėliau</string>
<string name="defaultBrowserLetsDoIt">Nustatyti kaip numatytąją naršyklę</string>
<string name="defaultBrowserDescriptionNoDefault">Kiekvieną kartą be jaudulio atverkite nuorodas.</string>
<string name="defaultBrowserInstructions">Pasirinkite „DuckDuckGo“ ir bakstelėkite <font color="#678fff"> „Always“ (visada) </font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-lv/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Nevar palaist lietotnes noklusējuma iestatījumu ekrānu</string>
<string name="setAsDefaultBrowser">Iestatīt kā noklusējuma pārlūku</string>
<string name="settingsDefaultBrowserEnabled">Iestatīt kā noklusējuma pārlūku</string>
<string name="defaultBrowserMaybeLater">Varbūt vēlāk</string>
<string name="defaultBrowserLetsDoIt">Iestatīt kā noklusējuma pārlūku</string>
<string name="defaultBrowserDescriptionNoDefault">Katru reizi atver saites bez raizēm.</string>
<string name="defaultBrowserInstructions">Atlasi DuckDuckGo un pieskaries <font color="#678fff">Vienmēr</font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-nb/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Kan ikke åpne innstillinger for standardapp</string>
<string name="setAsDefaultBrowser">Gjør til standardnettleser</string>
<string name="settingsDefaultBrowserEnabled">Gjør til standardnettleser</string>
<string name="defaultBrowserMaybeLater">Kanskje senere</string>
<string name="defaultBrowserLetsDoIt">Gjør til standardnettleser</string>
<string name="defaultBrowserDescriptionNoDefault">Åpne lenker med ro i sinnet, hver gang.</string>
<string name="defaultBrowserInstructions">Velg DuckDuckGo og trykk på <font color="#678fff">Alltid</font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-nl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Kan het instellingenscherm voor standaard-apps niet openen</string>
<string name="setAsDefaultBrowser">Instellen als standaard browser</string>
<string name="settingsDefaultBrowserEnabled">Instellen als standaard browser</string>
<string name="defaultBrowserMaybeLater">Later misschien</string>
<string name="defaultBrowserLetsDoIt">Instellen als standaard browser</string>
<string name="defaultBrowserDescriptionNoDefault">Open links altijd met een gerust hart.</string>
<string name="defaultBrowserInstructions">Selecteer DuckDuckGo en tik op <font color="#678fff">Altijd </font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Nie mogę otworzyć domyślnego ekranu ustawień aplikacji</string>
<string name="setAsDefaultBrowser">Ustaw jako domyślną przeglądarkę</string>
<string name="settingsDefaultBrowserEnabled">Ustaw jako domyślną przeglądarkę</string>
<string name="defaultBrowserMaybeLater">Może później</string>
<string name="defaultBrowserLetsDoIt">Ustaw jako domyślną przeglądarkę</string>
<string name="defaultBrowserDescriptionNoDefault">Zawsze otwieraj linki ze spokojem.</string>
<string name="defaultBrowserInstructions">Wybierz DuckDuckGo i dotknij <font color="#678fff">Zawsze</font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Não é possível iniciar o ecrã predefinido de definições da aplicação</string>
<string name="setAsDefaultBrowser">Definir como navegador padrão</string>
<string name="settingsDefaultBrowserEnabled">Definir como navegador padrão</string>
<string name="defaultBrowserMaybeLater">Talvez mais tarde</string>
<string name="defaultBrowserLetsDoIt">Definir como navegador padrão</string>
<string name="defaultBrowserDescriptionNoDefault">Abra links com tranquilidade, sempre.</string>
<string name="defaultBrowserInstructions">Selecione DuckDuckGo e toque em <font color="#678fff">Sempre</font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-ro/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Nu se poate lansa ecranul de setări implicite ale aplicației</string>
<string name="setAsDefaultBrowser">Setare ca browser implicit</string>
<string name="settingsDefaultBrowserEnabled">Setare ca browser implicit</string>
<string name="defaultBrowserMaybeLater">Poate mai târziu</string>
<string name="defaultBrowserLetsDoIt">Setare ca browser implicit</string>
<string name="defaultBrowserDescriptionNoDefault">Deschide link-urile liniștit, de fiecare dată.</string>
<string name="defaultBrowserInstructions">Selectează DuckDuckGo și atinge <font color="#678fff"> Întotdeauna </font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Не удаётся открыть настройки приложения по умолчанию</string>
<string name="setAsDefaultBrowser">Сделать браузером по умолчанию</string>
<string name="settingsDefaultBrowserEnabled">Сделать браузером по умолчанию</string>
<string name="defaultBrowserMaybeLater">Позже</string>
<string name="defaultBrowserLetsDoIt">Сделать браузером по умолчанию</string>
<string name="defaultBrowserDescriptionNoDefault">Открывайте ссылки, ни о чем не беспокоясь.</string>
<string name="defaultBrowserInstructions">Выберите DuckDuckGo и нажмите <font color="#678fff">Всегда</font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-sk/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Nedá sa spustiť obrazovka predvolených nastavení aplikácie</string>
<string name="setAsDefaultBrowser">Nastaviť ako predvolený prehliadač</string>
<string name="settingsDefaultBrowserEnabled">Nastaviť ako predvolený prehliadač</string>
<string name="defaultBrowserMaybeLater">Možno neskôr</string>
<string name="defaultBrowserLetsDoIt">Nastaviť ako predvolený prehliadač</string>
<string name="defaultBrowserDescriptionNoDefault">Vždy otvor odkazy s pokojom mysle.</string>
<string name="defaultBrowserInstructions">Zvoľte DuckDuckGo a ťuknite na položku <font color="#678fff">Vždy</font>.</string>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-sl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Zaslona privzetih nastavitev aplikacije ni mogoče zagnati</string>
<string name="setAsDefaultBrowser">Nastavite za privzeti brskalnik</string>
<string name="settingsDefaultBrowserEnabled">Nastavite za privzeti brskalnik</string>
<string name="defaultBrowserMaybeLater">Mogoče kasneje</string>
<string name="defaultBrowserLetsDoIt">Nastavite za privzeti brskalnik</string>
<string name="defaultBrowserDescriptionNoDefault">Bodite pomirjeni, ko odpirate povezave.</string>
<string name="defaultBrowserInstructions">Izberite aplikacijo DuckDuckGo in tapnite <font color="#678fff">Vedno</font>.</string>

Expand Down
Loading

0 comments on commit cbe2399

Please sign in to comment.