aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-11-22 12:03:21 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-11-22 12:03:21 +0100
commitd76b0a3104f0bf259472c54d253fc214c3238765 (patch)
tree494549b60baebdf25192c7f006258afe9951600b /src/main/res/values
parent1a7e0fd15389d018258b2cdddc05f7ccf9582bce (diff)
offer verification directly from the trust keys screen
Diffstat (limited to 'src/main/res/values')
-rw-r--r--src/main/res/values/attrs.xml1
-rw-r--r--src/main/res/values/strings.xml4
-rw-r--r--src/main/res/values/themes.xml2
3 files changed, 7 insertions, 0 deletions
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 82f9db89..7b7d2c5a 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -47,6 +47,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 416ee252..591d3dbc 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -703,4 +703,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 f15822c9..69d4d39f 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -57,6 +57,7 @@
<item name="attr/icon_settings">@drawable/ic_action_settings</item>
<item name="attr/icon_import_export">@drawable/ic_stat_communication_import_export</item>
<item name="attr/icon_share">@drawable/ic_action_share</item>
+ <item name="attr/icon_scan_qr_code">@drawable/ic_action_camera</item>
<item name="attr/icon_notifications">@drawable/ic_notifications_black54_24dp</item>
<item name="attr/icon_notifications_off">@drawable/ic_notifications_off_black54_24dp</item>
@@ -120,6 +121,7 @@
<item name="attr/icon_settings">@drawable/ic_action_settings_white</item>
<item name="attr/icon_import_export">@drawable/ic_stat_communication_import_export</item>
<item name="attr/icon_share">@drawable/ic_action_share</item>
+ <item name="attr/icon_scan_qr_code">@drawable/ic_action_camera</item>
<item name="attr/icon_notifications">@drawable/ic_notifications_white80</item>
<item name="attr/icon_notifications_off">@drawable/ic_notifications_off_white80</item>