Merge commit 'upstream/master'

2 files changed, 2 insertions, 1 deletions

diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index 03a14814..9e875d14 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -22,6 +22,7 @@ class Admin_Tags_Controller extends Admin_Controller {
     $filter = Input::instance()->get("filter");
 
     $view = new Admin_View("admin.html");
+    $view->page_title = t("Manage tags");
     $view->content = new View("admin_tags.html");
     $view->content->filter = $filter;
 
diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index b637a7f1..e1db387b 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -16,7 +16,7 @@
 <? $column_tag_count = 0 ?>
 
 <div class="g-block">
-  <h1> <?= t("Tag Admin") ?> </h1>
+  <h1> <?= t("Manage tags") ?> </h1>
 
   <div class="g-block-content">
     <table id="g-tag-admin">