7 files changed, 70 insertions, 70 deletions
diff --git a/examples/multilingual/layouts/_default/single.html b/examples/multilingual/layouts/_default/single.html
index 5a83414f8..831cfaf94 100644
--- a/examples/multilingual/layouts/_default/single.html
+++ b/examples/multilingual/layouts/_default/single.html
@@ -1,4 +1,4 @@
-{{ partial "head.html" . }}
-{{ partial "header.html" . }}
-{{ .Content }}
-{{ partial "footer.html" . }}
+{{ partial "head.html" . }}
+{{ partial "header.html" . }}
+{{ .Content }}
+{{ partial "footer.html" . }}
diff --git a/examples/multilingual/layouts/index.html b/examples/multilingual/layouts/index.html
index a4273218f..a4a1e5072 100644
--- a/examples/multilingual/layouts/index.html
+++ b/examples/multilingual/layouts/index.html
@@ -1 +1 @@
-<meta http-equiv="refresh" content="0; url=/home" />
-\ No newline at end of file
+<meta http-equiv="refresh" content="0; url=/home" />
diff --git a/examples/multilingual/layouts/partials/footer.html b/examples/multilingual/layouts/partials/footer.html
index 07a0b1c97..a12f744cc 100644
--- a/examples/multilingual/layouts/partials/footer.html
+++ b/examples/multilingual/layouts/partials/footer.html
@@ -1,3 +1,3 @@
-	<footer id="footer"><span class="copy-left">&copy;</span> 2015 Egon Elbre</footer>
-</body>
-</html>
-\ No newline at end of file
+<footer id="footer"><span class="copy-left">&copy;</span> 2015 Egon Elbre</footer>
+</body>
+</html>
diff --git a/examples/multilingual/layouts/partials/head.html b/examples/multilingual/layouts/partials/head.html
index fee14e72c..e493add1e 100644
--- a/examples/multilingual/layouts/partials/head.html
+++ b/examples/multilingual/layouts/partials/head.html
@@ -1,11 +1,11 @@
-<!DOCTYPE html>
-<html lang="{{ .Params.lang }}">
-<head>
-	<meta charset="utf-8">
-	{{ if .Title }}
-		<title>{{ (index .Site.Data.translations .Params.lang).head_title }} - {{ .Title }}</title>
-	{{ end }}
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<link rel="stylesheet" href="/main.css">
-</head>
-<body>
+<!DOCTYPE html>
+<html lang="{{ .Params.lang }}">
+<head>
+	<meta charset="utf-8">
+	{{ if .Title }}
+		<title>{{ i18n "head_title" }} - {{ .Title }}</title>
+	{{ end }}
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<link rel="stylesheet" href="/main.css">
+</head>
+<body>
diff --git a/examples/multilingual/layouts/partials/header.html b/examples/multilingual/layouts/partials/header.html
index f08c3523c..15f67ba72 100644
--- a/examples/multilingual/layouts/partials/header.html
+++ b/examples/multilingual/layouts/partials/header.html
@@ -1,17 +1,17 @@
-<header>
-	<nav id="language-menu">
-		<a href="/home">English</a>
-		<a href="/kodu">Eesti</a>
-	</nav>
-
-	<h1 id="title">{{ (index .Site.Data.translations .Params.lang).title }}</h1>
-
-	<nav id="main-menu">
-		{{ range (index .Site.Taxonomies.menu .Params.lang).Pages }}
-		<a href="{{ .Permalink  }}">{{ .LinkTitle }}</a>
-		{{ end }}
-		<div class="clear"></div>
-	</nav>
-</header>
-
-<h2 id="subtitle">{{ .Title }}</h2>
+<header>
+	<nav id="language-menu">
+		<a href="/home">English</a>
+		<a href="/kodu">Eesti</a>
+	</nav>
+
+	<h1 id="title">{{ .Site.Title }}</h1>
+
+	<nav id="main-menu">
+		{{ range .Site.Menus.main }}
+		<a href="{{ .URL  }}">{{ .Name }}</a>
+		{{ end }}
+		<div class="clear"></div>
+	</nav>
+</header>
+
+<h2 id="subtitle">{{ .Title }}</h2>
diff --git a/examples/multilingual/layouts/story/single.html b/examples/multilingual/layouts/story/single.html
index 0e2a19bdc..beb811cc2 100644
--- a/examples/multilingual/layouts/story/single.html
+++ b/examples/multilingual/layouts/story/single.html
@@ -1,17 +1,17 @@
-{{ partial "head.html" . }}
-{{ partial "header.html" . }}
-
-{{ if .Params.listing }}
-	{{ range .Site.Taxonomies.groups.news.Pages }}
-	<article class="post">
-		<h3><a href='{{ .Permalink }}'>{{ .Title }}</a> </h3>
-		<div class="post-meta">{{ .Date.Format "Mon, Jan 2, 2006" }} - {{ .FuzzyWordCount }} Words</div>
-		{{ .Summary }}
-		<a href='{{ .Permalink }}'><nobr>read more →</nobr></a>
-	</article>
-	{{ end }}
-{{ else }}
-	{{ .Content }}
-{{ end }}
-
-{{ partial "footer.html" . }}
+{{ partial "head.html" . }}
+{{ partial "header.html" . }}
+
+{{ if .Params.listing }}
+	{{ range .Site.Taxonomies.groups.news.Pages }}
+	<article class="post">
+		<h3><a href='{{ .Permalink }}'>{{ .Title }}</a> </h3>
+		<div class="post-meta">{{ .Date.Format "Mon, Jan 2, 2006" }} - {{ .FuzzyWordCount }} Words</div>
+		{{ .Summary }}
+		<a href='{{ .Permalink }}'><nobr>read more →</nobr></a>
+	</article>
+	{{ end }}
+{{ else }}
+	{{ .Content }}
+{{ end }}
+
+{{ partial "footer.html" . }}
diff --git a/examples/multilingual/layouts/uudis/single.html b/examples/multilingual/layouts/uudis/single.html
index 1898b3ad6..1af874d2a 100644
--- a/examples/multilingual/layouts/uudis/single.html
+++ b/examples/multilingual/layouts/uudis/single.html
@@ -1,17 +1,17 @@
-{{ partial "head.html" . }}
-{{ partial "header.html" . }}
-
-{{ if .Params.listing }}
-	{{ range .Site.Taxonomies.groups.uudised.Pages }}
-	<article class="post">
-		<h3><a href='{{ .Permalink }}'>{{ .Title }}</a> </h3>
-		<div class="post-meta">{{ .Date.Format "Mon, Jan 2, 2006" }} - {{ .FuzzyWordCount }} sõna</div>
-		{{ .Summary }}
-		<a href='{{ .Permalink }}'><nobr>loe edasi →</nobr></a>
-	</article>
-	{{ end }}
-{{ else }}
-	{{ .Content }}
-{{ end }}
-
-{{ partial "footer.html" . }}
+{{ partial "head.html" . }}
+{{ partial "header.html" . }}
+
+{{ if .Params.listing }}
+	{{ range .Site.Taxonomies.groups.uudised.Pages }}
+	<article class="post">
+		<h3><a href='{{ .Permalink }}'>{{ .Title }}</a> </h3>
+		<div class="post-meta">{{ .Date.Format "Mon, Jan 2, 2006" }} - {{ .FuzzyWordCount }} sõna</div>
+		{{ .Summary }}
+		<a href='{{ .Permalink }}'><nobr>loe edasi →</nobr></a>
+	</article>
+	{{ end }}
+{{ else }}
+	{{ .Content }}
+{{ end }}
+
+{{ partial "footer.html" . }}