diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-01-12 20:59:37 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-01-13 20:41:01 +0100 |
commit | 84eece622bb321c316a230432b85559ab2067084 (patch) | |
tree | 8b20f02cebeab0783ff02b1dbacea4ae095ca390 /OpenKeychain/src/main/res/values/strings.xml | |
parent | 50e515c6cdeede9552a577814c1a7c59325ae8c6 (diff) | |
download | open-keychain-84eece622bb321c316a230432b85559ab2067084.tar.gz open-keychain-84eece622bb321c316a230432b85559ab2067084.tar.bz2 open-keychain-84eece622bb321c316a230432b85559ab2067084.zip |
support addition of user attributes
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 4b5c46a5f..6e2b84642 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -309,6 +309,7 @@ <string name="progress_modify_unlock">"unlocking keyring…"</string> <string name="progress_modify_adduid">"adding user IDs…"</string> + <string name="progress_modify_adduat">"adding user attributes…"</string> <string name="progress_modify_revokeuid">"revoking user IDs…"</string> <string name="progress_modify_primaryuid">"changing primary user ID…"</string> <string name="progress_modify_subkeychange">"modifying subkeys…"</string> @@ -839,6 +840,8 @@ <string name="msg_mf_uid_primary">"Changing primary user ID to %s"</string> <string name="msg_mf_uid_revoke">"Revoking user ID %s"</string> <string name="msg_mf_uid_error_empty">"User ID must not be empty!"</string> + <string name="msg_mf_uat_add_image">"Adding user attribute of type image"</string> + <string name="msg_mf_uat_add_unknown">"Adding user attribute of unknown type"</string> <string name="msg_mf_unlock_error">"Error unlocking keyring!"</string> <string name="msg_mf_unlock">"Unlocking keyring"</string> |