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

Update Settings: Update sub-screens #5334

Merged
merged 18 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
fix: add translatable false to new strings
I didn't realise that adding new strings would mean that anyone asking for translations would get them, i now know to add them to donottranslate during development, but adding translatable=false for now to save moving them about
  • Loading branch information
mikescamell committed Dec 12, 2024
commit db4e35eb2db8879a323e017ace6ad9c1e6790a4f
10 changes: 5 additions & 5 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
<string name="webTrackingProtectionLearnMoreTitle">Web Tracking Protection</string>
<string name="webTrackingProtectionTitle">Web Tracking Protection is Enabled</string>
<string name="webTrackingProtectionDescription"><![CDATA[DuckDuckGo never tracks you and we aim to protect your privacy as much as possible. We continually maintain and develop layers of protection to keep up with new tracking methods and provide many protections that other browsers don’t offer by default. <u><a href="">Learn More</a><u/>]]></string>
<string name="webTrackingProtectionDescriptionNew" tools:ignore="MissingTranslation"><![CDATA[DuckDuckGo automatically blocks hidden trackers as you browse the web.\n<a href="">Learn More</a>]]></string>
<string name="webTrackingProtectionDescriptionNew" translatable="false"><![CDATA[DuckDuckGo automatically blocks hidden trackers as you browse the web.\n<a href="">Learn More</a>]]></string>

<!-- Cookie Pop-Up Protection -->
<string name="cookiePopupProtectionTitle">Cookie Pop-Up Protection</string>
Expand All @@ -200,7 +200,7 @@

<!-- Fire Button -->
<string name="fireButtonActivityTitle">Fire Button</string>
<string name="dataClearingActivityTitle" tools:ignore="MissingTranslation">Data Clearing</string>
<string name="dataClearingActivityTitle" translatable="false">Data Clearing</string>

<!-- Permissions -->
<string name="permissionsActivityTitle">Permissions</string>
Expand All @@ -212,7 +212,7 @@
<string name="settingsAutomaticallyClearingDialogSave">Save</string>

<string name="settingsAutomaticallyClearWhat">Automatically Clear…</string>
<string name="settingsAutomaticallyClearData" tools:ignore="MissingTranslation">Automatically Clear Data…</string>
<string name="settingsAutomaticallyClearData" translatable="false">Automatically Clear Data…</string>
<string name="settingsAutomaticallyClearWhatDialogTitle">Automatically clear…</string>
<string name="settingsAutomaticallyClearWhatOptionNone">None</string>
<string name="settingsAutomaticallyClearWhatOptionTabs">Tabs</string>
Expand All @@ -229,10 +229,10 @@

<!-- About Activity -->
<string name="aboutActivityTitle">About DuckDuckGo</string>
<string name="aboutActivityTitleNew" tools:ignore="MissingTranslation">About</string>
<string name="aboutActivityTitleNew" translatable="false">About</string>
<string name="aboutHeader">Welcome to the Duck Side!</string>
<string name="aboutDescription">DuckDuckGo is the independent Internet privacy company founded in 2008 for anyone who’s tired of being tracked online and wants an easy solution. We’re proof you can get real privacy protection online without tradeoffs.\n\nThe DuckDuckGo browser comes with the features you expect from a go-to browser, like bookmarks, tabs, passwords, and more, plus over <annotation type="privacy_protection_link">a dozen powerful privacy protections</annotation> not offered in most popular browsers by default. This uniquely comprehensive set of privacy protections helps protect your online activities, from searching to browsing, emailing, and more.\n\nOur privacy protections work without having to know anything about the technical details or deal with complicated settings. All you have to do is switch your browser to DuckDuckGo across all your devices and you get privacy by default.\n\nBut if you do want a peek under the hood, you can find more information about how DuckDuckGo privacy protections work on our <annotation type="learn_more_link">help pages</annotation></string>
<string name="aboutDescriptionNew" tools:ignore="MissingTranslation">DuckDuckGo is the independent Internet privacy company founded in 2008 for anyone who\'s tired of being tracked online and wants an easy solution. We\'re proof you can get real privacy protection online without tradeoffs.\n\nThe DuckDuckGo browser comes with the features you expect from a go-to browser, like bookmarks, tabs, passwords, and more, plus over <annotation type="privacy_protection_link">a dozen powerful privacy protections</annotation> not offered in most popular browsers by default. This uniquely comprehensive set of privacy protections helps protect your online activities, from searching to browsing, emailing, and more.\n\nOur privacy protections work without having to know anything about the technical details or deal with complicated settings. All you have to do is switch your browser to DuckDuckGo across all your devices and you get privacy by default.\n\nBut if you do want a peek under the hood, you can find more information about how DuckDuckGo privacy protections work on our <annotation type="learn_more_link">help pages</annotation></string>
<string name="aboutDescriptionNew" translatable="false">DuckDuckGo is the independent Internet privacy company founded in 2008 for anyone who\'s tired of being tracked online and wants an easy solution. We\'re proof you can get real privacy protection online without tradeoffs.\n\nThe DuckDuckGo browser comes with the features you expect from a go-to browser, like bookmarks, tabs, passwords, and more, plus over <annotation type="privacy_protection_link">a dozen powerful privacy protections</annotation> not offered in most popular browsers by default. This uniquely comprehensive set of privacy protections helps protect your online activities, from searching to browsing, emailing, and more.\n\nOur privacy protections work without having to know anything about the technical details or deal with complicated settings. All you have to do is switch your browser to DuckDuckGo across all your devices and you get privacy by default.\n\nBut if you do want a peek under the hood, you can find more information about how DuckDuckGo privacy protections work on our <annotation type="learn_more_link">help pages</annotation></string>
<string name="no_suggestions">No Suggestions</string>

<!-- Broken Site Activity -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<string name="autoconsentTitle">Cookie Pop-Up Protection</string>
<string name="autoconsentDescription"><![CDATA[When DuckDuckGo detects cookie pop-ups on sites you visit, we can automatically set your cookie preferences to minimize cookies and maximize privacy, then close the pop-ups. <u><a href="">Learn More</a><u/>]]></string>
<string name="autoconsentDescriptionNew" tools:ignore="MissingTranslation"><![CDATA[DuckDuckGo will try to select the most private settings available and hide these pop-ups for you.\n<a href="">Learn More</a>]]></string>
<string name="autoconsentDescriptionNew" translatable="false"><![CDATA[DuckDuckGo will try to select the most private settings available and hide these pop-ups for you.\n<a href="">Learn More</a>]]></string>
<string name="autoconsentToggle">Let DuckDuckGo handle cookie pop-ups</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
<string name="autofillEmailProtectionInContextSignUpConfirmExitDialogNegativeButton">Exit Setup</string>

<string name="autofillManagementScreenTitle">Passwords</string>
<string name="autofillManagementScreenTitleNew" tools:ignore="MissingTranslation">Passwords &amp; Autofill</string>
<string name="autofillManagementScreenTitleNew" translatable="false">Passwords &amp; Autofill</string>
<string name="credentialManagementNoLoginsSavedTitle">No passwords saved yet</string>
<string name="credentialManagementAutofillToggleLabel">Save and Autofill Passwords</string>
<string name="credentialManagementAutofillSubtitle">Passwords are encrypted. Nobody but you can see them, not even us. <annotation type="learn_more_link">Learn More</annotation></string>
Expand Down
6 changes: 3 additions & 3 deletions common/common-ui/src/main/res/values/strings-common-ui.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<string name="notifyme_button_label">Notify me</string>

<!--Status Indicator-->
<string name="alwaysOn" tools:ignore="MissingTranslation">Always On</string>
<string name="on" tools:ignore="MissingTranslation">On</string>
<string name="off" tools:ignore="MissingTranslation">Off</string>
<string name="alwaysOn" translatable="false">Always On</string>
<string name="on" translatable="false">On</string>
<string name="off" translatable="false">Off</string>
</resources>
2 changes: 1 addition & 1 deletion sync/sync-impl/src/main/res/values/strings-sync.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<string name="sync_setup_with_another_device_cta_subtitle">Securely sync bookmarks and passwords between your devices.</string>
<string name="sync_off_hint">Your data is end-to-end encrypted, and DuckDuckGo does not have access to the encryption key.</string>
<string name="sync_setup_single_device_title">Single-Device Setup</string>
<string name="sync_setup_other_options_title" tools:ignore="MissingTranslation">Other Options</string>
<string name="sync_setup_other_options_title" translatable="false">Other Options</string>
<string name="sync_setup_single_recover_data_cta_title">Recover Synced Data</string>
<string name="sync_setup_single_sync_this_device_cta_title">Sync and Back Up This Device</string>

Expand Down