Updated translations

This commit is contained in:
PeratX 2017-10-15 21:34:41 +08:00
parent da21a2838a
commit a2c81c4f57
6 changed files with 144 additions and 122 deletions

View File

@ -48,7 +48,7 @@ __Users must comply with local laws and regulations.__<br>
DNS Server Providers
-------------
* __CuteDNS__
* __[Pure DNS](http://puredns.cn/)__ - *Shutdown according to regulations*
* __[Pure DNS](https://puredns.cn/)__ - *Shutdown according to regulations*
* __[AIXYZ DNS](https://aixyz.com/)__ - __*For academic purposes only.*__
* __[FUN DNS](http://fundns.cn)__ - *The Most Pure Domain Name Resolution Service*

View File

@ -180,16 +180,14 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
DaedalusVpnService.secondaryServer = DNSServerHelper.getAddressById(DNSServerHelper.getSecondary());
Daedalus.getInstance().startService(Daedalus.getInstance().getServiceIntent().setAction(DaedalusVpnService.ACTION_ACTIVATE));
updateMainButton(R.string.button_text_deactivate);
Daedalus.updateShortcut(Daedalus.getInstance());
}
}
private void updateMainButton(int id) {
if (currentFragment instanceof HomeFragment) {
Button button = (Button) currentFragment.getView().findViewById(R.id.button_activate);
Button button = currentFragment.getView().findViewById(R.id.button_activate);
button.setText(id);
}
}

View File

@ -25,10 +25,9 @@ public class DaedalusTileService extends TileService {
@Override
public void onClick() {
Daedalus appContext = Daedalus.getInstance();
boolean activate = appContext.isServiceActivated();
boolean activate = Daedalus.getInstance().isServiceActivated();
Intent intent = new Intent(appContext, MainActivity.class)
Intent intent = new Intent(getApplicationContext(), MainActivity.class)
.setAction(Intent.ACTION_VIEW)
.putExtra(MainActivity.LAUNCH_ACTION, activate ? MainActivity.LAUNCH_ACTION_DEACTIVATE : MainActivity.LAUNCH_ACTION_ACTIVATE);

View File

@ -2,68 +2,71 @@
<resources>
<string name="app_name">Daedalus</string>
<string name="quick_toggle">开关</string>
<string name="action_settings">设置</string>
<string name="notice_main">世界很大,我要去看看。</string>
<string name="notice_activated">已启用 iTXTech Daedalus。</string>
<string name="notice_start_test">正在测试指定的 DNS 服务器……</string>
<string name="notice_queries">DNS 查询次数:</string>
<string name="notice_legacy_api">当前 Android API 无法支持所有功能。</string>
<string name="notice_need_restart">重新启用 Daedalus 以应用设置。</string>
<string name="notice_start_download">正在下载规则,请稍等 ……</string>
<string name="notice_downloaded">已下载规则。</string>
<string name="notice_now_downloading">Daedalus 当前正在下载规则,请稍等。</string>
<string name="notice_fill_in_all">请填写所有配置项。</string>
<string name="notice_delete_confirm_prompt">您确定要删除此配置项?</string>
<string name="notice_after_stop">请在服务停止后更改启用的规则。</string>
<string name="notice_check_dynamic_rule_reload">请在设置中勾选“允许动态更新规则”</string>
<string name="notice_export_complete">导出完成。</string>
<string name="notice_importing_rule">正在导入规则,请稍等。</string>
<string name="action_settings">设置</string>
<string name="action_about">关于</string>
<string name="action_dns_test">测试</string>
<string name="action_start_test">开始测试</string>
<string name="action_home">主页</string>
<string name="action_rules">规则</string>
<string name="action_dns_servers">服务器</string>
<string name="action_removed">已移除。</string>
<string name="action_undo">撤销</string>
<string name="action_log">日志</string>
<string name="action_refresh">刷新</string>
<string name="action_reload">重新加载规则</string>
<string name="delete">删除</string>
<string name="apply">应用</string>
<string name="export">导出</string>
<string name="navigation_drawer_close">关闭导航栏</string>
<string name="navigation_drawer_open">开启导航栏</string>
<string name="button_text_activate">启用</string>
<string name="button_text_deactivate">停用</string>
<string name="action_about">关于</string>
<string name="notice_activated">已启用 iTXTech Daedalus。</string>
<string name="config_dns_server">配置 DNS 服务器</string>
<string name="config_rule">配置规则</string>
<string name="settings_system">系统设置</string>
<string name="settings_boot">开机自动启用</string>
<string name="settings_server">服务器设置</string>
<string name="primary_server">首选 DNS 服务器</string>
<string name="secondary_server">备用 DNS 服务器</string>
<string name="notice_start_test">正在测试指定的 DNS 服务器……</string>
<string name="action_dns_test">测试</string>
<string name="action_start_test">开始测试</string>
<string name="test_domain">测试域名:</string>
<string name="test_time_used">耗时:</string>
<string name="test_dns_server">DNS 服务器:</string>
<string name="test_result_resolved">解析地址:</string>
<string name="test_failed">查询失败。超时或未知的主机。</string>
<string name="test_test_domain">google.com</string>
<string name="settings_notification">显示通知</string>
<string name="settings_check_update">检查更新</string>
<string name="settings_update_summary">前往 GitHub 发布页面。</string>
<string name="settings_count_number_of_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>
<string name="settings_dns_test_servers">DNS 测试服务器</string>
<string name="navigation_drawer_close">关闭导航栏</string>
<string name="navigation_drawer_open">开启导航栏</string>
<string name="action_home">主页</string>
<string name="nav_version">版本:</string>
<string name="nav_git_commit">Git commit:</string>
<string name="settings_help_and_support">支持和帮助</string>
<string name="server_aixyz_south_china">AIXYZ DNS 华南</string>
<string name="server_aixyz_east_china">AIXYZ DNS 华东</string>
<string name="server_fundns_south_china">FUN DNS 华南</string>
<string name="server_fundns_north_china">FUN DNS 华北</string>
<string name="nav_github">GitHub</string>
<string name="settings_advanced">高级系统设置</string>
<string name="settings_advanced_on">开启</string>
<string name="settings_local_rules_resolution">本地规则解析</string>
<string name="notice_need_restart">重新启用 Daedalus 以应用设置。</string>
<string name="action_rules">规则</string>
<string name="notice_start_download">正在下载规则,请稍等 ……</string>
<string name="notice_downloaded">已下载规则。</string>
<string name="notice_now_downloading">Daedalus 当前正在下载规则,请稍等。</string>
<string name="action_dns_servers">服务器</string>
<string name="settings_server_name">服务器名称</string>
<string name="settings_server_address">服务器地址</string>
<string name="settings_server_port">服务器端口</string>
<string name="delete">删除</string>
<string name="apply">应用</string>
<string name="export">导出</string>
<string name="notice_fill_in_all">请填写所有配置项。</string>
<string name="settings_dns_over_tcp">DNS over TCP</string>
<string name="action_removed">已移除。</string>
<string name="action_undo">撤销</string>
<string name="notice_delete_confirm_prompt">您确定要删除此配置项?</string>
<string name="config_dns_server">配置 DNS 服务器</string>
<string name="config_rule">配置规则</string>
<string name="settings_manual">使用手册</string>
<string name="settings_manual_summary">访问 GitHub wiki 页面。</string>
<string name="settings_log_size">日志大小限制</string>
<string name="settings_debug_output">调试输出</string>
<string name="settings_allow_dynamic_rule_reload">允许动态更新规则</string>
<string name="settings_dark_theme">使用暗主题</string>
<string name="settings_rule_name">规则名称</string>
<string name="settings_rule_type">规则类型</string>
<string name="settings_rule">规则设置</string>
@ -73,18 +76,28 @@
<string name="settings_rule_import">导入</string>
<string name="settings_rule_import_build_in">内置</string>
<string name="settings_rule_import_external">外部</string>
<string name="notice_after_stop">请在服务停止后更改启用的规则。</string>
<string name="settings_manual">使用手册</string>
<string name="settings_manual_summary">访问 GitHub wiki 页面。</string>
<string name="action_log">日志</string>
<string name="action_refresh">刷新</string>
<string name="settings_log_size">日志大小限制</string>
<string name="settings_debug_output">调试输出</string>
<string name="settings_server_name">服务器名称</string>
<string name="settings_server_address">服务器地址</string>
<string name="settings_server_port">服务器端口</string>
<string name="server_aixyz_south_china">AIXYZ DNS 华南</string>
<string name="server_aixyz_east_china">AIXYZ DNS 华东</string>
<string name="server_fundns_south_china">FUN DNS 华南</string>
<string name="server_fundns_north_china">FUN DNS 华北</string>
<string name="server_cutedns_south_china">CuteDNS 华南</string>
<string name="settings_allow_dynamic_rule_reload">允许动态更新规则</string>
<string name="action_reload">重新加载规则</string>
<string name="notice_check_dynamic_rule_reload">请在设置中勾选“允许动态更新规则”</string>
<string name="notice_export_complete">导出完成。</string>
<string name="notice_importing_rule">正在导入规则,请稍等。</string>
<string name="settings_dark_theme">使用暗主题</string>
<string name="primary_server">首选 DNS 服务器</string>
<string name="secondary_server">备用 DNS 服务器</string>
<string name="test_domain">测试域名:</string>
<string name="test_time_used">耗时:</string>
<string name="test_dns_server">DNS 服务器:</string>
<string name="test_result_resolved">解析地址:</string>
<string name="test_failed">查询失败。超时或未知的主机。</string>
<string name="test_test_domain">google.com</string>
<string name="nav_version">版本:</string>
<string name="nav_git_commit">Git commit:</string>
<string name="nav_github">GitHub</string>
</resources>

View File

@ -2,68 +2,71 @@
<resources>
<string name="app_name">Daedalus</string>
<string name="quick_toggle">开关</string>
<string name="action_settings">設定</string>
<string name="notice_main">世界很大,我要去看看。</string>
<string name="notice_activated">已啟動 iTXTech Daedalus。</string>
<string name="notice_start_test">正在測試指定的 DNS 伺服器……</string>
<string name="notice_queries">DNS 查詢次數:</string>
<string name="notice_legacy_api">目前 Android API 無法支援所有功能。</string>
<string name="notice_need_restart">重新啟動 Daedalus 以套用設定。</string>
<string name="notice_start_download">正在下載規則,請稍等……</string>
<string name="notice_downloaded">已下載規則。</string>
<string name="notice_now_downloading">Daedalus 目前正在下載規則,請稍等。</string>
<string name="notice_fill_in_all">請填寫所有設定項。</string>
<string name="notice_delete_confirm_prompt">您確定要刪除此設定項?</string>
<string name="notice_after_stop">請在服務停止後變更啟動的規則。</string>
<string name="notice_check_dynamic_rule_reload">請在設定中開啟「允許動態規則重新載入」</string>
<string name="notice_export_complete">导出完成。 TODO</string>
<string name="notice_importing_rule">正在导入规则,请稍等。 TODO</string>
<string name="action_settings">設定</string>
<string name="action_about">關於</string>
<string name="action_dns_test">測試</string>
<string name="action_start_test">開始測試</string>
<string name="action_home">主頁</string>
<string name="action_rules">規則</string>
<string name="action_dns_servers">伺服器</string>
<string name="action_removed">已移除。</string>
<string name="action_undo">復原</string>
<string name="action_log">紀錄檔</string>
<string name="action_refresh">重新整理</string>
<string name="action_reload">重新載入</string>
<string name="delete">刪除</string>
<string name="apply">套用</string>
<string name="export">导出 TODO</string>
<string name="navigation_drawer_close">關閉隱藏式瀏覽選單</string>
<string name="navigation_drawer_open">開啟隱藏式瀏覽選單</string>
<string name="button_text_activate">啟動</string>
<string name="button_text_deactivate">停用</string>
<string name="action_about">關於</string>
<string name="notice_activated">已啟動 iTXTech Daedalus。</string>
<string name="config_dns_server">設定 DNS 伺服器</string>
<string name="config_rule">設定規則</string>
<string name="settings_system">系統設定</string>
<string name="settings_boot">開機自動啟動</string>
<string name="settings_server">伺服器設定</string>
<string name="primary_server">主要 DNS 伺服器</string>
<string name="secondary_server">次要 DNS 伺服器</string>
<string name="notice_start_test">正在測試指定的 DNS 伺服器……</string>
<string name="action_dns_test">測試</string>
<string name="action_start_test">開始測試</string>
<string name="test_domain">測試的網域名稱:</string>
<string name="test_time_used">使用的時間:</string>
<string name="test_dns_server">DNS 伺服器:</string>
<string name="test_result_resolved">解析網址:</string>
<string name="test_failed">DNS 查詢失敗。逾時或未知的主機。</string>
<string name="test_test_domain">google.com</string>
<string name="settings_notification">顯示通知</string>
<string name="settings_check_update">檢查更新</string>
<string name="settings_update_summary">造訪 GitHub 發行頁面。</string>
<string name="settings_count_number_of_queries">統計 DNS 查詢次數</string>
<string name="notice_queries">DNS 查詢次數:</string>
<string name="notice_legacy_api">目前 Android API 無法支援所有功能。</string>
<string name="settings_bug_report">回報 Bug</string>
<string name="settings_issue_summary">前往 GitHub 送出 Bug 回饋。</string>
<string name="settings_dns_test_servers">DNS 測試伺服器</string>
<string name="navigation_drawer_close">關閉隱藏式瀏覽選單</string>
<string name="navigation_drawer_open">開啟隱藏式瀏覽選單</string>
<string name="action_home">主頁</string>
<string name="nav_version">版本:</string>
<string name="nav_git_commit">Git commit:</string>
<string name="settings_help_and_support">支援與說明</string>
<string name="server_aixyz_south_china">AIXYZ DNS 中國華南</string>
<string name="server_aixyz_east_china">AIXYZ DNS 中國華東</string>
<string name="server_fundns_south_china">FUN DNS 中國華南</string>
<string name="server_fundns_north_china">FUN DNS 中國華北</string>
<string name="nav_github">GitHub</string>
<string name="settings_advanced">進階系統設定</string>
<string name="settings_advanced_on">開啟</string>
<string name="settings_local_rules_resolution">本機規則解析</string>
<string name="notice_need_restart">重新啟動 Daedalus 以套用設定。</string>
<string name="action_rules">規則</string>
<string name="notice_start_download">正在下載規則,請稍等……</string>
<string name="notice_downloaded">已下載規則。</string>
<string name="notice_now_downloading">Daedalus 目前正在下載規則,請稍等。</string>
<string name="action_dns_servers">伺服器</string>
<string name="settings_server_name">伺服器名稱</string>
<string name="settings_server_address">伺服器網址</string>
<string name="settings_server_port">伺服器埠</string>
<string name="delete">刪除</string>
<string name="apply">套用</string>
<string name="export">导出 TODO</string>
<string name="notice_fill_in_all">請填寫所有設定項。</string>
<string name="settings_dns_over_tcp">DNS over TCP</string>
<string name="action_removed">已移除。</string>
<string name="action_undo">復原</string>
<string name="notice_delete_confirm_prompt">您確定要刪除此設定項?</string>
<string name="config_dns_server">設定 DNS 伺服器</string>
<string name="config_rule">設定規則</string>
<string name="settings_manual">使用手冊</string>
<string name="settings_manual_summary">造訪 GitHub wiki 頁面。</string>
<string name="settings_log_size">紀錄檔大小限制</string>
<string name="settings_debug_output">调试输出 TODO</string>
<string name="settings_allow_dynamic_rule_reload">允許動態規則重新載入</string>
<string name="settings_dark_theme">使用暗主题</string>
<string name="settings_rule_name">規則名稱</string>
<string name="settings_rule_type">規則類型</string>
<string name="settings_rule">規則設定</string>
@ -73,18 +76,28 @@
<string name="settings_rule_import">匯入</string>
<string name="settings_rule_import_build_in">内置</string>
<string name="settings_rule_import_external">外部</string>
<string name="notice_after_stop">請在服務停止後變更啟動的規則。</string>
<string name="settings_manual">使用手冊</string>
<string name="settings_manual_summary">造訪 GitHub wiki 頁面。</string>
<string name="action_log">紀錄檔</string>
<string name="action_refresh">重新整理</string>
<string name="settings_log_size">紀錄檔大小限制</string>
<string name="settings_debug_output">调试输出 TODO</string>
<string name="settings_server_name">伺服器名稱</string>
<string name="settings_server_address">伺服器網址</string>
<string name="settings_server_port">伺服器埠</string>
<string name="server_aixyz_south_china">AIXYZ DNS 中國華南</string>
<string name="server_aixyz_east_china">AIXYZ DNS 中國華東</string>
<string name="server_fundns_south_china">FUN DNS 中國華南</string>
<string name="server_fundns_north_china">FUN DNS 中國華北</string>
<string name="server_cutedns_south_china">CuteDNS 中國華南</string>
<string name="settings_allow_dynamic_rule_reload">允許動態規則重新載入</string>
<string name="action_reload">重新載入</string>
<string name="notice_check_dynamic_rule_reload">請在設定中開啟「允許動態規則重新載入」</string>
<string name="notice_export_complete">导出完成。 TODO</string>
<string name="notice_importing_rule">正在导入规则,请稍等。 TODO</string>
<string name="settings_dark_theme">使用暗主题</string>
<string name="primary_server">主要 DNS 伺服器</string>
<string name="secondary_server">次要 DNS 伺服器</string>
<string name="test_domain">測試的網域名稱:</string>
<string name="test_time_used">使用的時間:</string>
<string name="test_dns_server">DNS 伺服器:</string>
<string name="test_result_resolved">解析網址:</string>
<string name="test_failed">DNS 查詢失敗。逾時或未知的主機。</string>
<string name="test_test_domain">google.com</string>
<string name="nav_version">版本:</string>
<string name="nav_git_commit">Git commit:</string>
<string name="nav_github">GitHub</string>
</resources>

View File

@ -86,7 +86,6 @@
<string name="server_fundns_south_china">FUN DNS South China</string>
<string name="server_fundns_north_china">FUN DNS North China</string>
<string name="primary_server">Primary DNS server</string>
<string name="secondary_server">Secondary DNS server</string>