diff --git a/test_data/output/an-untranslated-article.html b/test_data/output/an-untranslated-article.html
index 061cf38..f2f6494 100644
--- a/test_data/output/an-untranslated-article.html
+++ b/test_data/output/an-untranslated-article.html
@@ -3,6 +3,7 @@
 <head>
           <title>Testing site - An untranslated article</title>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testing site Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/theme/style.css" />
@@ -15,7 +16,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="http://example.com/test/">Testing site <strong></strong></a></h1>
+                <h1><a href="http://example.com/test/">Testing site</a></h1>
         </header><!-- /#banner -->
         <nav id="menu"><ul>
             <li><a href="http://example.com/test/pages/untranslated-page.html">Untranslated page</a></li>
@@ -47,8 +48,8 @@ Here is a link to an <a class="reference external" href="http://example.com/test
 </section>
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>,
-                which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>,
+                which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
         </footer><!-- /#contentinfo -->
 </body>
diff --git a/test_data/output/cz/an-untranslated-article-en.html b/test_data/output/cz/an-untranslated-article-en.html
index 757de3f..4673ee5 100644
--- a/test_data/output/cz/an-untranslated-article-en.html
+++ b/test_data/output/cz/an-untranslated-article-en.html
@@ -3,6 +3,7 @@
 <head>
           <title>Testovací stránka - An untranslated article</title>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testovací stránka Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/cz/../theme/style.css" />
@@ -15,7 +16,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="http://example.com/test/cz/">Testovací stránka <strong></strong></a></h1>
+                <h1><a href="http://example.com/test/cz/">Testovací stránka</a></h1>
         </header><!-- /#banner -->
         <nav id="menu"><ul>
             <li class="active"><a href="http://example.com/test/cz/category/misc.html">misc</a></li>
@@ -46,8 +47,8 @@ Here is a link to an <a class="reference external" href="http://example.com/test
 </section>
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>,
-                which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>,
+                which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
         </footer><!-- /#contentinfo -->
 </body>
diff --git a/test_data/output/cz/feeds_all.atom.xml b/test_data/output/cz/feeds_all.atom.xml
index 2f45fbe..7415e1f 100644
--- a/test_data/output/cz/feeds_all.atom.xml
+++ b/test_data/output/cz/feeds_all.atom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Testovací stránka</title><link href="http://example.com/test/cz/" rel="alternate"></link><link href="http://example.com/test/feeds_all.atom.xml" rel="self"></link><id>http://example.com/test/cz/</id><updated>2014-09-15T00:00:00+00:00</updated><entry><title>Přeložený článek</title><link href="http://example.com/test/cz/translated-article.html" rel="alternate"></link><published>2014-09-15T00:00:00+00:00</published><updated>2014-09-15T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-09-15:/test/cz/translated-article.html</id><content type="html">&lt;p&gt;Jednoduchý článek s překlady.
 Zde je odkaz na &lt;a class="reference external" href="http://example.com/test/images/img.png"&gt;nějaký obrázek&lt;/a&gt;.&lt;/p&gt;
-</content></entry><entry><title>Ein übersetzter Artikel</title><link href="http://example.com/test/de/translated-article.html" rel="alternate"></link><published>2014-09-14T00:00:00+00:00</published><updated>2014-09-14T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-09-14:/test/de/translated-article.html</id><content type="html">&lt;p&gt;Ein einfacher Artikel mit einer Übersetzung.
+</content><category term="misc"></category></entry><entry><title>Ein übersetzter Artikel</title><link href="http://example.com/test/de/translated-article.html" rel="alternate"></link><published>2014-09-14T00:00:00+00:00</published><updated>2014-09-14T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-09-14:/test/de/translated-article.html</id><content type="html">&lt;p&gt;Ein einfacher Artikel mit einer Übersetzung.
 Hier ist ein Link zur &lt;a class="reference external" href="http://example.com/test/images/img.png"&gt;einigem Bild&lt;/a&gt;.&lt;/p&gt;
-</content></entry><entry><title>A translated article</title><link href="http://example.com/test/translated-article.html" rel="alternate"></link><published>2014-09-13T00:00:00+00:00</published><updated>2014-09-13T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-09-13:/test/translated-article.html</id><content type="html">&lt;p&gt;A simple article with a translation.
+</content><category term="misc"></category></entry><entry><title>A translated article</title><link href="http://example.com/test/translated-article.html" rel="alternate"></link><published>2014-09-13T00:00:00+00:00</published><updated>2014-09-13T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-09-13:/test/translated-article.html</id><content type="html">&lt;p&gt;A simple article with a translation.
 Here is a link to &lt;a class="reference external" href="http://example.com/test/images/img.png"&gt;some image&lt;/a&gt;.&lt;/p&gt;
-</content></entry><entry><title>An untranslated article</title><link href="http://example.com/test/cz/an-untranslated-article-en.html" rel="alternate"></link><published>2014-07-14T00:00:00+00:00</published><updated>2014-07-14T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-07-14:/test/cz/an-untranslated-article-en.html</id><content type="html">&lt;p&gt;An article without a translation.
+</content><category term="misc"></category></entry><entry><title>An untranslated article</title><link href="http://example.com/test/cz/an-untranslated-article-en.html" rel="alternate"></link><published>2014-07-14T00:00:00+00:00</published><updated>2014-07-14T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-07-14:/test/cz/an-untranslated-article-en.html</id><content type="html">&lt;p&gt;An article without a translation.
 Here is a link to an &lt;a class="reference external" href="http://example.com/test/pages/untranslated-page.html"&gt;untranslated page&lt;/a&gt;&lt;/p&gt;
-</content></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/test_data/output/cz/index.html b/test_data/output/cz/index.html
index baed1a0..c5fca32 100644
--- a/test_data/output/cz/index.html
+++ b/test_data/output/cz/index.html
@@ -3,6 +3,7 @@
 <head>
         <title>Welcome to our Testovací stránka</title>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testovací stránka Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/cz/../theme/style.css" />
@@ -10,7 +11,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="http://example.com/test/cz/">Testovací stránka <strong></strong></a></h1>
+                <h1><a href="http://example.com/test/cz/">Testovací stránka</a></h1>
         </header><!-- /#banner -->
         <nav id="menu"><ul>
             <li><a href="http://example.com/test/cz/category/misc.html">misc</a></li>
@@ -47,8 +48,8 @@ Here is a link to an <a class="reference external" href="http://example.com/test
 </section><!-- /#content -->
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>,
-                which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>,
+                which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
         </footer><!-- /#contentinfo -->
 </body>
diff --git a/test_data/output/cz/pages/404.html b/test_data/output/cz/pages/404.html
index a00a2be..884203b 100644
--- a/test_data/output/cz/pages/404.html
+++ b/test_data/output/cz/pages/404.html
@@ -3,6 +3,7 @@
 <head>
           <title>Testovací stránka - 404 stránka</title>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testovací stránka Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/cz/../theme/style.css" />
@@ -15,7 +16,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="http://example.com/test/cz/">Testovací stránka <strong></strong></a></h1>
+                <h1><a href="http://example.com/test/cz/">Testovací stránka</a></h1>
         </header><!-- /#banner -->
         <nav id="menu"><ul>
             <li><a href="http://example.com/test/cz/category/misc.html">misc</a></li>
@@ -31,9 +32,9 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>,
-                which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>,
+                which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
         </footer><!-- /#contentinfo -->
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/test_data/output/cz/translated-article.html b/test_data/output/cz/translated-article.html
index cd1cd3d..5a5e545 100644
--- a/test_data/output/cz/translated-article.html
+++ b/test_data/output/cz/translated-article.html
@@ -3,6 +3,7 @@
 <head>
           <title>Testovací stránka - Přeložený článek</title>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testovací stránka Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/cz/../theme/style.css" />
@@ -18,7 +19,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="http://example.com/test/cz/">Testovací stránka <strong></strong></a></h1>
+                <h1><a href="http://example.com/test/cz/">Testovací stránka</a></h1>
         </header><!-- /#banner -->
         <nav id="menu"><ul>
             <li class="active"><a href="http://example.com/test/cz/category/misc.html">misc</a></li>
@@ -52,8 +53,8 @@ Zde je odkaz na <a class="reference external" href="http://example.com/test/imag
 </section>
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>,
-                which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>,
+                which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
         </footer><!-- /#contentinfo -->
 </body>
diff --git a/test_data/output/de/drafts/an-untranslated-article-en.html b/test_data/output/de/drafts/an-untranslated-article-en.html
index f5be814..f01dc31 100644
--- a/test_data/output/de/drafts/an-untranslated-article-en.html
+++ b/test_data/output/de/drafts/an-untranslated-article-en.html
@@ -3,6 +3,7 @@
 <head>
           <title>Testseite - An untranslated article</title>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testseite Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/de/../theme/style.css" />
@@ -15,7 +16,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="http://example.com/test/de/">Testseite <strong></strong></a></h1>
+                <h1><a href="http://example.com/test/de/">Testseite</a></h1>
         </header><!-- /#banner -->
         <nav id="menu"><ul>
             <li class="active"><a href="http://example.com/test/de/category/misc.html">misc</a></li>
@@ -46,8 +47,8 @@ Here is a link to an <a class="reference external" href="http://example.com/test
 </section>
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>,
-                which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>,
+                which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
         </footer><!-- /#contentinfo -->
 </body>
diff --git a/test_data/output/de/feeds_all.atom.xml b/test_data/output/de/feeds_all.atom.xml
index 250b1ed..8d845fe 100644
--- a/test_data/output/de/feeds_all.atom.xml
+++ b/test_data/output/de/feeds_all.atom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Testseite</title><link href="http://example.com/test/de/" rel="alternate"></link><link href="http://example.com/test/feeds_all.atom.xml" rel="self"></link><id>http://example.com/test/de/</id><updated>2014-09-15T00:00:00+00:00</updated><entry><title>Přeložený článek</title><link href="http://example.com/test/cz/translated-article.html" rel="alternate"></link><published>2014-09-15T00:00:00+00:00</published><updated>2014-09-15T00:00:00+00:00</updated><author><name>Der Tester</name></author><id>tag:example.com,2014-09-15:/test/cz/translated-article.html</id><content type="html">&lt;p&gt;Jednoduchý článek s překlady.
 Zde je odkaz na &lt;a class="reference external" href="http://example.com/test/images/img.png"&gt;nějaký obrázek&lt;/a&gt;.&lt;/p&gt;
-</content></entry><entry><title>Ein übersetzter Artikel</title><link href="http://example.com/test/de/translated-article.html" rel="alternate"></link><published>2014-09-14T00:00:00+00:00</published><updated>2014-09-14T00:00:00+00:00</updated><author><name>Der Tester</name></author><id>tag:example.com,2014-09-14:/test/de/translated-article.html</id><content type="html">&lt;p&gt;Ein einfacher Artikel mit einer Übersetzung.
+</content><category term="misc"></category></entry><entry><title>Ein übersetzter Artikel</title><link href="http://example.com/test/de/translated-article.html" rel="alternate"></link><published>2014-09-14T00:00:00+00:00</published><updated>2014-09-14T00:00:00+00:00</updated><author><name>Der Tester</name></author><id>tag:example.com,2014-09-14:/test/de/translated-article.html</id><content type="html">&lt;p&gt;Ein einfacher Artikel mit einer Übersetzung.
 Hier ist ein Link zur &lt;a class="reference external" href="http://example.com/test/images/img.png"&gt;einigem Bild&lt;/a&gt;.&lt;/p&gt;
-</content></entry><entry><title>A translated article</title><link href="http://example.com/test/translated-article.html" rel="alternate"></link><published>2014-09-13T00:00:00+00:00</published><updated>2014-09-13T00:00:00+00:00</updated><author><name>Der Tester</name></author><id>tag:example.com,2014-09-13:/test/translated-article.html</id><content type="html">&lt;p&gt;A simple article with a translation.
+</content><category term="misc"></category></entry><entry><title>A translated article</title><link href="http://example.com/test/translated-article.html" rel="alternate"></link><published>2014-09-13T00:00:00+00:00</published><updated>2014-09-13T00:00:00+00:00</updated><author><name>Der Tester</name></author><id>tag:example.com,2014-09-13:/test/translated-article.html</id><content type="html">&lt;p&gt;A simple article with a translation.
 Here is a link to &lt;a class="reference external" href="http://example.com/test/images/img.png"&gt;some image&lt;/a&gt;.&lt;/p&gt;
-</content></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/test_data/output/de/index.html b/test_data/output/de/index.html
index 20dd30f..fc43ae1 100644
--- a/test_data/output/de/index.html
+++ b/test_data/output/de/index.html
@@ -3,6 +3,7 @@
 <head>
         <title>Willkommen Sie zur unserer Testseite</title>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testseite Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/de/../theme/style.css" />
@@ -10,7 +11,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="http://example.com/test/de/">Testseite <strong></strong></a></h1>
+                <h1><a href="http://example.com/test/de/">Testseite</a></h1>
         </header><!-- /#banner -->
         <nav id="menu"><ul>
             <li><a href="http://example.com/test/de/category/misc.html">misc</a></li>
@@ -35,8 +36,8 @@ Hier ist ein Link zur <a class="reference external" href="http://example.com/tes
 </section><!-- /#content -->
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>,
-                which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>,
+                which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
         </footer><!-- /#contentinfo -->
 </body>
diff --git a/test_data/output/de/pages/404.html b/test_data/output/de/pages/404.html
index 916c41f..6425660 100644
--- a/test_data/output/de/pages/404.html
+++ b/test_data/output/de/pages/404.html
@@ -3,6 +3,7 @@
 <head>
           <title>Testseite - Eine 404 Seite</title>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testseite Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/de/../theme/style.css" />
@@ -15,7 +16,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="http://example.com/test/de/">Testseite <strong></strong></a></h1>
+                <h1><a href="http://example.com/test/de/">Testseite</a></h1>
         </header><!-- /#banner -->
         <nav id="menu"><ul>
             <li><a href="http://example.com/test/de/category/misc.html">misc</a></li>
@@ -31,8 +32,8 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>,
-                which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>,
+                which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
         </footer><!-- /#contentinfo -->
 </body>
diff --git a/test_data/output/de/pages/untranslated-page-en.html b/test_data/output/de/pages/untranslated-page-en.html
index f364071..2df5ff9 100644
--- a/test_data/output/de/pages/untranslated-page-en.html
+++ b/test_data/output/de/pages/untranslated-page-en.html
@@ -3,6 +3,7 @@
 <head>
           <title>Testseite - Untranslated page</title>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testseite Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/de/../theme/style.css" />
@@ -12,7 +13,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="http://example.com/test/de/">Testseite <strong></strong></a></h1>
+                <h1><a href="http://example.com/test/de/">Testseite</a></h1>
         </header><!-- /#banner -->
         <nav id="menu"><ul>
             <li><a href="http://example.com/test/de/category/misc.html">misc</a></li>
@@ -25,8 +26,8 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>,
-                which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>,
+                which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
         </footer><!-- /#contentinfo -->
 </body>
diff --git a/test_data/output/de/translated-article.html b/test_data/output/de/translated-article.html
index 0a0bb7f..9393b95 100644
--- a/test_data/output/de/translated-article.html
+++ b/test_data/output/de/translated-article.html
@@ -3,6 +3,7 @@
 <head>
           <title>Testseite - Ein übersetzter Artikel</title>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testseite Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/de/../theme/style.css" />
@@ -18,7 +19,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="http://example.com/test/de/">Testseite <strong></strong></a></h1>
+                <h1><a href="http://example.com/test/de/">Testseite</a></h1>
         </header><!-- /#banner -->
         <nav id="menu"><ul>
             <li class="active"><a href="http://example.com/test/de/category/misc.html">misc</a></li>
@@ -52,8 +53,8 @@ Hier ist ein Link zur <a class="reference external" href="http://example.com/tes
 </section>
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>,
-                which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>,
+                which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
         </footer><!-- /#contentinfo -->
 </body>
diff --git a/test_data/output/feeds_all.atom.xml b/test_data/output/feeds_all.atom.xml
index 0e076a0..c6c0908 100644
--- a/test_data/output/feeds_all.atom.xml
+++ b/test_data/output/feeds_all.atom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Testing site</title><link href="http://example.com/test/" rel="alternate"></link><link href="http://example.com/test/feeds_all.atom.xml" rel="self"></link><id>http://example.com/test/</id><updated>2014-09-15T00:00:00+00:00</updated><entry><title>Přeložený článek</title><link href="http://example.com/test/cz/translated-article.html" rel="alternate"></link><published>2014-09-15T00:00:00+00:00</published><updated>2014-09-15T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-09-15:/test/cz/translated-article.html</id><content type="html">&lt;p&gt;Jednoduchý článek s překlady.
 Zde je odkaz na &lt;a class="reference external" href="http://example.com/test/images/img.png"&gt;nějaký obrázek&lt;/a&gt;.&lt;/p&gt;
-</content></entry><entry><title>Ein übersetzter Artikel</title><link href="http://example.com/test/de/translated-article.html" rel="alternate"></link><published>2014-09-14T00:00:00+00:00</published><updated>2014-09-14T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-09-14:/test/de/translated-article.html</id><content type="html">&lt;p&gt;Ein einfacher Artikel mit einer Übersetzung.
+</content><category term="misc"></category></entry><entry><title>Ein übersetzter Artikel</title><link href="http://example.com/test/de/translated-article.html" rel="alternate"></link><published>2014-09-14T00:00:00+00:00</published><updated>2014-09-14T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-09-14:/test/de/translated-article.html</id><content type="html">&lt;p&gt;Ein einfacher Artikel mit einer Übersetzung.
 Hier ist ein Link zur &lt;a class="reference external" href="http://example.com/test/images/img.png"&gt;einigem Bild&lt;/a&gt;.&lt;/p&gt;
-</content></entry><entry><title>A translated article</title><link href="http://example.com/test/translated-article.html" rel="alternate"></link><published>2014-09-13T00:00:00+00:00</published><updated>2014-09-13T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-09-13:/test/translated-article.html</id><content type="html">&lt;p&gt;A simple article with a translation.
+</content><category term="misc"></category></entry><entry><title>A translated article</title><link href="http://example.com/test/translated-article.html" rel="alternate"></link><published>2014-09-13T00:00:00+00:00</published><updated>2014-09-13T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-09-13:/test/translated-article.html</id><content type="html">&lt;p&gt;A simple article with a translation.
 Here is a link to &lt;a class="reference external" href="http://example.com/test/images/img.png"&gt;some image&lt;/a&gt;.&lt;/p&gt;
-</content></entry><entry><title>An untranslated article</title><link href="http://example.com/test/an-untranslated-article.html" rel="alternate"></link><published>2014-07-14T00:00:00+00:00</published><updated>2014-07-14T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-07-14:/test/an-untranslated-article.html</id><content type="html">&lt;p&gt;An article without a translation.
+</content><category term="misc"></category></entry><entry><title>An untranslated article</title><link href="http://example.com/test/an-untranslated-article.html" rel="alternate"></link><published>2014-07-14T00:00:00+00:00</published><updated>2014-07-14T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-07-14:/test/an-untranslated-article.html</id><content type="html">&lt;p&gt;An article without a translation.
 Here is a link to an &lt;a class="reference external" href="http://example.com/test/pages/untranslated-page.html"&gt;untranslated page&lt;/a&gt;&lt;/p&gt;
-</content></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
\ No newline at end of file
diff --git a/test_data/output/index.html b/test_data/output/index.html
index 97d87e1..c455687 100644
--- a/test_data/output/index.html
+++ b/test_data/output/index.html
@@ -3,6 +3,7 @@
 <head>
         <title>Welcome to our Testing site</title>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testing site Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/theme/style.css" />
@@ -10,7 +11,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="http://example.com/test/">Testing site <strong></strong></a></h1>
+                <h1><a href="http://example.com/test/">Testing site</a></h1>
         </header><!-- /#banner -->
         <nav id="menu"><ul>
             <li><a href="http://example.com/test/pages/untranslated-page.html">Untranslated page</a></li>
@@ -48,8 +49,8 @@ Here is a link to an <a class="reference external" href="http://example.com/test
 </section><!-- /#content -->
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>,
-                which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>,
+                which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
         </footer><!-- /#contentinfo -->
 </body>
diff --git a/test_data/output/pages/404.html b/test_data/output/pages/404.html
index 2d117d6..4695f3c 100644
--- a/test_data/output/pages/404.html
+++ b/test_data/output/pages/404.html
@@ -3,6 +3,7 @@
 <head>
           <title>Testing site - A 404 page</title>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testing site Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/theme/style.css" />
@@ -15,7 +16,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="http://example.com/test/">Testing site <strong></strong></a></h1>
+                <h1><a href="http://example.com/test/">Testing site</a></h1>
         </header><!-- /#banner -->
         <nav id="menu"><ul>
             <li><a href="http://example.com/test/pages/untranslated-page.html">Untranslated page</a></li>
@@ -32,8 +33,8 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>,
-                which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>,
+                which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
         </footer><!-- /#contentinfo -->
 </body>
diff --git a/test_data/output/pages/untranslated-page.html b/test_data/output/pages/untranslated-page.html
index 1053002..3ff02df 100644
--- a/test_data/output/pages/untranslated-page.html
+++ b/test_data/output/pages/untranslated-page.html
@@ -3,6 +3,7 @@
 <head>
           <title>Testing site - Untranslated page</title>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testing site Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/theme/style.css" />
@@ -12,7 +13,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="http://example.com/test/">Testing site <strong></strong></a></h1>
+                <h1><a href="http://example.com/test/">Testing site</a></h1>
         </header><!-- /#banner -->
         <nav id="menu"><ul>
             <li class="active"><a href="http://example.com/test/pages/untranslated-page.html">Untranslated page</a></li>
@@ -26,8 +27,8 @@
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>,
-                which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>,
+                which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
         </footer><!-- /#contentinfo -->
 </body>
diff --git a/test_data/output/translated-article.html b/test_data/output/translated-article.html
index 260eddb..45be1bb 100644
--- a/test_data/output/translated-article.html
+++ b/test_data/output/translated-article.html
@@ -3,6 +3,7 @@
 <head>
           <title>Testing site - A translated article</title>
         <meta charset="utf-8" />
+        <meta name="generator" content="Pelican" />
         <link href="http://example.com/test/feeds_all.atom.xml" type="application/atom+xml" rel="alternate" title="Testing site Full Atom Feed" />
 
 <link rel="stylesheet" href="http://example.com/test/theme/style.css" />
@@ -18,7 +19,7 @@
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="http://example.com/test/">Testing site <strong></strong></a></h1>
+                <h1><a href="http://example.com/test/">Testing site</a></h1>
         </header><!-- /#banner -->
         <nav id="menu"><ul>
             <li><a href="http://example.com/test/pages/untranslated-page.html">Untranslated page</a></li>
@@ -53,8 +54,8 @@ Here is a link to <a class="reference external" href="http://example.com/test/im
 </section>
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
-                Proudly powered by <a href="http://getpelican.com/">Pelican</a>,
-                which takes great advantage of <a href="http://python.org">Python</a>.
+                Proudly powered by <a href="https://getpelican.com/">Pelican</a>,
+                which takes great advantage of <a href="https://www.python.org/">Python</a>.
                 </address><!-- /#about -->
         </footer><!-- /#contentinfo -->
 </body>
diff --git a/test_i18n_subsites.py b/test_i18n_subsites.py
index c6c1d6a..83d0cb9 100644
--- a/test_i18n_subsites.py
+++ b/test_i18n_subsites.py
@@ -136,4 +136,4 @@ class TestFullRun(unittest.TestCase):
              self.temp_path], env={'PAGER': ''},
             stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
         self.assertFalse(out, 'non-empty `diff` stdout:\n{}'.format(out))
-        self.assertFalse(err, 'non-empty `diff` stderr:\n{}'.format(out))
+        self.assertFalse(err, 'non-empty `diff` stderr:\n{}'.format(err))
