diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-12-30 13:09:27 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-12-30 13:09:27 +0100 |
| commit | 9e663237b6dc4880bcdb1c763374c44f9f4416d2 (patch) | |
| tree | 3c317cf8a9e320db0b6ff5c451b82e7b32014627 /OpenKeychain/src/main/res/values-zh/strings.xml | |
| parent | 2223cdd4056341576a540b065bcb34a1e579b141 (diff) | |
| parent | ccde6add70ea9b5c559910d42dfb2e0bf79f5989 (diff) | |
| download | open-keychain-9e663237b6dc4880bcdb1c763374c44f9f4416d2.tar.gz open-keychain-9e663237b6dc4880bcdb1c763374c44f9f4416d2.tar.bz2 open-keychain-9e663237b6dc4880bcdb1c763374c44f9f4416d2.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/values-zh/strings.xml')
| -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 e9bdae446..8dd85050d 100644 --- a/OpenKeychain/src/main/res/values-zh/strings.xml +++ b/OpenKeychain/src/main/res/values-zh/strings.xml @@ -7,7 +7,7 @@ <string name="title_encrypt_text">加密文本</string> <string name="title_encrypt_files">加密文件</string> <string name="title_decrypt">解密</string> - <string name="title_authentication">密码</string> + <string name="title_unlock">密码</string> <string name="title_edit_key">编辑密钥</string> <string name="title_preferences">参数</string> <string name="title_api_registered_apps">已注册应用</string> |