From df1695507c951ec6fa5511075a4c99cb36a84878 Mon Sep 17 00:00:00 2001
From: Joe Germuska <joe@germuska.com>
Date: Tue, 6 May 2014 08:21:23 -0500
Subject: [PATCH] s/timeline/tidslinje - closes NUKnightLab/StoryJS-Core#40
 thanks @tbaschim

---
 source/js/Core/Language/locale/no.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/js/Core/Language/locale/no.js b/source/js/Core/Language/locale/no.js
index 4bc16e7..154d1da 100644
--- a/source/js/Core/Language/locale/no.js
+++ b/source/js/Core/Language/locale/no.js
@@ -25,13 +25,13 @@ if(typeof VMM != 'undefined') {
 			full_long_small_date: "HH:MM'<br/><small>'dddd',' d. mmm',' yyyy'</small>'"
 		},
 		messages: {
-			loading_timeline: "Laster timeline... ",
+			loading_timeline: "Laster tidslinje... ",
 			return_to_title: "Tilbake til tittel",
-			expand_timeline: "Utvid timeline",
-			contract_timeline: "Krymp timeline",
+			expand_timeline: "Utvid tidslinje",
+			contract_timeline: "Krymp tidslinje",
 			wikipedia: "Fra Wikipedia, den frie encyklopedi",
 			loading_content: "Laster innhold",
 			loading: "Laster"
 		}
 	}
-}
+}
\ No newline at end of file