diff options
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml index 254dc02bb..2630c407f 100644 --- a/OpenKeychain/src/main/res/values/dimens.xml +++ b/OpenKeychain/src/main/res/values/dimens.xml @@ -5,7 +5,5 @@ <dimen name="big_toolbar">120dp</dimen> <dimen name="huge_toolbar">222dp</dimen> <dimen name="minus_statusbar_height">0dp</dimen> - <!-- Default screen margins, per the Android Design guidelines. --> - <dimen name="activity_horizontal_margin">16dp</dimen> <dimen name="activity_vertical_margin">16dp</dimen> </resources>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index acc0c7f20..95e089275 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1740,6 +1740,9 @@ <item>50 EUR</item> <item>100 EUR</item> </string-array> - <string name="title_activity_redirect_key">RedirectKeyActivity</string> - <string name="action_settings">Settings</string> + <string name="redirect_import_key_title">"Import key attempt"</string> + <string name="redirect_import_key_message">"You scanned a fingerprint with another app, please scan with Openkeychain directly to be safe"</string> + <string name="redirect_import_key_yes">Scan again</string> + <string name="redirect_import_key_no">Close</string> + <string name="title_activity_redirect_key">Key import redirection</string> </resources> |