Fixed nb merge.

app/locale/nb.coffee

@@ -7,9 +7,9 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari
 #    old_browser_suffix: "You can try anyway, but it probably won't work."
 #    campaign: "Campaign"
-#    for_beginners: "For Beginners"
+    for_beginners: "For Begynnere"
-#    multiplayer: "Multiplayer" # Not currently shown on home page
+    multiplayer: "Flerspiller" # Not currently shown on home page
-#    for_developers: "For Developers" # Not currently shown on home page.
+    for_developers: "For Utviklere" # Not currently shown on home page.
 
   nav:
     play: "Spill" # The top nav bar entry where players choose which levels to play
@@ -17,8 +17,8 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     editor: "Editor"
     blog: "Blogg"
     forum: "Forum"
-#    account: "Account"
+    account: "bruker"
-#    profile: "Profile"
+    profile: "Profil"
 #    stats: "Stats"
 #    code: "Code"
     admin: "Administrator" # Only shows up when you are an admin
@@ -28,7 +28,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     about: "Om"
     contact: "Kontakt"
     twitter_follow: "Følg"
-#    teachers: "Teachers"
+    teachers: "Lærere"
 
   modal:
     close: "Lukk"
@@ -46,20 +46,20 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     subscribe_as_diplomat: "Meld deg på som Diplomat"
 
   play:
-#    play_as: "Play As" # Ladder page
+    play_as: "Spill som" # Ladder page
 #    spectate: "Spectate" # Ladder page
-#    players: "players" # Hover over a level on /play
+    players: "spillere" # Hover over a level on /play
-#    hours_played: "hours played" # Hover over a level on /play
+    hours_played: "Timer spilt" # Hover over a level on /play
-#    items: "Items" # Tooltip on item shop button from /play
+    items: "Gjenstander" # Tooltip on item shop button from /play
-#    heroes: "Heroes" # Tooltip on hero shop button from /play
+    heroes: "Helter" # Tooltip on hero shop button from /play
-#    achievements: "Achievements" # Tooltip on achievement list button from /play
+    achievements: "Oppnåelser" # Tooltip on achievement list button from /play
-#    account: "Account" # Tooltip on account button from /play
+    account: "Bruker" # Tooltip on account button from /play
-#    settings: "Settings" # Tooltip on settings button from /play
+    settings: "Innstillinger" # Tooltip on settings button from /play
-#    next: "Next" # Go from choose hero to choose inventory before playing a level
+    next: "Neste" # Go from choose hero to choose inventory before playing a level
-#    change_hero: "Change Hero" # Go back from choose inventory to choose hero
+    change_hero: "Endre Helt" # Go back from choose inventory to choose hero
 #    choose_inventory: "Equip Items"
 #    older_campaigns: "Older Campaigns"
-#    anonymous: "Anonymous Player"
+    anonymous: "Anonym Spiller"
     level_difficulty: "Vanskelighetsgrad: "
     campaign_beginner: "Begynner Felttog"
     choose_your_level: "Velg Ditt Nivå" # The rest of this section is the old play view at /play-old and isn't very important.
@@ -82,12 +82,12 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
   login:
     sign_up: "Lag konto"
     log_in: "Logg Inn"
-#    logging_in: "Logging In"
+    logging_in: "Logg ut"
     log_out: "Logg Ut"
     recover: "gjenåpne konto"
 
   signup:
-#    create_account_title: "Create Account to Save Progress"
+    create_account_title: "Opprett konto for å lagre fremgrang"
     description: "Det er gratis. Trenger bare noen få avklaringer, så er du klar:"
     email_announcements: "Motta kunngjøringer på epost"
     coppa: "13+ eller ikke fra USA"
@@ -95,7 +95,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     creating: "Oppretter Konto..."
     sign_up: "Registrer deg"
     log_in: "logg inn med passord"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
+    social_signup: "Eller du kan registrere deg gjennom Facebook eller Google+:"
 #    required: "You need to log in before you can go that way."
 
 #  recover:
@@ -112,13 +112,13 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 
   common:
     loading: "Laster..."
-#    saving: "Saving..."
+    saving: "Lagrer..."
 #    sending: "Sending..."
 #    send: "Send"
     cancel: "Avbryt"
-#    save: "Save"
+    save: "Lagre"
-#    publish: "Publish"
+    publish: "Publiser"
-#    create: "Create"
+    create: "Opprett"
     manual: "Manuelt"
 #    fork: "Fork"
     play: "Spill" # When used as an action verb, like "Play next level"
@@ -128,9 +128,9 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    submit_patch: "Submit Patch"
 
   general:
-#    and: "and"
+    and: "og"
     name: "Navn"
-#    date: "Date"
+    date: "Dato"
 #    body: "Body"
 #    version: "Version"
 #    commit_msg: "Commit Message"
@@ -146,44 +146,44 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     message: "Melding"
 #    code: "Code"
 #    ladder: "Ladder"
-#    when: "When"
+    when: "Når"
 #    opponent: "Opponent"
 #    rank: "Rank"
 #    score: "Score"
-#    win: "Win"
+    win: "Seier"
-#    loss: "Loss"
+    loss: "Tap"
-#    tie: "Tie"
+    tie: "uavgjort"
-#    easy: "Easy"
+    easy: "Lett"
-#    medium: "Medium"
+    medium: "Middels"
-#    hard: "Hard"
+    hard: "Vanskelig"
-#    player: "Player"
+    player: "Spiller"
 
-#  units:
+  units:
-#    second: "second"
+    second: "sekund"
-#    seconds: "seconds"
+    seconds: "sekunder"
-#    minute: "minute"
+    minute: "minut"
-#    minutes: "minutes"
+    minutes: "minuter"
-#    hour: "hour"
+    hour: "time"
-#    hours: "hours"
+    hours: "timer"
-#    day: "day"
+    day: "dag"
-#    days: "days"
+    days: "dager"
-#    week: "week"
+    week: "uke"
-#    weeks: "weeks"
+    weeks: "uker"
-#    month: "month"
+    month: "måned"
-#    months: "months"
+    months: "måneder"
-#    year: "year"
+    year: "år"
-#    years: "years"
+    years: "år"
 
   play_level:
     done: "Ferdig"
     home: "Hjem"
 #    skip: "Skip"
-#    game_menu: "Game Menu"
+    game_menu: "Spill Meny"
     guide: "Guide"
     restart: "Start på nytt"
     goals: "Mål"
-#    goal: "Goal"
+    goal: "Mål"
-#    success: "Success!"
+    success: "Vellyket!"
 #    incomplete: "Incomplete"
 #    timed_out: "Ran out of time"
 #    failing: "Failing"
@@ -229,7 +229,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    tome_your_skills: "Your Skills"
     hud_continue: "Fortsett (trykk shift-mellomrom)"
 #    hud_continue_short: "Continue"
-#    code_saved: "Code Saved"
+    code_saved: "Kode lagret"
 #    skip_tutorial: "Skip (esc)"
 #    keyboard_shortcuts: "Key Shortcuts"
 #    loading_ready: "Ready!"