From f6cc1219dc8a929bce7d56efe56bd54cfcc13251 Mon Sep 17 00:00:00 2001
From: PeratX <1215714524@qq.com>
Date: Thu, 6 Jul 2017 08:58:03 +0800
Subject: [PATCH] Improved strings
---
.../daedalus/service/DaedalusVpnService.java | 6 +-
app/src/main/res/values-zh-rCN/strings.xml | 4 +-
app/src/main/res/values-zh-rTW/strings.xml | 4 +-
app/src/main/res/values/strings.xml | 111 ++++++++++--------
4 files changed, 69 insertions(+), 56 deletions(-)
diff --git a/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java b/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java
index de26e87..03d12cc 100644
--- a/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java
+++ b/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java
@@ -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());
}
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 89d8432..00409d3 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -6,7 +6,7 @@
启用
停用
关于
- 已启用 iTXTech Daedalus。
+ 已启用 iTXTech Daedalus。
系统设置
开机自动启用
服务器设置
@@ -25,7 +25,7 @@
检查更新
前往 GitHub 发布页面。
统计 DNS 查询次数
- DNS 查询次数:
+ DNS 查询次数:
当前 Android API 无法支持所有功能。
提交反馈
前往 GitHub 提交 Bug 反馈。
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index d568355..a52793e 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -6,7 +6,7 @@
啟用
停用
關於
- 已啟用 iTXTech Daedalus。
+ 已啟用 iTXTech Daedalus。
系統設置
開機自動啟用
伺服器設置
@@ -25,7 +25,7 @@
檢查更新
前往 GitHub 發佈頁面。
統計 DNS 查詢次數
- DNS 查詢次數:
+ DNS 查詢次數:
當前 Android API 無法支持所有功能。
提交回饋
前往 GitHub 提交 Bug 回饋。
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b8efc5e..31b4473 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,66 +1,62 @@
Daedalus
- Settings
+
See the world outside.
+ iTXTech Daedalus is activated.
+ Testing specified DNS server …
+ DNS query times:
+ The current Android API can not support all the features.
+ Re-activate Daedalus to make the settings take effect.
+ Downloading rule, please wait …
+ Rule has been downloaded.
+ Daedalus is currently downloading rule, please wait.
+ Please fill in all configuration items.
+ Are you sure you want to remove this configuration?
+ Please modify activated rules after stopping service.
+
+ Settings
+ About
+ Test
+ Start test
+ Home
+ Rules
+ Servers
+ Removed.
+ Undo
+ Log
+ Refresh
+
+ Delete
+ Apply
+
+ Open navigation drawer
+ Close navigation drawer
+
Activate
Deactivate
- About
- iTXTech Daedalus is activated.
+
+ DNS server config
+ Rule config
+
System Settings
Auto activate on boot
Server Settings
- Primary DNS server
- Secondary DNS server
- Testing specified DNS server …
- Test
- Start test
- Test domain:
- Time used:
- DNS server:
- Address:
- DNS query failed. Timeout or unknown hostname.
- google.com
Show notification
Check update
Visit GitHub releases page.
Count DNS query times
- DNS query times:
- The current Android API can not support all the features.
Report a bug
Submit an issue in GitHub Issues page.
DNS test servers
- Open navigation drawer
- Close navigation drawer
- Home
- Version:
- Git commit:
Help & Support
- Pure DNS North China
- Pure DNS East China
- AIXYZ DNS South China
- AIXYZ DNS East China
- GitHub
Advanced System Settings
On
Local rules resolution
- Re-activate Daedalus to make the settings take effect.
- Rules
- Downloading rule, please wait …
- Rule has been downloaded.
- Daedalus is currently downloading rule, please wait.
- Servers
- Server Name
- Server Address
- Server Port
- Delete
- Apply
- Please fill in all configuration items.
DNS over TCP
- Removed.
- Undo
- Are you sure you want to remove this configuration?
- DNS server config
- Rule config
+ Log size limit
+ Manual
+ Visit GitHub wiki page.
+
Rule Name
Rule Type
Rule Settings
@@ -69,11 +65,28 @@
Rule Filename
Import
Import from build in rules
- Please modify activated rules after stopping service.
- Manual
- Visit GitHub wiki page.
- Log
- Refresh
- Log size limit
+
+ Server Name
+ Server Address
+ Server Port
+
+ Pure DNS North China
+ Pure DNS East China
+ AIXYZ DNS South China
+ AIXYZ DNS East China
CuteDNS South China
+
+ Primary DNS server
+ Secondary DNS server
+
+ Test domain:
+ Time used:
+ DNS server:
+ Address:
+ DNS query failed. Timeout or unknown hostname.
+ google.com
+
+ Version:
+ Git commit:
+ GitHub