diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb
index c8478965..f1758c7a 100644
--- a/app/models/dmsf_file.rb
+++ b/app/models/dmsf_file.rb
@@ -37,7 +37,7 @@ class DmsfFile < ActiveRecord::Base
   
   validates_presence_of :name
   validates_format_of :name, :with => DmsfFolder.invalid_characters,
-    :message => "contains invalid character(s)"
+    :message => l(:error_contains_invalid_character)
   
   validate_on_create :validates_name_uniqueness 
   
diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb
index f7f6a954..0cbaca10 100644
--- a/app/models/dmsf_folder.rb
+++ b/app/models/dmsf_folder.rb
@@ -33,7 +33,7 @@ class DmsfFolder < ActiveRecord::Base
   validates_uniqueness_of :name, :scope => [:dmsf_folder_id, :project_id]
   
   validates_format_of :name, :with => @@invalid_characters,
-    :message => "contains invalid character(s)"
+    :message => l(:error_contains_invalid_character)
   
   validate :check_cycle
   
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 14ffeb89..56e58df6 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -138,4 +138,5 @@ cs:
   :label_file: "File"
   :field_folder: "Folder"
   :error_create_cycle_in_folder_dependency: "create cycle in folder dependency"
+  :error_contains_invalid_character: "contains invalid character(s)"
   
\ No newline at end of file
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 611414a2..6c4e5fbd 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -134,4 +134,5 @@ de:
   :label_file: "File"
   :field_folder: "Folder"
   :error_create_cycle_in_folder_dependency: "create cycle in folder dependency"
+  :error_contains_invalid_character: "contains invalid character(s)"
   
\ No newline at end of file
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 7b53bb6a..d28f17f5 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -134,4 +134,5 @@ en-GB:
   :label_file: "File"
   :field_folder: "Folder"
   :error_create_cycle_in_folder_dependency: "create cycle in folder dependency"
+  :error_contains_invalid_character: "contains invalid character(s)"
   
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 178d3122..3af01129 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -138,4 +138,5 @@ en:
   :label_file: "File"
   :field_folder: "Folder"
   :error_create_cycle_in_folder_dependency: "create cycle in folder dependency"
+  :error_contains_invalid_character: "contains invalid character(s)"
   
\ No newline at end of file
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 93e497ff..c5e6b670 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -136,4 +136,5 @@ es:
   :label_file: "File"
   :field_folder: "Folder"
   :error_create_cycle_in_folder_dependency: "create cycle in folder dependency"
+  :error_contains_invalid_character: "contains invalid character(s)"
   
\ No newline at end of file
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 38bacb86..3fc307e0 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -134,4 +134,5 @@ fr:
   :label_file: "File"
   :field_folder: "Folder"
   :error_create_cycle_in_folder_dependency: "create cycle in folder dependency"
+  :error_contains_invalid_character: "contains invalid character(s)"
   
\ No newline at end of file
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 178d3122..3af01129 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -138,4 +138,5 @@ en:
   :label_file: "File"
   :field_folder: "Folder"
   :error_create_cycle_in_folder_dependency: "create cycle in folder dependency"
+  :error_contains_invalid_character: "contains invalid character(s)"
   
\ No newline at end of file
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 19d6d1f8..41ee743c 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -134,4 +134,5 @@ ru:
   :label_file: "File"
   :field_folder: "Folder"
   :error_create_cycle_in_folder_dependency: "create cycle in folder dependency"
+  :error_contains_invalid_character: "contains invalid character(s)"
   
\ No newline at end of file
diff --git a/db/migrate/01_create_hierarchy.rb b/db/migrate/01_create_hierarchy.rb
index cb0e6e73..38a6977e 100644
--- a/db/migrate/01_create_hierarchy.rb
+++ b/db/migrate/01_create_hierarchy.rb
@@ -19,11 +19,12 @@
 class CreateHierarchy < ActiveRecord::Migration
   def self.up
     create_table :dmsf_folders do |t|
-      t.string :name, :null => false
-      t.text :description
       t.references :project, :null => false
       t.references :dmsf_folder
       
+      t.string :name, :null => false
+      t.text :description
+      
       t.boolean :notification, :default => false, :null => false
       
       t.references :user, :null => false
@@ -31,9 +32,10 @@ class CreateHierarchy < ActiveRecord::Migration
     end
     
     create_table :dmsf_files do |t|
-      t.string :name, :null => false
       t.references :project, :null => false
       t.references :dmsf_folder
+      
+      t.string :name, :null => false
 
       t.boolean :notification, :default => false, :null => false
       
@@ -92,5 +94,7 @@ class CreateHierarchy < ActiveRecord::Migration
     drop_table :dmsf_file_revisions
     drop_table :dmsf_files
     drop_table :dmsf_folders
+    drop_table :dmsf_file_locks
+    drop_table :dmsf_user_prefs
   end
 end