Skip to content

Firefox reality quarantine #76

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.

Sign up for GitHub

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

Merged
Delphine merged 7 commits into from
Sep 13, 2019
Merged

Firefox reality quarantine #76

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
62e39eb
Title bar support (#1613)
keianhzo Aug 23, 2019
c6bff95
Media controls in the title bar (#1660)
keianhzo Aug 26, 2019
2978792
Adds close button when in private mode and one window is left (#1680)
keianhzo Aug 27, 2019
01e2849
History feed (#1656)
keianhzo Aug 27, 2019
1bd90a2
Update Bookmarks UI (#1704)
keianhzo Aug 29, 2019
68b537b
Added info regarding variable substitution (#1789)
keianhzo Sep 9, 2019
52084d1
Update voice collection dialog text (#1803)
bluemarvin Sep 9, 2019
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
117 changes: 112 additions & 5 deletions MozillaReality/FirefoxReality/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,11 +637,24 @@
<!-- This string is displayed as the title of the Bookmarks List, which contains the user's bookmarked websites. -->
<string name="bookmarks_title">Bookmarks</string>

<!-- This string is displayed as the title of the Bookmarks List when the bookmarks list is empty. -->
<string name="bookmarks_empty">Your Bookmarks List is Empty</string>

<!-- This string is displayed under the bookmarks title in the bookmarks list. -->
<string name="bookmarks_description">Click the @ icon when you’re on a page to add it to your bookmarks.</string>

<!-- This string is displayed in the middle of the Bookmarks List while the bookmarks are being loaded. -->
<string name="bookmarks_loading">Loading Bookmarks</string>

<!-- This string is displayed in a tooltip that appears when a user hovers
over an icon representing 'Remove Bookmark' for an individual bookmark
item listed in the Bookmarks List. -->
<string name="bookmarks_remove">Remove Bookmark</string>

<!-- This string is displayed in a tooltip that appears in the tray bar on top of the
bookmarks tray button then a new item is bookmarked. -->
<string name="bookmarks_saved_notification">Saved to Bookmarks!</string>

<!-- This string is displayed in a tooltip that appears when a user hovers
over an icon representing 'Edit This Bookmark' for an individual bookmark
item listed in the Bookmarks List. -->
Expand All @@ -661,6 +674,74 @@
all the bookmarks. -->
<string name="bookmarks_show_all">Show All Bookmarks</string>

<!-- This string is displayed as the title of the history list, which contains the user's visited websites. -->
<string name="history_title">History</string>

<!-- This string is displayed as the title of the history list when the history is empty. -->
<string name="history_empty">Your History is Empty</string>

<!-- This string is displayed under the history title in the history list. -->
<string name="history_description">You can access your browsing history here</string>

<!-- This string is displayed in the middle of the history list while the history is being loaded. -->
<string name="history_loading">Loading History</string>

<!-- This string is displayed as the section title in the history list for history entries that happened today. -->
<string name="history_section_today">Today</string>

<!-- This string is displayed as the section title in the history list for history entries that happened yesterday. -->
<string name="history_section_yesterday">Yesterday</string>

<!-- This string is displayed as the section title in the history list for history entries that happened last week. -->
<string name="history_section_last_week">Last Week</string>

<!-- This string is displayed as the section title in the history list for history entries that happened before last week. -->
<string name="history_section_older">Older</string>

<!-- This string is displayed is the "Clear History" button in the history list. When pressed a dialog for
clearing history is displayed. -->
<string name="history_clear">Clear History</string>

<!-- This string is displayed is the "Cancel" button from the clear history dialog.
When pressed the dialog is closed. -->
<string name="history_clear_cancel">Cancel</string>

<!-- This string is displayed is the "Clear Now" button from the clear history dialog.
When pressed the selected history range is deleted from the history storage. -->
<string name="history_clear_now">Clear Now</string>

<!-- This string is displayed is the clear history dialog.
If selected today's history is deleted from the history storage. -->
<string name="history_clear_range_today">Today</string>

<!-- This string is displayed is the clear history dialog.
If selected history since yesterday is deleted from the history storage. -->
<string name="history_clear_range_yesterday">Yesterday</string>

<!-- This string is displayed is the clear history dialog.
If selected history since last week is removed from the history storage. -->
<string name="history_clear_range_last_week">Last week</string>

<!-- This string is displayed is the clear history dialog.
If selected all the history is deleted from the history storage. -->
<string name="history_clear_range_everything">Everything</string>

<!-- This string is displayed in the header of the radio button where the clear cache time range
can be selected. -->
<string name="history_clear_time_range">Time range to clear:</string>

<!-- This string is displayed is the history context menu that is displayed when
the more button is pressed in a history item. It opens the selected history item in a new window. -->
<string name="history_context_menu_new_window">Open in a New Window</string>

<!-- This string is displayed is the history context menu that is displayed when
the more button is pressed in a history item. It add the selected items to favorites. -->
<string name="history_context_add_bookmarks">Add to Bookmarks</string>

<!-- This string is displayed is the history context menu that is displayed when
the more button is pressed in a history item. It removes the selected item from favorites. -->
<string name="history_context_remove_bookmarks">Remove from Bookmarks</string>

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

Expand Down Expand Up @@ -734,6 +815,14 @@
'Stop' stops the current page load. -->
<string name="stop_tooltip">Stop Loading</string>

<!-- This string is for the tooltip that appears upon hovering the 'Resume' button in the browser's title bar media buttons.
When clicked the current media playback is resumed. -->
<string name="media_resume_tooltip">Resume</string>

<!-- This string is for the tooltip that appears upon hovering the 'Pause' button in the browser's title bar media buttons.
When clicked the current media playback is paused. -->
<string name="media_pause_tooltip">Pause</string>

<!-- This string is for the tooltip that appears upon hovering the 'Home' button in the browser's navigation bar.
'Home' refers to the browser's start page (e.g., the Firefox Reality Home Page). -->
<string name="home_tooltip">Home</string>
Expand Down Expand Up @@ -800,10 +889,14 @@
tray. The button it labels, when pressed, opens a new browser window. -->
<string name="new_window_tooltip">Open a New Window</string>

<!-- This string is for the tooltip that appears when the user hovers over the down-arrow icon that appears in the
URL bar upon hover. The icon it labels, when pressed, expands a list of recently visited websites in the
user's History. -->
<string name="show_history_tooltip">Show history</string>
<!-- This string is for the tooltip that appears when the user hovers over the 'History' icon in the
tray and the History view is closed. The button it labels, when pressed, opens a list view of the user's visited
pages. -->
<string name="open_history_tooltip">Open History</string>

<!-- This string is for the tooltip that appears when the user hovers over the 'History' icon in the
tray and the History view is closed. The button it labels, when pressed, closes the History view. -->
<string name="close_history_tooltip">Close History</string>

<!-- This string is displayed in any button used for removing all the items in the current context. -->
<string name="remove_all">Remove All</string>
Expand Down Expand Up @@ -849,7 +942,8 @@
<!-- 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">Only 3 windows can be open. Close one to open another.</string>
<string name="max_windows_msg">Only %1$s 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>
Expand Down Expand Up @@ -885,4 +979,17 @@

<!-- 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>

<!-- This string is displayed in the URL bar when the user is in the home page -->

@Delphine Delphine Sep 4, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Please explain what "%1$s" refers to in comment.
CC @keianhzo.

@keianhzo keianhzo Sep 7, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Fixed: MozillaReality/FirefoxReality#1789

<string name="url_home_title">%1$s Home</string>

<!-- This string is displayed in the URL bar when the user is in the bookmarks panel -->
<string name="url_bookmarks_title">Bookmarks</string>

<!-- This string is displayed in the URL bar when the user is in the history panel -->
<string name="url_history_title">History</string>

<!-- This string is displayed in the Clear button on top of the window when in private mode. It only appears
when there is one window left. When clicked, it closes the private session -->
<string name="private_clear_button">Clear</string>
</resources>
2 changes: 1 addition & 1 deletion _meta/MozillaReality-FirefoxReality.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "MozillaReality/FirefoxReality",
"revs": {
"master": "9c4cba92f1ba79837ea2d81b9c4e5b235b30b69f"
"master": "357f7e126f7a0ae4d649a57e71d6cc2e22a07edc"
}
}