diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-29 09:55:09 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-29 09:55:09 +0100 |
| commit | 5564f65a69d3d6bdc6ff7fbf61004f31a0017877 (patch) | |
| tree | 40cc93f06a95a9c0a64b5c9a59762c15e26923c5 /OpenKeychain/src/main/res/values | |
| parent | 81d4d31fd746db2d7707fb8bffb52406f431bef2 (diff) | |
| parent | 198ddfeff7324533fb2daea778891def04f8e8c2 (diff) | |
| download | open-keychain-5564f65a69d3d6bdc6ff7fbf61004f31a0017877.tar.gz open-keychain-5564f65a69d3d6bdc6ff7fbf61004f31a0017877.tar.bz2 open-keychain-5564f65a69d3d6bdc6ff7fbf61004f31a0017877.zip | |
Merge remote-tracking branch 'origin/t/snackbar' into development
Conflicts:
OpenKeychain/build.gradle
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index dfb675a37..1151644d8 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -399,7 +399,7 @@ <string name="import_qr_code_text">"Place your camera over the QR Code!"</string> <!-- Generic result toast --> - <string name="view_log">"View Log"</string> + <string name="view_log">"Details"</string> <string name="with_warnings">", with warnings"</string> <string name="with_cancelled">", until cancelled"</string> |