NuCache dashboard cosmetics

src/Umbraco.Web.UI.Client/src/views/dashboard/settings/nucache.html

@@ -4,41 +4,51 @@
         <umb-load-indicator></umb-load-indicator>
     </div>
 
-    <p>You are running the brand new NuCache!</p>
-
-    <p style="min-height: 120px; background: #f8f8f8; padding: 10px;">
-        <span ng-show="vm.working">NuCache is working.</span>
-        <span ng-show="!vm.working">NuCache says: {{vm.status}}</span>
-    </p>
-
-    <p>This lets you refresh the status, or collect snapshots (after running a CLR GC).</p>
-
-    <div>
-        <button type="button" ng-click="vm.verify()" class="btn btn-warning">Refresh</button>
-        <button type="button" ng-click="vm.collect()" class="btn btn-warning">Collect</button>
-    </div>
-
-    <br>
-
-    <p>
-        This lets you rebuild the database cache (status above), ie the content of the cmsContentNu table.
-        Rebuilding can be expensive.
+    <p style="min-height: 120px; background: #f8f8f8; padding: 10px; margin-bottom: 4px;">
+        <span ng-show="vm.working">(wait)</span>
+        <span ng-show="!vm.working">{{vm.status}}</span>
     </p>
 
     <div>
-        <button type="button" ng-click="vm.rebuild()" class="btn btn-warning">Rebuild</button>
+        <button type="button" ng-click="vm.verify()" class="btn btn-warning">Refresh status</button>
     </div>
 
-    <br>
+    <h4 style="margin-top: 30px;">Memory Cache</h4>
 
     <p>
-        This lets you reload the in-memory and local file cache by entirely reloading it from
-        the data in the cmsContentNu table, but it does not rebuild that table. This is relatively
-        fast. Triggers the reload on all servers in an LB environment.
+        This button lets you reload the in-memory cache, by entirely reloading it from the database
+        cache (but it does not rebuild that database cache). This is relatively fast.
+        Use it when you think that the memory cache has not been properly refreshed, after some events
+        triggered&mdash;which would indicate a minor Umbraco issue.
+        (note: triggers the reload on all servers in an LB environment).
     </p>
 
     <div>
         <button type="button" ng-click="vm.reload($event)" class="btn btn-warning">Reload</button>
     </div>
 
+    <h4 style="margin-top: 30px;">Database Cache</h4>
+
+    <p>
+        This button lets you rebuild the database cache, ie the content of the cmsContentNu table.
+        <strong>Rebuilding can be expensive.</strong>
+        Use it when reloading is not enough, and you think that the database cache has not been
+        properly generated&mdash;which would indicate some critical Umbraco issue.
+    </p>
+
+    <div>
+        <button type="button" ng-click="vm.rebuild()" class="btn btn-warning">Rebuild</button>
+    </div>
+
+    <h4 style="margin-top: 30px;">Internals</h4>
+
+    <p>
+        This button lets you trigger a NuCache snapshots collection (after running a fullCLR GC).
+        Unless you know what that means, you probably do <em>not</em> need to use it.
+    </p>
+
+    <div>
+        <button type="button" ng-click="vm.collect()" class="btn btn-warning">Collect</button>
+    </div>
+
 </div>

src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedstatus.html

@@ -1,7 +1,7 @@
 <div id="published" ng-controller="Umbraco.Dashboard.PublishedStatusController as vm">
     <umb-box>
         <umb-box-content>
-            <h3 class="bold">Published Status</h3>
+            <h3 class="bold">Published Cache</h3>
 
             <umb-load-indicator ng-show="vm.loading"></umb-load-indicator>
 

src/Umbraco.Web.UI/Umbraco/config/lang/da.xml

@@ -1600,7 +1600,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="mediaFolderBrowser">Indhold</key>
     <key alias="settingsWelcome">Velkommen</key>
     <key alias="settingsExamine">Examine Management</key>
-    <key alias="settingsPublishedStatus">Published Status</key>
+    <key alias="settingsPublishedStatus">Published Cache</key>
     <key alias="settingsModelsBuilder">Models Builder</key>
     <key alias="settingsHealthCheck">Health Check</key>
     <key alias="memberIntro">Kom godt i gang</key>

src/Umbraco.Web.UI/Umbraco/config/lang/en.xml

@@ -2110,7 +2110,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="mediaFolderBrowser">Content</key>
     <key alias="settingsWelcome">Welcome</key>
     <key alias="settingsExamine">Examine Management</key>
-    <key alias="settingsPublishedStatus">Published Status</key>
+    <key alias="settingsPublishedStatus">Published Cache</key>
     <key alias="settingsModelsBuilder">Models Builder</key>
     <key alias="settingsHealthCheck">Health Check</key>
     <key alias="memberIntro">Getting Started</key>

src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml

@@ -2122,7 +2122,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="mediaFolderBrowser">Content</key>
     <key alias="settingsWelcome">Welcome</key>
     <key alias="settingsExamine">Examine Management</key>
-    <key alias="settingsPublishedStatus">Published Status</key>
+    <key alias="settingsPublishedStatus">Published Cache</key>
     <key alias="settingsModelsBuilder">Models Builder</key>
     <key alias="settingsHealthCheck">Health Check</key>
     <key alias="memberIntro">Getting Started</key>

src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs

@@ -1614,14 +1614,14 @@ AND cmsContentNu.nodeId IS NULL
             var ce = _contentStore.Count;
             var me = _mediaStore.Count;
 
-            return "I'm feeling good, really." +
+            return
                 " Database cache is " + (dbCacheIsOk ? "ok" : "NOT ok (rebuild?)") + "." +
-                " ContentStore has " + cg + " generation" + (cg > 1 ? "s" : "") +
-                ", " + cs + " snapshot" + (cs > 1 ? "s" : "") +
-                " and " + ce + " entr" + (ce > 1 ? "ies" : "y") + "." +
-                " MediaStore has " + mg + " generation" + (mg > 1 ? "s" : "") +
-                ", " + ms + " snapshot" + (ms > 1 ? "s" : "") +
-                " and " + me + " entr" + (me > 1 ? "ies" : "y") + ".";
+                " ContentStore contains " + ce + " item" + (ce > 1 ? "s" : "") +
+                " and has " + cg + " generation" + (cg > 1 ? "s" : "") +
+                " and " + cs + " snapshot" + (cs > 1 ? "s" : "") + "." +
+                " MediaStore contains " + me + " item" + (ce > 1 ? "s" : "") +
+                " and has " + mg + " generation" + (mg > 1 ? "s" : "") +
+                " and " + ms + " snapshot" + (ms > 1 ? "s" : "") + ".";
         }
 
         public void Collect()