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

App strings reworked #619

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

App strings reworked #619

wants to merge 14 commits into from

Conversation

comradekingu
Copy link
Contributor

@comradekingu comradekingu commented Oct 30, 2022

Will proofread later.
Ready for review.


Unsolved/for another day/thoughts:

Why are title/desc/changelogs here and not in fastlane?
"Try again" / "try again later" Maybe check when it should be one or the other, or make it all consistent.
The "DNS / DNS +" This is confusing, and there is something called "RDNS Plus" to make it more-so.

"Free and open source"
"Orbot is a free proxy app that empowers other apps to use the Internet more <u>securely</u>."

I am not a fan. A discussion for another day maybe.
Suggest moving all to "libre". However this also runs afoul of the playstore ineptness in blocking apps touting themselves as "free", as it translates it from other languages to English and triggers the auto-block.

Configure → set up?
Blocklist → blacklist, and use blacklist as a verb?
running / in lockdown mode → in lockdown
"pause state" then needs something?

@@ -306,60 +306,60 @@
9. Other memory and crash fixes.
</string>

<string name="connection_http3">HTTP3</string>
<string name="connection_http3">HTTP/3</string>

<!-- Settings Fragment strings -->
<string name="settings_ip_network_heading">Choose IP version</string>
<string name="settings_ip_network_desc">Choose between Internet Protocol versions.</string>

<string name="settings_ptrans_heading">Force IPv4 egress</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="settings_ptrans_heading">Force IPv4 egress</string>
<string name="settings_ptrans_heading">Egress-only IPv4</string>

Not sure about this.

Copy link
Collaborator

Choose a reason for hiding this comment

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

It really is forcing IPv4 egress (:

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is there any way to avoid the word "egress"?


<string name="default_dns_name">RDNS Default</string>
<string name="default_dns_name">RDNS (default)</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure about this.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Better left as-is, yeah.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Where can I find this? The other strings indicating defaults are "(default)"

<string name="orbot_stop_dialog_message">RethinkDNS has stopped forwarding connections to Orbot, but Orbot maybe running in the background.</string>
<string name="orbot_stop_dialog_dns_message">RethinkDNS is setup to forward DNS queries to Orbot. Change as required.</string>
<string name="orbot_stop_dialog_message">RethinkDNS has stopped forwarding connections to Orbot, but Orbot may be running in the background.</string>
<string name="orbot_stop_dialog_dns_message">RethinkDNS is set up to forward DNS queries to Orbot. Change as required.</string>
<string name="orbot_stop_dialog_negative">Stop Orbot</string>
<string name="orbot_stop_dialog_neutral">Change DNS</string>
<string name="orbot_stop_dialog_positive">Dismiss</string>

<string name="orbot_title">Orbot and Proxies</string>
<string name="orbot_explanation">
Orbot is a free proxy app that empowers other apps to use the Internet more &lt;u>securely&lt;/u>.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
Orbot is a free proxy app that empowers other apps to use the Internet more &lt;u>securely&lt;/u>.
Orbot is a free proxy app that lets other apps to use the Internet more &lt;u>securely&lt;/u>.

"lets" used in other similar strings.

Copy link
Collaborator

Choose a reason for hiding this comment

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

this text is used verbatim from Orbot developers.

<string name="orbot_socks5_desc">Forwards all TCP connections to Orbot.</string>
<string name="orbot_http">HTTP Proxy</string>
<string name="orbot_http_desc">Recommends that apps use Orbot\'s HTTP proxy.</string>
<string name="orbot_both">TCP + HTTP Proxy</string>
<string name="orbot_both">TCP + HTTP proxy</string>
<string name="orbot_both_desc">All of the above.</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="orbot_both_desc">All of the above.</string>
<string name="orbot_both_desc">All the above.</string>

Potential savings. Not sure.

Copy link
Collaborator

Choose a reason for hiding this comment

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

All of the above seems right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is, but maybe one word can be omitted.


<string name="firewall_mode_info_title">Firewall</string>
<string name="firewall_mode_info_explanation_new">Monitor network activity and firewall any app or IP address.</string>

<string name="apps_info_title">Apps</string>

<string name="hybrid_mode_info_title">DNS + Firewall</string>
<string name="hybrid_mode_info_title">DNS + firewall</string>

<string name="dns_mode_info_explanation_new">Monitor, block, and encrypt DNS requests.</string>

<string name="dns_firewall_mode_info_explanation_new">All of the above + bypass Internet censorship.</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="dns_firewall_mode_info_explanation_new">All of the above + bypass Internet censorship.</string>
<string name="dns_firewall_mode_info_explanation_new">Also bypasses Internet censorship.</string>

The third option in the dropdown menu available next to the blue "START".

<string name="always_on_dialog_positive_btn">Go to Settings</string>
<string name="always_on_dialog_negative_btn">Cancel</string>

<string name="always_on_dialog_stop_heading">Always-on VPN</string>
<string name="always_on_dialog_stop_message">Always-on VPN is enabled for Rethink. Are you sure you want to stop Rethink anyway?</string>
<string name="always_on_dialog_lockdown_stop_message">RethinkDNS is running VPN in <i>Lockdown</i> mode. Stopping it would result in loss of Internet connectivity on this user profile. Do you want to continue anyway?</string>
<string name="always_on_dialog_stop_message">Stop Rethink even though it uses always-on VPN in Android?</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure about this.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yeah, misleading since Rethink can't opt to be Always-on or even ask for it. The user must set it explcitly.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

How is it then "enabled for Rethink"?
I don't understand the implications here.

<string name="status_strict" description="This is similar to dns_on, but the protection is being provided by the operating system, not by Rethink. It is not color-highlighted.">
private dns is enabled
<string name="status_strict" description="Similar to dns_on, but the protection is provided by the operating system, not by Rethink. It is not color-highlighted.">
Private DNS on.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

For reduced complexity, all the "enable" is "turn on" or "on", and "disable" is "turn off" or "off", on the assumption that
nothing is ever disabled (subordinate) and turned on (primary function) in a way the user needs to know about.

Copy link
Collaborator

Choose a reason for hiding this comment

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

That's fine, but the period needn't be there.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can almost guarantee someone will translate that as "Private DNS on ___".

@@ -462,21 +462,21 @@

<string name="settings_notification_heading">Choose notification action</string>
<string name="settings_notification_desc">Action buttons to show with the RethinkDNS notification: %1$s</string>
<string name="settings_notification_desc1">Pause / Stop (default)</string>
<string name="settings_notification_desc2">DNS / DNS + Firewall</string>
<string name="settings_notification_desc1">Pause / stop (default)</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I like "thing/other thing", but didn't change any.
Most of them are part of the greater "+" or "Plus" consideration too, so it is a bit confusing.
Some plus signs I moved to observe the "one space either side" paradigm.

Copy link
Collaborator

Choose a reason for hiding this comment

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

gotcha.

uppercase S is preferred since Stop is text that's also used for the Stop action button.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There is no uppercase behind the slash anywhere because it isn't correct.
It would indicate a new sentence on a new line.
Changed to bold text.

@comradekingu comradekingu changed the title Draft: App strings reworked App strings reworked Oct 30, 2022
@ignoramous
Copy link
Collaborator

Still looking... But:

Some of the strings are terse and without proper punctuation for a reason (like a period . at the end). I guess we should mark those as such? Without screenshots, I guess it is that much harder...

@comradekingu
Copy link
Contributor Author

comradekingu commented Oct 31, 2022

@ignoramous
It doesn't have to be perfect for the first pass, but if it can I am all about it. It was intended to help the burden of translation.
I'll get a good look at it once I translate it all myself and use the app more.
Probably better to get more fancy at a later stage and attempt to get this far now.

<string name="settings_notification_dialog_option_3">\nNone:\nShows no button.\n</string>
<string name="settings_notification_dialog_option_1">\nPause / stop (default):\nTwo buttons, to quickly pause and stop RethinkDNS.</string>
<string name="settings_notification_dialog_option_2">\nDNS / DNS + Firewall:\nTwo buttons to quickly switch between the battery-saver DNS mode and the regular DNS + firewall mode.</string>
<string name="settings_notification_dialog_option_3">\nNone:\nNo buttons.\n</string>

<string name="settings_selected_theme">Current theme: %1$s</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="settings_selected_theme">Current theme: %1$s</string>
<string name="settings_selected_theme" translatable="false">%1$s</string>


<string name="settings_orbot_heading">Setup Orbot</string>
<string name="settings_orbot_heading">Set up Orbot</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="settings_orbot_heading">Set up Orbot</string>
<string name="settings_orbot_heading">Orbot</string>

Copy link
Collaborator

Choose a reason for hiding this comment

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

re: see discussion below on why these texts are call-to-action (verbs).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I left this here, because it acually sets something up, rather than turn it on (with some of the others).
The icons aren't shown, but rather downloaded first. And implicitly a toggle for "Icons in __" explains what it does.


<string name="settings_proxy_header">proxy</string>
<string name="settings_socks5_heading">Setup SOCKS5 Proxy</string>
<string name="settings_socks5_heading">Set up SOCKS5 Proxy</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="settings_socks5_heading">Set up SOCKS5 Proxy</string>
<string name="settings_socks5_heading">SOCKS5 proxy</string>

Arguably "proxy" can be dropped too, as it is in that category already.

Copy link
Collaborator

Choose a reason for hiding this comment

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

re: see discussion below on why these texts are call-to-action (verbs).

<string name="settings_socks5_desc">Forward connections to SOCKS5 endpoint.</string>
<string name="settings_https_heading">Setup HTTP(S) Proxy</string>
<string name="settings_https_desc">This setting is only a recommendation and it is possible that apps will ignore it. Apps using HTTP(S) proxy will bypass both Firewall and DNS rules.</string>
<string name="settings_https_heading">Set up HTTP(S) proxy</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="settings_https_heading">Set up HTTP(S) proxy</string>
<string name="settings_https_heading">HTTP(S) proxy</string>

Copy link
Collaborator

Choose a reason for hiding this comment

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

re: see discussion below on why these texts are call-to-action (verbs).

@@ -306,60 +306,60 @@
9. Other memory and crash fixes.
</string>

<string name="connection_http3">HTTP3</string>
<string name="connection_http3">HTTP/3</string>

<!-- Settings Fragment strings -->
<string name="settings_ip_network_heading">Choose IP version</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="settings_ip_network_heading">Choose IP version</string>
<string name="settings_ip_network_heading">IP version</string>

Copy link
Collaborator

Choose a reason for hiding this comment

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

The Settings screen has call-to-action string. Choose and Enable etc are valid text titles. In fact, having call-to-action strings are recommended by Material UI guidelines.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, but there is a > button there indicating it can be selected.
Edit: Tried going for a cleaner UI to get some overview, and then do call-to-action descriptions for the respective selection menus opened from there.


<!-- Settings Fragment strings -->
<string name="settings_ip_network_heading">Choose IP version</string>
<string name="settings_ip_network_desc">Choose between Internet Protocol versions.</string>

<string name="settings_ptrans_heading">Force IPv4 egress</string>
<string name="settings_ptrans_desc">Translate outbound IPv6 traffic to IPv4 on-device. Enable if you are connected to an IPv4-only network.</string>
<string name="settings_ptrans_desc">Translate outbound IPv6 traffic to IPv4 on-device. Use this if you are connected to an IPv4-only network.</string>

<string name="settings_allow_bypass_heading">Allow Bypass</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="settings_allow_bypass_heading">Allow Bypass</string>
<string name="settings_allow_bypass_heading">Bypassing</string>

Copy link
Collaborator

Choose a reason for hiding this comment

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

Allow Bypass is an Android term. Let's stick to it as-is.


<string name="show_logs_disabled_network_message">Connection logging has been disabled. To re-enable, goto <i>Settings</i> and turn on <i>Enable on-device logging.</i></string>
<string name="show_logs_disabled_dns_message">DNS request logging has been disabled. To re-enable, goto <i>Settings</i> and turn on <i>Enable on-device logging.</i></string>
<string name="show_logs_disabled_network_message">You can turn on connection logging again from <i>Settings</i> → <i>Turn on-device logging.</i></string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="show_logs_disabled_network_message">You can turn on connection logging again from <i>Settings</i> → <i>Turn on-device logging.</i></string>
<string name="show_logs_disabled_network_message">Turn on logging from <i>Settings</i> → <i>On-device logging.</i></string>

Changed to this elsewhere.

<string name="about_settings_vpn_profile">VPN Profile</string>
<string name="about_settings_notification">Notification Settings</string>
<string name="about_settings_vpn_profile">VPN profile</string>
<string name="about_settings_notification">Notification settings</string>
<string name="about_whats_new">What\'s new in %1$s</string>
<string name="about_twitter">Follow us on Twitter</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="about_twitter">Follow us on Twitter</string>
<string name="about_twitter">Twitter</string>

Copy link
Collaborator

Choose a reason for hiding this comment

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

It is meant as a call-to-action aka Follow us on Twitter is just about right for that...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

"Circumvent censorship … on your Android device."
Live by the sword.


<string name="cd_filter_all">All</string>
<string name="cd_filter_allowed">Allowed</string>
<string name="cd_filter_blocked">Blocked</string>

<string name="cd_dialog_title">Add domain</string>
<string name="cd_dialog_desc">Custom URL(domain) or wild card to either allow or block. eg, *.test.com, test.com/test</string>
<string name="cd_dialog_desc">Custom URL(domain) or wild card to either allow or block. e.g, *.test.com, test.com/test</string>
<string name="cd_dialog_edittext_hint">Enter %1$s</string>
<string name="cd_dialog_error_invalid_domain">Invalid URL(domain).</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="cd_dialog_error_invalid_domain">Invalid URL(domain).</string>
<string name="cd_dialog_error_invalid_domain">Invalid URL (domain).</string>

@@ -1094,23 +1094,23 @@
<string name="ada_lockdown_title">Lockdown app</string>
<string name="ada_lockdown_desc">When enabled, the app can connect only to IPs in <i>bypass app rules</i>; connections to any other IP will be blocked.</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="ada_lockdown_desc">When enabled, the app can connect only to IPs in <i>bypass app rules</i>; connections to any other IP will be blocked.</string>
<string name="ada_lockdown_desc">Allows the app to connect only to IPs in <i>bypass app rules</i>; connections to any other IP will be blocked.</string>

<string name="brbs_restore_dialog_failure_negative">Dismiss</string>

<string name="brbs_restore_complete_toast">Restore completed, restarting app…</string>
<string name="brbs_restore_complete_toast">Restored. Restarting app…</string>
<string name="brbs_backup_complete_toast">Backup completed</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="brbs_backup_complete_toast">Backup completed</string>
<string name="brbs_backup_complete_toast">Backup made</string>

<string name="hsf_blocklist_chip_text">%1$s blocklists configured</string>
<string name="hsf_blocklist_chip_text_no_blocklist">RethinkDNS in-use</string>
<string name="hsf_blocklist_chip_text_no_data">Enable RethinkDNS+</string>
<string name="hsf_blocklist_chip_text">%1$s blocklist(s) configured</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ignoramous Does this mean "added", "in use", or something else?
On the whole, "configure" in Rethink confuses me.

<string name="about_bug_report_desc">email crash logs</string>
<string name="about_bravedns_explantion">Rethink lets you monitor app activity, circumvent Internet censorship, and firewall apps on your Android device.</string>
<string name="about_bravedns_whoarewe">Rethink is libre software, led by ex-engineers from Amazon, IBM, and Scientific Games.</string>
<string name="about_bravedns_toreport_text">help and feedback</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="about_bravedns_toreport_text">help and feedback</string>
<string name="about_bravedns_toreport_text">Help and feedback</string>

<string name="about_bravedns_explantion">Rethink lets you monitor app activity, circumvent Internet censorship, and firewall apps on your Android device.</string>
<string name="about_bravedns_whoarewe">Rethink is libre software, led by ex-engineers from Amazon, IBM, and Scientific Games.</string>
<string name="about_bravedns_toreport_text">help and feedback</string>
<string name="about_bug_report_desc">e-mail crash logs</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="about_bug_report_desc">e-mail crash logs</string>
<string name="about_bug_report_desc">E-mail crash logs</string>

@@ -981,7 +980,7 @@

<!-- Notification dialog activity -->
<string name="notif_dialog_pause_dialog_title">App paused!</string>
<string name="notif_dialog_pause_dialog_message">Application in pause state, resume to continue</string>
<string name="notif_dialog_pause_dialog_message">App paused. Resume to continue.</string>
<string name="notif_dialog_pause_dialog_positive">Resume</string>
<string name="notif_dialog_pause_dialog_negative">Discard</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is there a reason for "Discard" here, and "Dismiss" elsewhere?


<string name="status_strict" description="This is similar to dns_on, but the protection is being provided by the operating system, not by Rethink. It is not color-highlighted.">
private dns is enabled
<string name="status_strict" description="Similar to dns_on, but the protection is provided by the operating system, not by Rethink. It is not color-highlighted.">
Copy link
Contributor Author

Choose a reason for hiding this comment

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

What is "dns_on"? Should it be "Rethink DNS (default)"?

<string name="hs_download_positive_website">Visit website</string>

<string name="hs_download_negative_default">Remind me later</string>

<!-- Universal Firewall-->
<string name="univ_firewall_rule_1">Block all apps when device is locked</string>
<string name="univ_firewall_rule_1">Block all apps when the device is locked</string>
<string name="univ_firewall_rule_2">Block any app not in use</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="univ_firewall_rule_2">Block any app not in use</string>
<string name="univ_firewall_rule_2">Block all inactive apps</string>

<string name="dns_connected_no_count">Connected</string>
<string name="dns_connected">Connected</string>
<string name="dns_delete_positive">Delete</string>
<string name="dns_delete_negative">Cancel</string>

<string name="dns_info_positive">Ok</string>
<string name="dns_info_positive">OK</string>
<string name="dns_info_neutral">Copy</string>

<string name="dns_select_toast">Atleast one resolver should be selected.</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="dns_select_toast">Atleast one resolver should be selected.</string>
<string name="dns_select_toast">Select at least one resolver.</string>

<string name="dns_proxy_ip_address">IP Address</string>
<string name="dns_proxy_port">Port Number</string>
<string name="dns_proxy_ip_address">IP</string>
<string name="dns_proxy_port">Port</string>
<string name="dns_proxy_negative_btn">Cancel</string>
<string name="dns_proxy_positive_btn">add</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="dns_proxy_positive_btn">add</string>
<string name="dns_proxy_positive_btn">Add</string>

<string name="dns_proxy_connection_failure_lockdown">Excluding %1$s for %2$s in lockdown mode can cause Internet connectivity issues.</string>
<string name="dns_crypt_connection_failure">Could not connect to DNSCrypt server.</string>
<string name="dns_proxy_connection_failure">Could not connect to the server of the DNS proxy.</string>
<string name="dns_proxy_connection_failure_lockdown">Excluding %1$s for %2$s in lockdown can cause Internet connectivity issues.</string>
<string name="dns_proxy_toast_parameter">DNS Proxy</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="dns_proxy_toast_parameter">DNS Proxy</string>
<string name="dns_proxy_toast_parameter">DNS proxy</string>

<string name="dns_proxy_connection_failure_lockdown">Excluding %1$s for %2$s in lockdown mode can cause Internet connectivity issues.</string>
<string name="dns_crypt_connection_failure">Could not connect to DNSCrypt server.</string>
<string name="dns_proxy_connection_failure">Could not connect to the server of the DNS proxy.</string>
<string name="dns_proxy_connection_failure_lockdown">Excluding %1$s for %2$s in lockdown can cause Internet connectivity issues.</string>
<string name="dns_proxy_toast_parameter">DNS Proxy</string>
<string name="socks5_proxy_toast_parameter">SOCKS5 Proxy</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="socks5_proxy_toast_parameter">SOCKS5 Proxy</string>
<string name="socks5_proxy_toast_parameter">SOCKS5 proxy</string>

<string name="firewall_rule_block_dns_bypass">DNS bypassed</string>
<string name="firewall_rule_exempt_app_bypass_univ">Bypassed app</string>
<string name="firewall_rule_exempt_dns_proxied">DNS proxied</string>
<string name="firewall_rule_exempt_orbot_setup">Orbot set up</string>
<string name="firewall_rule_block_http">Insecure HTTP</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="firewall_rule_block_http">Insecure HTTP</string>
<string name="firewall_rule_block_http">(Insecure) HTTP</string>

<string name="hsf_start_dialog_positive">Start</string>
<string name="hsf_start_dialog_negative">Dismiss</string>

<string name="hsf_whats_new_chip_text">What\'s new</string>
<string name="hsf_whats_new_chip_text">Changes</string>
<string name="hsf_proxy_chip_text">Proxy active</string>
<string name="hsf_blocklist_chip_text">%1$s blocklists configured</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Does this mean "recently added", "in use", or something else?
Has something been done to %1$s number of blocklists?

@ignoramous
Copy link
Collaborator

Hi @comradekingu

Appreciate the immense time and effort you have put in. And for that reason, I'm going to cherry-pick your suggestions and include them on a case-by-case basis. I'll update this PR as I do so for the next major release v054 (due Jan / Feb).

Right now, we are knee-deep with the v053l incremental release (a day or two away), and this PR won't make it because the other translations that have come in will be obsoleted.

Also: This PR is vast (touches almost the entire file) and opinionated (as in, not all proposed changes are quite right). As such, it is going to take a lot of time to review it in its current form. So, I'll see how best to incorporate the suggested changes, and perhaps, as mentioned above, do so in bit-sized commits and update this PR as we go.

@comradekingu
Copy link
Contributor Author

@ignoramous Thanks. It is all there for now on my part.
The untouched problems and smaller fixups can be done later.
In terms of cost benefit, I think a small fixup, merging the entire thing and then coming in to revert of improve later is better, but any way you want to make use of this is fine.
Weblate handles fuzzy strings, so translations aren't lost because the source string changes.

What I can do is answer questions or share my thinking if you put a "?" next to the ones that are unclear.
There is always some rationale. Either it is consistency on some level, avoiding errors in translation, and most often for sake of brevity.

<string name="cd_dns_proxy_error_text_1">Invalid IP address</string>
<string name="cd_dns_proxy_error_text_2">Port range should be from 1024–65535</string>
<string name="cd_dns_proxy_error_text_1">Invalid IP</string>
<string name="cd_dns_proxy_error_text_2">Select a port from 1024–65535</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is this correct?

<string name="hsf_vpn_dialog_negative">Cancel</string>

<string name="hsf_vpn_prepare_failure">Either VPN permission missing, or another app is in Always-on VPN mode.</string>
<string name="hsf_vpn_prepare_failure">Either you have not granted VPN permission, or another app is using <b>Always-on VPN</b>.</string>

<string name="hsf_notification_permission_failure">Enable notification permission from Settings screen</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

What is going on here?


<string name="collecting_logs_progress_text">Capturing…</string>

<string name="contributors_dialog_title">Authors</string>
<string name="contributors_list"><![CDATA[The <i>Rethink Open Source Project</i> owes its existence to these volunteers who devote countless hours on its development.<br/>
<string name="contributors_list"><![CDATA[The <i>Rethink Project</i> owes its existence to volunteers devoting countless hours to its development.<br/>
<br/>🛡️ Android app <br/>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<br/>🛡️ Android app <br/>
<br/>🛡️ Android app<br/>

<string name="hsf_start_btn_state">start</string>
<string name="hsf_stop_btn_state">stop</string>
<string name="hsf_start_btn_state">Start</string>
<string name="hsf_stop_btn_state">Stop</string>

<string name="hsf_uptime">(active since %1$s; protos: %2$s)</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="hsf_uptime">(active since %1$s; protos: %2$s)</string>
<string name="hsf_uptime">(active since %1$s; protocols: %2$s)</string>

?


<string name="settings_http_proxy_desc">Forwarding to %1$s:%2$s</string>
<string name="settings_http_proxy_desc">Forwarding to %1$s:%2$s</string>
<string name="settings_http_proxy_dialog_title">Custom Server URL</string>
<string name="settings_http_proxy_error_text1">Port range should be from 1024–65535</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="settings_http_proxy_error_text1">Port range should be from 1024–65535</string>
<string name="settings_http_proxy_error_text1">Select a port from 1024–65535</string>

?

<string name="settings_import_export_heading">Backup &amp; Restore</string>
<string name="settings_import_export_desc">Manually back up or restore the app data and settings.</string>
<string name="settings_import_export_heading">Backups and restoring</string>
<string name="settings_import_export_desc">Manually back up or restore the Rethink app data and settings.</string>

<string name="settings_app_notification_a13_heading">App Notification</string>
<string name="settings_app_notification_a13_desc">Enable notification permission for the app</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="settings_app_notification_a13_desc">Enable notification permission for the app</string>
<string name="settings_app_notification_a13_desc">Grant the app permission to send notifications</string>

<string name="orbot_both">TCP + HTTP Proxy</string>
<string name="orbot_http">HTTP(S) proxy</string>
<string name="orbot_http_desc">Recommends apps use Orbot\'s HTTP(S) proxy.</string>
<string name="orbot_both">TCP and HTTP(S) proxy</string>
<string name="orbot_both_desc">All of the above.</string>
<string name="orbot_none">None (default)</string>
<string name="orbot_none_desc">None of the above.</string>

<string name="orbot_bs_status_1">Forwarding %1$s connections to Orbot.</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
<string name="orbot_bs_status_1">Forwarding %1$s connections to Orbot.</string>
<string name="orbot_bs_status_1">Forwarding %1$s connections to Orbot</string>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants