Merge branch 'master' of github.com:diaspora/diaspora

app/controllers/dev_utilities_controller.rb

@@ -3,7 +3,7 @@
 #   the COPYRIGHT file.
 
 class DevUtilitiesController < ApplicationController
-  before_filter :authenticate_user!, :except => [:set_backer_number]
+  before_filter :authenticate_user!, :except => [:set_backer_number, :log]
   include ApplicationHelper
   include RequestsHelper
 

config/locales/devise/devise.nb.yml

@@ -2,7 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-no_NO:
+nb:
   errors:
     messages:
       not_found: "ble ikke funnet"

config/locales/diaspora/nb.yml

@@ -5,7 +5,7 @@
 # Sample localization file for English. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
-en:
+nb:
   hello: "Hallo, verden!"
   application:
       helper: