diff options
| author | Christian S <christian@pix-art.de> | 2015-10-31 17:14:53 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-10-31 17:14:53 +0100 |
| commit | c5dc1628a4068b8af3b2250080897e35937dc815 (patch) | |
| tree | 727ded0485a61fa64d613defb9b6917d9a6fa0ef /src/main/res/values | |
| parent | 107acd1a5b03d25aa38d1ad73b957482ea781035 (diff) | |
| parent | b9de159e97090e132b74e934bc42fa6186105fd2 (diff) | |
Merge remote-tracking branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/strings.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 9331bb752..44e038bea 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -30,7 +30,8 @@ <string name="minutes_ago">%d mins ago</string> <string name="unread_conversations">unread Conversations</string> <string name="sending">sending…</string> - <string name="encrypted_message">Decrypting message. Please wait…</string> + <string name="message_decrypting">Decrypting message. Please wait…</string> + <string name="pgp_message">OpenPGP encrypted message</string> <string name="nick_in_use">Nickname is already in use</string> <string name="admin">Admin</string> <string name="owner">Owner</string> |