diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-24 15:29:02 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-24 15:29:58 +0100 |
commit | f9ef1160ca764d508dafcb45fbf65f18911fff9c (patch) | |
tree | 816564326b238848669d7a0713f48c84791cd13b /OpenKeychain/src/main/res/values-zh | |
parent | fe32e7bff4e724d37903d07cd3b4f0287ec85879 (diff) | |
parent | 8b4388e1a2d5cb2b7f0524c18ad3383e3375ba7b (diff) | |
download | open-keychain-f9ef1160ca764d508dafcb45fbf65f18911fff9c.tar.gz open-keychain-f9ef1160ca764d508dafcb45fbf65f18911fff9c.tar.bz2 open-keychain-f9ef1160ca764d508dafcb45fbf65f18911fff9c.zip |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Diffstat (limited to 'OpenKeychain/src/main/res/values-zh')
-rw-r--r-- | OpenKeychain/src/main/res/values-zh/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml index d59b2a2e0..31df7e587 100644 --- a/OpenKeychain/src/main/res/values-zh/strings.xml +++ b/OpenKeychain/src/main/res/values-zh/strings.xml @@ -57,7 +57,7 @@ <string name="menu_help">帮助</string> <string name="menu_export_key">导出密钥</string> <string name="menu_delete_key">删除密钥</string> - <string name="menu_create_key">创建密钥</string> + <string name="menu_manage_keys">创建密钥</string> <string name="menu_search">搜索</string> <string name="menu_beam_preferences">参数</string> <string name="menu_key_edit_cancel">取消</string> |