From 7eb632f10e36de93521d0c65840e797423b7e91c Mon Sep 17 00:00:00 2001
From: dommyet <dommyet@gmail.com>
Date: Mon, 18 Jul 2016 14:28:29 +0800
Subject: [PATCH 1/6] Add zh language to languages.yaml (#17)

---
 languages.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/languages.yaml b/languages.yaml
index e1fa264..664cade 100644
--- a/languages.yaml
+++ b/languages.yaml
@@ -6,7 +6,6 @@ ro:
   PLUGIN_ERROR:
     ERROR: "Eroare"
     ERROR_MESSAGE: "Ooops. Se pare că pagina nu există."    
-
 fr:
   PLUGIN_ERROR:
     ERROR: "Erreur"
@@ -23,3 +22,7 @@ da:
   PLUGIN_ERROR:
     ERROR: "Fejl"
     ERROR_MESSAGE: "Ups. Det ser ud til at siden ikke eksisterer."
+zh:
+  PLUGIN_ERROR:
+    ERROR: "错误"
+    ERROR_MESSAGE: "呃，似乎这个页面不存在。"

From ad779e82666a9d8404dbb509df3974307fb8cab6 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Mon, 18 Jul 2016 08:29:40 +0200
Subject: [PATCH 2/6] Changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b155344..47509b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.x.x
+## xx/xx/2016
+
+1. [](#improved)
+    * Added chinese translation
+
 # v1.5.0
 ## 07/14/2015
 

From 600aeb37567877ba1293ca1606553e1930134691 Mon Sep 17 00:00:00 2001
From: Andreas Ender <ender@einfachsicher.com>
Date: Mon, 18 Jul 2016 16:54:08 +0200
Subject: [PATCH 3/6] Added german translation (#18)

---
 languages.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/languages.yaml b/languages.yaml
index 664cade..3e66028 100644
--- a/languages.yaml
+++ b/languages.yaml
@@ -2,6 +2,10 @@ en:
   PLUGIN_ERROR:
     ERROR: "Error"
     ERROR_MESSAGE: "Woops. Looks like this page doesn't exist."
+de:
+  PLUGIN_ERROR:
+    ERROR: "Fehler"
+    ERROR_MESSAGE: "Uuups. Sieht aus als ob diese Seite nicht existiert."    
 ro:
   PLUGIN_ERROR:
     ERROR: "Eroare"

From e9f5358f89ea5da8446a679d743424c4f9b0829f Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Mon, 18 Jul 2016 16:54:49 +0200
Subject: [PATCH 4/6] Changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47509b3..28ee480 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 ## xx/xx/2016
 
 1. [](#improved)
-    * Added chinese translation
+    * Added chinese and german translations
 
 # v1.5.0
 ## 07/14/2015

From a1b428cac1a8e3c4bb276de1f871ec8a5988cff1 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Mon, 18 Jul 2016 17:57:30 +0200
Subject: [PATCH 5/6] Fixed issue with the Smartypants plugin running before
 Twig was processed

---
 CHANGELOG.md   | 6 ++++--
 pages/error.md | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28ee480..18f2501 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,10 @@
-# v1.x.x
-## xx/xx/2016
+# v1.5.1
+## 07/xx/2016
 
 1. [](#improved)
     * Added chinese and german translations
+1. [](#bugfix)
+    * Fixed issue with the Smartypants plugin running before Twig was processed
 
 # v1.5.0
 ## 07/14/2015
diff --git a/pages/error.md b/pages/error.md
index 0c41271..f80c188 100644
--- a/pages/error.md
+++ b/pages/error.md
@@ -4,6 +4,7 @@ robots: noindex,nofollow
 template: error
 routable: false
 http_response_code: 404
+twig_first: true
 process:
 	twig: true
 ---

From 064f24de7cb6e3ad15da1c28dc401e86d32ac9fd Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Mon, 18 Jul 2016 17:58:03 +0200
Subject: [PATCH 6/6] Prepare release

---
 CHANGELOG.md    | 2 +-
 blueprints.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18f2501..9d47d15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 # v1.5.1
-## 07/xx/2016
+## 07/18/2016
 
 1. [](#improved)
     * Added chinese and german translations
diff --git a/blueprints.yaml b/blueprints.yaml
index 34b8820..6ce232c 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Error
-version: 1.5.0
+version: 1.5.1
 description: Displays the error page.
 icon: warning
 author: