diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SitePermissionsOptionsView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SitePermissionsOptionsView.java index 3747b98b2..9f21bdd27 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SitePermissionsOptionsView.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SitePermissionsOptionsView.java @@ -75,7 +75,7 @@ protected void updateUI() { switch (mCategory) { case SitePermission.SITE_PERMISSION_POPUP: - mBinding.headerLayout.setTitle(R.string.settings_privacy_policy_popups_title); + mBinding.headerLayout.setTitle(R.string.settings_privacy_policy_popups_title_v1); mBinding.contentText.setText(R.string.privacy_options_popups_list_header_v1); mBinding.emptyText.setText(R.string.privacy_options_popups_list_empty_first); break; diff --git a/app/src/main/res/layout/options_exceptions.xml b/app/src/main/res/layout/options_exceptions.xml index 274d5f286..833277634 100644 --- a/app/src/main/res/layout/options_exceptions.xml +++ b/app/src/main/res/layout/options_exceptions.xml @@ -24,7 +24,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:title="@string/settings_privacy_policy_popups_title" /> + app:title="@string/settings_privacy_policy_popups_title_v1" /> + app:buttonText="@string/security_options_block_pup_up_settings" /> - Exceptions for Pop-Ups + Exceptions for Pop-Ups @@ -671,7 +671,7 @@ - Advanced + Advanced @@ -877,7 +877,7 @@ Saved to Bookmarks! + downloads tray button then a download finishes. %1$s will be replaced with the downloaded file name. --> %1$s Downloaded - When you sign out, you won\'t be able to send or receive tabs from other devices. Your bookmarks and history will also stop syncing. + When you sign out, you won’t be able to send or receive tabs from other devices. Your bookmarks and history will also stop syncing. @@ -1551,7 +1551,7 @@ the Select` button. When clicked it closes all the previously selected tabs --> Wait + '%1$s' will be replaced at runtime with the status of the setting. --> Popup blocking is %1$s for this site. @@ -1613,7 +1613,8 @@ the Select` button. When clicked it closes all the previously selected tabs --> Disable - + Are you sure you want to exit %1$s? @@ -1685,9 +1686,10 @@ the Select` button. When clicked it closes all the previously selected tabs --> There was an error - + An error occurred while downloading %1$s. Please try again. - Ok + OK