diff options
| author | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-05-09 21:20:34 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-05-09 21:20:34 +0200 |
| commit | ef0bc6714a71555b05ca3dea10c274a40605810c (patch) | |
| tree | 14ca926d40be99bbbd10543ab876a990563a11a0 /res | |
| parent | f0eb80eb5cdf1b61b6c6d00d436d86650b8b3b43 (diff) | |
added dialog for otr file transfer
Diffstat (limited to 'res')
| -rw-r--r-- | res/menu/conversations.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml index 58fd3bfa..68bcc957 100644 --- a/res/menu/conversations.xml +++ b/res/menu/conversations.xml @@ -4,13 +4,13 @@ android:id="@+id/action_add" android:orderInCategory="10" android:icon="@drawable/ic_action_add" - android:showAsAction="always" + android:showAsAction="ifRoom" android:title="@string/action_add" /> <item android:id="@+id/action_security" android:orderInCategory="20" - android:showAsAction="always" + android:showAsAction="ifRoom" android:icon="@drawable/ic_action_unsecure" android:title="@string/action_secure" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index 43ef5069..5c844964 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -89,4 +89,7 @@ <string name="encrypted_message_received"><i>Encrypted message received. Touch to view and decrypt.</i></string> <string name="encrypted_image_received"><i>Encrypted image received. Touch to view and decrypt.</i></string> <string name="image_file"><i>Image received. Touch to view</i></string> + <string name="otr_file_transfer">OTR encryption not available</string> + <string name="otr_file_transfer_msg">Unfortunaly OTR encryption is not available for file transfer. You can choose either openPGP or no encryption.</string> + <string name="use_pgp_encryption">Use openPGP encryption</string> </resources> |