cryptenroll,homectl,journalctl: adjust messages before qrcodes

Users will generally know what a qrcode is, so let's not treat them as dumb and
explain that it can be scanned. OTOH, we should say what the qrcode contains
and it is useful to give a hint why the users would want to scan it. Reword
messages accordingly.

(Also, don't say "to your phone", when somebody might be using a stolen phone,
or something else then a phone.)

(cherry picked from commit 10faa40ba781cf499258a3b37de02dd643822dc6)

diff --git a/src/cryptenroll/cryptenroll-recovery.c b/src/cryptenroll/cryptenroll-recovery.c
index 7c170f28502647cbccf53cf9315cc4b1dcc05b5f..f12c2713383956a49812e204887c94bc1be714da 100644 (file)
--- a/src/cryptenroll/cryptenroll-recovery.c
+++ b/src/cryptenroll/cryptenroll-recovery.c
@@ -67,7 +67,7 @@ int enroll_recovery(
               "whenever authentication is requested.\n", stderr);
         fflush(stderr);
 
-        (void) print_qrcode(stderr, "You may optionally scan the recovery key off screen", password);
+        (void) print_qrcode(stderr, "Optionally scan the recovery key for safekeeping", password);
 
         if (asprintf(&keyslot_as_string, "%i", keyslot) < 0) {
                 r = log_oom();

diff --git a/src/home/homectl-recovery-key.c b/src/home/homectl-recovery-key.c
index bf18ae49e423d63cc09fdddc959a0904e1b67b05..ada9a2d693e346f2954103c0bce5b04581cf59da 100644 (file)
--- a/src/home/homectl-recovery-key.c
+++ b/src/home/homectl-recovery-key.c
@@ -159,7 +159,7 @@ int identity_add_recovery_key(JsonVariant **v) {
               "whenever authentication is requested.\n", stderr);
         fflush(stderr);
 
-        (void) print_qrcode(stderr, "You may optionally scan the recovery key off screen", password);
+        (void) print_qrcode(stderr, "Optionally scan the recovery key for safekeeping", password);
 
         return 0;
 }

diff --git a/src/journal/journalctl-authenticate.c b/src/journal/journalctl-authenticate.c
index 10630f5e6cc47bff7625c7307704229fc9302b98..5c8fa6e8bf9c11a469889bf93f7fca276224dc6a 100644 (file)
--- a/src/journal/journalctl-authenticate.c
+++ b/src/journal/journalctl-authenticate.c
@@ -198,9 +198,7 @@ int action_setup_keys(void) {
         if (!url)
                 return log_oom();
 
-        (void) print_qrcode(stderr,
-                            "To transfer the verification key to your phone scan the QR code below",
-                            url);
+        (void) print_qrcode(stderr, "Scan the verification key to transfer it to another device", url);
 #endif
 
         return 0;