diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-11-24 20:54:03 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-11-24 20:54:03 +0100 |
| commit | b945962edec63170e9f343e96df5387f3d544740 (patch) | |
| tree | 8a82f62be2186addf0cc1ce3d058cc04d1716658 /src/main/res/values | |
| parent | fa848a19791d88ade8423bdf3575c7c8f77916cd (diff) | |
offer verification directly from the trust keys screen
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | src/main/res/values/themes.xml | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 309c1fb30..da88d1f44 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -26,6 +26,7 @@ <attr name="icon_settings" format="reference" /> <attr name="icon_share" format="reference" /> <attr name="icon_import_export" format="reference" /> + <attr name="icon_scan_qr_code" format="reference"/> <attr name="icon_notifications" format="reference" /> <attr name="icon_notifications_off" format="reference" /> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 6415acaab..1d33ecffd 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -711,4 +711,8 @@ <string name="this_device_has_been_verified">This device has been verified</string> <string name="copy_fingerprint">Copy fingerprint</string> <string name="all_omemo_keys_have_been_verified">All OMEMO keys have been verified</string> + <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Barcode does not contain fingerprints for this conversation.</string> + <string name="verified_fingerprints">Verified fingerprints</string> + <string name="use_camera_icon_to_scan_barcode">Use the camera to scan a contacts barcode</string> + <string name="please_wait_for_keys_to_be_fetched">Please wait for keys to be fetched</string> </resources> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 071d26d3c..61a2d2bb1 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -32,7 +32,7 @@ <item name="attr/icon_settings">@drawable/ic_settings_grey600_24dp</item> <item name="attr/icon_import_export">@drawable/ic_import_export_white_24dp</item> <item name="attr/icon_share">@drawable/ic_share_white_24dp</item> - + <item name="attr/icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item> <item name="attr/dialog_horizontal_padding">16dp</item> <item name="attr/dialog_vertical_padding">16dp</item> </style> |