diff --git a/app/controllers/dmsf_detail_controller.rb b/app/controllers/dmsf_detail_controller.rb
index 5dd7782a..fc5da019 100644
--- a/app/controllers/dmsf_detail_controller.rb
+++ b/app/controllers/dmsf_detail_controller.rb
@@ -21,7 +21,7 @@ class DmsfDetailController < ApplicationController
   
   before_filter :find_project
   before_filter :authorize
-  before_filter :find_parent, :only => [:folder_new, :create_folder, :save_folder, :folder_detail]
+  before_filter :find_parent, :only => [:folder_new, :create_folder, :save_folder]
   before_filter :find_folder, :only => [:delete_folder, :save_folder,
     :upload_files, :commit_files, :folder_detail]
   before_filter :find_file, :only => [:save_file, :delete_file, :file_detail]
@@ -47,6 +47,7 @@ class DmsfDetailController < ApplicationController
   end
 
   def folder_detail
+    @parent = @folder.folder
     @pathfolder = copy_folder(@folder)
   end
 
diff --git a/app/views/dmsf_detail/folder_detail.html.erb b/app/views/dmsf_detail/folder_detail.html.erb
index 9b8896f7..a497b23e 100644
--- a/app/views/dmsf_detail/folder_detail.html.erb
+++ b/app/views/dmsf_detail/folder_detail.html.erb
@@ -1,11 +1,11 @@
-<% html_title("DMSF") %>
+<% html_title(l(:dmsf)) %>
 
 <div class="contextual">
 </div>
 <% create = @pathfolder == @parent %>
 <h2>
-<%= render(:partial => "/dmsf/path", :locals => {:path => @pathfolder.dmsf_path}) %>
-<%= "/ New Folder" if create %>
+<%= render(:partial => "/dmsf/path", :locals => {:path => @pathfolder.nil? ? [] : @pathfolder.dmsf_path}) %>
+<%= ("/ " + l(:heading_new_folder)) if create %>
 </h2>
 
 <% form_for(:dmsf_folder, @folder, :url => {:action => create ? "create_folder" : "save_folder", :id => @project, :folder_id => @folder, :parent_id => @parent},
@@ -13,15 +13,15 @@
 	<%= error_messages_for("folder") %>
 	<div class="box">
 		<p>
-			<%= label_tag("dmsf_folder_name", "Title:") %>
-			<%= f.text_field(:name, :size => "32") %>
+			<%= label_tag("dmsf_folder_name", l(:label_title) + ":") %>
+			<%= f.text_field(:name, :size => "32", :required => true) %>
 		</p>
 		<p>
-			<%= label_tag("dmsf_folder_description", "Description:") %>
+			<%= label_tag("dmsf_folder_description", l(:label_description) + ":") %>
 			<%= f.text_area(:description, :rows => 15, :class => "wiki-edit") %>
 		</p>
 	</div>
-	<%= submit_tag(create ? "Create" : "Save") %>
+	<%= submit_tag(create ? l(:submit_create) : l(:submit_save)) %>
 <% end %>
 
 <%= wikitoolbar_for "dmsf_folder_description" %>
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index ae5c3eaf..0b5f04be 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -76,4 +76,8 @@ cs:
   :note_uploaded_maximum_files_at_once: "There can be uploaded maximum of %{number} files at once."
   :note_upload_files_greater_than_two_gb: "To upload files greater than 2GB you must have 64b browser."
   :submit_upload_files: "Upload"
+  :heading_new_folder: "New Folder"
+  :label_title: "Title"
+  :label_description: "Description"
+  :submit_save: "Save"
   
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d14ffd68..ccd4dd21 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -76,5 +76,9 @@ en:
   :note_uploaded_maximum_files_at_once: "There can be uploaded maximum of %{number} files at once."
   :note_upload_files_greater_than_two_gb: "To upload files greater than 2GB you must have 64b browser."
   :submit_upload_files: "Upload"
+  :heading_new_folder: "New Folder"
+  :label_title: "Title"
+  :label_description: "Description"
+  :submit_save: "Save"
   
   
\ No newline at end of file