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

Firefox reality quarantine #62

Merged
merged 12 commits into from
Aug 22, 2019
99 changes: 95 additions & 4 deletions MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@
opens a dialog box that contains language-related settings. -->
<string name="settings_language">Language</string>

<!-- This string is used to label a text label for selecting the language in the 'Language' dialog window
(accessible from the browser's Settings' dialog window). Below this string appears
the different options for language settings. -->
<string name="settings_language_settings">Language Settings</string>

<!-- This string is used to label a text label for selecting the language in the 'Language' dialog window
(accessible from the browser's Settings' dialog window). Below this string appears a list of locales for
the user to choose as their preferred reading languages for website content. Each locale,
Expand All @@ -133,6 +138,40 @@
(e.g., `Español` is mapped to `es`) when configured in the 'Voice Search' system. -->
<string name="settings_language_choose_language_voice_search">Choose your preferred language for voice search</string>

<!-- This string is used to label a text label that appears in the header of 'Language Settings' ->
'Firefox Display Language' dialog window (accessible from the browser's Settings dialog window).
Below this string appears a list of locales for the user to choose as their preferred display
language for the application UI. -->
<string name="settings_language_choose_language_display_title">Firefox Display Language</string>

<!-- This string is used to label a text label that appears in the header description of 'Language Settings' ->
'Firefox Display Language' dialog window (accessible from the browser's Settings dialog window).
Below this string appears a list of locales for the user to choose as their preferred display
language for the application UI. -->
<string name="settings_language_choose_language_display_description">Choose the language used to display menus, messages, and notifications.</string>

<!-- This string is used to label a text label that appears in the header of 'Language Settings' ->
'Voice Search Language' dialog window (accessible from the browser's Settings dialog window).
Below this string appears a list of locales for the user to choose as their preferred voice search
language. -->
<string name="settings_language_choose_language_voice_search_title">Voice Search Language</string>

<!-- This string is used to label a text label that appears in the header description of 'Language Settings' ->
'Voice Search Language' dialog window (accessible from the browser's Settings dialog window).
Below this string appears a list of locales for the user to choose as their preferred voice search
language. -->
<string name="settings_language_choose_language_voice_search_description">Choose your preferred language for voice search.</string>

<!-- This string is used to label a text label that appears in the header of 'Language Settings' ->
'Preferred Language for Displaying Websites' dialog window (accessible from the browser's Settings dialog window).
Below this string appears a list of locales for the user to choose as their preferred languages for web content. -->
<string name="settings_language_choose_language_content_title">Preferred Website Languages</string>

<!-- This string is used to label a text label that appears in the header description of 'Language Settings' ->
'Preferred Language for Displaying Websites' dialog window (accessible from the browser's Settings dialog window).
Below this string appears a list of locales for the user to choose as their preferred languages for web content. -->
<string name="settings_language_choose_language_content_description">Web pages are sometimes offered in more than one language. Choose the languages you want to display in order of preference to the left side.</string>

<!-- This string is used to label a radio button in the 'Settings' Language dialog that, when pressed,
changes the app and the language of the speech-recognition-based search to 'English (US)'. -->
<string name="settings_language_english">English (US)</string>
Expand Down Expand Up @@ -342,6 +381,9 @@
<!-- This string labels the 'Reset' button that restores the default developer settings values. -->
<string name="developer_options_reset_button">Reset</string>

<!-- This string is used to label buttons to enable editing of other options. -->
<string name="settings_button_edit">Edit</string>

<!-- This string describes the radio buttons used to select the user's background environment
(seen while not in Immersive Mode). -->
<string name="developer_options_environments">Environment</string>
Expand Down Expand Up @@ -617,6 +659,30 @@
<!-- This string labels the Reset button that restores the default voice search language settings values. -->
<string name="language_options_reset">Reset Voice Search Language Settings</string>

<!-- This string labels the Reset button that restores the default display language settings values. -->
<string name="display_language_options_reset">Reset Display Language</string>

<!-- This string labels the Reset button that restores the default content language settings values. -->
<string name="content_language_options_reset">Reset Preferred Website Language</string>

<!-- This string labels the Reset button that restores all language settings values. -->
<string name="all_language_options_reset">Reset All Language Settings</string>

<!-- This string labels the description in the Voice Search Language button in the main language setting dialog. -->
<string name="language_options_voice_search_language"><![CDATA[Voice Search Language: <br>&emsp;&emsp;<b>%1$s</b>]]></string>

<!-- This string labels the description in the Content Language button in the main language setting dialog. -->
<string name="language_options_content_language"><![CDATA[Preferred Language for Displaying Websites: <br>&emsp;&emsp;<b>%1$s</b>]]></string>

<!-- This string labels the description in the Display Language button in the main language setting dialog. -->
<string name="language_options_display_language"><![CDATA[Display Language for App: <br>&emsp;&emsp;<b>%1$s</b>]]></string>

<!-- This string labels the description in the Content Language header for preferred languages list. -->
<string name="language_options_preferred_languages">Preferred Language(s)</string>

<!-- This string labels the description in the Content Language header for available languages list. -->
<string name="language_options_available_languages">Available Languages</string>

<!-- This string is for the table column name (in the browser's 'Bookmarks' list) for the 'Name' of the bookmarked website. -->
<string name="col_name">Name</string>

Expand Down Expand Up @@ -662,7 +728,7 @@

<!-- This string is for the tooltip that appears upon hovering the 'User Agent' button in the
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment here needs to be updated.
Also, since the string changes drastically in meaning, the string ID will need to be updated so that localizers can see it has changed.

The strings that have been modified below all need to be fixed in the same way (so, updating localization comment as well as string ID).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All these are new strings in 1.4 and haven't been translated yet (at least the translations haven't been comited to the FxR repo yet). Do we still need to add new strings even if they have only changed before being translated?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment updated.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

browser's navigation bar. The button it labels, when pressed, change the currently used user agent. -->
<string name="user_agent_tooltip">Switch User Agent</string>
<string name="user_agent_tooltip">Request desktop site</string>

<!-- This string is for the tooltip that appears upon hovering the 'Clear' button in the
browser's navigation bar. The button it labels, when pressed, clears the navigation bar text. -->
Expand Down Expand Up @@ -766,7 +832,10 @@
<!-- This string is displayed in the message of the notification message shown when the user tries to open a new window and
it has already opened the maximum number of allowed windows. %1$s expands to a integer value that represent the maximum windows
that can be opened (initially 3) -->
<string name="max_windows_message">You cannot have more than %1$s windows open at a time. Please close one before opening another.</string>
<string name="max_windows_message">Only 3 windows can be open. Close one to open another.</string>
<!-- This string is displayed in the button of the notification message shown when the user tries to open a new window and
it has already opened the maximum number of allowed windows. -->
<string name="max_windows_button">OK</string>

<!-- This string is displayed in the title of the alert dialog shown when the user does not have permission to run the application on the device. -->
<string name="not_entitled_title">Unable To Run</string>
Expand All @@ -777,7 +846,29 @@
<!-- This string is displayed in a button that when pressed allows a user to view a page that has been blocked from being displayed.-->
<string name="performance_unblock_page">Unblock Page</string>
<!-- This string is displayed as the title of a dialog displayed when poor web page performance has been detected. -->
<string name="performance_title">Poor Performance Detected</string>
<string name="performance_title">Poor Site Performance</string>
<!-- This string is displayed as the message body of a dialog displayed when poor web page performance has been detected and the page has been unloaded to restore performance. -->
<string name="performance_message">The current web page is affecting performance and has been suspended. Reducing the window size can help improve a web page with poor performance.</string>
<string name="performance_message">Try reducing the window size to improve performance. Unblocking this page may crash your app.</string>

<!-- This string is displayed anywhere where we need to display the "Default" string by itself. -->
<string name="tag_default">Default</string>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure we want to do this.
@Pike : Could you please confirm?
(also I see there's another "default" string below, so not sure this is useful)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed that string as it's not being used.


<!-- This string is displayed in the title of the Voice Search samples collect dialog. That dialog is shown the first time
a user tries to use the voice search. -->
<string name="voice_samples_collect_dialog_title">Allow Firefox to Anonymously Collect Voice Samples?</string>

<!-- This string is displayed in the description of the Voice Search samples collect dialog. That dialog is shown the first time
a user tries to use the voice search. -->
<string name="voice_samples_collect_dialog_description">Your data is always anonymous and protected under our Personal Data Promise. We collect voice samples to improve the experience and performance of our products. You’ll always be able to use voice search, even if you don’t allow collection.&lt;a href=&quot;privacy&quot;&gt;Learn More&lt;/a&gt;</string>

<!-- This string is displayed in the button of the Voice Search samples collect dialog.
When clicked the user opts out from the voice data collection. -->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be "opts in" since the string is "Allow"?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

<string name="voice_samples_collect_dialog_allow">Allow</string>

<!-- This string is displayed in the button of the Voice Search samples collect dialog.
When clicked the user opts in for the voice data collection. -->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be "opts out" since the string is "Don't Allow"?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

<string name="voice_samples_collect_dialog_do_not_allow">Don’t Allow</string>

<!-- This string is displayed in the content language list in front of the system default language in between parenthesis -->
<string name="language_default">Default</string>
</resources>
2 changes: 1 addition & 1 deletion _meta/MozillaReality-FirefoxReality.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "MozillaReality/FirefoxReality",
"revs": {
"master": "3d484cbda11329013255f9b95c51e36185622e4f"
"master": "9e9fa00d450353e5bebd13e5f7f91deeb223c8f5"
}
}