Pagination localisation clean-up (#14157)

* Range start should be one-based, like the range end

* Clean up pagination translation

* Restore ScheduledReports translations

* Update screenshots

* Revert changes to non-English translations

* Update screenshots

* Update screenshot

* Replace UsersManager_XtoYofN with General_Pagination

* Only remove translation from en.json.

* Off by one

* Update screenshots

* Fix off-by-one in range end

* Update screenshots

* Updated screenshot

65 files changed, 135 insertions, 123 deletions

diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png
index da5c3676a6..a063604c49 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e43a51c5063e88fc56c49d5f4a7357ffef238ca9d0d40e182c90db19cc50a1b
-size 378815
+oid sha256:82cefcaa768d7009ddfb3a1fa8f3492d2798737e7b979f0cfcc1e750c4923af8
+size 378821
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png
index e1ed542cc1..1a2c412d0f 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:32eae9bb7a068bef58a28cc8b1f4437fb2445a55695fa5ecbf6c8bba8a893f66
-size 353618
+oid sha256:15d7a5df9a692335f7a68daa65842fc730e34ac40ad3539076acacc2ca889b43
+size 353624
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png
index 9b3fff4133..714efeac64 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6794bc960ba114cdeffd4e2b408dddf98e86a023d7682f45ce006d0bb1ece52a
-size 80938
+oid sha256:43148b5c8d4b70cb4f47b190d0293af6baa357136e0f57701eb9c38723e474f6
+size 80941
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png
index 0723231dc0..548a9a0731 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:931cf07c23e2a960f01838c2848ac497cbd1bb8e93d6934ca927ee78359ead42
-size 484339
+oid sha256:8c033fb1ed5b621c6019a5fce9a1e65219ec6366a1bc047b06c7dfdfe3ec1aef
+size 484413
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png
index c0ae311a53..7c0bff066e 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:348e275b404dc8d16f0ecd6f5654e6cebf645d76aec116a856b0d91fd5c36541
-size 353524
+oid sha256:f4f5d22d3279248e264bfb4c59702be2dcbed8ef7c945c5e3fecab5b72d202a8
+size 353530
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png
index 04656d3dd3..bd3db806c3 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ae0431ecfae984f0f2be35b5adece38a58199f3f8111ed76e7a378300cf162f
-size 72821
+oid sha256:db569203cbc5f9fccca60d7fe20050e1e370b13db270aa173f76f38032818fa6
+size 72822
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png
index 545999a153..754c984574 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:571acab976f8815a511c3002f7566d2e97b27d2d7facf3db75a5b2b90660d7c9
-size 88948
+oid sha256:6b1be8a4126612707a1a8c9380893ba162a80ae414a2b7b6ab9548b9a1b3dcb3
+size 88955
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png
index 8ebf91905a..5380d7f84e 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:373d959b10fcd5cf26909d7bb3273d35c8d9caa3a61def53cd2397f946c1d72b
-size 64097
+oid sha256:13b7ecde8260edea084251c2b79afe01c2ce26bb4b281e9546061925a416cef0
+size 64099
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png
index c78956a0c7..6d0551e558 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c4d3a01b6e4efe4c47dfbf5dd39cb7853c5ecb9a062f572406a5c3f4bd043e3d
+oid sha256:41620f57d099a01107196fb4915c946604857386236035e942b539eb5cfb532e
 size 64523
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png
index 256c7241db..de30e34175 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6698dc11d1e82ffd0d285bf5a924df1b0f43a6864857d32bb09ba19ca8f29f79
-size 71025
+oid sha256:071f8104a21b1a72167bb51e9eb05a89ba9aa3449451fca9b3c01bf25ae3f01b
+size 71024
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png
index f665ae1d4c..2a5718b168 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d14ac9db64a10cb29e4ed6e2d0e696f3ec4bd28dd681fee7bffe0e6ad3e740ac
-size 377593
+oid sha256:509685c0a6015074568d0b0f8bb63cb163aad296a667f502f19c0c9236dd5c1c
+size 377599
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png
index 8ebf91905a..5380d7f84e 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:373d959b10fcd5cf26909d7bb3273d35c8d9caa3a61def53cd2397f946c1d72b
-size 64097
+oid sha256:13b7ecde8260edea084251c2b79afe01c2ce26bb4b281e9546061925a416cef0
+size 64099
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png
index 68f5b116de..d913b448b8 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d366013d8b53e44f187914d36e4c8c9b39e46f15cd3374fd9f194b71118df10
-size 73092
+oid sha256:b401f91fa287964a9d219d8e4c186b93e16585cc445d953d4675406cef6dfb5a
+size 73094
diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
index f952b8508b..79fac09408 100644
--- a/plugins/CoreHome/CoreHome.php
+++ b/plugins/CoreHome/CoreHome.php
@@ -315,6 +315,7 @@ class CoreHome extends \Piwik\Plugin
         $translationKeys[] = 'General_Hide';
         $translationKeys[] = 'General_Save';
         $translationKeys[] = 'General_Website';
+        $translationKeys[] = 'General_Pagination';
         $translationKeys[] = 'General_RowsToDisplay';
         $translationKeys[] = 'Intl_Year_Short';
         $translationKeys[] = 'General_MultiSitesSummary';
@@ -327,7 +328,6 @@ class CoreHome extends \Piwik\Plugin
         $translationKeys[] = 'CoreHome_DataTableIncludeAggregateRows';
         $translationKeys[] = 'CoreHome_DataTableExcludeAggregateRows';
         $translationKeys[] = 'CoreHome_Default';
-        $translationKeys[] = 'CoreHome_PageOf';
         $translationKeys[] = 'CoreHome_FormatMetrics';
         $translationKeys[] = 'CoreHome_ShowExportUrl';
         $translationKeys[] = 'CoreHome_HideExportUrl';
diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
index 31d30dbae5..a657c853fc 100644
--- a/plugins/CoreHome/javascripts/dataTable.js
+++ b/plugins/CoreHome/javascripts/dataTable.js
@@ -941,7 +941,7 @@ $.extend(DataTable.prototype, UIControl.prototype, {
 
                 // only show this string if there is some rows in the datatable
                 if (totalRows != 0) {
-                    var str = sprintf(_pk_translate('CoreHome_PageOf'), offset + '-' + offsetEndDisp, totalRows);
+                    var str = sprintf(_pk_translate('General_Pagination'), offset, offsetEndDisp, totalRows);
                     $(this).text(str);
                 } else {
                     $(this).hide();
diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json
index d1e6613199..cd302097eb 100644
--- a/plugins/CoreHome/lang/en.json
+++ b/plugins/CoreHome/lang/en.json
@@ -47,7 +47,6 @@
         "Menu": "Menu",
         "NoPrivilegesAskPiwikAdmin": "You are logged in as '%1$s' but it seems you don't have any permission set in Matomo. %2$s Ask your Matomo administrator (click to email)%3$s to give you 'view' access to a website.",
         "OnlyForSuperUserAccess": "This widget is displayed in the default dashboard only to users having Super User access.",
-        "PageOf": "%1$s of %2$s",
         "PeriodRange": "Range",
         "ReportGeneratedOn": "Report generated on %s",
         "ReportGeneratedXAgo": "Report generated %s ago",
diff --git a/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png b/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png
index e98f6db10a..8206489358 100644
--- a/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png
+++ b/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d7364ea09c23f1ca0387e9983c18cf402b2046fbbad46019d8197ac1074fffde
-size 233735
+oid sha256:df2c045ece25d4892202f685cffe5831b98e4c37474e92ff3243521a4030f30f
+size 233737
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
index d345027ea4..0904afb99a 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54a0117ba2d5d12255c16adcb36f606e981e19f634e66ff346c2592da3dde2a0
-size 451345
+oid sha256:8eef795ccd2928d1ece55fd5d1efe543107249bfae928fd1fdd4a53d19790fd9
+size 451403
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
index b5f2b4c597..8562db968b 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:acccf6a691df336135548824d794645f238a9e9fc302dd80479dc874e76e88e6
-size 653760
+oid sha256:98b2d43a636e15844d02456adb19416cc66f7c0c92e5361e41bda95ceca0d33e
+size 653810
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png
index e8fbd442c9..1c29d0f30d 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c7bb8d40cf49ee4b77cef496f437003fc7d6de182798f335088b4f86cc887768
-size 653328
+oid sha256:2388da5bc654b90aa6c072a4309c5e5e9123a12a333de3be089884ec49229b45
+size 653374
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png
index 93b17ad722..a06e635bf3 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18f27154250ee9e45dea15fc4175f7f2cefcc5950a04eb4d7680c4e4089ebdfc
-size 200236
+oid sha256:a5d00ab29adb7a0f29fe6cd5931128c8f5a413f3bf66f37978d3ae1fa7ceee26
+size 200238
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard-model.service.js b/plugins/MultiSites/angularjs/dashboard/dashboard-model.service.js
index 0cc399c464..0254a15a08 100644
--- a/plugins/MultiSites/angularjs/dashboard/dashboard-model.service.js
+++ b/plugins/MultiSites/angularjs/dashboard/dashboard-model.service.js
@@ -28,8 +28,8 @@
             updateWebsitesList: updateWebsitesList,
             getNumberOfFilteredSites: getNumberOfFilteredSites,
             getNumberOfPages: getNumberOfPages,
-            getCurrentPagingOffsetStart: getCurrentPagingOffsetStart,
-            getCurrentPagingOffsetEnd: getCurrentPagingOffsetEnd,
+            getPaginationLowerBound: getPaginationLowerBound,
+            getPaginationUpperBound: getPaginationUpperBound,
             previousPage: previousPage,
             nextPage: nextPage,
             searchSite: searchSite,
@@ -86,12 +86,16 @@
             return Math.ceil(getNumberOfFilteredSites() / model.pageSize - 1);
         }
 
-        function getCurrentPagingOffsetStart() {
+        function getCurrentPagingOffset() {
             return Math.ceil(model.currentPage * model.pageSize);
         }
 
-        function getCurrentPagingOffsetEnd() {
-            var end = getCurrentPagingOffsetStart() + parseInt(model.pageSize, 10);
+        function getPaginationLowerBound() {
+            return getCurrentPagingOffset() + 1;
+        }
+
+        function getPaginationUpperBound() {
+            var end = getCurrentPagingOffset() + parseInt(model.pageSize, 10);
             var max = getNumberOfFilteredSites();
             if (end > max) {
                 end = max;
@@ -145,7 +149,7 @@
                 hideMetricsDoc: '1',
                 filter_sort_order: 'asc',
                 filter_limit: model.pageSize,
-                filter_offset: getCurrentPagingOffsetStart(),
+                filter_offset: getCurrentPagingOffset(),
                 showColumns: 'label,nb_visits,nb_pageviews,visits_evolution,pageviews_evolution,revenue_evolution,nb_actions,revenue'
             };
 
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html
index c479798550..2be78996d0 100644
--- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html
+++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html
@@ -99,7 +99,7 @@
                         </span>
                         <span class="dataTablePages">
                             <span id="counter">
-                                {{ 'General_Pagination'|translate:model.getCurrentPagingOffsetStart():model.getCurrentPagingOffsetEnd():model.getNumberOfFilteredSites() }}
+                                {{ 'General_Pagination'|translate:model.getPaginationLowerBound():model.getPaginationUpperBound():model.getNumberOfFilteredSites() }}
                             </span>
                         </span>
                         <span id="next" class="next dataTableNext" ng-hide="model.currentPage >= model.getNumberOfPages()" ng-click="model.nextPage()">
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png
index c39b39ebb1..8ebf77051f 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b111c55510c661bf8be2e293d18fda7360c5a80166c6d17539a00b39860be3fa
-size 73257
+oid sha256:5d217c10905d35d772c83d89129896e08a05a899e95bfc6ec53672229d09957e
+size 73126
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png
index a799c92ab4..04a4a5cfff 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d0b745ef8bcacd034893dcdee574c29e3071abeceb1aaa5c201581aed21213a
-size 54967
+oid sha256:a51477dd72b89b98fb9906da608416bbbe857fc5af00b4094f0fbf004f07c859
+size 55078
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png
index c39b39ebb1..8ebf77051f 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b111c55510c661bf8be2e293d18fda7360c5a80166c6d17539a00b39860be3fa
-size 73257
+oid sha256:5d217c10905d35d772c83d89129896e08a05a899e95bfc6ec53672229d09957e
+size 73126
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png
index 1601487c7b..3861316bec 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28aa076f0a9adf1c7169ede698318182088503811486eadb984750dff0235c59
-size 63526
+oid sha256:b49b59a09c20b070e2d9de66c0e6bc78b3e39bb8aefde61c9d9e60b8c87a011d
+size 63396
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png
index d88b6a3395..7c06652bf5 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb7f304ab8b22767693ad9107852ea51e85d49da4cdf9edabd319bef4ca63fc0
-size 54935
+oid sha256:0a25c546768a6c95ec1a4aa2507e2a52d40f390f591a02245de3b56e8cc63e20
+size 55046
diff --git a/plugins/SitesManager/angularjs/sites-manager/sites-manager-admin-sites-model.js b/plugins/SitesManager/angularjs/sites-manager/sites-manager-admin-sites-model.js
index 628de72e73..ce2c4aa24f 100644
--- a/plugins/SitesManager/angularjs/sites-manager/sites-manager-admin-sites-model.js
+++ b/plugins/SitesManager/angularjs/sites-manager/sites-manager-admin-sites-model.js
@@ -36,8 +36,8 @@
             model.sites = sites;
 
             var numSites      = sites.length;
-            model.offsetStart = model.currentPage * model.pageSize;
-            model.offsetEnd   = model.offsetStart + numSites;
+            model.offsetStart = model.currentPage * model.pageSize + 1;
+            model.offsetEnd   = model.offsetStart + numSites - 1;
             model.hasPrev     = model.currentPage >= 1;
             model.hasNext     = numSites === model.pageSize;
         }
diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png
index 54053b2caa..4ebca6449a 100644
--- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png
+++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6579c30c31a28357fc4d69f1bf3b5284fc5f9a9ba7d4c57e3df310a1b4954655
-size 180919
+oid sha256:b3497758d0c7c1284f1ae67f85c30c25af6d5208b73b4b27f98e1d4d811810f6
+size 180718
diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png
index 06378779f4..aad7c74fb2 100644
--- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png
+++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd57742a3a94d3ab4f5c47d78959ae84e34cb7e1e741fd968aa54210e908795b
-size 186022
+oid sha256:36a8a43b3542fdeef8d4c238b9b28192b5fc1130fd979c05f5d7f91daa1a36af
+size 185832
diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png
index 5f8482ff74..4ff88edcfc 100644
--- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png
+++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7d6eb4a27612289f11bb30d323e4cd7b21db78ae5d1762377aea42e7aacd61c0
-size 186041
+oid sha256:b83a016f0f4d53242f02d0b077dbbda663780b460ae5d79c8cbe3639bb58c088
+size 185845
diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png
index bd3ce81138..ed4963a612 100644
--- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png
+++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6b0c8468378d8261840ec6c7c2cf0438527529ddffd8cc50d8a57ddbdc8dcbc
-size 188002
+oid sha256:b8805c0ee7c9c33b5ba5856e2fc2e960a365232965880e463af94214240d1afa
+size 187799
diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png
index 9dee4412a4..e6d1804357 100644
--- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png
+++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b294fdd184afee8fca634a9dd84cf5a533ca49ec2b52bff8c726f234001f8cd2
-size 178927
+oid sha256:e2d1cd3d110f616ec24900389d083ddaa00031769670d3455aa5626fbc6a57f2
+size 178750
diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png
index d9085aa12c..8507dadcf4 100644
--- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png
+++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:61ad98f703804d44388847ef0acc631df1a8379167d9d1071196b9e114cfcba1
-size 184175
+oid sha256:1e00aee6453a3740e301c6aaee9b5ad5e2782dfc569d3de8b79813ab12fef397
+size 183881
diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php
index 2d2d938251..c1d7405f1f 100644
--- a/plugins/UsersManager/UsersManager.php
+++ b/plugins/UsersManager/UsersManager.php
@@ -221,6 +221,7 @@ class UsersManager extends \Piwik\Plugin
         $translationKeys[] = "General_OrCancel";
         $translationKeys[] = "General_Save";
         $translationKeys[] = "General_Done";
+        $translationKeys[] = "General_Pagination";
         $translationKeys[] = "UsersManager_DeleteConfirm";
         $translationKeys[] = "UsersManager_ConfirmGrantSuperUserAccess";
         $translationKeys[] = "UsersManager_ConfirmProhibitOtherUsersSuperUserAccess";
@@ -272,7 +273,6 @@ class UsersManager extends \Piwik\Plugin
         $translationKeys[] = 'UsersManager_UserSearch';
         $translationKeys[] = 'UsersManager_DeleteUsers';
         $translationKeys[] = 'UsersManager_FilterByAccess';
-        $translationKeys[] = 'UsersManager_XtoYofN';
         $translationKeys[] = 'UsersManager_Username';
         $translationKeys[] = 'UsersManager_RoleFor';
         $translationKeys[] = 'UsersManager_TheDisplayedUsersAreSelected';
diff --git a/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.html b/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.html
index e35cfac6f6..3657a63d62 100644
--- a/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.html
+++ b/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.html
@@ -78,7 +78,7 @@
 
                 <div class="counter">
                     <span>
-                        {{ 'UsersManager_XtoYofN'|translate:$ctrl.searchParams.offset:$ctrl.getPaginationUpperBound():$ctrl.totalEntries }}
+                        {{ 'General_Pagination'|translate:$ctrl.getPaginationLowerBound():$ctrl.getPaginationUpperBound():$ctrl.totalEntries }}
                     </span>
                     <div piwik-activity-indicator ng-if="$ctrl.isLoadingUsers" loading="$ctrl.isLoadingUsers"></div>
                 </div>
@@ -203,4 +203,4 @@
             <a href="" class="modal-action modal-close modal-no" ng-click="$ctrl.userToChange.role = $ctrl.previousRole; $ctrl.userToChange = null; $ctrl.roleToChangeTo = null;">{{:: 'General_No'|translate }}</a>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.js b/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.js
index c60b01ec6f..02c5c3425d 100644
--- a/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.js
+++ b/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.js
@@ -59,6 +59,7 @@
         vm.changeUserRole = changeUserRole;
         vm.onRowSelected = onRowSelected;
         vm.deleteRequestedUsers = deleteRequestedUsers;
+        vm.getPaginationLowerBound = getPaginationLowerBound;
         vm.getPaginationUpperBound = getPaginationUpperBound;
         vm.showDeleteConfirm = showDeleteConfirm;
         vm.getAffectedUsersCount = getAffectedUsersCount;
@@ -180,6 +181,10 @@
             return result;
         }
 
+        function getPaginationLowerBound() {
+            return vm.searchParams.offset + 1;
+        }
+
         function getPaginationUpperBound() {
             return Math.min(vm.searchParams.offset + vm.searchParams.limit, vm.totalEntries);
         }
diff --git a/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.html b/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.html
index 5295e4e18f..c50105247b 100644
--- a/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.html
+++ b/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.html
@@ -86,7 +86,7 @@
 
                 <span class="counter">
                     <span>
-                        {{ 'UsersManager_XtoYofN'|translate:$ctrl.offset:$ctrl.getPaginationUpperBound():$ctrl.totalEntries }}
+                        {{ 'General_Pagination'|translate:$ctrl.getPaginationLowerBound():$ctrl.getPaginationUpperBound():$ctrl.totalEntries }}
                     </span>
                 </span>
 
@@ -215,4 +215,4 @@
             <a href="" class="modal-action modal-close modal-no">{{:: 'General_No'|translate }}</a>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.js b/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.js
index 66065d0728..e1e4958c17 100644
--- a/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.js
+++ b/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.js
@@ -58,6 +58,7 @@
         vm.$onChanges = $onChanges;
         vm.onAllCheckboxChange = onAllCheckboxChange;
         vm.onRowSelected = onRowSelected;
+        vm.getPaginationLowerBound = getPaginationLowerBound;
         vm.getPaginationUpperBound = getPaginationUpperBound;
         vm.fetchAccess = fetchAccess;
         vm.gotoPreviousPage = gotoPreviousPage;
@@ -180,6 +181,10 @@
             vm.isAllCheckboxSelected = selectedRowKeyCount === vm.siteAccess.length;
         }
 
+        function getPaginationLowerBound() {
+            return vm.offset + 1;
+        }
+
         function getPaginationUpperBound() {
             return Math.min(vm.offset + vm.limit, vm.totalEntries);
         }
diff --git a/plugins/UsersManager/lang/en.json b/plugins/UsersManager/lang/en.json
index 5c54a7d238..99d585aed1 100644
--- a/plugins/UsersManager/lang/en.json
+++ b/plugins/UsersManager/lang/en.json
@@ -114,7 +114,6 @@
         "ClickToSelectAll": "Click to select all %1$s.",
         "AllWebsitesAreSelected": "All %1$s websites are selected.",
         "ClickToSelectDisplayedWebsites": "Click to select the %1$s displayed websites.",
-        "XtoYofN": "%1$s - %2$s of %3$s",
         "DeletePermConfirmSingle": "Are you sure you want to remove %1$s's access to %2$s?",
         "DeletePermConfirmMultiple": "Are you sure you want to remove %1$s's access the %2$s selected websites?",
         "ChangePermToSiteConfirmSingle": "Are you sure you want to change %1$s's role to %2$s to %3$s?",
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png
index da32d8a10f..fe64f5cf60 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e53d73a510f1c7479aa0a61bc9a4401f3ada6412d4c5936a4f39f01fec0d6938
-size 80549
+oid sha256:1a992036679293e4a70c5a0f977a1324052b53b649d353fd65bfa25c3b8d1e53
+size 80540
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png
index b6a0770cb0..ca3ab57fc2 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:446b4027bd42df96d170c568852063182fe21a853cc7f877a94b8f8dcf920182
-size 108447
+oid sha256:4aeb9086df4521c6bde46f4f344620a544404e13c41e23f9087138e842dbd52a
+size 108344
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png
index abc2f48332..05972ae1be 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c29133fe81c8ccce8086de231c6d3fbf96589d6c30d340e00cc997ca47d313b1
-size 161819
+oid sha256:b666c634e642ac44c50f4ea411f2124dc265bd747bb907ddd478726ea4260323
+size 161895
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search_deselected.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search_deselected.png
index d46bdcfadb..69234ea5d1 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search_deselected.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search_deselected.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:939e66b5c4cb95890a2dee58b0e55745af574cd904ae54d94f5241ca98d0634f
-size 161818
+oid sha256:8a6cd5db35ac81eb7ecdb85f4336cac2608e01244c1caf01cf68a60cf628ab23
+size 161895
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png
index d46bdcfadb..69234ea5d1 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:939e66b5c4cb95890a2dee58b0e55745af574cd904ae54d94f5241ca98d0634f
-size 161818
+oid sha256:8a6cd5db35ac81eb7ecdb85f4336cac2608e01244c1caf01cf68a60cf628ab23
+size 161895
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png
index ec032e499f..8d5883c35b 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ba88f9ed89a81b943a70da4ca19473fc20d898a5a18c9c4d1fc3a8e8fecfb80
-size 156814
+oid sha256:7b06a999abc1d82f7f05504982a2b98a3848a95e3a9477704a45d89629ba07ec
+size 156863
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png
index 4c23537ad7..6573a7aa54 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b590350831bf72fa4085ab9754433dc69ee35a86231b17104da9b3b9ee328351
-size 142796
+oid sha256:ca7b1018f351cb40d46df3b622768c5bed3e1538fe99bd9e5a6497b49b9b8061
+size 142861
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png
index bbb6a1d124..458a341bbf 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ae28122fef76c910c64a13cab3ecab46cd823bbc7a2b0e8c857831fbe5aba65
-size 155379
+oid sha256:b9cec4b754e5849c8f9e1f19c78c5d0ae040aa043692d0a27a41ed0c745f0f9e
+size 155289
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png
index 7ca8d9763c..54f19d2678 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2cbabd2e695a24daeb9d00d74755c5b7270ef5b40507b32d033284d2db3e4557
-size 142902
+oid sha256:d0ca416b08a3694ddefe3536e1d40eb0264bd77e214457023a9205719899dfae
+size 142806
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png
index 34d59aa733..ae9354135f 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f4c0ec9766420ffa29e42a0585f3c23a69f8b57672ca9f1875a8e8ccbc1d700
-size 141469
+oid sha256:63bab18bcbecc3bf3dfddada93a6eb459f178bf0fdce4cf0c5e87e66af9b4c58
+size 141355
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png
index e0a90d3452..a42f2cd5c2 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1001a998713681241d9163f0f59371acdae0269b647106b79e7c98453d8f6ee1
-size 152550
+oid sha256:a93fe86c57e2fda781c1a643b06513a73e2c445d57746c072ef6200eca92eb35
+size 152489
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png
index 5c5f293f35..66f8fae3ff 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eda2d1c1092176cb3afb178d9e52b887b769a2b89b7df6fe45f8982f29b6f325
-size 149690
+oid sha256:e651f3c3ca488e4c7a2cb21c2967ec5cefe203b53854594cdd9a044b51b04a86
+size 149611
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png
index ecbe5cc1d2..e8bddcfbdd 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e07b964a068d778560d0cc468e00101e59fa159303d3cb4fa9ee16ec451faab1
-size 154848
+oid sha256:73842631d4e8364fd12ed690456dcd5e5aa3f59bb6be0cf949b74fc0171d9483
+size 154849
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png
index 30b933ad74..db504e90f4 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:22b3a53cd7fec71d57faa1b335efbdc4a56c80bc0b01ff3897c2e83afd0a42b9
-size 99635
+oid sha256:9bf2b6803c3f8f854904525bb6b732ebb10c12337ebb4429a9dd443a1bea8d06
+size 99676
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png
index f844af5c8f..f7ebb1e16d 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74b8da48bf60b49101242bf8f0568847a63cafc1327b162348c6569962815a79
-size 110156
+oid sha256:0f0178ad819f50c522695f6ee26f49f3d234e69d45c03926e53bc6ba931f5319
+size 110189
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png
index c372f70560..7bd52d8da7 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:873ab7849c3ad5cf11702b7f09204e3e2a1a4e9350c0546e4c5ef8375ce7c47a
-size 106499
+oid sha256:c3de312697133d2bd8f9ce29af03036d9a3fe232b8107a00801197c14c949595
+size 106504
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png
index 406b3c94c5..663c9724db 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4879cc4a520db1072e5cc8665c0513d6e559dc961256550c2078ddac96da8eae
-size 87826
+oid sha256:a60334be90dd50374bbff65d7ca85baf93d57b74e79d323dfaf3389705dd74b8
+size 87863
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png
index 2f1deb0437..44f7cb3811 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d47601f5098fd7c909af44a5ae0e118afc4402e1d916b85ffbacbd58ffc0cdbb
-size 90338
+oid sha256:63a85148040533f91e587ae827c16a83275dec92a938de1bddf0cedced2d002f
+size 90296
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png
index ae50dd4d78..bd062772c5 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46e7da989ac5e931445d4b5a305c123e2f820af08a7db0352e84724c4fb545d9
-size 104403
+oid sha256:f522c3fbd71c9818978d0443f06ef28b5a588ed9236471a11adf36784dbeb46f
+size 104422
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png
index cc38a01a3c..531ba20bce 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e20620c5f62d652fd392d797c73ca24aa885cd65e1852443b1f0b533bdb3a328
-size 89862
+oid sha256:e151f66a3a927c11fd61b08b7b85edc8c9b1aec3c4d690509dfd3132ba64278a
+size 89869
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png
index c08db9fab7..3c29fc51c2 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd6fcc234e579981a293655cd9dd32af5a4959725268dd2e24da89ad3f07ae20
-size 91907
+oid sha256:ec7d718ae1e01251c2f5560d1f024dad3d9df6ad911bfd54a4dc38fefa616eac
+size 91915
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png
index 66e7a5bdf7..b9b8a52fdb 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:015387b5883db92467c2556a4594172aef37e7d4cce879923487e6857553b4aa
-size 142213
+oid sha256:757455c8b741db255bf771567455715bf62de8a05312dd12e58de807828aad5d
+size 142269
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png
index 543f209d92..6eb94b86a5 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:268b8153adda52f709c91b9a494dacca4157b80a85bfdbf8f60d46b1bb1c796e
-size 148372
+oid sha256:1f0ebed17464c2b5d95e76d539081f392bb3bda69fabc8839263b2f731f82a63
+size 148433
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png
index cac10d7a7c..9c302af207 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77c1f32f5b2644f11b53b31c5cafa123655f4f75caa6cd26fb0b1582af4dfaab
-size 149559
+oid sha256:7733b9179ceb89ded9320dc1b1308272bb6484566e7b16b3ac9ea05ad931dfdb
+size 149628