Improved strings

This commit is contained in:
PeratX 2017-07-06 08:58:03 +08:00
parent 25fa2e2167
commit f6cc1219dc
4 changed files with 69 additions and 56 deletions

View File

@ -78,13 +78,13 @@ public class DaedalusVpnService extends VpnService implements Runnable {
Intent nIntent = new Intent(this, MainActivity.class);
PendingIntent pIntent = PendingIntent.getActivity(this, 0, nIntent, PendingIntent.FLAG_UPDATE_CURRENT);
builder.setWhen(0)
.setContentTitle(getResources().getString(R.string.notification_activated))
.setContentTitle(getResources().getString(R.string.notice_activated))
.setDefaults(NotificationCompat.DEFAULT_LIGHTS)
.setSmallIcon(R.drawable.ic_security)
.setColor(getResources().getColor(R.color.colorPrimary)) //backward compatibility
.setAutoCancel(false)
.setOngoing(true)
.setTicker(getResources().getString(R.string.notification_activated))
.setTicker(getResources().getString(R.string.notice_activated))
.setContentIntent(pIntent)
.addAction(R.drawable.ic_clear, getResources().getString(R.string.button_text_deactivate),
PendingIntent.getBroadcast(this, 0,
@ -260,7 +260,7 @@ public class DaedalusVpnService extends VpnService implements Runnable {
if (time - lastUpdate >= 1000) {
lastUpdate = time;
if (notification != null) {
notification.setContentTitle(getResources().getString(R.string.notification_queries) + " " + String.valueOf(provider.getDnsQueryTimes()));
notification.setContentTitle(getResources().getString(R.string.notice_queries) + " " + String.valueOf(provider.getDnsQueryTimes()));
NotificationManager manager = (NotificationManager) this.getSystemService(Context.NOTIFICATION_SERVICE);
manager.notify(NOTIFICATION_ACTIVATED, notification.build());
}

View File

@ -6,7 +6,7 @@
<string name="button_text_activate">启用</string>
<string name="button_text_deactivate">停用</string>
<string name="action_about">关于</string>
<string name="notification_activated">已启用 iTXTech Daedalus。</string>
<string name="notice_activated">已启用 iTXTech Daedalus。</string>
<string name="settings_system">系统设置</string>
<string name="settings_boot">开机自动启用</string>
<string name="settings_server">服务器设置</string>
@ -25,7 +25,7 @@
<string name="settings_check_update">检查更新</string>
<string name="settings_update_summary">前往 GitHub 发布页面。</string>
<string name="settings_count_number_of_queries">统计 DNS 查询次数</string>
<string name="notification_queries">DNS 查询次数:</string>
<string name="notice_queries">DNS 查询次数:</string>
<string name="notice_legacy_api">当前 Android API 无法支持所有功能。</string>
<string name="settings_bug_report">提交反馈</string>
<string name="settings_issue_summary">前往 GitHub 提交 Bug 反馈。</string>

View File

@ -6,7 +6,7 @@
<string name="button_text_activate">啟用</string>
<string name="button_text_deactivate">停用</string>
<string name="action_about">關於</string>
<string name="notification_activated">已啟用 iTXTech Daedalus。</string>
<string name="notice_activated">已啟用 iTXTech Daedalus。</string>
<string name="settings_system">系統設置</string>
<string name="settings_boot">開機自動啟用</string>
<string name="settings_server">伺服器設置</string>
@ -25,7 +25,7 @@
<string name="settings_check_update">檢查更新</string>
<string name="settings_update_summary">前往 GitHub 發佈頁面。</string>
<string name="settings_count_number_of_queries">統計 DNS 查詢次數</string>
<string name="notification_queries">DNS 查詢次數:</string>
<string name="notice_queries">DNS 查詢次數:</string>
<string name="notice_legacy_api">當前 Android API 無法支持所有功能。</string>
<string name="settings_bug_report">提交回饋</string>
<string name="settings_issue_summary">前往 GitHub 提交 Bug 回饋。</string>

View File

@ -1,66 +1,62 @@
<resources>
<string name="app_name">Daedalus</string>
<string name="action_settings">Settings</string>
<string name="notice_main">See the world outside.</string>
<string name="notice_activated">iTXTech Daedalus is activated.</string>
<string name="notice_start_test">Testing specified DNS server …</string>
<string name="notice_queries">DNS query times:</string>
<string name="notice_legacy_api">The current Android API can not support all the features.</string>
<string name="notice_need_restart">Re-activate Daedalus to make the settings take effect.</string>
<string name="notice_start_download">Downloading rule, please wait …</string>
<string name="notice_downloaded">Rule has been downloaded.</string>
<string name="notice_now_downloading">Daedalus is currently downloading rule, please wait.</string>
<string name="notice_fill_in_all">Please fill in all configuration items.</string>
<string name="notice_delete_confirm_prompt">Are you sure you want to remove this configuration?</string>
<string name="notice_after_stop">Please modify activated rules after stopping service.</string>
<string name="action_settings">Settings</string>
<string name="action_about">About</string>
<string name="action_dns_test">Test</string>
<string name="action_start_test">Start test</string>
<string name="action_home">Home</string>
<string name="action_rules">Rules</string>
<string name="action_dns_servers">Servers</string>
<string name="action_removed">Removed.</string>
<string name="action_undo">Undo</string>
<string name="action_log">Log</string>
<string name="action_refresh">Refresh</string>
<string name="delete">Delete</string>
<string name="apply">Apply</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
<string name="button_text_activate">Activate</string>
<string name="button_text_deactivate">Deactivate</string>
<string name="action_about">About</string>
<string name="notification_activated">iTXTech Daedalus is activated.</string>
<string name="config_dns_server">DNS server config</string>
<string name="config_rule">Rule config</string>
<string name="settings_system">System Settings</string>
<string name="settings_boot">Auto activate on boot</string>
<string name="settings_server">Server Settings</string>
<string name="primary_server">Primary DNS server</string>
<string name="secondary_server">Secondary DNS server</string>
<string name="notice_start_test">Testing specified DNS server …</string>
<string name="action_dns_test">Test</string>
<string name="action_start_test">Start test</string>
<string name="test_domain">Test domain:</string>
<string name="test_time_used">Time used:</string>
<string name="test_dns_server">DNS server:</string>
<string name="test_result_resolved">Address:</string>
<string name="test_failed">DNS query failed. Timeout or unknown hostname.</string>
<string name="test_test_domain">google.com</string>
<string name="settings_notification">Show notification</string>
<string name="settings_check_update">Check update</string>
<string name="settings_update_summary">Visit GitHub releases page.</string>
<string name="settings_count_number_of_queries">Count DNS query times</string>
<string name="notification_queries">DNS query times:</string>
<string name="notice_legacy_api">The current Android API can not support all the features.</string>
<string name="settings_bug_report">Report a bug</string>
<string name="settings_issue_summary">Submit an issue in GitHub Issues page.</string>
<string name="settings_dns_test_servers">DNS test servers</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
<string name="action_home">Home</string>
<string name="nav_version">Version:</string>
<string name="nav_git_commit">Git commit:</string>
<string name="settings_help_and_support">Help &amp; Support</string>
<string name="server_puredns_north_china">Pure DNS North China</string>
<string name="server_puredns_east_china">Pure DNS East China</string>
<string name="server_aixyz_south_china">AIXYZ DNS South China</string>
<string name="server_aixyz_east_china">AIXYZ DNS East China</string>
<string name="nav_github">GitHub</string>
<string name="settings_advanced">Advanced System Settings</string>
<string name="settings_advanced_on">On</string>
<string name="settings_local_rules_resolution">Local rules resolution</string>
<string name="notice_need_restart">Re-activate Daedalus to make the settings take effect.</string>
<string name="action_rules">Rules</string>
<string name="notice_start_download">Downloading rule, please wait …</string>
<string name="notice_downloaded">Rule has been downloaded.</string>
<string name="notice_now_downloading">Daedalus is currently downloading rule, please wait.</string>
<string name="action_dns_servers">Servers</string>
<string name="settings_server_name">Server Name</string>
<string name="settings_server_address">Server Address</string>
<string name="settings_server_port">Server Port</string>
<string name="delete">Delete</string>
<string name="apply">Apply</string>
<string name="notice_fill_in_all">Please fill in all configuration items.</string>
<string name="settings_dns_over_tcp">DNS over TCP</string>
<string name="action_removed">Removed.</string>
<string name="action_undo">Undo</string>
<string name="notice_delete_confirm_prompt">Are you sure you want to remove this configuration?</string>
<string name="config_dns_server">DNS server config</string>
<string name="config_rule">Rule config</string>
<string name="settings_log_size">Log size limit</string>
<string name="settings_manual">Manual</string>
<string name="settings_manual_summary">Visit GitHub wiki page.</string>
<string name="settings_rule_name">Rule Name</string>
<string name="settings_rule_type">Rule Type</string>
<string name="settings_rule">Rule Settings</string>
@ -69,11 +65,28 @@
<string name="settings_rule_filename">Rule Filename</string>
<string name="settings_rule_import">Import</string>
<string name="settings_rule_import_build_in">Import from build in rules</string>
<string name="notice_after_stop">Please modify activated rules after stopping service.</string>
<string name="settings_manual">Manual</string>
<string name="settings_manual_summary">Visit GitHub wiki page.</string>
<string name="action_log">Log</string>
<string name="action_refresh">Refresh</string>
<string name="settings_log_size">Log size limit</string>
<string name="settings_server_name">Server Name</string>
<string name="settings_server_address">Server Address</string>
<string name="settings_server_port">Server Port</string>
<string name="server_puredns_north_china">Pure DNS North China</string>
<string name="server_puredns_east_china">Pure DNS East China</string>
<string name="server_aixyz_south_china">AIXYZ DNS South China</string>
<string name="server_aixyz_east_china">AIXYZ DNS East China</string>
<string name="server_cutedns_south_china">CuteDNS South China</string>
<string name="primary_server">Primary DNS server</string>
<string name="secondary_server">Secondary DNS server</string>
<string name="test_domain">Test domain:</string>
<string name="test_time_used">Time used:</string>
<string name="test_dns_server">DNS server:</string>
<string name="test_result_resolved">Address:</string>
<string name="test_failed">DNS query failed. Timeout or unknown hostname.</string>
<string name="test_test_domain">google.com</string>
<string name="nav_version">Version:</string>
<string name="nav_git_commit">Git commit:</string>
<string name="nav_github">GitHub</string>
</resources>