diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-02-01 06:09:13 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-02-01 06:09:13 -0800 |
| commit | 695694bbb9dd7ce788f070be14e87d2983a8b81f (patch) | |
| tree | a1bf1771405fd50669cf4f6dc1f733542c59a105 /res | |
| parent | aac21a8b0746b1e2020e9893eb3241196bedd3fa (diff) | |
| parent | f2f5e2ae576470cc59502c1dc2f404eb2e92807f (diff) | |
| download | android_packages_apps_Dialer-695694bbb9dd7ce788f070be14e87d2983a8b81f.tar.gz android_packages_apps_Dialer-695694bbb9dd7ce788f070be14e87d2983a8b81f.tar.bz2 android_packages_apps_Dialer-695694bbb9dd7ce788f070be14e87d2983a8b81f.zip | |
Merge "Dialer:add black and white list menu"
Diffstat (limited to 'res')
| -rw-r--r-- | res/values-zh-rCN/strings.xml | 7 | ||||
| -rw-r--r-- | res/values/strings.xml | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 5c2e3fe25..39921a83b 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -216,9 +216,14 @@ <string name="call_log_show_all_slots">"所有卡"</string> <string name="call_log_all_calls_header">"所有通话"</string> <string name="calllog_search_hint">"搜索通话记录"</string> - + <string name="firewall_number_len_not_valid">号码错误</string> + <string name="firewall_number_in_black">"该号码已在黑名单中"</string> + <string name="firewall_number_in_white">"该号码已在白名单中"</string> + <string name="firewall_save_success">保存成功</string> + <string name="firewall_add_blacklist_warning">如果将该号码加入黑名单，你将不会再收到该号码的消息和来电</string> <string name="add_to_white_list">加入白名单</string> <string name="add_to_black_list">加入黑名单</string> <string name="video_call">视频电话</string> <string name="menu_add_to_4g_conference_call">加入4G电话会议</string> + </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index d7f123908..616248d7c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -841,5 +841,10 @@ <string name="add_to_white_list">Add to white list</string> <string name="add_to_black_list">Add to black list</string> <string name="dialog_title">Tip</string> + <string name="firewall_number_len_not_valid">Number is wrong</string> + <string name="firewall_number_in_black">"Number already in blacklist"</string> + <string name="firewall_number_in_white">"Number already in whitelist"</string> + <string name="firewall_save_success">Saved successfully</string> + <string name="firewall_add_blacklist_warning">if you add this number to blacklsit, you will not receive the messages and calls from it</string> </resources> |