App strings reworked #619

comradekingu · 2022-10-30T18:14:44Z

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 securely."

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?

comradekingu · 2022-10-30T18:17:06Z

app/src/main/res/values/strings.xml

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


Suggested change

<string name="settings_ptrans_heading">Force IPv4 egress</string>

<string name="settings_ptrans_heading">Egress-only IPv4</string>

Not sure about this.

It really is forcing IPv4 egress (:

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

app/src/main/res/values/strings.xml

comradekingu · 2022-10-30T18:19:37Z

app/src/main/res/values/strings.xml


-    <string name="default_dns_name">RDNS Default</string>
+    <string name="default_dns_name">RDNS (default)</string>


Not sure about this.

Better left as-is, yeah.

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

app/src/main/res/values/strings.xml

comradekingu · 2022-10-30T18:22:23Z

app/src/main/res/values/strings.xml

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


Suggested change

Orbot is a free proxy app that empowers other apps to use the Internet more securely.

Orbot is a free proxy app that lets other apps to use the Internet more securely.

"lets" used in other similar strings.

this text is used verbatim from Orbot developers.

comradekingu · 2022-10-30T18:22:48Z

app/src/main/res/values/strings.xml

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


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.

All of the above seems right?

It is, but maybe one word can be omitted.

comradekingu · 2022-10-30T18:23:07Z

app/src/main/res/values/strings.xml


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


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".

comradekingu · 2022-10-30T18:23:59Z

app/src/main/res/values/strings.xml

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


Not sure about this.

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

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

app/src/main/res/values/strings.xml

comradekingu · 2022-10-30T18:43:12Z

app/src/main/res/values/strings.xml

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


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.

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

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

app/src/main/res/values/strings.xml

comradekingu · 2022-10-30T18:47:47Z

app/src/main/res/values/strings.xml

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


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.

gotcha.

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

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.

ignoramous · 2022-10-31T10:51:32Z

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 · 2022-10-31T12:11:33Z

@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.

comradekingu · 2022-10-31T12:16:16Z

app/src/main/res/values/strings.xml

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


Suggested change

<string name="settings_selected_theme">Current theme: %1$s</string>

<string name="settings_selected_theme" translatable="false">%1$s</string>

comradekingu · 2022-10-31T12:16:36Z

app/src/main/res/values/strings.xml


-    <string name="settings_orbot_heading">Setup Orbot</string>
+    <string name="settings_orbot_heading">Set up Orbot</string>


Suggested change

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

<string name="settings_orbot_heading">Orbot</string>

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

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.

comradekingu · 2022-10-31T12:17:01Z

app/src/main/res/values/strings.xml


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


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.

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

comradekingu · 2022-10-31T12:17:13Z

app/src/main/res/values/strings.xml

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


Suggested change

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

<string name="settings_https_heading">HTTP(S) proxy</string>

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

comradekingu · 2022-10-31T12:18:17Z

app/src/main/res/values/strings.xml

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


Suggested change

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

<string name="settings_ip_network_heading">IP version</string>

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.

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.

comradekingu · 2022-10-31T12:18:55Z

app/src/main/res/values/strings.xml


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


Suggested change

<string name="settings_allow_bypass_heading">Allow Bypass</string>

<string name="settings_allow_bypass_heading">Bypassing</string>

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

comradekingu · 2022-10-31T12:19:52Z

app/src/main/res/values/strings.xml


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


Suggested change

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

<string name="show_logs_disabled_network_message">Turn on logging from Settings → On-device logging.</string>

Changed to this elsewhere.

app/src/main/res/values/strings.xml

comradekingu · 2022-10-31T12:21:35Z

app/src/main/res/values/strings.xml

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


Suggested change

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

<string name="about_twitter">Twitter</string>

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

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

app/src/main/res/values/strings.xml

comradekingu · 2022-11-02T22:16:35Z

app/src/main/res/values/strings.xml


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


Suggested change

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

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

comradekingu · 2022-11-02T22:17:41Z

app/src/main/res/values/strings.xml

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


Suggested change

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

<string name="ada_lockdown_desc">Allows the app to connect only to IPs in bypass app rules; connections to any other IP will be blocked.</string>

comradekingu · 2022-11-02T22:18:41Z

app/src/main/res/values/strings.xml

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


Suggested change

<string name="brbs_backup_complete_toast">Backup completed</string>

<string name="brbs_backup_complete_toast">Backup made</string>

comradekingu · 2022-11-03T14:33:05Z

app/src/main/res/values/strings.xml

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


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

comradekingu · 2022-11-03T14:33:56Z

app/src/main/res/values/strings.xml

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


Suggested change

<string name="about_bravedns_toreport_text">help and feedback</string>

<string name="about_bravedns_toreport_text">Help and feedback</string>

comradekingu · 2022-11-03T14:34:14Z

app/src/main/res/values/strings.xml

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


Suggested change

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

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

comradekingu · 2022-11-03T17:10:29Z

app/src/main/res/values/strings.xml

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


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

comradekingu · 2022-11-03T18:01:15Z

app/src/main/res/values/strings.xml


-    <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.">


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

comradekingu · 2022-11-03T22:46:34Z

app/src/main/res/values/strings.xml

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


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>

comradekingu · 2022-11-03T22:47:50Z

app/src/main/res/values/strings.xml

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


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>

comradekingu · 2022-11-03T22:48:05Z

app/src/main/res/values/strings.xml

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


Suggested change

<string name="dns_proxy_positive_btn">add</string>

<string name="dns_proxy_positive_btn">Add</string>

comradekingu · 2022-11-03T22:48:46Z

app/src/main/res/values/strings.xml

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


Suggested change

<string name="dns_proxy_toast_parameter">DNS Proxy</string>

<string name="dns_proxy_toast_parameter">DNS proxy</string>

comradekingu · 2022-11-03T22:48:56Z

app/src/main/res/values/strings.xml

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


Suggested change

<string name="socks5_proxy_toast_parameter">SOCKS5 Proxy</string>

<string name="socks5_proxy_toast_parameter">SOCKS5 proxy</string>

comradekingu · 2022-11-03T22:49:40Z

app/src/main/res/values/strings.xml

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


Suggested change

<string name="firewall_rule_block_http">Insecure HTTP</string>

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

comradekingu · 2022-11-23T18:43:12Z

app/src/main/res/values/strings.xml

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


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

ignoramous · 2022-11-26T07:59:44Z

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 · 2022-11-26T22:56:56Z

@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.

comradekingu · 2022-12-09T08:03:12Z

app/src/main/res/values/strings.xml

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


Is this correct?

comradekingu · 2022-12-10T20:43:02Z

app/src/main/res/values/strings.xml

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


What is going on here?

comradekingu · 2022-12-10T20:59:07Z

app/src/main/res/values/strings.xml


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


Suggested change

 🛡️ Android app 

 🛡️ Android app

comradekingu · 2022-12-10T21:01:07Z

app/src/main/res/values/strings.xml

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


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>

?

comradekingu · 2022-12-10T21:02:29Z

app/src/main/res/values/strings.xml


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


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>

?

comradekingu · 2022-12-10T21:03:26Z

app/src/main/res/values/strings.xml

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


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>

comradekingu · 2022-12-10T21:04:20Z

app/src/main/res/values/strings.xml

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


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>

App strings reworked

7702cd1

comradekingu commented Oct 30, 2022

View reviewed changes

app/src/main/res/values/strings.xml Show resolved Hide resolved

comradekingu commented Oct 30, 2022

View reviewed changes

app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved