diff options
| author | sgiehl <stefan@matomo.org> | 2020-04-01 12:07:42 +0300 |
|---|---|---|
| committer | sgiehl <stefan@matomo.org> | 2020-04-01 13:15:52 +0300 |
| commit | 677fec1f635e697927d389835a3ee53554f84ff9 (patch) | |
| tree | bc0d60fdac68876c0d2bc715d49b2bb53975bc82 /plugins/UserCountry | |
| parent | 53cc7a4299535b481d90c45ea5fb7137a6ef9092 (diff) | |
| parent | 19af9b6c0a63b07020d935ea88710c80823c9d62 (diff) | |
Merge branch '3.x-dev' into 4.x-dev
Diffstat (limited to 'plugins/UserCountry')
| -rw-r--r-- | plugins/UserCountry/lang/en.json | 4 | ||||
| -rw-r--r-- | plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_geoip2.png | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/plugins/UserCountry/lang/en.json b/plugins/UserCountry/lang/en.json index fc74a8a402..4c927f7345 100644 --- a/plugins/UserCountry/lang/en.json +++ b/plugins/UserCountry/lang/en.json @@ -40,6 +40,8 @@ "SubmenuLocations": "Locations", "TestIPLocatorFailed": "Matomo tried checking the location of a known IP address (%1$s), but your server returned no information. This provider may not be configured correctly (the geolocation database may be named incorrectly or located in the wrong directory, for instance).", "ToGeolocateOldVisits": "To get location data for your old visits, use the script described %1$shere%2$s.", - "WidgetLocation": "Visitor Location" + "WidgetLocation": "Visitor Location", + "GeoIpDbIpAccuracyNote": "Note: the DBIP databases are free and can be downloaded automatically, but geolocation results (specifically city results) are not as accurate as MaxMind's. MaxMind, however, requires that you create an account even for the free database. If you want to use MaxMind's geolocation database, you can start the process %1$shere%2$s", + "MaxMindLinkExplanation": "If you are using MaxMind's geolocation databases and you do not already know how to generate your download URL, %1$sclick here to learn how%2$s." } }
\ No newline at end of file diff --git a/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_geoip2.png b/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_geoip2.png index b473f43668..31e960ba67 100644 --- a/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_geoip2.png +++ b/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_geoip2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e61141b5348e44ee80558a5745ce954d782902a01413cf8d04318702d08b6130 -size 238072 +oid sha256:292b0caff23e0120ec9aad8d464da6578028e96df38ccbf8d0849d5592b96301 +size 247236 |
