diff --git a/config/locale_settings.yml b/config/locale_settings.yml
index c92f9370ad8c197b01847094cd41f16a62e299e8..af441b4dba36c2e222e8c2ab24d6536b52bb169c 100644
--- a/config/locale_settings.yml
+++ b/config/locale_settings.yml
@@ -3,7 +3,7 @@ default: "en"
 
 available:
   ar: "العربية"
-  art_nvi: "Na'vi"
+  art-nvi: "Na'vi"
   bg: "български език"
   br: "Brezhoneg"
   ca: "Català"
@@ -98,6 +98,8 @@ fallbacks:
     - "ur"
   de_formal:
     - "de"
+  art_nvi:
+    - "art-nvi"
 
 
 rtl:
diff --git a/config/locales/cldr/plurals.rb b/config/locales/cldr/plurals.rb
index f2d5cf128aec1fa33c07ef541c3da66a1f48f324..0ab9d1e08a5d7c7ccb897cd6911b383c1d0b6d6f 100644
--- a/config/locales/cldr/plurals.rb
+++ b/config/locales/cldr/plurals.rb
@@ -1,5 +1,5 @@
 {
-  :art_nvi => { :i18n => {:plural => { :keys => [:zero, :one, :two, :few, :other], :rule => lambda { |n| n == 0 ? :zero : n == 1 ? :one : n == 2 ? :two : n == 3 ? :few : :other }, :js_rule => 'function (n) { return n == 0 ? "zero" : n == 1 ? "one" : n == 2 ? "two" : n == 3 ? "few" : "other" }' } } },  :ar => { :i18n => {:plural => { :keys => [:zero, :one, :two, :few, :many, :other], :rule => lambda { |n| n == 0 ? :zero : n == 1 ? :one : n == 2 ? :two : [3, 4, 5, 6, 7, 8, 9, 10].include?(n % 100) ? :few : [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99].include?(n % 100) ? :many : :other }, :js_rule => 'function (n) { return n == 0 ? "zero" : n == 1 ? "one" : n == 2 ? "two" : jQuery.inArray(n % 100, [3, 4, 5, 6, 7, 8, 9, 10]) != -1 ? "few" : jQuery.inArray(n % 100, [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99]) != -1 ? "many" : "other" }' } } },
+  :art-nvi => { :i18n => {:plural => { :keys => [:zero, :one, :two, :few, :other], :rule => lambda { |n| n == 0 ? :zero : n == 1 ? :one : n == 2 ? :two : n == 3 ? :few : :other }, :js_rule => 'function (n) { return n == 0 ? "zero" : n == 1 ? "one" : n == 2 ? "two" : n == 3 ? "few" : "other" }' } } },  :ar => { :i18n => {:plural => { :keys => [:zero, :one, :two, :few, :many, :other], :rule => lambda { |n| n == 0 ? :zero : n == 1 ? :one : n == 2 ? :two : [3, 4, 5, 6, 7, 8, 9, 10].include?(n % 100) ? :few : [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99].include?(n % 100) ? :many : :other }, :js_rule => 'function (n) { return n == 0 ? "zero" : n == 1 ? "one" : n == 2 ? "two" : jQuery.inArray(n % 100, [3, 4, 5, 6, 7, 8, 9, 10]) != -1 ? "few" : jQuery.inArray(n % 100, [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99]) != -1 ? "many" : "other" }' } } },
   :bg => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other }, :js_rule => 'function (n) { return n == 1 ? "one" : "other" }' } } },
   :br => { :i18n => {:plural => { :keys => [:one, :two, :few, :many, :other], :rule => lambda { |n| n % 10 == 1 && n ? :one : n % 10 == 2 && n ? :two : [3, 4].include?(n % 10) && ![10, 11, 12, 13, 14, 15, 16, 17, 18, 19].include?(n % 100) ? :few : n % 1000000 == 0 && n != 0 ? :many : :other }, :js_rule => 'function (n) { return n % 10 == 1 && n ? "one" : n % 10 == 2 && n ? "two" : jQuery.inArray(n % 10, [3, 4]) != -1 && !jQuery.inArray(n % 100, [10, 11, 12, 13, 14, 15, 16, 17, 18, 19]) != -1 ? "few" : n % 1000000 == 0 && n != 0 ? "many" : "other" }' } } },
   :ca => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other }, :js_rule => 'function (n) { return n == 1 ? "one" : "other" }' } } },
@@ -47,4 +47,4 @@
   :ur => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other }, :js_rule => 'function (n) { return n == 1 ? "one" : "other" }' } } },
   :vi => { :i18n => {:plural => { :keys => [:other], :rule => lambda { |n| :other }, :js_rule => 'function (n) { return "other" }' } } },
   :zh => { :i18n => {:plural => { :keys => [:other], :rule => lambda { |n| :other }, :js_rule => 'function (n) { return "other" }' } } }
-}
\ No newline at end of file
+}
diff --git a/config/locales/devise/devise.art_nvi.yml b/config/locales/devise/devise.art-nvi.yml
similarity index 98%
rename from config/locales/devise/devise.art_nvi.yml
rename to config/locales/devise/devise.art-nvi.yml
index 46c9c126f1c367772d9cb726bfd1c7dd70952ad0..972cbc95e292552f3a6261a5ca6cac971bb40257 100644
--- a/config/locales/devise/devise.art_nvi.yml
+++ b/config/locales/devise/devise.art-nvi.yml
@@ -4,7 +4,7 @@
 
 
 
-art_nvi:
+"art-nvi":
   devise:
     confirmations:
       confirmed: "Ngeyä Diaspora lílmatem. Nga fpxílmäkim."
@@ -64,4 +64,4 @@ art_nvi:
   errors:
     messages:
       already_confirmed: "li stameftxaw"
-      not_found: "ke rìmun"
\ No newline at end of file
+      not_found: "ke rìmun"
diff --git a/config/locales/diaspora/art_nvi.yml b/config/locales/diaspora/art-nvi.yml
similarity index 98%
rename from config/locales/diaspora/art_nvi.yml
rename to config/locales/diaspora/art-nvi.yml
index 62ee40df69b37d3938f5ef62fc0bc428e90846fe..04ff59efb4289cd5e8295baa98134ff05097c6f3 100644
--- a/config/locales/diaspora/art_nvi.yml
+++ b/config/locales/diaspora/art-nvi.yml
@@ -4,7 +4,7 @@
 
 
 
-art_nvi:
+"art-nvi":
   _comments: "Aysäplltxevi"
   _home: "Kelutral"
   _photos: "ayrel"
@@ -153,4 +153,4 @@ art_nvi:
     logged_out:
       works_on_modern: "Fì'u tìkangkem si mì syawyu lefngap lefkrr nìwotx"
     update:
-      language_changed: "lì'fyal lìmatem"
\ No newline at end of file
+      language_changed: "lì'fyal lìmatem"
diff --git a/config/locales/javascript/javascript.art_nvi.yml b/config/locales/javascript/javascript.art-nvi.yml
similarity index 94%
rename from config/locales/javascript/javascript.art_nvi.yml
rename to config/locales/javascript/javascript.art-nvi.yml
index 798adfec858f56c9e52b96f398fa533af99ce463..d4d62dcaa28296fe8c156bc2ffc25985cec33c30 100644
--- a/config/locales/javascript/javascript.art_nvi.yml
+++ b/config/locales/javascript/javascript.art-nvi.yml
@@ -4,7 +4,7 @@
 
 
 
-art_nvi:
+"art-nvi":
   javascripts:
     aspect_dropdown:
       add_to_aspect: "sung tuteti"
@@ -42,4 +42,4 @@ art_nvi:
       years: "%d ayzìsìt"
     videos:
       unknown: "rusikxa rol fnel astxong"
-      watch: "Tse'a fìrusikxa rolit <%= provider %>mì"
\ No newline at end of file
+      watch: "Tse'a fìrusikxa rolit <%= provider %>mì"