Skip to content

App strings reworked #619

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

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

App strings reworked #619

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7702cd1
App strings reworked
comradekingu Oct 30, 2022
a1e050c
Suggested changes and fixes
comradekingu Oct 31, 2022
8550d30
RethinkDNS → Rethink
comradekingu Oct 31, 2022
d2a0e98
Back up, restoring, Wi-Fi, ms, translatable false
comradekingu Oct 31, 2022
f01067e
Continue, no +, no mode, menus, action required
comradekingu Nov 1, 2022
ce61815
Backups and restoring
comradekingu Nov 1, 2022
50f1ce9
- but not firewall rules
comradekingu Nov 1, 2022
fe8cb96
Savings and versals
comradekingu Nov 2, 2022
6890099
Consistency and savings
comradekingu Nov 3, 2022
464e181
RDNS → Rethink DNS
comradekingu Nov 3, 2022
fc1b730
More untranslatable and polish
comradekingu Nov 3, 2022
8cbe785
Merge branch 'main' into patch-2
comradekingu Nov 23, 2022
1fb8ba6
Fix build
comradekingu Nov 23, 2022
3f88f5e
Merge branch 'main' into patch-2
comradekingu Jan 6, 2023
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
Prev Previous commit
Merge branch 'main' into patch-2
  • Loading branch information
@comradekingu
comradekingu authored Jan 6, 2023
commit 3f88f5e5cf5fb2d7f6846dfab7f907291d05e0be
16 changes: 6 additions & 10 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,7 @@
\n <u>#7</u>: Block connections when DNS is bypassed (universal firewall).
</string>

<string name="private_dns_toast">Private DNS set.</string>
<string name="always_on_dialog_heading">Action Required</string>
<string name="always_on_dialog_heading">Turn off Always-on VPN</string>
<string name="always_on_dialog">Turn off \"Always-on VPN\" in the Android settings to start Rethink.</string>
<string name="always_on_dialog_positive_btn">Open Settings</string>
<string name="always_on_dialog_negative_btn">Cancel</string>
Expand Down Expand Up @@ -432,7 +431,7 @@
<string name="settings_http_proxy_hostname">Hostname</string>
<string name="settings_http_proxy_port">Port</string>

<string name="settings_dns_proxy_dialog_header">Set SOCKS5 (TCP) proxy</string>
<string name="settings_dns_proxy_dialog_header">Set SOCKS5 proxy</string>
<string name="settings_dns_proxy_dialog_app">App</string>
<string name="settings_dns_proxy_dialog_hostname">Hostname</string>
<string name="settings_dns_proxy_dialog_port_number">Port</string>
Expand Down Expand Up @@ -535,7 +534,7 @@

<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>
<string name="hsf_blocklist_chip_text">%1$s blocklists</string>
<string name="hsf_blocklist_chip_text_no_blocklist">Rethink is in use</string>
<string name="hsf_blocklist_chip_text_no_data">Turn on Rethink Plus</string>
<string name="hsf_dns_logs_chip_text">DNS logs</string>
Expand Down Expand Up @@ -640,6 +639,7 @@

<string name="app_info_error">Could not launch app info.</string>
<string name="vpn_profile_error">Could not launch VPN profile.</string>
<string name="private_dns_error">Could not launch private DNS screen.</string>
<string name="notification_screen_error">Could not show app-notification screen.</string>
<string name="intent_launch_error">Cound not launch %1$s.</string>
<string name="no_browser_error">Install a web browser to open the website.</string>
Expand Down Expand Up @@ -1085,15 +1085,15 @@

<string name="ci_header">IP and Port Rules</string>

<string name="ci_no_rules_text">Could not find any universal IP block or bypass rules.</string>
<string name="ci_no_rules_text">Could not find any IP or port rules.</string>

<string name="ci_bypass_universal_initial">BU</string>
<string name="ci_bypass_universal_txt">Bypass universal</string>
<string name="ci_bypass_universal_desc">— Bypasses universal</string>

<string name="ci_bypass_app_initial">BA</string>
<string name="ci_bypass_app_txt">Bypass app rules</string>
<string name="ci_bypass_app_desc">- Bypasses app rules</string>
<string name="ci_bypass_app_desc">— Bypasses app rules</string>

<string name="ci_blocked_initial">B</string>
<string name="ci_blocked_txt">Blocked</string>
Expand All @@ -1113,10 +1113,6 @@
<string name="ada_noapp_dialog_message">Could not find info about the specified app.</string>
<string name="ada_noapp_dialog_positive">OK</string>

<string name="ada_ip_rules_status_bypass_app_rules">Bypass app rules</string>
<string name="ada_ip_rules_status_blocked">Blocked</string>
<string name="ada_ip_rules_status_allowed">No rule</string>

<string name="ada_firewall_status"><![CDATA[This app <b><i>%1$s</i></b>.]]></string>

<string name="ada_ip_connection_count">Connected to %1$s IP(s)</string>
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.