Skip to content

Commit

Permalink
Merge pull request #7424 from brave/pr7415_ipfs-text-updates_1.19.x
Browse files Browse the repository at this point in the history
Update various strings for IPFS (uplift to 1.19.x)
  • Loading branch information
kjozwiak authored Dec 14, 2020
2 parents a34fbcb + fff8a42 commit 933a7b1
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
10 changes: 5 additions & 5 deletions app/brave_generated_resources.grd
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
Allow Google login for extensions
</message>
<message name="IDS_SETTINGS_RESOLVE_IPFS_URLS_DESC" desc="The description for how to handle IPFS URIs">
Method to resolve IPFS locations
Method to resolve IPFS resources
</message>
<message name="IDS_IPFS_RESOLVE_OPTION_ASK" desc="Select control value for which IPFS resolve method to use">
Ask
Expand All @@ -707,7 +707,7 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
IPFS public gateway fallback
</message>
<message name="IDS_SETTINGS_IPFS_AUTO_FALLBACK_TO_GATEWAY_DESC" desc="The description for the switch of automatically fallback to IPFS public gateway">
Automatically fallback to IPFS public gateway when the local node cannot be accessed.
Automatically fall back to public IPFS gateway if your local node cannot be reached.
</message>
<message name="IDS_SETTINGS_HANGOUTS_ENABLED_DESC" desc="The description for Hangouts switch in settings">
Uses Hangouts component to enable screen sharing and other features in the browser.
Expand All @@ -722,7 +722,7 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
Relaunch Now
</message>
<message name="IDS_SETTINGS_IPFS_COMPANION_ENABLED_DESC" desc="The description for IPFS companion switch in settings">
Uses IPFS companion extension to enhance IPFS support in the browser.
Uses the IPFS Companion extension for enhanced IPFS support in Brave, including access to common IPFS tasks from your browser bar.
</message>
<message name="IDS_SETTINGS_MANAGE_EXTENSIONS_LABEL" desc="The label of manage extensions link in settings">
Manage extensions
Expand Down Expand Up @@ -925,7 +925,7 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
</message>
<!-- IPFS -->
<message name="IDS_BRAVE_IPFS_INSTALL" desc="Install IPFS daemon infobar text">
Would you like to enable IPFS local daemon support in Brave?
IPFS resources detected. Would you like Brave to load them using a local IPFS node?
</message>
<message name="IDS_BRAVE_IPFS_SETTINGS" desc="Open IPFS settings">
Settings
Expand All @@ -934,7 +934,7 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
Enable IPFS
</message>
<message name="IDS_BRAVE_IPFS_LEARN_MORE">
Learn more about privacy consequences
Learn more about IPFS and privacy
</message>
<!-- Brave Wayback Machine -->
<message name="IDS_BRAVE_WAYBACK_MACHINE_INFOBAR_PAGE_MISSING_TEXT" desc="The label for sorry message when page is not available on infobar">
Expand Down
3 changes: 2 additions & 1 deletion components/ipfs/ipfs_constants.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const char kIPNSScheme[] = "ipns";
const char kDefaultIPFSGateway[] = "https://dweb.link";
const char kDefaultIPFSLocalGateway[] = "http://localhost";
const char kIPFSLearnMoreURL[] =
"https://support.brave.com/hc/en-us/articles/360051406452";
"https://support.brave.com/hc/en-us/sections/"
"360010974932-InterPlanetary-File-System-IPFS-";

} // namespace ipfs
14 changes: 7 additions & 7 deletions components/resources/ipfs_strings.grdp
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
<grit-part>
<if expr="ipfs_enabled">
<message name="IDS_IPFS_CONNECTED_PEERS_TITLE" desc="Number of peers connected">Connected peers:</message>
<message name="IDS_IPFS_ADDRESSES_CONFIG_TITLE" desc="Title of addresses config section">Addresses Config</message>
<message name="IDS_IPFS_DAEMON_STATUS_TITLE" desc="Title of daemon status section">Daemon Status</message>
<message name="IDS_IPFS_ADDRESSES_CONFIG_TITLE" desc="Title of addresses config section">Addresses</message>
<message name="IDS_IPFS_DAEMON_STATUS_TITLE" desc="Title of daemon status section">IPFS node status</message>
<message name="IDS_IPFS_API" desc="Title of the API config">API</message>
<message name="IDS_IPFS_GATEWAY" desc="Title of the gateway config">Gateway</message>
<message name="IDS_IPFS_SWARM" desc="Title of the swarm config">Swarm</message>
<message name="IDS_IPFS_LAUNCHED" desc="Title of the launched status">Launched</message>
<message name="IDS_IPFS_LAUNCH" desc="Text of launch action">Launch</message>
<message name="IDS_IPFS_SHUTDOWN" desc="Text of shutdown action">Shutdown</message>
<message name="IDS_IPFS_LAUNCH" desc="Text of launch action">Start</message>
<message name="IDS_IPFS_SHUTDOWN" desc="Text of shutdown action">Stop</message>
<message name="IDS_IPFS_NOT_INSTALLED" desc="Text of not installed state">Not Installed</message>
<message name="IDS_UTILITY_PROCESS_IPFS_NAME" desc="The utility process which manages IPFS daemon">IPFS Service</message>
<message name="IDS_IPFS_NOT_CONNECTED_TITLE" desc="Title of IPFS not connected interstitial page.">
IPFS Not Connected
</message>
<message name="IDS_IPFS_NOT_CONNECTED_HEADING" desc="Heading of IPFS not connected interstitial page.">
Can't connect to the IPFS content
Can't load IPFS resources using local node
</message>
<message name="IDS_IPFS_NOT_CONNECTED_PRIMARY_PARAGRAPH" desc="Main paragraph of IPFS not connected interstitial page.">
Failed to connect to the IPFS content using the local IPFS node, click the proceed button below to connect through the public gateway this time and automatically fallback to the public gateway in the future.
Failed to use the local IPFS node to load the requested IPFS resources. Click the "Proceed" button to use the public gateway instead, and to fall back automatically to the public gateway in the future.
</message>
<message name="IDS_IPFS_NOT_CONNECTED_PRIMARY_BUTTON" desc="The text for the IPFS not connected interstitial primary button.">
Proceed with Public Gateway
Expand All @@ -31,7 +31,7 @@
Hide Advanced
</message>
<message name="IDS_IPFS_NOT_CONNECTED_EXPLANATION" desc="The text of the IPFS not connected interstitial that will be displayed when the user presses the 'Advanced' button for additional information.">
We cannot connect to the requested content using the local IPFS node because the local node didn't start or because there are no connected peers available at the moment. By proceeding, we will automatically fallback to the default public gateway in the future when we cannot connect to IPFS content using the local IPFS node. This can be turned off later in settings.
Brave cannot load the requested IPFS resources either because the local node did not start, or because there are no connected peers available at the moment. If you choose "Proceed", Brave will automatically fall back to the default public gateway whenever using the local node fails. You can change this behavior at any point in Brave settings.
</message>
</if>
</grit-part>

0 comments on commit 933a7b1

Please sign in to comment.