Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Additional "default browser" prompts: translations #5571

Open
wants to merge 20 commits into
base: develop
Choose a base branch
from
Open
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
11 changes: 0 additions & 11 deletions app/lint-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5364,17 +5364,6 @@
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.defaultBrowserLetsDoIt)
primaryButton.setText(R.string.setAsDefaultBrowser)
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.defaultBrowserLetsDoIt)
primaryButton.setText(R.string.setAsDefaultBrowser)
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/defaultBrowserLetsDoIt"
android:text="@string/setAsDefaultBrowser"
app:buttonSize="large"
app:layout_constraintBottom_toTopOf="@+id/continueButton"
app:layout_constraintEnd_toEndOf="@+id/browserProtectionSubtitle"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/bottom_sheet_default_browser.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="36dp"
android:text="@string/defaultBrowserBottomSheetDialogPrimaryButton"
android:text="@string/setAsDefaultBrowser"
app:buttonSize="large" />

<com.duckduckgo.common.ui.view.button.DaxButtonGhost
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/defaultBrowserLetsDoIt"
android:text="@string/setAsDefaultBrowser"
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/defaultBrowserPopupMenuItem"
android:contentDescription="@string/setAsDefaultBrowser"
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/defaultBrowserPopupMenuItem"
android:text="@string/setAsDefaultBrowser"
android:textColor="@color/blue50"
app:typography="body1"
tools:ignore="InvalidColorAttribute" />
Expand Down
10 changes: 7 additions & 3 deletions app/src/main/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@

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

Expand Down Expand Up @@ -696,7 +695,7 @@
<string name="sslErrorLeaveCTA">Напускане на този сайт</string>
<string name="sslErrorAdvancedCTA">Разширени</string>
<string name="sslErrorExpandedHeadline">DuckDuckGo Ви предупреждава, когато сертификатът на даден уебсайт е невалиден.</string>
<string name="sslErrorExpandedCTA"><![CDATA[<u>Поемане на риска и отваряне на сайта<u/>]]></string>
<string name="sslErrorExpandedCTA"><![CDATA[<u>Поемане на риска и отваряне на сайта</u>]]></string>
<string name="sslErrorExpiredMessage" instruction="Placeholder is domain with certificate issues">Сертификатът за сигурност за %1$s е изтекъл. Възможно е уебсайтът да е конфигуриран грешно, хакер да е компрометирал връзката Ви или системният Ви часовник да е неправилно настроен.</string>
<string name="sslErrorWrongHostMessage" instruction="Placeholder is domain with certificate issues">Сертификатът за сигурност за %1$s не съответства на *.%2$s. Възможно е уебсайтът да е конфигуриран грешно, хакер да е компрометирал връзката Ви или системният Ви часовник да е неправилно настроен.</string>
<string name="sslErrorUntrustedMessage" instruction="Placeholder is domain with certificate issues">Операционната система на Вашето устройство не се доверява на сертификата за сигурност за %1$s. Възможно е уебсайтът да е конфигуриран грешно, хакер да е компрометирал връзката Ви или системният Ви часовник да е неправилно настроен.</string>
Expand Down Expand Up @@ -793,4 +792,9 @@
<string name="duckChatTitle">Duck.ai</string>
<string name="duckChatMenuItem">AI Chat</string>

<!-- Default Browser Bottom Sheet Dialog -->
<string name="defaultBrowserBottomSheetDialogTitle">Доверете се на DuckDuckGo да защитава повече от нещата, които правите онлайн</string>
<string name="defaultBrowserBottomSheetDialogSubTitle">Направете ни браузър по подразбиране, за да отваряте връзките към сайтове в DuckDuckGo.</string>
<string name="defaultBrowserBottomSheetDialogGhostButton">Не сега</string>

</resources>
10 changes: 7 additions & 3 deletions app/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Nelze spustit výchozí obrazovku nastavení aplikace.</string>
<string name="settingsDefaultBrowserEnabled">Nastavit jako výchozí prohlížeč</string>
<string name="setAsDefaultBrowser">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 Expand Up @@ -696,7 +695,7 @@
<string name="sslErrorLeaveCTA">Opustit tuhle stránku</string>
<string name="sslErrorAdvancedCTA">Pokročilé</string>
<string name="sslErrorExpandedHeadline">DuckDuckGo tě upozorní, když má web neplatný certifikát.</string>
<string name="sslErrorExpandedCTA"><![CDATA[<u>Přijmout riziko a přejít na stránku<u/>]]></string>
<string name="sslErrorExpandedCTA"><![CDATA[<u>Přijmout riziko a přejít na stránku</u>]]></string>
<string name="sslErrorExpiredMessage" instruction="Placeholder is domain with certificate issues">Platnost bezpečnostního certifikátu pro %1$s vypršela. Je možné, že web je nesprávně nakonfigurovaný, že útočník prolomil tvoje připojení nebo že tvoje systémové hodiny jsou nesprávné.</string>
<string name="sslErrorWrongHostMessage" instruction="Placeholder is domain with certificate issues">Bezpečnostní certifikát pro %1$s neodpovídá *.%2$s. Je možné, že web je nesprávně nakonfigurovaný, že útočník prolomil tvoje připojení nebo že tvoje systémové hodiny jsou nesprávné.</string>
<string name="sslErrorUntrustedMessage" instruction="Placeholder is domain with certificate issues">Operační systém tvého zařízení nedůvěřuje bezpečnostnímu certifikátu %1$s. Je možné, že web je nesprávně nakonfigurovaný, že útočník prolomil tvoje připojení nebo že tvoje systémové hodiny jsou nesprávné.</string>
Expand Down Expand Up @@ -797,4 +796,9 @@
<string name="duckChatTitle">Duck.ai</string>
<string name="duckChatMenuItem">Nový AI Chat</string>

<!-- Default Browser Bottom Sheet Dialog -->
<string name="defaultBrowserBottomSheetDialogTitle">Používej DuckDuckGo a získej větší ochranu při prohlížení internetu</string>
<string name="defaultBrowserBottomSheetDialogSubTitle">Nastav si nás jako výchozí prohlížeč, aby se všechny odkazy na stránky otevíraly v DuckDuckGo.</string>
<string name="defaultBrowserBottomSheetDialogGhostButton">Teď ne</string>

</resources>
10 changes: 7 additions & 3 deletions app/src/main/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Det var ikke muligt at starte standard app-indstillingsskærmen</string>
<string name="settingsDefaultBrowserEnabled">Angiv som standardbrowser</string>
<string name="setAsDefaultBrowser">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 Expand Up @@ -696,7 +695,7 @@
<string name="sslErrorLeaveCTA">Forlad dette websted</string>
<string name="sslErrorAdvancedCTA">Avanceret</string>
<string name="sslErrorExpandedHeadline">DuckDuckGo advarer dig, når en hjemmeside har et ugyldigt certifikat.</string>
<string name="sslErrorExpandedCTA"><![CDATA[<u>Accepter risiko og besøg webstedet<u/>]]></string>
<string name="sslErrorExpandedCTA"><![CDATA[<u>Accepter risiko og besøg webstedet</u>]]></string>
<string name="sslErrorExpiredMessage" instruction="Placeholder is domain with certificate issues">Sikkerhedscertifikatet for %1$s er udløbet. Det er muligt, at webstedet er forkert konfigureret, at en angriber har kompromitteret din forbindelse, eller at dit systemur er forkert.</string>
<string name="sslErrorWrongHostMessage" instruction="Placeholder is domain with certificate issues">Sikkerhedscertifikatet for %1$s matcher ikke *.%2$s. Det er muligt, at webstedet er forkert konfigureret, eller at en angriber har kompromitteret din forbindelse, eller at dit systemur er forkert.</string>
<string name="sslErrorUntrustedMessage" instruction="Placeholder is domain with certificate issues">Enhedens operativsystem har ikke tillid til sikkerhedscertifikatet for %1$s. Det er muligt, at webstedet er forkert konfigureret, eller at en angriber har kompromitteret din forbindelse, eller at dit systemur er forkert.</string>
Expand Down Expand Up @@ -793,4 +792,9 @@
<string name="duckChatTitle">Duck.ai</string>
<string name="duckChatMenuItem">Ny AI-chat</string>

<!-- Default Browser Bottom Sheet Dialog -->
<string name="defaultBrowserBottomSheetDialogTitle">Lad DuckDuckGo beskytte mere af det, du foretager dig online</string>
<string name="defaultBrowserBottomSheetDialogSubTitle">Gør os til din standardbrowser, så alle links åbner i DuckDuckGo.</string>
<string name="defaultBrowserBottomSheetDialogGhostButton">Ikke nu</string>

</resources>
10 changes: 7 additions & 3 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">Standardmäßiger App-Einstellungsbildschirm kann nicht gestartet werden</string>
<string name="settingsDefaultBrowserEnabled">Als Standard-Browser festlegen</string>
<string name="setAsDefaultBrowser">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 Expand Up @@ -696,7 +695,7 @@
<string name="sslErrorLeaveCTA">Diese Website verlassen</string>
<string name="sslErrorAdvancedCTA">Erweitert</string>
<string name="sslErrorExpandedHeadline">DuckDuckGo warnt dich, wenn eine Website ein ungültiges Zertifikat hat.</string>
<string name="sslErrorExpandedCTA"><![CDATA[<u>Risiko akzeptieren und Website besuchen<u/>]]></string>
<string name="sslErrorExpandedCTA"><![CDATA[<u>Risiko akzeptieren und Website besuchen</u>]]></string>
<string name="sslErrorExpiredMessage" instruction="Placeholder is domain with certificate issues">Das Sicherheitszertifikat für %1$s ist abgelaufen. Es ist möglich, dass die Website falsch konfiguriert ist, ein Angreifer deine Verbindung kompromittiert hat oder deine Systemuhr falsch ist.</string>
<string name="sslErrorWrongHostMessage" instruction="Placeholder is domain with certificate issues">Das Sicherheitszertifikat für %1$s stimmt nicht mit *.%2$s überein. Es ist möglich, dass die Website falsch konfiguriert ist, ein Angreifer deine Verbindung kompromittiert hat oder deine Systemuhr falsch ist.</string>
<string name="sslErrorUntrustedMessage" instruction="Placeholder is domain with certificate issues">Das Sicherheitszertifikat für %1$s wird vom Betriebssystem deines Geräts als nicht vertrauenswürdig eingestuft. Es ist möglich, dass die Website falsch konfiguriert ist, ein Angreifer deine Verbindung kompromittiert hat oder deine Systemuhr falsch ist.</string>
Expand Down Expand Up @@ -793,4 +792,9 @@
<string name="duckChatTitle">Duck.ai</string>
<string name="duckChatMenuItem">Neuer AI Chat</string>

<!-- Default Browser Bottom Sheet Dialog -->
<string name="defaultBrowserBottomSheetDialogTitle">Mit DuckDuckGo kannst du mehr von dem schützen, was du online tust</string>
<string name="defaultBrowserBottomSheetDialogSubTitle">Mach uns zu deinem Standardbrowser, damit alle Links in DuckDuckGo geöffnet werden.</string>
<string name="defaultBrowserBottomSheetDialogGhostButton">Jetzt nicht</string>

</resources>
10 changes: 7 additions & 3 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@

<!-- Default Browser -->
<string name="cannotLaunchDefaultAppSettings">La pantalla de configuración predeterminada de la aplicación no se puede abrir</string>
<string name="settingsDefaultBrowserEnabled">Definir como navegador predeterminado</string>
<string name="setAsDefaultBrowser">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 Expand Up @@ -696,7 +695,7 @@
<string name="sslErrorLeaveCTA">Salir de este sitio</string>
<string name="sslErrorAdvancedCTA">Avanzado</string>
<string name="sslErrorExpandedHeadline">DuckDuckGo te avisa cuando un sitio web tiene un certificado no válido.</string>
<string name="sslErrorExpandedCTA"><![CDATA[<u>Aceptar el riesgo y visitar el sitio<u/>]]></string>
<string name="sslErrorExpandedCTA"><![CDATA[<u>Aceptar el riesgo y visitar el sitio</u>]]></string>
<string name="sslErrorExpiredMessage" instruction="Placeholder is domain with certificate issues">El certificado de seguridad de %1$s ha caducado. Es posible que el sitio web esté mal configurado, que un atacante haya comprometido tu conexión o que el reloj del sistema no sea correcto.</string>
<string name="sslErrorWrongHostMessage" instruction="Placeholder is domain with certificate issues">El certificado de seguridad de %1$s no coincide con *.%2$s. Es posible que el sitio web esté mal configurado, que un atacante haya comprometido tu conexión o que el reloj del sistema no sea correcto.</string>
<string name="sslErrorUntrustedMessage" instruction="Placeholder is domain with certificate issues">El sistema operativo del dispositivo no confía en el certificado de seguridad de %1$s. Es posible que el sitio web esté mal configurado, que un atacante haya comprometido tu conexión o que el reloj del sistema no sea correcto.</string>
Expand Down Expand Up @@ -793,4 +792,9 @@
<string name="duckChatTitle">Duck.ai</string>
<string name="duckChatMenuItem">Nuevo AI Chat</string>

<!-- Default Browser Bottom Sheet Dialog -->
<string name="defaultBrowserBottomSheetDialogTitle">Deja que DuckDuckGo proteja más de lo que haces en línea</string>
<string name="defaultBrowserBottomSheetDialogSubTitle">Haznos tu navegador predeterminado para que todos los enlaces a sitios se abran en DuckDuckGo.</string>
<string name="defaultBrowserBottomSheetDialogGhostButton">Ahora no</string>

</resources>
Loading
Loading