Merge branch 'master' into WebGUI8

lib/WebGUI/i18n/English/Asset_WikiPage.pm

@@ -291,6 +291,24 @@ our $I18N =
         context     => q{Help for template variable},
     },
 
+    'keywordsLoop' => {
+        message     => q{A loop containing all keywords for this page is tagged with.},
+        lastUpdated => 0,
+        context     => q{Help for template variable},
+    },
+
+    'keyword title' => {
+        message     => q{The name of this keyword.},
+        lastUpdated => 0,
+        context     => q{Help for template variable},
+    },
+
+    'keyword url' => {
+        message     => q{The URL to view all pages tagged with this keyword.  The URL will have the gateway URL prepended to it.},
+        lastUpdated => 0,
+        context     => q{Help for template variable},
+    },
+
     'help owner' => {
         message     => q{The username of the owner of the page},
         lastUpdated => 0,
@@ -309,12 +327,36 @@ our $I18N =
         context     => 'Body text for help page',
     },
 
-
     'isFeatured label' => {
         message     => q{Feature this on the front page},
         lastUpdated => 0,
         context     => 'Label for asset property',
     },
+
+    'isKeywordPage' => {
+        message     => q{A boolean that is true if this page is a keyword page.},
+        lastUpdated => 0,
+        context     => 'template variable help',
+    },
+
+    'keyword_page_loop' => {
+        message     => q{If this page is a keyword page, then this loop will contain a list of all pages tagged with this page's keyword.  The pagination variables will apply to the list of pages in this loop.  If this page is not a keyword page, the loop will be blank, and the pagination variables will not be present.},
+        lastUpdated => 0,
+        context     => 'template variable help',
+    },
+
+    'keyword page title' => {
+        message     => q{The title of a page that has this keyword.},
+        lastUpdated => 0,
+        context     => 'template variable help',
+    },
+
+    'keyword page url' => {
+        message     => q{The URL to a page that has this keyword.  The URL will have the gateway URL prepended to it.},
+        lastUpdated => 0,
+        context     => 'template variable help',
+    },
+
 };
 
 1;