Combines various translation source string update PRs (#19542)

* Live plugin language reworked (#19438)

* Live plugin language reworked

* Sentence casing

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Visited earlier, subcategories

* Reverted to "visits log"

* RowActionTooltipWithDimension reverted

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Update plugins/Live/lang/en.json

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* updates expected test files

* Tour pluging language reworked (#19499)

* updates expected test files

* Transitions plugin language reworked (#19497)

* Transitions plugin language reworked

* Suggested changes made

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Launch transitions sentence

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* UserCountry plugin language reworked (#19479)

* UserCountry plugin language reworked

* Suggested changes and fixes

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Deduplication

* Steps for accurate geolocation

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* TwoFactorAuth plugin language reworked (#19482)

* TwoFactorAuth plugin language reworked

* Suggested changes and clarifications made

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Avoiding misinterpretations

* Clarifications

* Spelling: your old codes

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* prerequisite

* - log in

Co-authored-by: Stefan Giehl <stefan@matomo.org>

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* fix syntax

* updates expected test files

* fix placeholder

Co-authored-by: Allan Nordhøy <epost@anotheragency.no>

15 files changed, 61 insertions, 61 deletions

diff --git a/plugins/TwoFactorAuth/lang/en.json b/plugins/TwoFactorAuth/lang/en.json
index c1d4665472..a76abb184c 100644
--- a/plugins/TwoFactorAuth/lang/en.json
+++ b/plugins/TwoFactorAuth/lang/en.json
@@ -2,50 +2,50 @@
     "TwoFactorAuth": {
         "TwoFactorAuthentication": "Two-factor authentication",
         "TwoFAShort": "2FA",
-        "TwoFactorAuthenticationIntro": "%1$sTwo-factor authentication%2$s increase your account security by adding an additional layer of verification when you log in. Each time you log in you will not only be asked to provide your login and password, but also an additional authentication token which changes periodically and is generated for example on your mobile device. This means that even when someone knows your username and password, they still won't be able to log in unless they have access to your mobile device for example.",
-        "TwoFactorAuthenticationIsEnabled": "Two-factor authentication is currently enabled.",
-        "TwoFactorAuthenticationIsDisabled": "Two-factor authentication is currently disabled.",
-        "TwoFactorAuthenticationRequired": "Two-factor authentication is required to be enabled for everyone, you cannot disable it.",
-        "ConfigureDifferentDevice": "Configure a different device",
+        "TwoFactorAuthenticationIntro": "%1$sTwo-factor authentication%2$s increases account security by also asking you for a code generated on a mobile device, or one of the remaining recovery codes (in addition to your password) to log in.",
+        "TwoFactorAuthenticationIsEnabled": "Two-factor authentication on.",
+        "TwoFactorAuthenticationIsDisabled": "Two-factor authentication off.",
+        "TwoFactorAuthenticationRequired": "Two-factor authentication is required for everyone, you cannot turn it off.",
+        "ConfigureDifferentDevice": "Set up a new device",
         "SetUpTwoFactorAuthentication": "Set up two-factor authentication (2FA)",
-        "RequiredToSetUpTwoFactorAuthentication": "You are required to set up two-factor authentication before you can log in",
+        "RequiredToSetUpTwoFactorAuthentication": "You must set up two-factor authentication before logging in.",
         "AuthenticationCode": "Authentication code",
         "Verify": "Verify",
         "StepX": "Step %s",
-        "MissingAuthCodeAPI": "Please specify two-factor authentication code.",
-        "InvalidAuthCode": "The two-factor authentication code is not correct.",
-        "RequiredAuthCodeNotConfiguredAPI": "You are required to set up two-factor authentication. Please log in to your account.",
-        "VerifyIdentifyExplanation": "Open the two-factor authentication app on your device to view your authentication code and verify your identity.",
-        "DontHaveYourMobileDevice": "Don’t have your mobile device?",
+        "MissingAuthCodeAPI": "Please specify a two-factor authentication code.",
+        "InvalidAuthCode": "Incorrect two-factor authentication code.",
+        "RequiredAuthCodeNotConfiguredAPI": "You must set up two-factor authentication. Please log in to do so.",
+        "VerifyIdentifyExplanation": "Verify yourself by opening the two-factor authentication app on your device to get your authentication code.",
+        "DontHaveYourMobileDevice": "Don't have your mobile device?",
         "EnterRecoveryCodeInstead": "Enter one of your recovery codes",
-        "AskSuperUserResetAuthenticationCode": "Ask super user to reset your authentication code",
+        "AskSuperUserResetAuthenticationCode": "Ask a superuser to reset your authentication code",
         "SetupIntroFollowSteps": "Please follow these steps to set up two-factor authentication:",
-        "SetupFinishedTitle": "Congratulations! Your account is now more secure.",
-        "SetupFinishedSubtitle": "You have successfully set up two-factor authentication. Next time you log in, you will need to also enter the authentication code. Make sure you have your mobile device or your backup codes with you.",
-        "WarningChangingConfiguredDevice": "You are about to change the configured two-factor authentication device. This will invalidate any previously configured device.",
+        "SetupFinishedTitle": "Your account is now more secure.",
+        "SetupFinishedSubtitle": "You have now set up two-factor authentication. From now on you need to enter an authentication code to log in. Make sure you have your mobile device or your backup codes with you.",
+        "WarningChangingConfiguredDevice": "You are about to change the configured two-factor authentication device, invalidating the one you had before.",
         "ShowRecoveryCodes": "Show recovery codes",
         "ConfirmSetup": "Confirm setup",
         "NotPossibleToLogIn": "Cannot log in to Matomo Analytics",
-        "LostAuthenticationDevice": "Hi,%1$sI have two-factor authentication enabled and lost my authentication device. Could you please reset two-factor authentication for my username %5$s? You can find the instructions for this here: %6$s.%2$sThe Matomo URL is %3$s.%4$sThanks",
-        "WrongAuthCodeTryAgain": "Wrong authentication code entered. Please try again.",
-        "DisableTwoFA": "Disable two-factor authentication",
-        "EnableTwoFA": "Enable two-factor authentication",
-        "ConfirmDisableTwoFA": "Are you sure you want to disable two-factor authentication for your account? Having two-factor authentication enabled increases your account security.",
-        "VerifyAuthCodeIntro": "Please enter the six-digit code from your authenticator app below to confirm you have successfully set up on your device.",
-        "VerifyAuthCodeHelp": "Please enter the six-digit code that has been generated on your mobile device after scanning the bar code.",
+        "LostAuthenticationDevice": "Hi,%1$sI have two-factor authentication and lost my authentication device. Could you please reset the two-factor authentication for my username \"%5$s\"? Instructions here: %6$s.%2$sThe Matomo URL is %3$s.%4$sThanks",
+        "WrongAuthCodeTryAgain": "Wrong authentication code. Please try again.",
+        "DisableTwoFA": "Turn off two-factor authentication",
+        "EnableTwoFA": "Turn on two-factor authentication",
+        "ConfirmDisableTwoFA": "Turn off two-factor authentication for your account? This will lower your account security.",
+        "VerifyAuthCodeIntro": "Please enter the six-digit code from your OTP app below to confirm you have set up on your device.",
+        "VerifyAuthCodeHelp": "Please enter the six-digit code generated on your mobile device after scanning the barcode.",
         "Your2FaAuthSecret": "Your two-factor authentication secret",
-        "SetupAuthenticatorOnDevice": "Setup authenticator on your device",
-        "SetupAuthenticatorOnDeviceStep1": "Install an authenticator app, for example:",
-        "SetupAuthenticatorOnDeviceStep2": "Next, open the app and scan the below bar code with the two-factor authentication app on your phone. If you can’t scan the barcode, %1$senter this code%2$s instead.",
-        "SetupBackupRecoveryCodes": "Please backup your recovery codes using one of the above methods before continuing the two-factor authentication setup.",
+        "SetupAuthenticatorOnDevice": "Set up an OTP app on your device",
+        "SetupAuthenticatorOnDeviceStep1": "Install an OTP app, for example:",
+        "SetupAuthenticatorOnDeviceStep2": "Next, open the app and scan the barcode below with the OTP app on your mobile device. %1$sEnter this code%2$s if you can't scan the barcode.",
+        "SetupBackupRecoveryCodes": "Please save your recovery codes securely using one of the methods above before continuing.",
         "RecoveryCodes": "Recovery codes",
-        "RecoveryCodesExplanation": "You can use recovery codes to access your account when you cannot receive two-factor authentication codes, for example when you don't have your mobile device with you.",
-        "RecoveryCodesSecurity": "Please treat your recovery codes with the same level of security as you would your password!",
-        "RecoveryCodesAllUsed": "All recovery codes have been used, it is highly recommended you regenerate your recovery codes.",
-        "RecoveryCodesRegenerated": "Recovery codes have been regenerated. Make sure to download or print the newly generated codes.",
+        "RecoveryCodesExplanation": "You can use recovery codes to access your account when you cannot receive two-factor authentication codes (for example when you don't have your mobile device with you).",
+        "RecoveryCodesSecurity": "Please protect your recovery codes like a password.",
+        "RecoveryCodesAllUsed": "All recovery codes have been used. You must generate new ones.",
+        "RecoveryCodesRegenerated": "Recovery codes generated. Make sure to download or print out the newly generated codes.",
         "GenerateNewRecoveryCodes": "Generate new recovery codes",
-        "GenerateNewRecoveryCodesInfo": "When you generate new recovery codes, your old codes won’t work anymore. Make sure to download or print your new codes.",
+        "GenerateNewRecoveryCodesInfo": "Generating new recovery codes means your old ones won't work anymore. Download or print out your new codes.",
         "RequireTwoFAForAll": "Require two-factor authentication for everyone",
-        "RequireTwoFAForAllInformation": "When enabled, every user has to enable two factor authentication. Enforcing 2FA will require all users to have access to a device where they can install an authenticator app. You can only enable this if you already have two factor authentication set up yourself."
+        "RequireTwoFAForAllInformation": "Requires other users also log in with 2FA by using an OTP app on their mobile device. (As a prerequisite, you must use 2FA yourself.)"
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified.png
index 1b433ac09c..8fa0640eff 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e0118420990876aedea3de99d01a4265a48657e4ab31944b184256fb06abf1c
-size 41177
+oid sha256:772869a00bea1a576ba1a7723a4b160d75c977dc9ecc87e144f2d4637f9c4624
+size 41531
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified_wrong_code.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified_wrong_code.png
index 9154560f36..6dc5fc9f01 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified_wrong_code.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified_wrong_code.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e5ded36bd07974ec329f2b10b0ea442b0e1cbcce62338b97e269dacedd093769
-size 48834
+oid sha256:728dd8b690de99338af10dcdb596d32073a8489799fdcbbfd1bd0e6d75b469c9
+size 47986
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png
index f954cb94b3..20698df7ed 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d48acfb0bee9aea9e3e2b9847dba1f1ab62ae0aee6d88b12ff134cf06dd9da29
-size 60139
+oid sha256:a8483eb5cc0071e198329db8c7100ba06a0da6cc8c2a703d573e0bf0b3dbcb31
+size 57998
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png
index b522f495a0..293e751f74 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d418c2c6a6ebf3e7c95ed839e18f330aeed156d2cc1371fa4ec008d1fb883d54
-size 92484
+oid sha256:e64e4de3e4a8a3812af0b4db92287db1475139ce08a741fc51c75583f5b20965
+size 85135
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step2.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step2.png
index 77a35e6ce5..bcd36ac969 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step2.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7926caf73a1860283e2eef62d5aac0dea3bdd94aada0dd41bcece2e5f9c3197c
-size 125529
+oid sha256:f4698773a1109217c1a045b72d980b9fb2be85d37af92ec384a996f0cb2fa211
+size 120431
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png
index f017cb3c08..56ebf5fea7 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1c18522b3cec0b11757039987abd9ceba1b125c3e379657bce51522597c3ec2
-size 162328
+oid sha256:7b9a026af53e00fe1d068e011fcf653232540d036c9b0640292cadaa01f4fbef
+size 154084
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png
index 81943adc30..8b54f9495b 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8b37ab111c80837ddb451bd9c7eb7ab9e7dd9bc8994476088a6cfbaa4c5d6de
-size 66859
+oid sha256:42124bc73cc6c45fde7f6397023f7bb654574892fd6d0bfd973ffc0642fe829e
+size 63297
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step2.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step2.png
index d85d5a5bac..33487ce143 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step2.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b1f3c1af5c9a2f6c2ce1c9222eec9d833c38f61b689f2aa1118461f8499aba3d
-size 86228
+oid sha256:8d77685dcbc9996a5878336b1e843c6979bc7c65c76a84b5d0f72c73f475e669
+size 83492
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png
index 389351c553..dca0c57926 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1188f261fc033679860dbdc5bf6cdaf9a0f0d4246f6435e04882390d73c4aadb
-size 114098
+oid sha256:6735b30f0436a4b17733012ac3babef1f0d5f63bd5cdd1509c46a14d4618df5b
+size 108932
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step4.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step4.png
index aa7cf15880..b210b203ca 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step4.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step4.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f2058c1ae548aa0e2101b7fc818c6239cd34ee4de650a776cd66d27aaab41fa0
-size 30322
+oid sha256:abcd09dc2b4df5b5047576f9bf2d6377ed1ea608790e3f71c83ddf9786b6bf6b
+size 26511
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step1.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step1.png
index f34da61680..203a2485eb 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step1.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3be79fe62492bdb97492bd5150216fff4468c9ae3ffab548ebcb1439459e4738
-size 14166
+oid sha256:f6176915cd1dd8d36e08810ad9f3c1b6014ac70663f99c8e6bc71fb636c34260
+size 9805
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step3.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step3.png
index 27987bf12b..18a7dd4eb7 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step3.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c8af4bce2cbfb44c6c4ad37057c4986423c615f829f93608226a224a663289a
-size 44042
+oid sha256:2a65302c5f48432ede95f9b04b8550a323f68065eeb4b5ef4fb7fb519e32082d
+size 26496
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png
index 79a6b8b3a0..c0d6fa479e 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1fc401f84f8ae04fba130470f7e0f1708f9b3ae38556478592173f538a0452b5
-size 47350
+oid sha256:f66fee6f7cb3c72b0ad7efe75de67d7e68570a4799fc0c362f4c3cbde77b030c
+size 29708
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled_required.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled_required.png
index 896ab6d587..4a77a54fa8 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled_required.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled_required.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b86748ca1940df1abd0fce75648d9ee2702dd5b4a0aa4e008f660f3425472e0f
-size 51823
+oid sha256:e1ece418bf5932f9e7e35868aeb93975e5472aa7c12597ffdf5a8162594e6ed0
+size 33162