diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb
index 1e15bee8..081643c8 100644
--- a/app/controllers/dmsf_controller.rb
+++ b/app/controllers/dmsf_controller.rb
@@ -98,7 +98,7 @@ class DmsfController < ApplicationController
       download_entries(selected_folders, selected_files)
     end
   rescue ZipMaxFilesError
-    flash[:error] = l(:error_max_files_exceeded) + Setting.plugin_redmine_dmsf["dmsf_max_file_download"].to_i.to_s
+    flash[:error] = l(:error_max_files_exceeded, :number => Setting.plugin_redmine_dmsf["dmsf_max_file_download"].to_i.to_s)
     redirect_to({:controller => "dmsf", :action => "index", :id => @project, :folder_id => @folder})
   rescue DmsfAccessError
     render_403
diff --git a/app/views/dmsf/index.html.erb b/app/views/dmsf/index.html.erb
index f73902ae..897a5f85 100644
--- a/app/views/dmsf/index.html.erb
+++ b/app/views/dmsf/index.html.erb
@@ -3,11 +3,11 @@
 <div class="contextual">
 	<% if User.current.allowed_to?(:folder_manipulation, @project) %>
 		<% unless @folder.nil? %>
-			<%= link_to("Details",
+			<%= link_to(l(:link_details),
 		          {:controller => "dmsf_detail", :action => "folder_detail", :id => @project, :folder_id => @folder}) %> |
 		<% end %>
 		<% form_for(DmsfFolder.new, :url => {:controller => "dmsf_detail", :action => "create_folder", :id => @project, :folder_id => @folder}, :html => {:method=>:post}) do |f| %>
-			Title: <%= f.text_field(:name) %><%= f.submit("Create folder") %>
+			Title: <%= f.text_field(:name) %><%= f.submit(l(:submit_create_folder)) %>
 		<% end %>
 	<% end %>
 </div>
@@ -30,20 +30,20 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
 		<thead>
 			<tr id="root">
 				<th style="width: 17px; padding: 2px; text-align: left;">
-					<input id="check_all_entries" title="Check/Uncheck all for zip download or email" type="checkbox" />
+					<input id="check_all_entries" title="<%= l(:title_check_uncheck_all_for_zip_download_or_email) %>" type="checkbox" />
 				</th>
-				<%= sort_header_tag("title", :caption => "Title") %>
-				<%= sort_header_tag("size", :caption => "Size") %>
-				<%= sort_header_tag("modified", :caption => "Modified") %>
-				<%= sort_header_tag("version", :caption => "Ver.") %>
-				<%= sort_header_tag("author", :caption => "Author") %>
+				<%= sort_header_tag("title", :caption => l(:link_title)) %>
+				<%= sort_header_tag("size", :caption => l(:link_size)) %>
+				<%= sort_header_tag("modified", :caption => l(:link_modified)) %>
+				<%= sort_header_tag("version", :caption => l(:link_ver)) %>
+				<%= sort_header_tag("author", :caption => l(:link_author)) %>
 				<th></th>
 			</tr>
 		</thead>
 	<tbody>
 	<% @subfolders.each do |subfolder| %>
 		<tr class="dir">
-			<td class="size"><%= check_box_tag("subfolders[]", subfolder.id, false, :title => "Check for multi download or email") %></td>
+			<td class="size"><%= check_box_tag("subfolders[]", subfolder.id, false, :title => l(:title_check_for_zip_download_or_email)) %></td>
 			<td class="filename">
 				<%= link_to(h(subfolder.name),
 		          {:action => "index", :folder_id => subfolder},
@@ -59,17 +59,17 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
 						<%= link_to(image_tag("delete.png", :plugin => "redmine_dmsf"), 
 							{:controller => "dmsf_detail", :action => "delete_folder", :id => @project, 
 							:folder_id => @folder, :delete_folder_id => subfolder}, :class => "delete-link",
-							:title => "Delete") %>
+							:title => l(:title_delete)) %>
 					<% end %>
 					<% if User.current.allowed_to?(:file_approval, @project) %>
 						<% if subfolder.notification %>
 							<%= link_to(image_tag("notify.png", :plugin => "redmine_dmsf"),
 				        		{:controller => "dmsf_state", :action => "folder_notify_deactivate", :id => @project,
-								:folder_id => subfolder}, :title => "Notifications active: Deactivate") %>
+								:folder_id => subfolder}, :title => l(:title_notifications_active_deactivate)) %>
 						<% else %>
 							<%= link_to(image_tag("notifynot.png", :plugin => "redmine_dmsf"),
 				        		{:controller => "dmsf_state", :action => "folder_notify_activate", :id => @project, 
-								:folder_id => subfolder}, :title => "Notifications not active: Activate") %>
+								:folder_id => subfolder}, :title => l(:title_notifications_not_active_activate)) %>
 						<% end %>
 					<% end %>
 				</div><br class="clear" />
@@ -78,12 +78,12 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
 	<% end %>
 	<% @files.each do |file| %>
 		<tr class="file">
-			<td class="size"><%= check_box_tag("files[]", file.id, false, :title => "Check for zip download or email") %></td>
+			<td class="size"><%= check_box_tag("files[]", file.id, false, :title => l(:title_check_for_zip_download_or_email)) %></td>
 			<td class="filename">
 				<%= link_to(h(file.last_revision.display_title),
 		        	{:action => "download_file", :id => @project, :file_id => file},
 		        	:class => "icon icon-file #{Redmine::MimeType.css_class_of(file.name)}",
-					:title => "#{h(file.last_revision.title)} version #{file.last_revision.version} download") %>
+					:title => l(:title_title_version_version_download, :title => h(file.last_revision.title), :version => file.last_revision.version)) %>
 				<div class="filename">
 					(<%= h(file.display_name) %>)</div><br class="clear" />
 			</td>
@@ -205,6 +205,10 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
 	<%= javascript_include_tag "plupload/plupload.html5.js", :plugin => "redmine_dmsf" %>
 	<%= javascript_include_tag "plupload/plupload.html4.js", :plugin => "redmine_dmsf" %>
 	<%= javascript_include_tag "plupload/jquery.ui.plupload/jquery.ui.plupload.js", :plugin => "redmine_dmsf" %>
+	<% if I18n.locale && !I18n.locale.to_s.match(/^en.*/) %>
+		<%= javascript_include_tag "plupload/i18n/#{I18n.locale.to_s.downcase}.js", :plugin => "redmine_dmsf" %>
+	<% end %>
+	
 	<script type="text/javascript">
 		jQuery.noConflict();
 		
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 8b7e5e31..7b735573 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -10,7 +10,7 @@ cs:
   :notice_file_unlocked: "File unlocked"
   :error_only_user_that_locked_file_can_unlock_it: "Only user that locked file can unlock it"
   :question_do_you_really_want_to_delete_this_entry: "Do you really want to delete this entry?"
-  :error_max_files_exceeded: "Limit for number of simultaneously downloadable files exceeded: "
+  :error_max_files_exceeded: "Limit for %{number} simultaneously downloaded files exceeded"
   :question_do_you_really_want_to_delete_this_revision: "Do you really want to delete this revision?"
   :error_entry_project_does_not_match_current_project: "Entry project doesn't match current project"
   :notice_folder_created: "Folder created"
@@ -21,7 +21,6 @@ cs:
   :error_folder_title_is_already_used: "Title is already used"
   :notice_folder_details_were_saved: "Folder details were saved"
   :error_file_is_locked: "File is locked"
-  
   :notice_file_deleted: "File deleted"
   :error_at_least_one_revision_must_be_present: "At least one revision must be present"
   :notice_revision_deleted: "Revision deleted" 
@@ -37,5 +36,17 @@ cs:
   :notice_file_notifications_activated: "File notifications activated"
   :warning_file_notifications_already_deactivated: "File notifications already deactivated"
   :notice_file_notifications_deactivated: "File notifications deactivated"
-  
+  :link_details: "Details"
+  :submit_create_folder: "Create folder"
+  :title_check_uncheck_all_for_zip_download_or_email: "Check/Uncheck all for zip download or email"
+  :link_title: "Title"
+  :link_size: "Size"
+  :link_modified: "Modified"
+  :link_ver: "Ver."
+  :link_author: "Author"
+  :title_check_for_zip_download_or_email: "Check for Zip download or email"
+  :title_delete: "Delete"
+  :title_notifications_active_deactivate: "Notifications active: Deactivate"
+  :title_notifications_not_active_activate: "Notifications not active: Activate"
+  :title_title_version_version_download: "%{title} version %{version} download"
   
\ No newline at end of file
diff --git a/config/locales/de.yml b/config/locales/de.yml
index e9c76b2d..d0f5439b 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -10,7 +10,7 @@ de:
   :notice_file_unlocked: "File unlocked"
   :error_only_user_that_locked_file_can_unlock_it: "Only user that locked file can unlock it"
   :question_do_you_really_want_to_delete_this_entry: "Do you really want to delete this entry?"
-  :error_max_files_exceeded: "Limit for number of simultaneously downloadable files exceeded: "
+  :error_max_files_exceeded: "Limit for %{number} simultaneously downloaded files exceeded"
   :question_do_you_really_want_to_delete_this_revision: "Do you really want to delete this revision?"
   :error_entry_project_does_not_match_current_project: "Entry project doesn't match current project"
   :notice_folder_created: "Folder created"
@@ -36,4 +36,17 @@ de:
   :notice_file_notifications_activated: "File notifications activated"
   :warning_file_notifications_already_deactivated: "File notifications already deactivated"
   :notice_file_notifications_deactivated: "File notifications deactivated"
+  :link_details: "Details"
+  :submit_create_folder: "Create folder"
+  :title_check_uncheck_all_for_zip_download_or_email: "Check/Uncheck all for zip download or email"
+  :link_title: "Title"
+  :link_size: "Size"
+  :link_modified: "Modified"
+  :link_ver: "Ver."
+  :link_author: "Author"
+  :title_check_for_zip_download_or_email: "Check for Zip download or email"
+  :title_delete: "Delete"
+  :title_notifications_active_deactivate: "Notifications active: Deactivate"
+  :title_notifications_not_active_activate: "Notifications not active: Activate"
+  :title_title_version_version_download: "%{title} version %{version} download"
   
\ No newline at end of file
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index c5217b45..5ac06d66 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -10,7 +10,7 @@ en-GB:
   :notice_file_unlocked: "File unlocked"
   :error_only_user_that_locked_file_can_unlock_it: "Only user that locked file can unlock it"
   :question_do_you_really_want_to_delete_this_entry: "Do you really want to delete this entry?"
-  :error_max_files_exceeded: "Limit for number of simultaneously downloadable files exceeded: "
+  :error_max_files_exceeded: "Limit for %{number} simultaneously downloaded files exceeded"
   :question_do_you_really_want_to_delete_this_revision: "Do you really want to delete this revision?"
   :error_entry_project_does_not_match_current_project: "Entry project doesn't match current project"
   :notice_folder_created: "Folder created"
@@ -36,4 +36,17 @@ en-GB:
   :notice_file_notifications_activated: "File notifications activated"
   :warning_file_notifications_already_deactivated: "File notifications already deactivated"
   :notice_file_notifications_deactivated: "File notifications deactivated"
+  :link_details: "Details"
+  :submit_create_folder: "Create folder"
+  :title_check_uncheck_all_for_zip_download_or_email: "Check/Uncheck all for zip download or email"
+  :link_title: "Title"
+  :link_size: "Size"
+  :link_modified: "Modified"
+  :link_ver: "Ver."
+  :link_author: "Author"
+  :title_check_for_zip_download_or_email: "Check for Zip download or email"
+  :title_delete: "Delete"
+  :title_notifications_active_deactivate: "Notifications active: Deactivate"
+  :title_notifications_not_active_activate: "Notifications not active: Activate"
+  :title_title_version_version_download: "%{title} version %{version} download"
   
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ff92b6fc..4c739d7c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -10,7 +10,7 @@ en:
   :notice_file_unlocked: "File unlocked"
   :error_only_user_that_locked_file_can_unlock_it: "Only user that locked file can unlock it"
   :question_do_you_really_want_to_delete_this_entry: "Do you really want to delete this entry?"
-  :error_max_files_exceeded: "Limit for number of simultaneously downloadable files exceeded: "
+  :error_max_files_exceeded: "Limit for %{number} simultaneously downloaded files exceeded"
   :question_do_you_really_want_to_delete_this_revision: "Do you really want to delete this revision?"
   :error_entry_project_does_not_match_current_project: "Entry project doesn't match current project"
   :notice_folder_created: "Folder created"
@@ -36,4 +36,17 @@ en:
   :notice_file_notifications_activated: "File notifications activated"
   :warning_file_notifications_already_deactivated: "File notifications already deactivated"
   :notice_file_notifications_deactivated: "File notifications deactivated"
-  
+  :link_details: "Details"
+  :submit_create_folder: "Create folder"
+  :title_check_uncheck_all_for_zip_download_or_email: "Check/Uncheck all for zip download or email"
+  :link_title: "Title"
+  :link_size: "Size"
+  :link_modified: "Modified"
+  :link_ver: "Ver."
+  :link_author: "Author"
+  :title_check_for_zip_download_or_email: "Check for Zip download or email"
+  :title_delete: "Delete"
+  :title_notifications_active_deactivate: "Notifications active: Deactivate"
+  :title_notifications_not_active_activate: "Notifications not active: Activate"
+  :title_title_version_version_download: "%{title} version %{version} download"
+  
\ No newline at end of file
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 6eb6668e..a10abd11 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -10,7 +10,7 @@ es:
   :notice_file_unlocked: "File unlocked"
   :error_only_user_that_locked_file_can_unlock_it: "Only user that locked file can unlock it"
   :question_do_you_really_want_to_delete_this_entry: "Do you really want to delete this entry?"
-  :error_max_files_exceeded: "Limit for number of simultaneously downloadable files exceeded: "
+  :error_max_files_exceeded: "Limit for %{number} simultaneously downloaded files exceeded"
   :question_do_you_really_want_to_delete_this_revision: "Do you really want to delete this revision?"
   :error_entry_project_does_not_match_current_project: "Entry project doesn't match current project"
   :notice_folder_created: "Folder created"
@@ -36,4 +36,17 @@ es:
   :notice_file_notifications_activated: "File notifications activated"
   :warning_file_notifications_already_deactivated: "File notifications already deactivated"
   :notice_file_notifications_deactivated: "File notifications deactivated"
+  :link_details: "Details"
+  :submit_create_folder: "Create folder"
+  :title_check_uncheck_all_for_zip_download_or_email: "Check/Uncheck all for zip download or email"
+  :link_title: "Title"
+  :link_size: "Size"
+  :link_modified: "Modified"
+  :link_ver: "Ver."
+  :link_author: "Author"
+  :title_check_for_zip_download_or_email: "Check for Zip download or email"
+  :title_delete: "Delete"
+  :title_notifications_active_deactivate: "Notifications active: Deactivate"
+  :title_notifications_not_active_activate: "Notifications not active: Activate"
+  :title_title_version_version_download: "%{title} version %{version} download"
   
\ No newline at end of file
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 6f4a19e8..d9d287c2 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -10,7 +10,7 @@ fr:
   :notice_file_unlocked: "File unlocked"
   :error_only_user_that_locked_file_can_unlock_it: "Only user that locked file can unlock it"
   :question_do_you_really_want_to_delete_this_entry: "Do you really want to delete this entry?"
-  :error_max_files_exceeded: "Limit for number of simultaneously downloadable files exceeded: "
+  :error_max_files_exceeded: "Limit for %{number} simultaneously downloaded files exceeded"
   :question_do_you_really_want_to_delete_this_revision: "Do you really want to delete this revision?"
   :error_entry_project_does_not_match_current_project: "Entry project doesn't match current project"
   :notice_folder_created: "Folder created"
@@ -36,4 +36,17 @@ fr:
   :notice_file_notifications_activated: "File notifications activated"
   :warning_file_notifications_already_deactivated: "File notifications already deactivated"
   :notice_file_notifications_deactivated: "File notifications deactivated"
+  :link_details: "Details"
+  :submit_create_folder: "Create folder"
+  :title_check_uncheck_all_for_zip_download_or_email: "Check/Uncheck all for zip download or email"
+  :link_title: "Title"
+  :link_size: "Size"
+  :link_modified: "Modified"
+  :link_ver: "Ver."
+  :link_author: "Author"
+  :title_check_for_zip_download_or_email: "Check for Zip download or email"
+  :title_delete: "Delete"
+  :title_notifications_active_deactivate: "Notifications active: Deactivate"
+  :title_notifications_not_active_activate: "Notifications not active: Activate"
+  :title_title_version_version_download: "%{title} version %{version} download"
   
\ No newline at end of file
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 71953701..45ff608d 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -10,7 +10,7 @@ ru:
   :notice_file_unlocked: "File unlocked"
   :error_only_user_that_locked_file_can_unlock_it: "Only user that locked file can unlock it"
   :question_do_you_really_want_to_delete_this_entry: "Do you really want to delete this entry?"
-  :error_max_files_exceeded: "Limit for number of simultaneously downloadable files exceeded: "
+  :error_max_files_exceeded: "Limit for %{number} simultaneously downloaded files exceeded"
   :question_do_you_really_want_to_delete_this_revision: "Do you really want to delete this revision?"
   :error_entry_project_does_not_match_current_project: "Entry project doesn't match current project"
   :notice_folder_created: "Folder created"
@@ -36,5 +36,17 @@ ru:
   :notice_file_notifications_activated: "File notifications activated"
   :warning_file_notifications_already_deactivated: "File notifications already deactivated"
   :notice_file_notifications_deactivated: "File notifications deactivated"
-  
+  :link_details: "Details"
+  :submit_create_folder: "Create folder"
+  :title_check_uncheck_all_for_zip_download_or_email: "Check/Uncheck all for zip download or email"
+  :link_title: "Title"
+  :link_size: "Size"
+  :link_modified: "Modified"
+  :link_ver: "Ver."
+  :link_author: "Author"
+  :title_check_for_zip_download_or_email: "Check for Zip download or email"
+  :title_delete: "Delete"
+  :title_notifications_active_deactivate: "Notifications active: Deactivate"
+  :title_notifications_not_active_activate: "Notifications not active: Activate"
+  :title_title_version_version_download: "%{title} version %{version} download"
   
\ No newline at end of file