From f200b91fa2201e8abd26ebb6f75780a82c59a807 Mon Sep 17 00:00:00 2001
From: eaxs <tkuhn@live.com>
Date: Tue, 14 Apr 2015 06:44:02 -0400
Subject: [PATCH] Added pull.bat to gitignore

---
 languages/nb-NO/site/nb-NO.tpl_goggles.ini |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/languages/nb-NO/site/nb-NO.tpl_goggles.ini b/languages/nb-NO/site/nb-NO.tpl_goggles.ini
index a8337e3..aafe340 100644
--- a/languages/nb-NO/site/nb-NO.tpl_goggles.ini
+++ b/languages/nb-NO/site/nb-NO.tpl_goggles.ini
@@ -16,4 +16,15 @@
 TPL_GOGGLES_BOOTSTRAP_CSS_LABEL="Aktiver Bootstrap CSS"
 TPL_GOGGLES_BOOTSTRAP_CSS_DESC="Inkluder Bootstrap Base CSS-stiler"
 TPL_GOGGLES_BOOTSTRAP_JS_LABEL="Aktiver Bootstrap JavaScript"
-TPL_GOGGLES_BOOTSTRAP_JS_DESC="Inkluder jQuery og Bootstrap JavaScript"
\ No newline at end of file
+TPL_GOGGLES_BOOTSTRAP_JS_DESC="Inkluder jQuery og Bootstrap JavaScript"
+
+TPL_GOGGLES_LOGO_LABEL="Logo"
+TPL_GOGGLES_LOGO_DESC="Last opp en tilpasset logo for nettstedet mal."
+TPL_GOGGLES_CREATE_BUTTON_LABEL="Opprett knapp"
+TPL_GOGGLES_CREATE_BUTTON_DESC="Vis Projectfork Opprett knapp"
+
+TPL_GOGGLES_DISPLAY_NAME_LABEL = "Vis navn"
+TPL_GOGGLES_DISPLAY_NAME_DESC  = "Velg hvor brukernavnet skal vises i øverste høyre hjørne av malen"
+TPL_GOGGLES_DISPLAY_NAME_USERNAME = "Brukernavn"
+TPL_GOGGLES_DISPLAY_NAME_FULL_NAME = "Fult navn"
+TPL_GOGGLES_DISPLAY_NAME_EMAIL = "epost adresse"

--
Gitblit v1.9.1