diff --git a/redmine/app/controllers/account_controller.rb b/redmine/app/controllers/account_controller.rb
index b156bfd..bc65622 100644
--- a/redmine/app/controllers/account_controller.rb
+++ b/redmine/app/controllers/account_controller.rb
@@ -41,7 +41,7 @@ class AccountController < ApplicationController
         self.logged_in_user = user
         redirect_back_or_default :controller => 'account', :action => 'my_page'
       else
-        flash[:notice] = l(:notice_account_invalid_creditentials)
+        flash.now[:notice] = l(:notice_account_invalid_creditentials)
       end
     end
   end
@@ -64,7 +64,7 @@ class AccountController < ApplicationController
     @user = self.logged_in_user
     if request.post? and @user.update_attributes(@params[:user])
       set_localization
-      flash[:notice] = l(:notice_account_updated)
+      flash.now[:notice] = l(:notice_account_updated)
       self.logged_in_user.reload
     end
   end
@@ -72,11 +72,12 @@ class AccountController < ApplicationController
   # Change logged in user's password
   def change_password
     @user = self.logged_in_user
+    flash.now[:notice] = l(:notice_can_t_change_password) and render :action => 'my_account' and return if @user.auth_source_id
     if @user.check_password?(@params[:password])
       @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
-      flash[:notice] = l(:notice_account_password_updated) if @user.save
+      flash.now[:notice] = l(:notice_account_password_updated) if @user.save
     else
-      flash[:notice] = l(:notice_account_wrong_password)
+      flash.now[:notice] = l(:notice_account_wrong_password)
     end
     render :action => 'my_account'
   end
@@ -100,11 +101,16 @@ class AccountController < ApplicationController
       return
     else
       if request.post?
-        user = User.find_by_mail(params[:mail])      
-        flash[:notice] = l(:notice_account_unknown_email) and return unless user
+        user = User.find_by_mail(params[:mail])
+        # user not found in db
+        flash.now[:notice] = l(:notice_account_unknown_email) and return unless user
+        # user uses an external authentification
+        flash.now[:notice] = l(:notice_can_t_change_password) and return if user.auth_source_id
+        # create a new token for password recovery
         token = Token.new(:user => user, :action => "recovery")
         if token.save
-          Mailer.set_language_if_valid(Localization.lang)
+          # send token to user via email
+          Mailer.set_language_if_valid(user.language)
           Mailer.deliver_lost_password(token)
           flash[:notice] = l(:notice_account_lost_email_sent)
           redirect_to :action => 'login'
@@ -143,7 +149,7 @@ class AccountController < ApplicationController
         @user.custom_values = @custom_values
         token = Token.new(:user => @user, :action => "register")
         if @user.save and token.save
-          Mailer.set_language_if_valid(Localization.lang)
+          Mailer.set_language_if_valid(@user.language)
           Mailer.deliver_register(token)
           flash[:notice] = l(:notice_account_register_done)
           redirect_to :controller => ''
diff --git a/redmine/app/controllers/application.rb b/redmine/app/controllers/application.rb
index adae235..8acbb09 100644
--- a/redmine/app/controllers/application.rb
+++ b/redmine/app/controllers/application.rb
@@ -37,21 +37,19 @@ class ApplicationController < ActionController::Base
   end 
   
   def set_localization
-    Localization.lang = begin
-      if self.logged_in_user and Localization.langs.keys.include? self.logged_in_user.language
+    lang = begin
+      if self.logged_in_user and self.logged_in_user.language and !self.logged_in_user.language.empty? and GLoc.valid_languages.include? self.logged_in_user.language.to_sym
         self.logged_in_user.language
       elsif request.env['HTTP_ACCEPT_LANGUAGE']
         accept_lang = HTTPUtils.parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.split('-').first
-        if Localization.langs.keys.include? accept_lang
+        if accept_lang and !accept_lang.empty? and GLoc.valid_languages.include? accept_lang.to_sym
           accept_lang
         end
       end
     rescue
       nil
     end || $RDM_DEFAULT_LANG
-
-    set_language_if_valid(Localization.lang)
-    
+    set_language_if_valid(lang)    
   end
   
   def require_login
diff --git a/redmine/app/controllers/enumerations_controller.rb b/redmine/app/controllers/enumerations_controller.rb
index 01664c8..8e5be0a 100644
--- a/redmine/app/controllers/enumerations_controller.rb
+++ b/redmine/app/controllers/enumerations_controller.rb
@@ -38,7 +38,7 @@ class EnumerationsController < ApplicationController
   def create
     @enumeration = Enumeration.new(params[:enumeration])
     if @enumeration.save
-      flash[:notice] = 'Enumeration was successfully created.'
+      flash[:notice] = l(:notice_successful_create)
       redirect_to :action => 'list', :opt => @enumeration.opt
     else
       render :action => 'new'
@@ -52,7 +52,7 @@ class EnumerationsController < ApplicationController
   def update
     @enumeration = Enumeration.find(params[:id])
     if @enumeration.update_attributes(params[:enumeration])
-      flash[:notice] = 'Enumeration was successfully updated.'
+      flash[:notice] = l(:notice_successful_update)
       redirect_to :action => 'list', :opt => @enumeration.opt
     else
       render :action => 'edit'
@@ -60,7 +60,8 @@ class EnumerationsController < ApplicationController
   end
 
   def destroy
-    Enumeration.find(params[:id]).destroy
+    Enumeration.find(params[:id]).destroy
+    flash[:notice] = l(:notice_successful_delete)
     redirect_to :action => 'list'
   rescue
     flash[:notice] = "Unable to delete enumeration"
diff --git a/redmine/app/controllers/help_controller.rb b/redmine/app/controllers/help_controller.rb
index e51d077..6fde039 100644
--- a/redmine/app/controllers/help_controller.rb
+++ b/redmine/app/controllers/help_controller.rb
@@ -31,7 +31,7 @@ class HelpController < ApplicationController
       end
     end
     # choose language according to available help translations
-    lang = (@help_config['langs'].include? Localization.lang) ? Localization.lang : @help_config['langs'].first
+    lang = (@help_config['langs'].include? current_language) ? current_language : @help_config['langs'].first
 	
     if template
       redirect_to "/manual/#{lang}/#{template}"
diff --git a/redmine/app/controllers/projects_controller.rb b/redmine/app/controllers/projects_controller.rb
index 3c4d806..3d45f72 100644
--- a/redmine/app/controllers/projects_controller.rb
+++ b/redmine/app/controllers/projects_controller.rb
@@ -227,7 +227,7 @@ class ProjectsController < ApplicationController
     CSV::Writer.generate(export, ',') do |csv|
       csv << %w(Id Status Tracker Subject Author Created Updated)
       @issues.each do |issue|
-        csv << [issue.id, issue.status.name, issue.tracker.name, issue.subject, issue.author.display_name, _('(time)', issue.created_on),  _('(time)', issue.updated_on)]
+        csv << [issue.id, issue.status.name, issue.tracker.name, issue.subject, issue.author.display_name, l_datetime(issue.created_on),  l_datetime(issue.updated_on)]
       end
     end
     export.rewind
diff --git a/redmine/app/controllers/roles_controller.rb b/redmine/app/controllers/roles_controller.rb
index 657f62e..0e26ff5 100644
--- a/redmine/app/controllers/roles_controller.rb
+++ b/redmine/app/controllers/roles_controller.rb
@@ -37,7 +37,7 @@ class RolesController < ApplicationController
         redirect_to :action => 'list'
       end
     end
-    @permissions = Permission.find(:all, :order => 'sort ASC')
+    @permissions = Permission.find(:all, :conditions => ["is_public=?", false], :order => 'sort ASC')
   end
 
   def edit
@@ -48,7 +48,7 @@ class RolesController < ApplicationController
       flash[:notice] = 'Role was successfully updated.'
       redirect_to :action => 'list'
     end
-    @permissions = Permission.find(:all, :order => 'sort ASC')
+    @permissions = Permission.find(:all, :conditions => ["is_public=?", false], :order => 'sort ASC')
   end
 
   def destroy
@@ -61,8 +61,7 @@ class RolesController < ApplicationController
     redirect_to :action => 'list'
   end
   
-  def workflow
-    
+  def workflow    
     @role = Role.find_by_id(params[:role_id])
     @tracker = Tracker.find_by_id(params[:tracker_id])    
     
diff --git a/redmine/app/helpers/application_helper.rb b/redmine/app/helpers/application_helper.rb
index ddb8460..6e395d3 100644
--- a/redmine/app/helpers/application_helper.rb
+++ b/redmine/app/helpers/application_helper.rb
@@ -50,18 +50,18 @@ module ApplicationHelper
   end
 
   def format_date(date)
-    _('(date)', date) if date
+    l_date(date) if date
   end
   
   def format_time(time)
-    _('(time)', time) if time
+    l_datetime(time) if time
   end
   
   def pagination_links_full(paginator, options={}, html_options={})
     html =''
-    html << link_to(('&#171; ' + _('Previous') ), { :page => paginator.current.previous }) + ' ' if paginator.current.previous
+    html << link_to(('&#171; ' + l(:label_previous) ), { :page => paginator.current.previous }) + ' ' if paginator.current.previous
     html << (pagination_links(paginator, options, html_options) || '')
-    html << ' ' + link_to((_('Next') + ' &#187;'), { :page => paginator.current.next }) if paginator.current.next
+    html << ' ' + link_to((l(:label_next) + ' &#187;'), { :page => paginator.current.next }) if paginator.current.next
     html  
   end
   
@@ -90,4 +90,8 @@ module ApplicationHelper
       ""
     end
   end
+  
+  def lang_options_for_select
+    GLoc.valid_languages.collect {|lang| [ l_lang_name(lang.to_s, lang), lang.to_s]}
+  end
 end
diff --git a/redmine/app/helpers/search_filter_helper.rb b/redmine/app/helpers/search_filter_helper.rb
index 98b2812..62ff5f2 100644
--- a/redmine/app/helpers/search_filter_helper.rb
+++ b/redmine/app/helpers/search_filter_helper.rb
@@ -58,42 +58,43 @@ module SearchFilterHelper
 	
   def search_filter_init_list_issues
 	search_filter_criteria('status_id') { 
-    [ [_('[Open]'), "O", ["issue_statuses.is_closed=?", false]],
-      [_('[All]'), "A", nil]
+    [ [('['+l(:label_open_issues_plural)+']'), "O", ["issue_statuses.is_closed=?", false]],
+      [('['+l(:label_closed_issues_plural)+']'), "C", ["issue_statuses.is_closed=?", true]],
+      [('['+l(:label_all)+']'), "A", nil]
     ] + IssueStatus.find(:all).collect {|s| [s.name, s.id, ["issues.status_id=?", s.id]] }                                                      
     }
     
     search_filter_criteria('tracker_id') { 
-    [ [_('[All]'), "A", nil]
+    [ [('['+l(:label_all)+']'), "A", nil]
     ] + Tracker.find(:all).collect {|s| [s.name, s.id, ["issues.tracker_id=?", s.id]] }                                                      
     }
 	
     search_filter_criteria('priority_id') { 
-    [ [_('[All]'), "A", nil]
+    [ [('['+l(:label_all)+']'), "A", nil]
     ] + Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect {|s| [s.name, s.id, ["issues.priority_id=?", s.id]] }                                                      
     }
     
     search_filter_criteria('category_id') { 
-    [ [_('[All]'), "A", nil],
-      [_('[None]'), "N", ["issues.category_id is null"]]
+    [ [('['+l(:label_all)+']'), "A", nil],
+      [('['+l(:label_none)+']'), "N", ["issues.category_id is null"]]
     ] + @project.issue_categories.find(:all).collect {|s| [s.name, s.id, ["issues.category_id=?", s.id]] }                                                      
     }    
 
     search_filter_criteria('fixed_version_id') { 
-    [ [_('[All]'), "A", nil],
-      [_('[None]'), "N", ["issues.fixed_version_id is null"]]
+    [ [('['+l(:label_all)+']'), "A", nil],
+      [('['+l(:label_none)+']'), "N", ["issues.fixed_version_id is null"]]
     ] + @project.versions.collect {|s| [s.name, s.id, ["issues.fixed_version_id=?", s.id]] }                                                      
     }
 
     search_filter_criteria('assigned_to_id') { 
-    [ [_('[All]'), "A", nil],
-      [_('[None]'), "N", ["issues.assigned_to_id is null"]]
+    [ [('['+l(:label_all)+']'), "A", nil],
+      [('['+l(:label_none)+']'), "N", ["issues.assigned_to_id is null"]]
     ] + @project.users.collect {|s| [s.display_name, s.id, ["issues.assigned_to_id=?", s.id]] }                                                      
     }
     
     search_filter_criteria('subproject_id') { 
-    [ [_('[None]'), "N", ["issues.project_id=?", @project.id]],
-      [_('[All]'), "A", ["(issues.project_id=? or projects.parent_id=?)", @project.id, @project.id]]
+    [ [('['+l(:label_none)+']'), "N", ["issues.project_id=?", @project.id]],
+      [('['+l(:label_all)+']'), "A", ["(issues.project_id=? or projects.parent_id=?)", @project.id, @project.id]]
     ]                                                     
     }  
   end
diff --git a/redmine/app/models/auth_source_ldap.rb b/redmine/app/models/auth_source_ldap.rb
index 9579a10..895cf1c 100644
--- a/redmine/app/models/auth_source_ldap.rb
+++ b/redmine/app/models/auth_source_ldap.rb
@@ -30,7 +30,7 @@ class AuthSourceLdap < AuthSource
     # get user's DN
     ldap_con = initialize_ldap_con(self.account, self.account_password)
     login_filter = Net::LDAP::Filter.eq( self.attr_login, login ) 
-    object_filter = Net::LDAP::Filter.eq( "objectClass", "organizationalPerson" ) 
+    object_filter = Net::LDAP::Filter.eq( "objectClass", "*" ) 
     dn = String.new
     ldap_con.search( :base => self.base_dn, 
                      :filter => object_filter & login_filter, 
diff --git a/redmine/app/models/enumeration.rb b/redmine/app/models/enumeration.rb
index 7f985d2..122da15 100644
--- a/redmine/app/models/enumeration.rb
+++ b/redmine/app/models/enumeration.rb
@@ -21,18 +21,14 @@ class Enumeration < ActiveRecord::Base
 	validates_presence_of :opt, :name
 	validates_uniqueness_of :name, :scope => [:opt]
 	
-	OPTIONS = [
-		["Issue priorities", "IPRI"],
-		["Document categories", "DCAT"]
-	].freeze
+	OPTIONS = {
+	  "IPRI" => :enumeration_issue_priorities,
+      "DCAT" => :enumeration_doc_categories
+	}.freeze
 	
 	def self.get_values(option)
 		find(:all, :conditions => ['opt=?', option])
 	end
-
-  def name
-    _ self.attributes['name']
-  end
   
 private
   def check_integrity
diff --git a/redmine/app/models/issue_status.rb b/redmine/app/models/issue_status.rb
index ef98620..4265809 100644
--- a/redmine/app/models/issue_status.rb
+++ b/redmine/app/models/issue_status.rb
@@ -38,10 +38,6 @@ class IssueStatus < ActiveRecord::Base
     statuses
   end
   
-  def name
-    _ self.attributes['name']
-  end
-  
 private
   def check_integrity
     raise "Can't delete status" if Issue.find(:first, :conditions => ["status_id=?", self.id]) or IssueHistory.find(:first, :conditions => ["status_id=?", self.id])
diff --git a/redmine/app/models/mailer.rb b/redmine/app/models/mailer.rb
index bf4c85d..755764d 100644
--- a/redmine/app/models/mailer.rb
+++ b/redmine/app/models/mailer.rb
@@ -45,6 +45,5 @@ class Mailer < ActionMailer::Base
     @from           = 'redmine@somenet.foo'
     @subject        = "redMine account activation"
     @body['token']  = token
-  end  
-
+  end
 end
diff --git a/redmine/app/models/member.rb b/redmine/app/models/member.rb
index d379365..1214b64 100644
--- a/redmine/app/models/member.rb
+++ b/redmine/app/models/member.rb
@@ -16,14 +16,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Member < ActiveRecord::Base
-	belongs_to :user
-	belongs_to :role
-	belongs_to :project
-	
-	validates_presence_of :role, :user, :project
+  belongs_to :user
+  belongs_to :role
+  belongs_to :project
+
+  validates_presence_of :role, :user, :project
   validates_uniqueness_of :user_id, :scope => :project_id
-	
-	def name
-		self.user.display_name
-	end
+
+  def name
+    self.user.display_name
+  end
 end
diff --git a/redmine/app/models/news.rb b/redmine/app/models/news.rb
index c4884ac..faafa7e 100644
--- a/redmine/app/models/news.rb
+++ b/redmine/app/models/news.rb
@@ -16,13 +16,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class News < ActiveRecord::Base
-	belongs_to :project
-	belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
-	
-	validates_presence_of :title, :description
-
-	# returns last created news
-	def self.latest
-		find(:all, :limit => 5, :include => [ :author, :project ], :order => "news.created_on DESC")	
-	end	
+  belongs_to :project
+  belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
+  
+  validates_presence_of :title, :description
+  
+  # returns last created news
+  def self.latest
+    find(:all, :limit => 5, :include => [ :author, :project ], :order => "news.created_on DESC")	
+  end
 end
diff --git a/redmine/app/models/permission.rb b/redmine/app/models/permission.rb
index 164ca21..6209746 100644
--- a/redmine/app/models/permission.rb
+++ b/redmine/app/models/permission.rb
@@ -16,27 +16,27 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Permission < ActiveRecord::Base
-	has_and_belongs_to_many :roles
-  
-	validates_presence_of :controller, :action, :description
-  
+  has_and_belongs_to_many :roles
+
+  validates_presence_of :controller, :action, :description
+
   GROUPS = {
-    100 => "Project",
-		200 => "Membres",
-    300 => "Versions",
-    400 => "Issue categories",
-		1000 => "Issues",
-		1100 => "News",
-		1200 => "Documents",
-    1300 => "Files",
-	}.freeze
+    100 => :label_project,
+    200 => :label_member_plural,
+    300 => :label_version_plural,
+    400 => :label_issue_category_plural,
+    1000 => :label_issue_plural,
+    1100 => :label_news_plural,
+    1200 => :label_document_plural,
+    1300 => :label_attachment_plural,
+  }.freeze
   
   @@cached_perms_for_public = nil
   @@cached_perms_for_roles = nil
   
- 	def name
-		self.controller + "/" + self.action
-	end
+  def name
+    self.controller + "/" + self.action
+  end
   
   def group_id
     (self.sort / 100)*100
diff --git a/redmine/app/models/role.rb b/redmine/app/models/role.rb
index ce880b5..6908095 100644
--- a/redmine/app/models/role.rb
+++ b/redmine/app/models/role.rb
@@ -17,13 +17,13 @@
 
 class Role < ActiveRecord::Base
   before_destroy :check_integrity  
-	has_and_belongs_to_many :permissions
+  has_and_belongs_to_many :permissions
   has_many :workflows, :dependent => true
   has_many :members
-	
-	validates_presence_of :name
-	validates_uniqueness_of :name
-  
+
+  validates_presence_of :name
+  validates_uniqueness_of :name
+
 private
   def check_integrity
     raise "Can't delete role" if Member.find(:first, :conditions =>["role_id=?", self.id])
diff --git a/redmine/app/models/tracker.rb b/redmine/app/models/tracker.rb
index ca37eb9..a4376a3 100644
--- a/redmine/app/models/tracker.rb
+++ b/redmine/app/models/tracker.rb
@@ -24,10 +24,6 @@ class Tracker < ActiveRecord::Base
   validates_presence_of :name
   validates_uniqueness_of :name
   
-  def name
-    _ self.attributes['name']
-  end
-  
 private
   def check_integrity
     raise "Can't delete tracker" if Issue.find(:first, :conditions => ["tracker_id=?", self.id])
diff --git a/redmine/app/models/user.rb b/redmine/app/models/user.rb
index ea31348..ba489ac 100644
--- a/redmine/app/models/user.rb
+++ b/redmine/app/models/user.rb
@@ -57,7 +57,7 @@ class User < ActiveRecord::Base
         # user has an external authentication method
         return nil unless user.auth_source.authenticate(login, password)
       else
-        # local authentication
+        # authentication with local password
         return nil unless User.hash_password(password) == user.hashed_password        
       end
     else
@@ -69,6 +69,7 @@ class User < ActiveRecord::Base
         onthefly.language = $RDM_DEFAULT_LANG
         if onthefly.save
           user = find(:first, :conditions => ["login=?", login])
+          logger.info("User '#{user.login}' created on the fly.") if logger
         end
       end
     end    
diff --git a/redmine/app/views/account/my_account.rhtml b/redmine/app/views/account/my_account.rhtml
index 097e231..4aa6e62 100644
--- a/redmine/app/views/account/my_account.rhtml
+++ b/redmine/app/views/account/my_account.rhtml
@@ -23,7 +23,7 @@
   <%= text_field 'user', 'mail' %></p>
   
   <p><label for="user_language"><%=l(:field_language)%></label><br/>
-  <%= select("user", "language", Localization.langs.invert) %></p>
+  <%= select("user", "language", lang_options_for_select) %></p>
   <!--[eoform:user]-->
 
   <p><%= check_box 'user', 'mail_notification' %> <label for="user_mail_notification"><%=l(:field_mail_notification)%></label></p>
@@ -34,7 +34,8 @@
 </div>
 
 
-<div class="splitcontentright">
+<div class="splitcontentright">
+<% unless @user.auth_source_id %>
   <div class="box">
   <h3><%=l(:field_password)%></h3>
   &nbsp;
@@ -51,5 +52,6 @@
 
   <center><%= submit_tag l(:button_save) %></center>
   <%= end_form_tag %>
-  </div>
+  </div>
+<% end %>
 </div>
\ No newline at end of file
diff --git a/redmine/app/views/account/register.rhtml b/redmine/app/views/account/register.rhtml
index 2bdf380..3a953a2 100644
--- a/redmine/app/views/account/register.rhtml
+++ b/redmine/app/views/account/register.rhtml
@@ -1,7 +1,6 @@
 <h2><%=l(:label_register)%></h2>
 
 <%= start_form_tag %>
-
 <%= error_messages_for 'user' %>
 
 <div class="box">
@@ -25,22 +24,15 @@
 <%= text_field 'user', 'mail'  %></p>
 
 <p><label for="user_language"><%=l(:field_language)%></label><br/>
-<%= select("user", "language", Localization.langs.invert) %></p>
+<%= select("user", "language", lang_options_for_select) %></p>
 
-<% for custom_value in @custom_values %>
-  <div style="float:left;margin-right:10px;">
-	<p><%= content_tag "label", custom_value.custom_field.name %>
-	<% if custom_value.custom_field.is_required? %><span class="required">*</span><% end %>
-	<br />
-	<%= custom_field_tag custom_value %></p>
-  </div>
+<% for custom_value in @custom_values %>
+	<p><%= custom_field_tag_with_label custom_value %></p>
 <% end %>
 
-<div style="clear: both;"></div>
-
 <p><%= check_box 'user', 'mail_notification' %> <label for="user_mail_notification"><%=l(:field_mail_notification)%></label></p>
 <!--[eoform:user]-->
 </div>
 
-  <%= submit_tag l(:button_submit) %>
+<%= submit_tag l(:button_submit) %>
 <%= end_form_tag %>
diff --git a/redmine/app/views/admin/info.rhtml b/redmine/app/views/admin/info.rhtml
index 03dddaf..4777a15 100644
--- a/redmine/app/views/admin/info.rhtml
+++ b/redmine/app/views/admin/info.rhtml
@@ -1,4 +1,4 @@
-<h2><%=_('Information')%></h2>
+<h2><%=l(:label_information_plural)%></h2>
 
 <p><%=l(:field_version)%>: <strong><%= RDM_APP_NAME %> <%= RDM_APP_VERSION %></strong></p>
 
diff --git a/redmine/app/views/custom_fields/list.rhtml b/redmine/app/views/custom_fields/list.rhtml
index fba9521..7f45f7a 100644
--- a/redmine/app/views/custom_fields/list.rhtml
+++ b/redmine/app/views/custom_fields/list.rhtml
@@ -7,7 +7,7 @@
 	<th><%=l(:field_field_format)%></th>
 	<th><%=l(:field_is_required)%></th>
 	<th><%=l(:field_is_for_all)%></th>
-	<th><%=_('Used by')%></th>
+	<th><%=l(:label_used_by)%></th>
 	<th></th>
 </tr>  
 <% for custom_field in @custom_fields %>
diff --git a/redmine/app/views/documents/_form.rhtml b/redmine/app/views/documents/_form.rhtml
index e4dac38..ae56cdd 100644
--- a/redmine/app/views/documents/_form.rhtml
+++ b/redmine/app/views/documents/_form.rhtml
@@ -9,7 +9,7 @@
 <p><label for="document_title"><%=l(:field_title)%> <span class="required">*</span></label><br />
 <%= text_field 'document', 'title', :size => 60 %></p>
 
-<p><label for="document_description"><%=l(:field_description)%> <span class="required">*</span></label><br />
+<p><label for="document_description"><%=l(:field_description)%></label><br />
 <%= text_area 'document', 'description', :cols => 60, :rows => 5 %></p>
 <!--[eoform:document]-->
 
diff --git a/redmine/app/views/documents/edit.rhtml b/redmine/app/views/documents/edit.rhtml
index 2f1e9a9..059c99d 100644
--- a/redmine/app/views/documents/edit.rhtml
+++ b/redmine/app/views/documents/edit.rhtml
@@ -1,8 +1,8 @@
-<h2><%=_('Document')%></h2>
+<h2><%=l(:label_document)%></h2>
 
 <%= start_form_tag :action => 'edit', :id => @document %>
   <%= render :partial => 'form' %>
-  <%= submit_tag _('Save') %>
+  <%= submit_tag l(:button_save) %>
 <%= end_form_tag %>
 
 
diff --git a/redmine/app/views/documents/show.rhtml b/redmine/app/views/documents/show.rhtml
index 1cadf7c..1366213 100644
--- a/redmine/app/views/documents/show.rhtml
+++ b/redmine/app/views/documents/show.rhtml
@@ -1,18 +1,18 @@
 <h2><%= @document.title %></h2>
 
-<strong><%=_('Description')%>:</strong> <%= @document.description %><br />
-<strong><%=_('Category')%>:</strong> <%= @document.category.name %><br />
+<strong><%=l(:field_description)%>:</strong> <%= @document.description %><br />
+<strong><%=l(:field_category)%>:</strong> <%= @document.category.name %><br />
 <br />
 
 <% if authorize_for('documents', 'edit') %>
-  <%= start_form_tag ({ :controller => 'documents', :action => 'edit', :id => @document }, :method => 'get' ) %>
-  <%= submit_tag _('Edit') %>
+  <%= start_form_tag({ :controller => 'documents', :action => 'edit', :id => @document }, :method => 'get' ) %>
+  <%= submit_tag l(:button_edit) %>
   <%= end_form_tag %> 
 <% end %>
 
 <% if authorize_for('documents', 'destroy') %>
-  <%= start_form_tag ({ :controller => 'documents', :action => 'destroy', :id => @document } ) %>
-  <%= submit_tag _('Delete') %>
+  <%= start_form_tag({ :controller => 'documents', :action => 'destroy', :id => @document } ) %>
+  <%= submit_tag l(:button_delete) %>
   <%= end_form_tag %>  
 <% end %>
 
@@ -24,12 +24,12 @@
   <td><%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %></td>
   <td align="center"><%= format_date(attachment.created_on) %></td>
   <td align="center"><%= attachment.author.display_name %></td>
-  <td><%= human_size(attachment.filesize) %><br /><%= attachment.downloads %> <%=_('download')%>(s)</td>
+  <td><%= human_size(attachment.filesize) %><br /><%= lwr(:label_download, attachment.downloads) %></td>
   
   <% if authorize_for('documents', 'destroy_attachment') %>
   <td align="center">
     <%= start_form_tag :action => 'destroy_attachment', :id => @document, :attachment_id => attachment %>
-    <%= submit_tag _('Delete'), :class => "button-small" %>
+    <%= submit_tag l(:button_delete), :class => "button-small" %>
     <%= end_form_tag %>
   </tr>
   <% end %>
@@ -40,8 +40,8 @@
 
 <% if authorize_for('documents', 'add_attachment') %>
   <%= start_form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true) %>
-  <%=_('Add file')%><br /><%= file_field 'attachment', 'file'  %>
-  <%= submit_tag _('Add') %>
+  <%=l(:label_attachment_new)%><br /><%= file_field 'attachment', 'file'  %>
+  <%= submit_tag l(:button_add) %>
   <%= end_form_tag %> 
 <% end %>
 
diff --git a/redmine/app/views/enumerations/_form.rhtml b/redmine/app/views/enumerations/_form.rhtml
index d78dc35..280eebf 100644
--- a/redmine/app/views/enumerations/_form.rhtml
+++ b/redmine/app/views/enumerations/_form.rhtml
@@ -3,7 +3,7 @@
 <!--[form:optvalue]-->
 <%= hidden_field 'enumeration', 'opt'  %>
 
-<p><label for="enumeration_name"><%=_('Name')%></label><br/>
+<p><label for="enumeration_name"><%=l(:field_name)%></label><br/>
 <%= text_field 'enumeration', 'name'  %></p>
 <!--[eoform:optvalue]-->
 
diff --git a/redmine/app/views/enumerations/edit.rhtml b/redmine/app/views/enumerations/edit.rhtml
index 16bd377..5c26414 100644
--- a/redmine/app/views/enumerations/edit.rhtml
+++ b/redmine/app/views/enumerations/edit.rhtml
@@ -1,10 +1,10 @@
-<h2><%=_('Enumerations')%></h2>
+<h2><%=l(:label_enumerations)%></h2>
 
 <%= start_form_tag :action => 'update', :id => @enumeration %>
   <%= render :partial => 'form' %>
-  <%= submit_tag _('Save') %>
+  <%= submit_tag l(:button_save) %>
 <%= end_form_tag %>
 
 <%= start_form_tag :action => 'destroy', :id => @enumeration %>
-  <%= submit_tag _('Delete') %>
+  <%= submit_tag l(:button_delete) %>
 <%= end_form_tag %>
\ No newline at end of file
diff --git a/redmine/app/views/enumerations/list.rhtml b/redmine/app/views/enumerations/list.rhtml
index b5ce65c..15b91c1 100644
--- a/redmine/app/views/enumerations/list.rhtml
+++ b/redmine/app/views/enumerations/list.rhtml
@@ -1,22 +1,21 @@
-<h2><%=_('Enumerations')%></h2>
+<h2><%=l(:label_enumerations)%></h2>
 
-<% for option in Enumeration::OPTIONS %>
+<% Enumeration::OPTIONS.each do |option, name| %>
 
-	<% if @params[:opt]==option[1] %>	
+	<% if @params[:opt]==option %>	
   
-		<p><%= image_tag 'dir_open' %> <b><%=_ option[0] %></b></p>		
+		<p><%= image_tag 'dir_open' %> <b><%= l(name) %></b></p>		
 		<ul>
-		<% for value in Enumeration::find(:all, :conditions => [ "opt = ?", option[1]]) %>			
+		<% for value in Enumeration.find(:all, :conditions => ["opt = ?", option]) %>			
 			<li><%= link_to value.name, :action => 'edit', :id => value %></li>	
 		<% end %>
     </ul>
     <ul>
-      <li><%= link_to ('&#187; ' + _('New')), :action => 'new', :opt => option[1] %></li>
+      <li><%= link_to ('&#187; ' + l(:label_new)), :action => 'new', :opt => option %></li>
     </ul>
     
 	<% else %>	
-		<p><%= image_tag 'dir' %> <%= link_to _(option[0]), :opt => option[1] %></p>		
+		<p><%= image_tag 'dir' %> <%= link_to l(name), :opt => option %></p>		
 	<% end %>
   
-<% end %>
-
+<% end %>
\ No newline at end of file
diff --git a/redmine/app/views/enumerations/new.rhtml b/redmine/app/views/enumerations/new.rhtml
index 30048f2..87ede01 100644
--- a/redmine/app/views/enumerations/new.rhtml
+++ b/redmine/app/views/enumerations/new.rhtml
@@ -1,6 +1,6 @@
-<h2><%=_('New enumeration')%></h2>
+<h2><%=l(:label_enumeration_new)%></h2>
 
 <%= start_form_tag :action => 'create' %>
   <%= render :partial => 'form' %>
-  <%= submit_tag _('Create') %>
+  <%= submit_tag l(:button_create) %>
 <%= end_form_tag %>
diff --git a/redmine/app/views/issue_categories/_form.rhtml b/redmine/app/views/issue_categories/_form.rhtml
index eba2f16..fdf0cfd 100644
--- a/redmine/app/views/issue_categories/_form.rhtml
+++ b/redmine/app/views/issue_categories/_form.rhtml
@@ -1,7 +1,7 @@
 <%= error_messages_for 'issue_category' %>
 
 <!--[form:issue_category]-->
-<p><label for="issue_category_name"><%=_('Name')%></label><br/>
+<p><label for="issue_category_name"><%l(:field_name)%></label><br/>
 <%= text_field 'issue_category', 'name'  %></p>
 <!--[eoform:issue_category]-->
 
diff --git a/redmine/app/views/issue_categories/edit.rhtml b/redmine/app/views/issue_categories/edit.rhtml
index 3afdd1c..087dd7c 100644
--- a/redmine/app/views/issue_categories/edit.rhtml
+++ b/redmine/app/views/issue_categories/edit.rhtml
@@ -1,6 +1,6 @@
-<h2>Editing issue category</h2>
+<h2><%=l(:label_issue_category)%></h2>
 
 <%= start_form_tag :action => 'edit', :id => @category %>
   <%= render :partial => 'form' %>
-  <%= submit_tag _('Save') %>
+  <%= submit_tag l(:button_save) %>
 <%= end_form_tag %>
diff --git a/redmine/app/views/issue_statuses/_form.rhtml b/redmine/app/views/issue_statuses/_form.rhtml
index 7c4d636..237466a 100644
--- a/redmine/app/views/issue_statuses/_form.rhtml
+++ b/redmine/app/views/issue_statuses/_form.rhtml
@@ -1,16 +1,16 @@
 <%= error_messages_for 'issue_status' %>
 
 <!--[form:issue_status]-->
-<p><label for="issue_status_name"><%=_('Name')%></label> <span class="required">*</span><br/>
+<p><label for="issue_status_name"><%=l(:field_name)%></label> <span class="required">*</span><br/>
 <%= text_field 'issue_status', 'name'  %></p>
 
 <p><%= check_box 'issue_status', 'is_closed' %>
-<label for="issue_status_is_closed"><%=_('Issue closed')%></label></p>
+<label for="issue_status_is_closed"><%=l(:field_is_closed)%></label></p>
 
 <p><%= check_box 'issue_status', 'is_default' %>
-<label for="issue_status_is_default"><%=_('Default status')%></label></p>
+<label for="issue_status_is_default"><%=l(:field_is_default)%></label></p>
 
-<p><label for="issue_status_html_color"><%=_('Color')%></label>
+<p><label for="issue_status_html_color"><%=l(:field_html_color)%></label>
 #<%= text_field 'issue_status', 'html_color', :maxlength => 6 %> <span class="required">*</span></p>
 
 <!--[eoform:issue_status]-->
diff --git a/redmine/app/views/issue_statuses/edit.rhtml b/redmine/app/views/issue_statuses/edit.rhtml
index d3ed922..140a40d 100644
--- a/redmine/app/views/issue_statuses/edit.rhtml
+++ b/redmine/app/views/issue_statuses/edit.rhtml
@@ -1,6 +1,6 @@
-<h2><%=_('Issue status')%></h2>
+<h2><%=l(:label_issue_status)%></h2>
 
 <%= start_form_tag :action => 'update', :id => @issue_status %>
   <%= render :partial => 'form' %>
-  <%= submit_tag _('Save') %>
+  <%= submit_tag l(:button_save) %>
 <%= end_form_tag %>
diff --git a/redmine/app/views/issue_statuses/list.rhtml b/redmine/app/views/issue_statuses/list.rhtml
index 8c05322..ce7f846 100644
--- a/redmine/app/views/issue_statuses/list.rhtml
+++ b/redmine/app/views/issue_statuses/list.rhtml
@@ -1,11 +1,11 @@
-<h2><%=_('Issue statuses')%></h2>
+<h2><%=l(:label_issue_status_plural)%></h2>
  
 <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
   <tr class="ListHead">
-  <th><%=_('Status')%></th>
-  <th><%=_('Default status')%></th>
-  <th><%=_('Issue closed')%></th>
-  <th><%=_('Color')%></th>
+  <th><%=l(:field_status)%></th>
+  <th><%=l(:field_is_default)%></th>
+  <th><%=l(:field_is_closed)%></th>
+  <th><%=l(:field_html_color)%></th>
   <th></th>
   </tr>
   
@@ -17,7 +17,7 @@
   <td bgcolor="#<%= status.html_color %>">&nbsp</td>  
   <td align="center">
     <%= start_form_tag :action => 'destroy', :id => status %>
-    <%= submit_tag _('Delete'), :class => "button-small" %>
+    <%= submit_tag l(:button_delete), :class => "button-small" %>
     <%= end_form_tag %>
   </td>
   </tr>
@@ -27,4 +27,4 @@
 <%= pagination_links_full @issue_status_pages %>
 <br />
 
-<%= link_to '&#187; ' + _('New issue status'), :action => 'new' %>
+<%= link_to '&#187; ' + l(:label_issue_status_new), :action => 'new' %>
diff --git a/redmine/app/views/issue_statuses/new.rhtml b/redmine/app/views/issue_statuses/new.rhtml
index f7ac082..1dc61eb 100644
--- a/redmine/app/views/issue_statuses/new.rhtml
+++ b/redmine/app/views/issue_statuses/new.rhtml
@@ -1,6 +1,6 @@
-<h2><%=_('New issue status')%></h2>
+<h2><%=l(:label_issue_status_new)%></h2>
 
 <%= start_form_tag :action => 'create' %>
   <%= render :partial => 'form' %>
-  <%= submit_tag _('Create') %>
+  <%= submit_tag l(:button_create) %>
 <%= end_form_tag %>
diff --git a/redmine/app/views/issues/_list_simple.rhtml b/redmine/app/views/issues/_list_simple.rhtml
index 66b70a1..bcc05d1 100644
--- a/redmine/app/views/issues/_list_simple.rhtml
+++ b/redmine/app/views/issues/_list_simple.rhtml
@@ -1,28 +1,28 @@
 <% if issues.length > 0 %>
-	<table cellspacing="0" cellpadding="1" width="100%" border="0" class="listTable">
-		<tr><td>
-		<table width="100%" border="0" cellspacing="1" cellpadding="2" class="listTableContent">		
-			<tr class="ListHead">	
-				<th>#</th>
-				<th><%=_('Tracker')%></th>
-				<th><%=_('Subject')%></th>
-			</tr>	
-			<% for issue in issues %>
-			<tr bgcolor="#<%= issue.status.html_color %>">
-				<td align="center">
-					<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %><br />
-				</td>
-				<td><p class="small"><%= issue.project.name %> - <%= issue.tracker.name %><br />
-          <%= issue.status.name %> - <%= format_time(issue.updated_on) %></p></td>
-				<td>
-          <p class="small"><%= link_to issue.subject, :controller => 'issues', :action => 'show', :id => issue %></p>
-        </td>
-			</tr>
-			<% end %>
-		</table>
-		</td>
+<table cellspacing="0" cellpadding="1" width="100%" border="0" class="listTable">
+	<tr><td>
+	<table width="100%" border="0" cellspacing="1" cellpadding="2" class="listTableContent">		
+		<tr class="ListHead">	
+		<th>#</th>
+		<th><%=l(:field_tracker)%></th>
+		<th><%=l(:field_subject)%></th>
 		</tr>	
-	</table>
+		<% for issue in issues %>
+		<tr bgcolor="#<%= issue.status.html_color %>">
+			<td align="center">
+				<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %><br />
+			</td>
+			<td><p class="small"><%= issue.project.name %> - <%= issue.tracker.name %><br />
+                <%= issue.status.name %> - <%= format_time(issue.updated_on) %></p></td>
+			<td>
+                <p class="small"><%= link_to issue.subject, :controller => 'issues', :action => 'show', :id => issue %></p>
+            </td>
+		</tr>
+		<% end %>
+	</table>
+	</td>
+	</tr>	
+</table>
 <% else %>
-	<%=_('No issue')%>
+	<i><%=l(:label_no_data)%></i>
 <% end %>
\ No newline at end of file
diff --git a/redmine/app/views/issues/change_status.rhtml b/redmine/app/views/issues/change_status.rhtml
index aa85ae2..35494db 100644
--- a/redmine/app/views/issues/change_status.rhtml
+++ b/redmine/app/views/issues/change_status.rhtml
@@ -1,4 +1,4 @@
-<h2><%=_('Issue')%> #<%= @issue.id %>: <%= @issue.subject %></h2>
+<h2><%=l(:label_issue)%> #<%= @issue.id %>: <%= @issue.subject %></h2>
 
 <%= error_messages_for 'history' %>
 <%= start_form_tag :action => 'change_status', :id => @issue %>
@@ -7,26 +7,25 @@
 <%= hidden_field 'history', 'status_id' %>
 
 <div class="box">
-<p><%=_('New status')%>: <b><%= @history.status.name %></b></p>
+<p><%=l(:label_issue_status_new)%>: <b><%= @history.status.name %></b></p>
 
 <div>
-<p><label for="issue_assigned_to_id"><%=_('Assigned to')%></label><br/>
+<p><label for="issue_assigned_to_id"><%=l(:field_assigned_to)%></label><br/>
 <select name="issue[assigned_to_id]">
 <option value=""></option>
 <%= options_from_collection_for_select @assignable_to, "id", "display_name", @issue.assigned_to_id %></p>
 </select></p>
 </div>
 
-<p><label for="issue_fixed_version"><%=_('Fixed in version')%></label><br/>
+<p><label for="issue_fixed_version"><%=l(:field_fixed_version)%></label><br/>
 <select name="issue[fixed_version_id]">
 <option value="">--none--</option>
 <%= options_from_collection_for_select @issue.project.versions, "id", "name", @issue.fixed_version_id %>
 </select></p>
 
-<p><label for="history_notes"><%=_('Notes')%></label><br />
+<p><label for="history_notes"><%=l(:field_notes)%></label><br />
 <%= text_area 'history', 'notes', :cols => 60, :rows => 10  %></p>
 </div>
-
 
-<%= submit_tag _('Save') %>
+<%= submit_tag l(:button_save) %>
 <%= end_form_tag %>
diff --git a/redmine/app/views/issues/edit.rhtml b/redmine/app/views/issues/edit.rhtml
index 876542f..b8fc6ad 100644
--- a/redmine/app/views/issues/edit.rhtml
+++ b/redmine/app/views/issues/edit.rhtml
@@ -1,21 +1,21 @@
-<h2><%=_@issue.tracker.name%> #<%= @issue.id %> - <%= @issue.subject %></h2>
+<h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%= @issue.subject %></h2>
 
 <%= error_messages_for 'issue' %>
 <%= start_form_tag :action => 'edit', :id => @issue %>
 
 <div class="box">
 <!--[form:issue]-->
-<p><%=_('Status')%>: <b><%= @issue.status.name %></b></p>
+<p><%=l(:field_status)%>: <b><%= @issue.status.name %></b></p>
 
 <div style="float:left;margin-right:10px;">
-<p><label for="issue_priority_id"><%=_('Priority')%> <span class="required">*</span></label><br/>
+<p><label for="issue_priority_id"><%=l(:field_priority)%> <span class="required">*</span></label><br/>
 <select name="issue[priority_id]">
 <%= options_from_collection_for_select @priorities, "id", "name", @issue.priority_id %></p>
 </select></p>
 </div>
 
 <div style="float:left;margin-right:10px;">
-<p><label for="issue_assigned_to_id"><%=_('Assigned to')%></label><br/>
+<p><label for="issue_assigned_to_id"><%=l(:field_assigned_to)%></label><br/>
 <select name="issue[assigned_to_id]">
 <option value=""></option>
 <%= options_from_collection_for_select @issue.project.members, "user_id", "name", @issue.assigned_to_id %></p>
@@ -23,24 +23,27 @@
 </div>
 
 <div>
-<p><label for="issue_category_id"><%=_('Category')%></label><br/>
+<p><label for="issue_category_id"><%=l(:field_category)%></label><br/>
 <select name="issue[category_id]">
 <option value=""></option>
 <%= options_from_collection_for_select @project.issue_categories, "id", "name", @issue.category_id %></p>
 </select></p>
 </div>
 
-<p><label for="issue_subject"><%=_('Subject')%></label><span class="required">*</span><br/>
+<p><label for="issue_subject"><%=l(:field_subject)%></label><span class="required">*</span><br/>
 <%= text_field 'issue', 'subject', :size => 60  %></p>
 
-<p><label for="issue_description"><%=_('Description')%></label><span class="required">*</span><br/>
+<p><label for="issue_description"><%=l(:field_description)%></label><span class="required">*</span><br/>
 <%= text_area 'issue', 'description', :cols => 60, :rows => 10  %></p>
+
+<p><label for="issue_due_date"><%=l(:field_due_date)%></label><br />
+<%= date_select 'issue', 'due_date', :start_year => Date.today.year, :include_blank => true %></p>
 
 <% for custom_value in @custom_values %>
 	<p><%= custom_field_tag_with_label custom_value %></p>
 <% end %>
 
-<p><label for="issue_fixed_version"><%=_('Fixed in version')%></label><br/>
+<p><label for="issue_fixed_version"><%=l(:field_fixed_version)%></label><br/>
 <select name="issue[fixed_version_id]">
 <option value="">--none--</option>
 <%= options_from_collection_for_select @project.versions, "id", "name", @issue.fixed_version_id %>
@@ -49,5 +52,5 @@
 <!--[eoform:issue]-->
 </div>
 
-<%= submit_tag _('Save') %>
+<%= submit_tag l(:button_save) %>
 <%= end_form_tag %>
diff --git a/redmine/app/views/issues/show.rhtml b/redmine/app/views/issues/show.rhtml
index 649f9ad..acba6af 100644
--- a/redmine/app/views/issues/show.rhtml
+++ b/redmine/app/views/issues/show.rhtml
@@ -1,42 +1,43 @@
-
-<h2><%=_(@issue.tracker.name)%> #<%= @issue.id %> - <%= @issue.subject %></h2>
+<h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%= @issue.subject %></h2>
 
 <div class="box">
-<p><b><%=_('Status')%>:</b> <%= @issue.status.name %></p>
-<p><b><%=_('Priority')%>:</b> <%= @issue.priority.name %></p>
-<p><b><%=_('Category')%>:</b> <%= @issue.category.name unless @issue.category_id.nil? %></p>
-<p><b><%=_('Author')%>:</b> <%= @issue.author.display_name %></p>
-<p><b><%=_('Assigned to')%>:</b> <%= @issue.assigned_to.display_name unless @issue.assigned_to.nil? %></p>
-
-<p><b><%=_('Subject')%>:</b> <%= @issue.subject %></p>
-<p><b><%=_('Description')%>:</b> <%= simple_format auto_link @issue.description %></p>
-<p><b><%=_('Created on')%>:</b> <%= format_date(@issue.created_on) %></p>
+<p>
+<b><%=l(:field_status)%> :</b> <%= @issue.status.name %> &nbsp &nbsp
+<b><%=l(:field_priority)%> :</b> <%= @issue.priority.name %> &nbsp &nbsp
+<b><%=l(:field_assigned_to)%> :</b> <%= @issue.assigned_to ? @issue.assigned_to.display_name : "-" %> &nbsp &nbsp
+<b><%=l(:field_category)%> :</b> <%= @issue.category ? @issue.category.name : "-"  %>
+</p>
+<p><b><%=l(:field_author)%> :</b> <%= @issue.author.display_name %></p>
+<p><b><%=l(:field_subject)%> :</b> <%= @issue.subject %></p>
+<p><b><%=l(:field_description)%> :</b> <%= simple_format auto_link @issue.description %></p>
+<p><b><%=l(:field_due_date)%> :</b> <%= format_date(@issue.due_date) %></p>
+<p><b><%=l(:field_created_on)%> :</b> <%= format_date(@issue.created_on) %></p>
 
 <% for custom_value in @custom_values %>
-<p><b><%= custom_value.custom_field.name %></b>: <%= show_value custom_value %></p>
+<p><b><%= custom_value.custom_field.name %></b> : <%= show_value custom_value %></p>
 <% end %>
 
 <% if authorize_for('issues', 'edit') %>
   <%= start_form_tag ({:controller => 'issues', :action => 'edit', :id => @issue}, :method => "get" ) %>
-  <%= submit_tag _('Edit') %>
+  <%= submit_tag l(:button_edit) %>
   <%= end_form_tag %>
   &nbsp;&nbsp;
 <% end %>
 
 <% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %>
   <%= start_form_tag ({:controller => 'issues', :action => 'change_status', :id => @issue}) %>
-  <label for="history_status_id"><%=_('Change status')%>:</label>
+  <label for="history_status_id"><%=l(:label_change_status)%> :</label>
   <select name="history[status_id]">
   <%= options_from_collection_for_select @status_options, "id", "name" %>
   </select>
-  <%= submit_tag _ "Update..." %>
+  <%= submit_tag l(:button_change) %>
   <%= end_form_tag %>
   &nbsp;&nbsp;
 <% end %>
 
 <% if authorize_for('issues', 'destroy') %>
   <%= start_form_tag ({:controller => 'issues', :action => 'destroy', :id => @issue} ) %>
-  <%= submit_tag _ "Delete" %>
+  <%= submit_tag l(:button_delete) %>
   <%= end_form_tag %>
   &nbsp;&nbsp;
 <% end %>
@@ -46,7 +47,7 @@
 
 <div class="splitcontentleft">
 <div class="box">
-<h3><%=_('History')%></h3>
+<h3><%=l(:label_history)%></h3>
 <table width="100%">
 <% for history in @issue.histories.find(:all, :include => :author) %>
 <tr>
@@ -64,7 +65,7 @@
 
 <div class="splitcontentright">
 <div class="box">
-<h3><%=_('Attachments')%></h3>
+<h3><%=l(:label_attachment_plural)%></h3>
 <table width="100%">
 <% for attachment in @issue.attachments %>
 <tr>
@@ -74,7 +75,7 @@
 <% if authorize_for('issues', 'destroy_attachment') %>
   <td>
   <%= start_form_tag :action => 'destroy_attachment', :id => @issue, :attachment_id => attachment %>
-  <%= submit_tag _('Delete'), :class => "button-small" %>
+  <%= submit_tag l(:button_delete), :class => "button-small" %>
   <%= end_form_tag %>
   </td>
 <% end %>
@@ -84,8 +85,8 @@
 <br />
 <% if authorize_for('issues', 'add_attachment') %>
   <%= start_form_tag ({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true) %>
-  <%=_('Add file')%>: <%= file_field 'attachment', 'file'  %>
-  <%= submit_tag _('Add') %>
+  <%=l(:label_attachment_new)%>: <%= file_field 'attachment', 'file'  %>
+  <%= submit_tag l(:button_add) %>
   <%= end_form_tag %> 
 <% end %>
 </div>
diff --git a/redmine/app/views/layouts/base.rhtml b/redmine/app/views/layouts/base.rhtml
index de99a0b..dd85ed5 100644
--- a/redmine/app/views/layouts/base.rhtml
+++ b/redmine/app/views/layouts/base.rhtml
@@ -14,33 +14,33 @@
 <script type='text/javascript'>
 var menu_contenu=' \
 <div id="menuAdmin" class="menu" onmouseover="menuMouseover(event)"> \
-<a class="menuItem" href="\/admin\/projects" onmouseover="menuItemMouseover(event,\'menuProjects\');"><span class="menuItemText"><%=_('Projects')%><\/span><span class="menuItemArrow">&#9654;<\/span><\/a> \
-<a class="menuItem" href="\/users" onmouseover="menuItemMouseover(event,\'menuUsers\');"><span class="menuItemText"><%=_('Users')%><\/span><span class="menuItemArrow">&#9654;<\/span><\/a> \
-<a class="menuItem" href="\/roles"><%=_('Roles and permissions')%><\/a> \
-<a class="menuItem" href="\/trackers" onmouseover="menuItemMouseover(event,\'menuTrackers\');"><span class="menuItemText"><%=_('Trackers')%><\/span><span class="menuItemArrow">&#9654;<\/span><\/a> \
-<a class="menuItem" href="\/custom_fields"><%=_('Custom fields')%><\/a> \
-<a class="menuItem" href="\/enumerations"><%=_('Enumerations')%><\/a> \
-<a class="menuItem" href="\/admin\/mail_options"><%=_('Mail notifications')%><\/a> \
+<a class="menuItem" href="\/admin\/projects" onmouseover="menuItemMouseover(event,\'menuProjects\');"><span class="menuItemText"><%=l(:label_project_plural)%><\/span><span class="menuItemArrow">&#9654;<\/span><\/a> \
+<a class="menuItem" href="\/users" onmouseover="menuItemMouseover(event,\'menuUsers\');"><span class="menuItemText"><%=l(:label_user_plural)%><\/span><span class="menuItemArrow">&#9654;<\/span><\/a> \
+<a class="menuItem" href="\/roles"><%=l(:label_role_and_permissions)%><\/a> \
+<a class="menuItem" href="\/trackers" onmouseover="menuItemMouseover(event,\'menuTrackers\');"><span class="menuItemText"><%=l(:label_tracker_plural)%><\/span><span class="menuItemArrow">&#9654;<\/span><\/a> \
+<a class="menuItem" href="\/custom_fields"><%=l(:label_custom_field_plural)%><\/a> \
+<a class="menuItem" href="\/enumerations"><%=l(:label_enumerations)%><\/a> \
+<a class="menuItem" href="\/admin\/mail_options"><%=l(:field_mail_notification)%><\/a> \
 <a class="menuItem" href="\/auth_sources"><%=l(:label_authentication)%><\/a> \
-<a class="menuItem" href="\/admin\/info"><%=_('Information')%><\/a> \
+<a class="menuItem" href="\/admin\/info"><%=l(:label_information_plural)%><\/a> \
 <\/div> \
 <div id="menuTrackers" class="menu"> \
-<a class="menuItem" href="\/issue_statuses"><%=_('Issue Statuses')%><\/a> \
-<a class="menuItem" href="\/roles\/workflow"><%=_('Workflow')%><\/a> \
+<a class="menuItem" href="\/issue_statuses"><%=l(:label_issue_status_plural)%><\/a> \
+<a class="menuItem" href="\/roles\/workflow"><%=l(:label_workflow)%><\/a> \
 <\/div> \
-<div id="menuProjects" class="menu"><a class="menuItem" href="\/projects\/add"><%=_('New')%><\/a><\/div> \
-<div id="menuUsers" class="menu"><a class="menuItem" href="\/users\/add"><%=_('New')%><\/a><\/div> \
+<div id="menuProjects" class="menu"><a class="menuItem" href="\/projects\/add"><%=l(:label_new)%><\/a><\/div> \
+<div id="menuUsers" class="menu"><a class="menuItem" href="\/users\/add"><%=l(:label_new)%><\/a><\/div> \
  \
 <% unless @project.nil? || @project.id.nil? %> \
 <div id="menuProject" class="menu" onmouseover="menuMouseover(event)"> \
-<%= link_to _('Issues'), {:controller => 'projects', :action => 'list_issues', :id => @project }, :class => "menuItem" %> \
-<%= link_to _('Reports'), {:controller => 'reports', :action => 'issue_report', :id => @project }, :class => "menuItem" %> \
-<%= link_to _('News'), {:controller => 'projects', :action => 'list_news', :id => @project }, :class => "menuItem" %> \
-<%= link_to _('Change log'), {:controller => 'projects', :action => 'changelog', :id => @project }, :class => "menuItem" %> \
-<%= link_to _('Documents'), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %> \
-<%= link_to _('Members'), {:controller => 'projects', :action => 'list_members', :id => @project }, :class => "menuItem" %> \
-<%= link_to _('Files'), {:controller => 'projects', :action => 'list_files', :id => @project }, :class => "menuItem" %> \
-<%= link_to_if_authorized _('Settings'), {:controller => 'projects', :action => 'settings', :id => @project }, :class => "menuItem" %> \
+<%= link_to l(:label_issue_plural), {:controller => 'projects', :action => 'list_issues', :id => @project }, :class => "menuItem" %> \
+<%= link_to l(:label_report_plural), {:controller => 'reports', :action => 'issue_report', :id => @project }, :class => "menuItem" %> \
+<%= link_to l(:label_news_plural), {:controller => 'projects', :action => 'list_news', :id => @project }, :class => "menuItem" %> \
+<%= link_to l(:label_change_log), {:controller => 'projects', :action => 'changelog', :id => @project }, :class => "menuItem" %> \
+<%= link_to l(:label_document_plural), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %> \
+<%= link_to l(:label_member_plural), {:controller => 'projects', :action => 'list_members', :id => @project }, :class => "menuItem" %> \
+<%= link_to l(:label_attachment_plural), {:controller => 'projects', :action => 'list_files', :id => @project }, :class => "menuItem" %> \
+<%= link_to_if_authorized l(:label_settings), {:controller => 'projects', :action => 'settings', :id => @project }, :class => "menuItem" %> \
 <\/div> \
 <% end %> \
 ';
@@ -95,20 +95,20 @@ var menu_contenu=' \
 		<% unless @project.nil? || @project.id.nil? %>
 			<h2><%= @project.name %></h2>
 			<ul class="menublock">
-				<li><%= link_to _('Overview'), :controller => 'projects', :action => 'show', :id => @project %></li>
-				<li><%= link_to _('Issues'), :controller => 'projects', :action => 'list_issues', :id => @project %></li>
-				<li><%= link_to _('Reports'), :controller => 'reports', :action => 'issue_report', :id => @project %></li>
-				<li><%= link_to _('News'), :controller => 'projects', :action => 'list_news', :id => @project %></li>
-				<li><%= link_to _('Change log'), :controller => 'projects', :action => 'changelog', :id => @project %></li>
-				<li><%= link_to _('Documents'), :controller => 'projects', :action => 'list_documents', :id => @project %></li>
-				<li><%= link_to _('Members'), :controller => 'projects', :action => 'list_members', :id => @project %></li>
-				<li><%= link_to _('Files'), :controller => 'projects', :action => 'list_files', :id => @project %></li>
-				<li><%= link_to_if_authorized _('Settings'), :controller => 'projects', :action => 'settings', :id => @project %></li>
+				<li><%= link_to l(:label_overview), :controller => 'projects', :action => 'show', :id => @project %></li>
+				<li><%= link_to l(:label_issue_plural), :controller => 'projects', :action => 'list_issues', :id => @project %></li>
+				<li><%= link_to l(:label_report_plural), :controller => 'reports', :action => 'issue_report', :id => @project %></li>
+				<li><%= link_to l(:label_news_plural), :controller => 'projects', :action => 'list_news', :id => @project %></li>
+				<li><%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %></li>
+				<li><%= link_to l(:label_document_plural), :controller => 'projects', :action => 'list_documents', :id => @project %></li>
+				<li><%= link_to l(:label_member_plural), :controller => 'projects', :action => 'list_members', :id => @project %></li>
+				<li><%= link_to l(:label_attachment_plural), :controller => 'projects', :action => 'list_files', :id => @project %></li>
+				<li><%= link_to_if_authorized l(:label_settings), :controller => 'projects', :action => 'settings', :id => @project %></li>
 			</ul>
 		<% end %>
 		
 		<% if loggedin? and @logged_in_user.memberships.length > 0 %>
-			<h2><%=_('My projects') %></h2>
+			<h2><%=l(:label_my_projects) %></h2>
 			<ul class="menublock">
 				<% for membership in @logged_in_user.memberships %>	
 					<li><%= link_to membership.project.name, :controller => 'projects', :action => 'show', :id => membership.project %></li>
diff --git a/redmine/app/views/mailer/_issue.rhtml b/redmine/app/views/mailer/_issue.rhtml
index f2ab6fa..57acb4b 100644
--- a/redmine/app/views/mailer/_issue.rhtml
+++ b/redmine/app/views/mailer/_issue.rhtml
@@ -1,5 +1,5 @@
-<%=_('Issue')%> #<%= issue.id %> - <%= issue.subject %>
-<%=_('Author')%>: <%= issue.author.display_name %>
+<%=l(:label_issue)%> #<%= issue.id %> - <%= issue.subject %>
+<%=l(:field_author)%>: <%= issue.author.display_name %>
 
 <%= issue.description %>
 
diff --git a/redmine/app/views/news/_form.rhtml b/redmine/app/views/news/_form.rhtml
index ea6d5df..564a883 100644
--- a/redmine/app/views/news/_form.rhtml
+++ b/redmine/app/views/news/_form.rhtml
@@ -1,13 +1,13 @@
 <%= error_messages_for 'news' %>
 
 <!--[form:news]-->
-<p><label for="news_title"><%=_('Title')%></label> <span class="required">*</span><br/>
+<p><label for="news_title"><%=l(:field_title)%></label> <span class="required">*</span><br/>
 <%= text_field 'news', 'title', :size => 60  %></p>
 
-<p><label for="news_summary"><%=_('Summary')%></label><br/>
+<p><label for="news_summary"><%=l(:field_summary)%></label><br/>
 <%= text_area 'news', 'summary', :cols => 60, :rows => 2 %></p>
 
-<p><label for="news_description"><%=_('Description')%> <span class="required">*</span></label><br/>
+<p><label for="news_description"><%=l(:field_description)%> <span class="required">*</span></label><br/>
 <%= text_area 'news', 'description', :cols => 60, :rows => 10 %></p>
 <!--[eoform:news]-->
 
diff --git a/redmine/app/views/news/edit.rhtml b/redmine/app/views/news/edit.rhtml
index 2e849ab..27f7ac9 100644
--- a/redmine/app/views/news/edit.rhtml
+++ b/redmine/app/views/news/edit.rhtml
@@ -1,6 +1,6 @@
-<h2><%=_('News')%></h2>
+<h2><%=l(:label_news)%></h2>
 
 <%= start_form_tag :action => 'edit', :id => @news %>
   <%= render :partial => 'form' %>
-  <%= submit_tag _('Save') %>
+  <%= submit_tag l(:button_save) %>
 <%= end_form_tag %>
diff --git a/redmine/app/views/news/show.rhtml b/redmine/app/views/news/show.rhtml
index f571b54..2ff75fa 100644
--- a/redmine/app/views/news/show.rhtml
+++ b/redmine/app/views/news/show.rhtml
@@ -1,9 +1,9 @@
 <h2><%= @news.title %></h2>
 
 <p>
-<b><%=_('Summary')%></b>: <%= @news.summary %><br />
-<b><%=_('By')%></b>: <%= @news.author.display_name %><br />
-<b><%=_('Date')%></b>: <%= format_time(@news.created_on) %>
+<b><%=l(:field_summary)%></b>: <%= @news.summary %><br />
+<b><%=l(:field_author)%></b>: <%= @news.author.display_name %><br />
+<b><%=l(:field_created_on)%></b>: <%= format_time(@news.created_on) %>
 </p>
 
 <%= simple_format auto_link @news.description %>
diff --git a/redmine/app/views/projects/_form.rhtml b/redmine/app/views/projects/_form.rhtml
index 9623a9d..06fdc46 100644
--- a/redmine/app/views/projects/_form.rhtml
+++ b/redmine/app/views/projects/_form.rhtml
@@ -2,31 +2,31 @@
 
 <div class="box">
 <!--[form:project]-->
-<p><label for="project_name"><%=_('Name')%> <span class="required">*</span></label><br/>
+<p><label for="project_name"><%=l(:field_name)%> <span class="required">*</span></label><br/>
 <%= text_field 'project', 'name'  %></p>
 
 <% if admin_loggedin? %>
-<p><label for="project_parent_id"><%=_('Subproject of')%></label><br/>
+<p><label for="project_parent_id"><%=l(:field_parent)%></label><br/>
 <select name="project[parent_id]">
 <option value=""></option>
 <%= options_from_collection_for_select @root_projects, "id", "name", @project.parent_id %>
 </select></p>
 <% end %>
 
-<p><label for="project_description"><%=_('Description')%> <span class="required">*</span></label><br/>
+<p><label for="project_description"><%=l(:field_description)%> <span class="required">*</span></label><br/>
 <%= text_area 'project', 'description', :cols => 60, :rows => 3 %></p>
 
-<p><label for="project_homepage"><%=_('Homepage')%></label><br/>
+<p><label for="project_homepage"><%=l(:field_homepage)%></label><br/>
 <%= text_field 'project', 'homepage', :size => 40 %></p>
 
 <p><%= check_box 'project', 'is_public' %>
-<label for="project_is_public"><%=_('Public')%></label></p>
+<label for="project_is_public"><%=l(:field_is_public)%></label></p>
 
 <% for custom_value in @custom_values %>
 	<p><%= custom_field_tag_with_label custom_value %></p>
 <% end %>
 
-<fieldset><legend><%=_('Custom fields')%></legend>
+<fieldset><legend><%=l(:label_custom_field_plural)%></legend>
 <% for custom_field in @custom_fields %>
 	<input type="checkbox"
 	
diff --git a/redmine/app/views/projects/add.rhtml b/redmine/app/views/projects/add.rhtml
index bdfe086..2dd4eb4 100644
--- a/redmine/app/views/projects/add.rhtml
+++ b/redmine/app/views/projects/add.rhtml
@@ -1,6 +1,6 @@
-<h2><%=_('New project')%></h2>
+<h2><%=l(:label_project_new)%></h2>
 
 <%= start_form_tag :action => 'add' %>
 <%= render :partial => 'form' %>
-<%= submit_tag _('Create') %>
+<%= submit_tag l(:button_create) %>
 <%= end_form_tag %>
diff --git a/redmine/app/views/projects/add_document.rhtml b/redmine/app/views/projects/add_document.rhtml
index f1adc8d..8d6d2e3 100644
--- a/redmine/app/views/projects/add_document.rhtml
+++ b/redmine/app/views/projects/add_document.rhtml
@@ -1,26 +1,12 @@
-<h2><%=_('New document')%></h2>
+<h2><%=l(:label_document_new)%></h2>
 
-<%= error_messages_for 'document' %>
 <%= start_form_tag( { :action => 'add_document', :id => @project }, :multipart => true) %>
-
-<!--[form:document]-->
-<p><label for="document_category_id"><%=_('Category')%></label><br />
-<select name="document[category_id]">
-<%= options_from_collection_for_select @categories, "id", "name",@document.category_id %>
-</select></p>
-
-<p><label for="document_title"><%=_('Title')%> <span class="required">*</span></label><br />
-<%= text_field 'document', 'title', :size => 60 %></p>
-
-<p><label for="document_description"><%=_('Description')%> <span class="required">*</span></label><br />
-<%= text_area 'document', 'description', :cols => 60, :rows => 5 %></p>
+<%= render :partial => 'documents/form' %>
 
-<p><label for="attachment_file"><%=_('File')%></label><br/>
+<p><label for="attachment_file"><%=l(:label_attachment)%></label><br/>
 <%= file_field 'attachment', 'file'  %></p>
 
-<!--[eoform:document]-->
-
-<%= submit_tag _('Create') %>
+<%= submit_tag l(:button_create) %>
 <%= end_form_tag %>
 
 
diff --git a/redmine/app/views/projects/add_file.rhtml b/redmine/app/views/projects/add_file.rhtml
index 4e8ce9b..fee67c5 100644
--- a/redmine/app/views/projects/add_file.rhtml
+++ b/redmine/app/views/projects/add_file.rhtml
@@ -1,13 +1,14 @@
-<h2><%=_('New file')%></h2>
+<h2><%=l(:label_attachment_new)%></h2>
 
+<%= error_messages_for 'attachment' %>
 <%= start_form_tag ({ :action => 'add_file', :project => @project }, :multipart => true) %>
 
-<p><label for="version_id"><%=_('Version')%></label><br />
+<p><label for="version_id"><%=l(:field_version)%></label><br />
 <select name="version_id">
 <%= options_from_collection_for_select @versions, "id", "name" %>
 </select></p>
 
-<p><b><%=_('File')%><b><br /><%= file_field 'attachment', 'file'  %></p>
+<p><b><%=l(:label_attachment)%><b><br /><%= file_field 'attachment', 'file'  %></p>
 <br/>
-<%= submit_tag _('Add') %>
+<%= submit_tag l(:button_add) %>
 <%= end_form_tag %> 
\ No newline at end of file
diff --git a/redmine/app/views/projects/add_issue.rhtml b/redmine/app/views/projects/add_issue.rhtml
index 5e4d450..48d296f 100644
--- a/redmine/app/views/projects/add_issue.rhtml
+++ b/redmine/app/views/projects/add_issue.rhtml
@@ -1,4 +1,4 @@
-<h2><%=_('New issue')%>: <%=_(@tracker.name)%></h2>
+<h2><%=l(:label_issue_new)%>: <%= @tracker.name %></h2>
 
 <%= start_form_tag( { :action => 'add_issue', :id => @project }, :multipart => true) %>
 <%= error_messages_for 'issue' %>
@@ -9,14 +9,14 @@
 <%= hidden_field_tag 'tracker_id', @tracker.id %>
 
 <div style="float:left;margin-right:10px;">
-<p><label for="issue_priority_id"><%=_('Priority')%> <span class="required">*</span></label><br/>
+<p><label for="issue_priority_id"><%=l(:field_priority)%> <span class="required">*</span></label><br />
 <select name="issue[priority_id]">
 <%= options_from_collection_for_select @priorities, "id", "name", @issue.priority_id %></p>
 </select></p>
 </div>
 
 <div style="float:left;margin-right:10px;">
-<p><label for="issue_assigned_to_id"><%=_('Assigned to')%></label><br/>
+<p><label for="issue_assigned_to_id"><%=l(:field_assigned_to)%></label><br />
 <select name="issue[assigned_to_id]">
 <option value=""></option>
 <%= options_from_collection_for_select @issue.project.members, "user_id", "name", @issue.assigned_to_id %></p>
@@ -24,28 +24,29 @@
 </div>
 
 <div>
-<p><label for="issue_category_id"><%=_('Category')%></label><br/>
+<p><label for="issue_category_id"><%=l(:field_category)%></label><br />
 <select name="issue[category_id]">
 <option value=""></option><%= options_from_collection_for_select @project.issue_categories, "id", "name", @issue.category_id %>
 </select></p>
 </div>
 
-<p><label for="issue_subject"><%=_('Subject')%> <span class="required">*</span></label><br/>
+<p><label for="issue_subject"><%=l(:field_subject)%> <span class="required">*</span></label><br />
 <%= text_field 'issue', 'subject', :size => 80  %></p>
 
-<p><label for="issue_description"><%=_('Description')%> <span class="required">*</span></label><br/>
+<p><label for="issue_description"><%=l(:field_description)%> <span class="required">*</span></label><br />
 <%= text_area 'issue', 'description', :cols => 60, :rows => 10 %></p>
+
+<p><label for="issue_due_date"><%=l(:field_due_date)%></label><br />
+<%= date_select 'issue', 'due_date', :start_year => Date.today.year, :include_blank => true %></p>
 
 <% for custom_value in @custom_values %>
 	<p><%= custom_field_tag_with_label custom_value %></p>
 <% end %>
 
-<p><label for="attachment_file"><%=_('Attachment')%></label><br/>
+<p><label for="attachment_file"><%=l(:label_attachment)%></label><br />
 <%= file_field 'attachment', 'file'  %></p>
-
 <!--[eoform:issue]-->
 </div>
 
-
-<%= submit_tag _('Create') %>
+<%= submit_tag l(:button_create) %>
 <%= end_form_tag %>
\ No newline at end of file
diff --git a/redmine/app/views/projects/add_news.rhtml b/redmine/app/views/projects/add_news.rhtml
index c106e7c..abe6e96 100644
--- a/redmine/app/views/projects/add_news.rhtml
+++ b/redmine/app/views/projects/add_news.rhtml
@@ -1,7 +1,7 @@
-<h2><%=('Add news')%></h2>
+<h2><%=l(:label_news_new)%></h2>
 
 <%= start_form_tag :action => 'add_news', :id => @project %>
   <%= render :partial => 'news/form' %>
-  <%= submit_tag _('Create') %>
+  <%= submit_tag l(:button_create) %>
 <%= end_form_tag %>
 
diff --git a/redmine/app/views/projects/add_version.rhtml b/redmine/app/views/projects/add_version.rhtml
index 27b258f..501a7e6 100644
--- a/redmine/app/views/projects/add_version.rhtml
+++ b/redmine/app/views/projects/add_version.rhtml
@@ -1,7 +1,7 @@
-<h2><%=_('New version')%></h2>
+<h2><%=l(:label_version_new)%></h2>
 
 <%= start_form_tag :action => 'add_version', :id => @project  %>
   <%= render :partial => 'versions/form' %>
-  <%= submit_tag _('Create') %>
+  <%= submit_tag l(:button_create) %>
 <%= end_form_tag %>
 
diff --git a/redmine/app/views/projects/changelog.rhtml b/redmine/app/views/projects/changelog.rhtml
index 5d2a588..c3c7bb6 100644
--- a/redmine/app/views/projects/changelog.rhtml
+++ b/redmine/app/views/projects/changelog.rhtml
@@ -1,4 +1,4 @@
-<h2><%=_('Change log')%></h2>
+<h2><%=l(:label_change_log)%></h2>
 
 <% fixed_issues = @fixed_issues.group_by {|i| i.fixed_version } %>
 <% fixed_issues.each do |version, issues| %>
diff --git a/redmine/app/views/projects/destroy.rhtml b/redmine/app/views/projects/destroy.rhtml
index 2e26478..d11705b 100644
--- a/redmine/app/views/projects/destroy.rhtml
+++ b/redmine/app/views/projects/destroy.rhtml
@@ -1,11 +1,13 @@
-<h2><%=_('Confirmation')%></h2>
+<h2><%=l(:label_confirmation)%></h2>
 <div class="box">
 <center>
-<p><%=_('Are you sure you want to delete project')%> <strong><%= @project.name %></strong> ?</p>
+<p><strong><%= @project.name %></strong><br />
+<%=l(:text_project_destroy_confirmation)%></p>
+
 <p>
     <%= start_form_tag({:controller => 'projects', :action => 'destroy', :id => @project}) %>
     <%= hidden_field_tag "confirm", 1 %>
-    <%= submit_tag _('Delete') %>
+    <%= submit_tag l(:button_delete) %>
     <%= end_form_tag %>
 </p>
 </center>
diff --git a/redmine/app/views/projects/list.rhtml b/redmine/app/views/projects/list.rhtml
index 1c7cd43..b48fef3 100644
--- a/redmine/app/views/projects/list.rhtml
+++ b/redmine/app/views/projects/list.rhtml
@@ -1,10 +1,10 @@
-<h2><%=_('Public projects')%></h2>
+<h2><%=l(:label_public_projects)%></h2>
 
 <table width="100%" cellspacing="1" cellpadding="2" class="listTableContent">
   <tr class="ListHead">
-	<%= sort_header_tag('name', :caption => _('Project')) %>
-	<th>Description</th>
-	<%= sort_header_tag('created_on', :caption => _('Created on')) %>
+	<%= sort_header_tag('name', :caption => l(:label_project)) %>
+	<th><%=l(:field_description)%></th>
+	<%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
   </tr>
   
 <% for project in @projects %>
diff --git a/redmine/app/views/projects/list_documents.rhtml b/redmine/app/views/projects/list_documents.rhtml
index aa76709..7e6eff0 100644
--- a/redmine/app/views/projects/list_documents.rhtml
+++ b/redmine/app/views/projects/list_documents.rhtml
@@ -1,4 +1,4 @@
-<h2><%=_('Documents')%></h2>
+<h2><%=l(:label_document_plural)%></h2>
 
 <% documents = @documents.group_by {|d| d.category } %>
 <% documents.each do |category, docs| %>
@@ -8,7 +8,7 @@
   <li>
     <b><%= link_to d.title, :controller => 'documents', :action => 'show', :id => d %></b>
     <br />
-    <%=_('Desciption')%>: <%= d.description %><br />
+    <%=l(:field_description)%>: <%= d.description %><br />
     <%= format_time(d.created_on) %>    
   </li>		
 
@@ -17,5 +17,5 @@
 <% end %>
 
 <p>
-<%= link_to_if_authorized '&#187; ' + _('New'), :controller => 'projects', :action => 'add_document', :id => @project %>
+<%= link_to_if_authorized '&#187; ' + l(:label_document_new), :controller => 'projects', :action => 'add_document', :id => @project %>
 </p>
diff --git a/redmine/app/views/projects/list_files.rhtml b/redmine/app/views/projects/list_files.rhtml
index ced6400..4498f25 100644
--- a/redmine/app/views/projects/list_files.rhtml
+++ b/redmine/app/views/projects/list_files.rhtml
@@ -1,13 +1,13 @@
-<h2><%=_('Files')%></h2>
+<h2><%=l(:label_attachment_plural)%></h2>
 
 <% delete_allowed = authorize_for('versions', 'destroy_file') %>
 
 <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
   <tr class="ListHead">
-    <th><%=_('Version')%></th>
-    <th><%=_('File')%></th>
-    <th><%=_('Date')%></th>
-    <th><%=_('Size')%></th>
+    <th><%=l(:field_version)%></th>
+    <th><%=l(:field_filename)%></th>
+    <th><%=l(:label_date)%></th>
+    <th><%=l(:field_filesize)%></th>
     <th>D/L</th>
     <th>MD5</th>
     <% if delete_allowed %><th></th><% end %>
@@ -28,7 +28,7 @@
     <% if delete_allowed %>
     <td align="center">
       <%= start_form_tag :controller => 'versions', :action => 'destroy_file', :id => version, :attachment_id => file %>
-      <%= submit_tag _('Delete'), :class => "button-small" %>
+      <%= submit_tag l(:button_delete), :class => "button-small" %>
       <%= end_form_tag %>
     </td>
     <% end %>
@@ -40,7 +40,7 @@
 
 <br />
 <p>
-<%= link_to_if_authorized '&#187; ' + _('New'), :controller => 'projects', :action => 'add_file', :id => @project %>
+<%= link_to_if_authorized '&#187; ' + l(:label_attachment_new), :controller => 'projects', :action => 'add_file', :id => @project %>
 </p>
 
 
diff --git a/redmine/app/views/projects/list_issues.rhtml b/redmine/app/views/projects/list_issues.rhtml
index 652ad6b..4bba76b 100644
--- a/redmine/app/views/projects/list_issues.rhtml
+++ b/redmine/app/views/projects/list_issues.rhtml
@@ -1,56 +1,53 @@
-<h2><%=_('Issues')%></h2>
+<h2><%=l(:label_issue_plural)%></h2>
 
 <form method="post" class="noborder">
-	<table cellpadding=2>
+<table cellpadding=2>
   <tr>
-    <td><small><%=_('Status')%>:</small><br /><%= search_filter_tag 'status_id', :class => 'select-small' %></td>
-    <td><small><%=_('Tracker')%>:</small><br /><%= search_filter_tag 'tracker_id', :class => 'select-small' %></td>
-    <td><small><%=_('Priority')%>:</small><br /><%= search_filter_tag 'priority_id', :class => 'select-small' %></td>
-    <td><small><%=_('Category')%>:</small><br /><%= search_filter_tag 'category_id', :class => 'select-small' %></td>
-    <td><small><%=_('Fixed in version')%>:</small><br /><%= search_filter_tag 'fixed_version_id', :class => 'select-small' %></td>
-    <td><small><%=_('Assigned to')%>:</small><br /><%= search_filter_tag 'assigned_to_id', :class => 'select-small' %></td>
-    <td><small><%=_('Subprojects')%>:</small><br /><%= search_filter_tag 'subproject_id', :class => 'select-small' %></td>
+    <td><small><%=l(:field_status)%>:</small><br /><%= search_filter_tag 'status_id', :class => 'select-small' %></td>
+    <td><small><%=l(:field_tracker)%>:</small><br /><%= search_filter_tag 'tracker_id', :class => 'select-small' %></td>
+    <td><small><%=l(:field_priority)%>:</small><br /><%= search_filter_tag 'priority_id', :class => 'select-small' %></td>
+    <td><small><%=l(:field_category)%>:</small><br /><%= search_filter_tag 'category_id', :class => 'select-small' %></td>
+    <td><small><%=l(:field_fixed_version)%>:</small><br /><%= search_filter_tag 'fixed_version_id', :class => 'select-small' %></td>
+    <td><small><%=l(:field_assigned_to)%>:</small><br /><%= search_filter_tag 'assigned_to_id', :class => 'select-small' %></td>
+    <td><small><%=l(:label_subproject_plural)%>:</small><br /><%= search_filter_tag 'subproject_id', :class => 'select-small' %></td>
 
     <td valign="bottom">
-      <%= submit_tag _('Apply filter'), :class => 'button-small' %>
+      <%= submit_tag l(:button_apply), :class => 'button-small' %>
       <%= end_form_tag %>
       
       <%= start_form_tag %>
-      <%= submit_tag _('Reset'), :class => 'button-small' %>
+      <%= submit_tag l(:button_clear), :class => 'button-small' %>
       <%= end_form_tag %>
     </td>
   </tr>
 </table>
  &nbsp;
-	<table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
-	
-	   <tr><td colspan="7" align="right">
-	   <small><%= link_to 'Export to CSV', :action => 'export_issues_csv', :id => @project.id %></small>
-	   </td></tr>
-	
-		<tr class="ListHead">	
-			<%= sort_header_tag('issues.id', :caption => '#') %>
-			<%= sort_header_tag('issue_statuses.name', :caption => _('Status')) %>
-			<%= sort_header_tag('issues.tracker_id', :caption => _('Tracker')) %>
-			<th><%=_('Subject')%></th>
-			<%= sort_header_tag('users.lastname', :caption => _('Author')) %>
-			<%= sort_header_tag('issues.created_on', :caption => _('Created on')) %>
-			<%= sort_header_tag('issues.updated_on', :caption => _('Last update')) %>
-		</tr>
-
-		<% for issue in @issues %>
-		<tr bgcolor="#<%= issue.status.html_color %>">
-			<td align="center"><%= link_to issue.long_id, :controller => 'issues', :action => 'show', :id => issue %></td>
-			<td align="center"><%= issue.status.name %></td>
-			<td align="center"><%= issue.tracker.name %></td>
-			<td><%= link_to issue.subject, :controller => 'issues', :action => 'show', :id => issue %></td>
-			<td align="center"><%= issue.author.display_name %></td>
-			<td align="center"><%= format_time(issue.created_on) %></td>
-			<td align="center"><%= format_time(issue.updated_on) %></td>
-		</tr>
-		<% end %>
-	</table>
-	<p>
-	<%= pagination_links_full @issue_pages %>
-	[ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]
-    </p>
\ No newline at end of file
+<table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
+    <tr><td colspan="7" align="right">
+    <small><%= link_to l(:label_export_csv), :action => 'export_issues_csv', :id => @project.id %></small>
+    </td></tr>	
+    <tr class="ListHead">	
+		<%= sort_header_tag('issues.id', :caption => '#') %>
+		<%= sort_header_tag('issue_statuses.name', :caption => l(:field_status)) %>
+		<%= sort_header_tag('issues.tracker_id', :caption => l(:field_tracker)) %>
+		<th><%=l(:field_subject)%></th>
+		<%= sort_header_tag('users.lastname', :caption => l(:field_author)) %>
+		<%= sort_header_tag('issues.created_on', :caption => l(:field_created_on)) %>
+		<%= sort_header_tag('issues.updated_on', :caption => l(:field_updated_on)) %>
+	</tr>
+	<% for issue in @issues %>
+	<tr bgcolor="#<%= issue.status.html_color %>">
+		<td align="center"><%= link_to issue.long_id, :controller => 'issues', :action => 'show', :id => issue %></td>
+		<td align="center"><%= issue.status.name %></td>
+		<td align="center"><%= issue.tracker.name %></td>
+		<td><%= link_to issue.subject, :controller => 'issues', :action => 'show', :id => issue %></td>
+		<td align="center"><%= issue.author.display_name %></td>
+		<td align="center"><%= format_time(issue.created_on) %></td>
+		<td align="center"><%= format_time(issue.updated_on) %></td>
+	</tr>
+	<% end %>
+</table>
+<p>
+<%= pagination_links_full @issue_pages %>
+[ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]
+</p>
\ No newline at end of file
diff --git a/redmine/app/views/projects/list_members.rhtml b/redmine/app/views/projects/list_members.rhtml
index 6fca0d2..655abb2 100644
--- a/redmine/app/views/projects/list_members.rhtml
+++ b/redmine/app/views/projects/list_members.rhtml
@@ -1,4 +1,4 @@
-<h2><%=_('Project members')%></h2>
+<h2><%=l(:label_member_plural)%></h2>
 
 <% members = @members.group_by {|m| m.role } %>
 <% members.each do |role, member| %>
diff --git a/redmine/app/views/projects/list_news.rhtml b/redmine/app/views/projects/list_news.rhtml
index aee4146..a1b1594 100644
--- a/redmine/app/views/projects/list_news.rhtml
+++ b/redmine/app/views/projects/list_news.rhtml
@@ -1,4 +1,4 @@
-<h2><%=_('News')%></h2>
+<h2><%=l(:label_news_plural)%></h2>
 
 <% for news in @news %>
 	<p>
@@ -7,11 +7,11 @@
 	<%= link_to_if_authorized image_tag('delete'), { :controller => 'news', :action => 'destroy', :id => news }, :confirm => 'Are you sure?' %>
 	<br />
 	<%= news.summary %>
-	<small>[<%= link_to _('Read...'), :controller => 'news', :action => 'show', :id => news %>]</small>
+	<small>[<%= link_to l(:label_read), :controller => 'news', :action => 'show', :id => news %>]</small>
 	</p>
 <% end %>
 
 <%= pagination_links_full @news_pages %>
 <p>
-<%= link_to_if_authorized '&#187; ' + _('Add'), :controller => 'projects', :action => 'add_news', :id => @project %>
+<%= link_to_if_authorized '&#187; ' + l(:label_news_new), :controller => 'projects', :action => 'add_news', :id => @project %>
 </p>
diff --git a/redmine/app/views/projects/settings.rhtml b/redmine/app/views/projects/settings.rhtml
index f6b5e16..1d1684f 100644
--- a/redmine/app/views/projects/settings.rhtml
+++ b/redmine/app/views/projects/settings.rhtml
@@ -1,14 +1,14 @@
-<h2><%=_('Settings')%></h2>
+<h2><%=l(:label_settings)%></h2>
 
 <%= start_form_tag :action => 'edit', :id => @project %>
 <%= render :partial => 'form' %>
-<center><%= submit_tag _('Save') %></center>
+<center><%= submit_tag l(:button_save) %></center>
 <%= end_form_tag %>
 
 &nbsp;
 
 <div class="box">
-<h3><%=_('Members')%></h3>
+<h3><%=l(:label_member_plural)%></h3>
 <%= error_messages_for 'member' %>
 <table>
 <% for member in @project.members.find(:all, :include => :user) %>
@@ -22,12 +22,12 @@
       </select>
     </td>
     <td>
-      <%= submit_tag _('Save'), :class => "button-small" %>
+      <%= submit_tag l(:button_change), :class => "button-small" %>
       <%= end_form_tag %>
     </td>
 		<td>
       <%= start_form_tag :controller => 'members', :action => 'destroy', :id => member %>
-      <%= submit_tag _('Delete'), :class => "button-small" %>
+      <%= submit_tag l(:button_delete), :class => "button-small" %>
       <%= end_form_tag %>
 		</td>
 	</tr>
@@ -35,7 +35,7 @@
 <% end %>
 </table>
 <hr />
-    <label><%=_('New member')%></label><br/>
+    <label><%=l(:label_member_new)%></label><br/>
       <%= start_form_tag :controller => 'projects', :action => 'add_member', :id => @project %>
       <select name="member[user_id]">
         <%= options_from_collection_for_select @users, "id", "display_name", @member.user_id %>
@@ -43,12 +43,12 @@
       <select name="member[role_id]">
         <%= options_from_collection_for_select @roles, "id", "name", @member.role_id %>
       </select>
-      <%= submit_tag _('Add') %>
+      <%= submit_tag l(:button_add) %>
       <%= end_form_tag %>
 </div>
 
 <div class="box">
-<h3><%=_('Versions')%></h3>
+<h3><%=l(:label_version_plural)%></h3>
 
 <table>
 <% for version in @project.versions %>
@@ -57,7 +57,7 @@
   <td><%=h version.description %></td>
   <td>
       <%= start_form_tag :controller => 'versions', :action => 'destroy', :id => version %>
-      <%= submit_tag _('Delete'), :class => "button-small" %>
+      <%= submit_tag l(:button_delete), :class => "button-small" %>
       <%= end_form_tag %>  
   </td>
   </tr>
@@ -65,13 +65,13 @@
 </table>
 <hr />
       <%= start_form_tag ({ :controller => 'projects', :action => 'add_version', :id => @project }, :method => 'get' ) %>
-      <%= submit_tag _('New version...') %>
+      <%= submit_tag l(:label_version_new) %>
       <%= end_form_tag %>  
 </div>
 
 
 <div class="box">
-<h3><%=_('Issue categories')%></h3>
+<h3><%=l(:label_issue_category_plural)%></h3>
 <table>
 <% for @category in @project.issue_categories %>
 	<% unless @category.new_record? %>
@@ -81,12 +81,12 @@
       <%= text_field 'category', 'name', :size => 25  %>
     </td>
 		<td>
-      <%= submit_tag _('Save'), :class => "button-small" %>
+      <%= submit_tag l(:button_save), :class => "button-small" %>
       <%= end_form_tag %>
     </td>
     <td>
       <%= start_form_tag :controller => 'issue_categories', :action => 'destroy', :id => @category %>
-      <%= submit_tag _('Delete'), :class => "button-small" %>
+      <%= submit_tag l(:button_delete), :class => "button-small" %>
       <%= end_form_tag %>
 		</td>
 	</tr>
@@ -96,10 +96,10 @@
 <hr />
 
 <%= start_form_tag :action => 'add_issue_category', :id => @project %>
+<label for="issue_category_name"><%=l(:label_issue_category_new)%></label><br/>
 <%= error_messages_for 'issue_category' %>
-<label for="issue_category_name"><%=_('New category')%></label><br/>
 <%= text_field 'issue_category', 'name', :size => 25 %>
-<%= submit_tag _('Create') %>
+<%= submit_tag l(:button_create) %>
 <%= end_form_tag %>
 
 </div>
diff --git a/redmine/app/views/projects/show.rhtml b/redmine/app/views/projects/show.rhtml
index 985142f..81f2beb 100644
--- a/redmine/app/views/projects/show.rhtml
+++ b/redmine/app/views/projects/show.rhtml
@@ -1,10 +1,10 @@
-<h2><%=_('Overview')%></h2> 
+<h2><%=l(:label_overview)%></h2> 
 	
 <div class="splitcontentleft">
 	<%= @project.description %>	
 	<ul>
-	<li><%=_('Homepage')%>: <%= link_to @project.homepage, @project.homepage %></li>
-	<li><%=_('Created on')%>: <%= format_date(@project.created_on) %></li>
+	<li><%=l(:field_homepage)%>: <%= link_to @project.homepage, @project.homepage %></li>
+	<li><%=l(:field_created_on)%>: <%= format_date(@project.created_on) %></li>
 	<% for custom_value in @custom_values %>
 	<% if !custom_value.value.empty? %>
 	   <li><%= custom_value.custom_field.name%>: <%= custom_value.value%></li>
@@ -13,31 +13,32 @@
 	</ul>	
 
   <div class="box">
-    <h3><%= image_tag "tracker" %> <%=_('Trackers')%></h3>
+    <h3><%= image_tag "tracker" %> <%=l(:label_tracker_plural)%></h3>
     <ul>
     <% for tracker in @trackers %>    
       <li><%= link_to tracker.name, :controller => 'projects', :action => 'list_issues', :id => @project, 
                                                 :set_filter => 1, 
                                                 "tracker_id" => tracker.id %>:
-      <%= Issue.count(:conditions => ["project_id=? and tracker_id=? and issue_statuses.is_closed=?", @project.id, tracker.id, false], :include => :status) %> <%=_('open')%>
+      <%= issue_count = Issue.count(:conditions => ["project_id=? and tracker_id=? and issue_statuses.is_closed=?", @project.id, tracker.id, false], :include => :status) %>
+      <%= lwr(:label_open_issues, issue_count) %>
       </li>
     <% end %>
     </ul>
     <% if authorize_for 'projects', 'add_issue' %>
-        &#187; <%=_('Report an issue')%>:
+        &#187; <%=l(:label_issue_new)%>:
         <ul>
         <% @trackers.each do |tracker| %>
-        <li><%= link_to _(tracker.name), :controller => 'projects', :action => 'add_issue', :id => @project, :tracker_id => tracker %></li>
+        <li><%= link_to tracker.name, :controller => 'projects', :action => 'add_issue', :id => @project, :tracker_id => tracker %></li>
         <% end %>
         </ul>
     <% end %>
-    <center><small>[ <%= link_to _('View all issues'), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %> ]</small></center>
+    <center><small>[ <%= link_to l(:label_issue_view_all), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %> ]</small></center>
   </div>
 </div>
 
 <div class="splitcontentright">
 	<div class="box">
-		<h3><%= image_tag "users" %> <%=_('Members')%></h3>	
+		<h3><%= image_tag "users" %> <%=l(:label_member_plural)%></h3>	
 		<% for member in @members %>
 		<%= link_to_user member.user %> (<%= member.role.name %>)<br />		
 		<% end %>		
@@ -45,7 +46,7 @@
   
   <% if @subprojects %>
  	<div class="box">
-		<h3><%= image_tag "projects" %> <%=_('Subprojects')%></h3>	
+		<h3><%= image_tag "projects" %> <%=l(:label_subproject_plural)%></h3>	
 		<% for subproject in @subprojects %>
 		<%= link_to subproject.name, :action => 'show', :id => subproject %><br />		
 		<% end %>		
@@ -53,16 +54,16 @@
   <% end %>
   
   <div class="box">
-    <h3><%=_('Latest news')%></h3>  
+    <h3><%=l(:label_news_latest)%></h3>  
     <% for news in @news %>
       <p>
       <b><%= news.title %></b> <small>(<%= link_to_user news.author %> <%= format_time(news.created_on) %>)</small><br />
       <%= news.summary %>
-      <small>[<%= link_to _('Read...'), :controller => 'news', :action => 'show', :id => news %>]</small>
+      <small>[<%= link_to l(:label_read), :controller => 'news', :action => 'show', :id => news %>]</small>
       </p>
       <hr />
     <% end %>
-    <center><small>[ <%= link_to _('View all news'), :controller => 'projects', :action => 'list_news', :id => @project %> ]</small></center>
+    <center><small>[ <%= link_to l(:label_news_view_all), :controller => 'projects', :action => 'list_news', :id => @project %> ]</small></center>
   </div>  
 </div>
 
diff --git a/redmine/app/views/reports/_simple.rhtml b/redmine/app/views/reports/_simple.rhtml
index f556d0a..2dde32a 100644
--- a/redmine/app/views/reports/_simple.rhtml
+++ b/redmine/app/views/reports/_simple.rhtml
@@ -6,9 +6,9 @@
 <% for status in @statuses %>
   <td align="center" width="<%= col_width %>%" bgcolor="#<%= status.html_color %>"><small><%= status.name %></small></td>
 <% end %>
-<td align="center" width="<%= col_width %>%"><strong><%=_('Open')%></strong></td>
-<td align="center" width="<%= col_width %>%"><strong><%=_('Closed')%></strong></td>
-<td align="center" width="<%= col_width %>%"><strong><%=_('Total')%></strong></td>
+<td align="center" width="<%= col_width %>%"><strong><%=l(:label_open_issues_plural)%></strong></td>
+<td align="center" width="<%= col_width %>%"><strong><%=l(:label_closed_issues_plural)%></strong></td>
+<td align="center" width="<%= col_width %>%"><strong><%=l(:label_total)%></strong></td>
 </tr>
 
 <% for row in rows %>
diff --git a/redmine/app/views/reports/issue_report.rhtml b/redmine/app/views/reports/issue_report.rhtml
index 32a1f55..08347bd 100644
--- a/redmine/app/views/reports/issue_report.rhtml
+++ b/redmine/app/views/reports/issue_report.rhtml
@@ -1,13 +1,13 @@
-<h2><%=_('Reports')%></h2>
+<h2><%=l(:label_report_plural)%></h2>
 
-<strong><%=_('Issues by tracker')%></strong>
+<strong><%=l(:field_tracker)%></strong>
 <%= render :partial => 'simple', :locals => { :data => @issues_by_tracker, :field_name => "tracker_id", :rows => @trackers } %>
 <br />
 
-<strong><%=_('Issues by priority')%></strong>
+<strong><%=l(:field_priority)%></strong>
 <%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %>
 <br />
 
-<strong><%=_('Issues by category')%></strong>
+<strong><%=l(:field_category)%></strong>
 <%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %>
 
diff --git a/redmine/app/views/roles/_form.rhtml b/redmine/app/views/roles/_form.rhtml
index cc30e82..b007d1e 100644
--- a/redmine/app/views/roles/_form.rhtml
+++ b/redmine/app/views/roles/_form.rhtml
@@ -2,22 +2,22 @@
 
 <div class="box">
 <!--[form:role]-->
-<p><label for="role_name"><%=_('Name')%> <span class="required">*</span></label><br />
+<p><label for="role_name"><%=l(:field_name)%> <span class="required">*</span></label><br />
 <%= text_field 'role', 'name' %></p>
 
-<strong><%=_('Permissions')%></strong>
+<strong><%=l(:label_permissions)%>:</strong>
 <% permissions = @permissions.group_by {|p| p.group_id } %>
-<% permissions.keys.sort.each do |group_id| %>
-<fieldset><legend><%= _(Permission::GROUPS[group_id]) %></legend>
+<% permissions.keys.sort.each do |group_id| %>
+<fieldset style="margin-top: 6px;"><legend><strong><%= l(Permission::GROUPS[group_id]) %></strong></legend>
 <% permissions[group_id].each do |p| %>
-  <div style="width:200px;float:left;"><%= check_box_tag "permission_ids[]", p.id, (@role.permissions.include? p) %>
-  <%= _(p.description) %>
+  <div style="width:170px;float:left;"><%= check_box_tag "permission_ids[]", p.id, (@role.permissions.include? p) %>
+  <%= l(p.description.to_sym) %>
   </div>
 <% end %>
 </fieldset>
 <% end %>
 <br />
-<a href="javascript:checkAll('role_form', true)"><%=_('Check all')%></a> |
-<a href="javascript:checkAll('role_form', false)"><%=_('Uncheck all')%></a><br />
+<a href="javascript:checkAll('role_form', true)"><%=l(:button_check_all)%></a> |
+<a href="javascript:checkAll('role_form', false)"><%=l(:button_uncheck_all)%></a><br />
 <!--[eoform:role]-->
 </div>
diff --git a/redmine/app/views/roles/edit.rhtml b/redmine/app/views/roles/edit.rhtml
index cffbe01..0bc3525 100644
--- a/redmine/app/views/roles/edit.rhtml
+++ b/redmine/app/views/roles/edit.rhtml
@@ -1,10 +1,8 @@
-<h2><%=_('Role')%></h2> 
+<h2><%=l(:label_role)%></h2> 
 
 <%= start_form_tag ({ :action => 'edit', :id => @role }, :id => 'role_form') %>
 <%= render :partial => 'form' %>
-
-<br />
-<%= submit_tag _('Save') %>
+<%= submit_tag l(:button_save) %>
 <%= end_form_tag %>
 
 
diff --git a/redmine/app/views/roles/list.rhtml b/redmine/app/views/roles/list.rhtml
index eb1a9ec..ae92a80 100644
--- a/redmine/app/views/roles/list.rhtml
+++ b/redmine/app/views/roles/list.rhtml
@@ -1,8 +1,8 @@
-<h2><%=_('Roles')%></h2>
+<h2><%=l(:label_role_plural)%></h2>
 
 <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
   <tr class="ListHead">
-    <th><%=_('Role')%></th>
+    <th><%=l(:label_role)%></th>
 	<th></th>
   </tr>
   
@@ -11,7 +11,7 @@
   <td><%= link_to role.name, :action => 'edit', :id => role %></td>
   <td align="center">
     <%= start_form_tag :action => 'destroy', :id => role %>
-    <%= submit_tag _('Delete'), :class => "button-small" %>
+    <%= submit_tag l(:button_delete), :class => "button-small" %>
     <%= end_form_tag %>
   </tr>
 <% end %>
@@ -20,4 +20,4 @@
 <%= pagination_links_full @role_pages %>
 <br />
 
-<%= link_to '&#187; ' + _('New role'), :action => 'new' %>
+<%= link_to '&#187; ' + l(:label_role_new), :action => 'new' %>
diff --git a/redmine/app/views/roles/new.rhtml b/redmine/app/views/roles/new.rhtml
index c82fb21..11d2d92 100644
--- a/redmine/app/views/roles/new.rhtml
+++ b/redmine/app/views/roles/new.rhtml
@@ -1,8 +1,7 @@
-<h2><%=_('New role')%></h2> 
+<h2><%=l(:label_role_new)%></h2> 
 
 <%= start_form_tag ({ :action => 'new' }, :id => 'role_form') %>
-<%= render :partial => 'form' %>
-
-<br /><%= submit_tag _('Create') %>
+<%= render :partial => 'form' %>
+<%= submit_tag l(:button_create) %>
 <%= end_form_tag %>
 
diff --git a/redmine/app/views/roles/workflow.rhtml b/redmine/app/views/roles/workflow.rhtml
index 652f6a0..3c2d460 100644
--- a/redmine/app/views/roles/workflow.rhtml
+++ b/redmine/app/views/roles/workflow.rhtml
@@ -1,22 +1,22 @@
-<h2><%=_('Workflow setup')%></h2>
+<h2><%=l(:label_workflow)%></h2>
 
-<p><%=_('Select a workflow to edit')%>:</p>
+<p><%=l(:text_workflow_edit)%>:</p>
 
 <%= start_form_tag ({:action => 'workflow'}, :method => 'get') %>
 <div style="float:left;margin-right:10px;">
-<p><label for="role_id"><%=_('Role')%></label><br/>
+<p><label for="role_id"><%=l(:label_role)%></label><br/>
 <select id="role_id" name="role_id">
   <%= options_from_collection_for_select @roles, "id", "name", (@role.id unless @role.nil?) %>
 </select></p>
 </div>
 
 <div>
-<p><label for="tracker_id"><%=_('Tracker')%></label><br/>
+<p><label for="tracker_id"><%=l(:label_tracker)%></label><br/>
 <select id="tracker_id" name="tracker_id">
   <%= options_from_collection_for_select @trackers, "id", "name", (@tracker.id unless @tracker.nil?) %>
 </select>
 
-<%= submit_tag _('Edit') %>
+<%= submit_tag l(:button_edit) %>
 </p>
 </div>
 <%= end_form_tag %>
@@ -28,8 +28,8 @@
   <%= form_tag ({:action => 'workflow', :role_id => @role, :tracker_id => @tracker }, :id => 'workflow_form' ) %>
 	<table>
 	<tr>
-	<td align="center"><strong><%=_('Issue status')%></strong></td>
-	<td align="center" colspan="<%= @statuses.length %>"><strong><%=_('New statuses allowed')%></strong></td>
+	<td align="center"><strong><%=l(:label_current_status)%></strong></td>
+	<td align="center" colspan="<%= @statuses.length %>"><strong><%=l(:label_new_statuses_allowed)%></strong></td>
 	</tr>
 	<tr>
 	<td></td>
@@ -59,11 +59,11 @@
 	</table>
 <br />
 <p>
-<a href="javascript:checkAll('workflow_form', true)"><%=_('Check all')%></a> |
-<a href="javascript:checkAll('workflow_form', false)"><%=_('Uncheck all')%></a>
+<a href="javascript:checkAll('workflow_form', true)"><%=l(:button_check_all)%></a> |
+<a href="javascript:checkAll('workflow_form', false)"><%=l(:button_uncheck_all)%></a>
 </p>
 <br />
-<%= submit_tag _('Save') %>
+<%= submit_tag l(:button_save) %>
 <%= end_form_tag %>
 
 <% end %>
diff --git a/redmine/app/views/trackers/_form.rhtml b/redmine/app/views/trackers/_form.rhtml
index 0eab8e9..e0b74ec 100644
--- a/redmine/app/views/trackers/_form.rhtml
+++ b/redmine/app/views/trackers/_form.rhtml
@@ -1,10 +1,10 @@
 <%= error_messages_for 'tracker' %>
 
 <!--[form:tracker]-->
-<p><label for="tracker_name"><%=_('Name')%></label> <span class="required">*</span><br/>
+<p><label for="tracker_name"><%=l(:field_name)%></label> <span class="required">*</span><br/>
 <%= text_field 'tracker', 'name'  %></p>
 
 <p><%= check_box 'tracker', 'is_in_chlog' %>
-<label for="tracker_is_in_chlog"><%=_('View issues in change log')%></label></p>
+<label for="tracker_is_in_chlog"><%=l(:field_is_in_chlog)%></label></p>
 <!--[eoform:tracker]-->
 
diff --git a/redmine/app/views/trackers/edit.rhtml b/redmine/app/views/trackers/edit.rhtml
index a209b3f..25cec51 100644
--- a/redmine/app/views/trackers/edit.rhtml
+++ b/redmine/app/views/trackers/edit.rhtml
@@ -1,6 +1,6 @@
-<h2><%=_('Tracker')%></h2>
+<h2><%=l(:label_tracker)%></h2>
 
 <%= start_form_tag :action => 'edit', :id => @tracker %>
   <%= render :partial => 'form' %>
-  <%= submit_tag _('Save') %>
+  <%= submit_tag l(:button_save) %>
 <%= end_form_tag %>
diff --git a/redmine/app/views/trackers/list.rhtml b/redmine/app/views/trackers/list.rhtml
index 8b03a14..475a6b9 100644
--- a/redmine/app/views/trackers/list.rhtml
+++ b/redmine/app/views/trackers/list.rhtml
@@ -1,8 +1,8 @@
-<h2><%=_('Trackers')%></h2>
+<h2><%=l(:label_tracker_plural)%></h2>
 
 <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
   <tr class="ListHead">
-  <th><%=_('Tracker')%></th>
+  <th><%=l(:label_tracker)%></th>
   <th></th>
   </tr>
   
@@ -11,7 +11,7 @@
   <td><%= link_to tracker.name, :action => 'edit', :id => tracker %></td>
   <td align="center">
     <%= start_form_tag :action => 'destroy', :id => tracker %>
-    <%= submit_tag _('Delete'), :class => "button-small" %>
+    <%= submit_tag l(:button_delete), :class => "button-small" %>
     <%= end_form_tag %>
   </td>
   </tr>
@@ -21,4 +21,4 @@
 <%= pagination_links_full @tracker_pages %>
 <br />
 
-<%= link_to '&#187; ' + _('New tracker'), :action => 'new' %>
+<%= link_to '&#187; ' + l(:label_tracker_new), :action => 'new' %>
diff --git a/redmine/app/views/trackers/new.rhtml b/redmine/app/views/trackers/new.rhtml
index a24fca7..788854c 100644
--- a/redmine/app/views/trackers/new.rhtml
+++ b/redmine/app/views/trackers/new.rhtml
@@ -1,7 +1,7 @@
-<h2><%=_('New tracker')%></h2>
+<h2><%=l(:label_tracker_new)%></h2>
 
 <%= start_form_tag :action => 'new' %>
   <%= render :partial => 'form' %>
-  <%= submit_tag _('Create') %>
+  <%= submit_tag l(:button_create) %>
 <%= end_form_tag %>
 
diff --git a/redmine/app/views/users/_form.rhtml b/redmine/app/views/users/_form.rhtml
index 84cc6f1..db5639f 100644
--- a/redmine/app/views/users/_form.rhtml
+++ b/redmine/app/views/users/_form.rhtml
@@ -2,26 +2,26 @@
 
 <div class="box">
 <!--[form:user]-->
-<p><label for="user_login"><%=_('Login')%></label> <span class="required">*</span><br/>
+<p><label for="user_login"><%=l(:field_login)%></label> <span class="required">*</span><br/>
 <%= text_field 'user', 'login', :size => 25  %></p>
 
-<p><label for="password"><%=_('Password')%></label> <span class="required">*</span><br/>
+<p><label for="password"><%=l(:field_password)%></label> <span class="required">*</span><br/>
 <%= password_field_tag 'password', nil, :size => 25  %></p>
 
-<p><label for="password_confirmation"><%=_('Confirmation')%></label> <span class="required">*</span><br/>
+<p><label for="password_confirmation"><%=l(:field_password_confirmation)%></label> <span class="required">*</span><br/>
 <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
 
-<p><label for="user_firstname"><%=_('Firstname')%></label> <span class="required">*</span><br/>
+<p><label for="user_firstname"><%=l(:field_firstname)%></label> <span class="required">*</span><br/>
 <%= text_field 'user', 'firstname'  %></p>
 
-<p><label for="user_lastname"><%=_('Lastname')%></label> <span class="required">*</span><br/>
+<p><label for="user_lastname"><%=l(:field_lastname)%></label> <span class="required">*</span><br/>
 <%= text_field 'user', 'lastname'  %></p>
 
-<p><label for="user_mail"><%=_('Mail')%></label> <span class="required">*</span><br/>
+<p><label for="user_mail"><%=l(:field_mail)%></label> <span class="required">*</span><br/>
 <%= text_field 'user', 'mail'  %></p>
 
-<p><label for="user_language"><%=_('Language')%></label><br/>
-<%= select("user", "language", Localization.langs.invert) %></p>
+<p><label for="user_language"><%=l(:field_language)%></label><br/>
+<%= select("user", "language", lang_options_for_select) %></p>
 
 <% for custom_value in @custom_values %>
 	<p><%= custom_field_tag_with_label custom_value %></p>
@@ -29,9 +29,9 @@
 
 <div style="clear: both;"></div>
 
-<p><%= check_box 'user', 'admin' %> <label for="user_admin"><%=_('Administrator')%></label></p>
+<p><%= check_box 'user', 'admin' %> <label for="user_admin"><%=l(:field_admin)%></label></p>
 
-<p><%= check_box 'user', 'mail_notification' %> <label for="user_mail_notification"><%=_('Mail notifications')%></label></p>
+<p><%= check_box 'user', 'mail_notification' %> <label for="user_mail_notification"><%=l(:field_mail_notification)%></label></p>
 
 <!--[eoform:user]-->
 </div>
diff --git a/redmine/app/views/users/add.rhtml b/redmine/app/views/users/add.rhtml
index 9d0ba8d..13e7069 100644
--- a/redmine/app/views/users/add.rhtml
+++ b/redmine/app/views/users/add.rhtml
@@ -1,6 +1,6 @@
-<h2><%=_('New user')%></h2>
+<h2><%=l(:label_user_new)%></h2>
 
 <%= start_form_tag :action => 'add' %>
   <%= render :partial => 'form' %>
-  <%= submit_tag _('Create') %>
+  <%= submit_tag l(:button_create) %>
 <%= end_form_tag %>
diff --git a/redmine/app/views/users/edit.rhtml b/redmine/app/views/users/edit.rhtml
index a033a7f..524b920 100644
--- a/redmine/app/views/users/edit.rhtml
+++ b/redmine/app/views/users/edit.rhtml
@@ -1,7 +1,6 @@
-<h2><%=_('User')%></h2>
+<h2><%=l(:label_user)%></h2>
 
 <%= start_form_tag :action => 'edit', :id => @user %>
   <%= render :partial => 'form' %>
-  <%= submit_tag _('Save') %>
-  
+  <%= submit_tag l(:button_save) %>  
 <%= end_form_tag %>
diff --git a/redmine/app/views/users/list.rhtml b/redmine/app/views/users/list.rhtml
index 7263000..129decd 100644
--- a/redmine/app/views/users/list.rhtml
+++ b/redmine/app/views/users/list.rhtml
@@ -1,15 +1,15 @@
-<h2><%=_('Users')%></h2>
+<h2><%=l(:label_user_plural)%></h2>
 
 <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">		
 <tr class="ListHead">
-	<%= sort_header_tag('login', :caption => _('Login')) %>
-	<%= sort_header_tag('firstname', :caption => _('Firstname')) %>
-	<%= sort_header_tag('lastname', :caption => _('Lastname')) %>
-	<th><%=_('Mail')%></th>
-	<%= sort_header_tag('admin', :caption => _('Admin')) %>
-	<%= sort_header_tag('status', :caption => _('Status')) %>
-	<%= sort_header_tag('created_on', :caption => _('Created on')) %>
-	<%= sort_header_tag('last_login_on', :caption => _('Last login')) %>
+	<%= sort_header_tag('login', :caption => l(:field_login)) %>
+	<%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
+	<%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
+	<th><%=l(:field_mail)%></th>
+	<%= sort_header_tag('admin', :caption => l(:field_admin)) %>
+	<%= sort_header_tag('status', :caption => l(:field_status)) %>
+	<%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
+	<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on)) %>
   <th></th>
 </tr>  
 <% for user in @users %>
@@ -26,10 +26,10 @@
     <%= start_form_tag :action => 'edit', :id => user %>
     <% if user.locked? %>
       <%= hidden_field_tag 'user[status]', User::STATUS_ACTIVE %>
-      <%= submit_tag _('Unlock'), :class => "button-small"  %>
+      <%= submit_tag l(:button_unlock), :class => "button-small"  %>
     <% else %>
       <%= hidden_field_tag 'user[status]', User::STATUS_LOCKED %>
-      <%= submit_tag _('Lock'), :class => "button-small"  %>
+      <%= submit_tag l(:button_lock), :class => "button-small"  %>
     <% end %>
     <%= end_form_tag %>  
   </td>
@@ -42,5 +42,5 @@
 </p>
 
 <p>
-<%= link_to '&#187; ' + _('New user'), :action => 'add' %>
+<%= link_to '&#187; ' + l(:label_user_new), :action => 'add' %>
 </p>
\ No newline at end of file
diff --git a/redmine/app/views/versions/_form.rhtml b/redmine/app/views/versions/_form.rhtml
index a62d22d..18de3c5 100644
--- a/redmine/app/views/versions/_form.rhtml
+++ b/redmine/app/views/versions/_form.rhtml
@@ -1,13 +1,13 @@
 <%= error_messages_for 'version' %>
 
 <!--[form:version]-->
-<p><label for="version_name"><%=_('Version')%></label> <span class="required">*</span><br/>
+<p><label for="version_name"><%=l(:field_name)%></label> <span class="required">*</span><br/>
 <%= text_field 'version', 'name', :size => 20  %></p>
 
-<p><label for="version_description"><%=_('Description')%></label><br/>
+<p><label for="version_description"><%=l(:field_description)%></label><br/>
 <%= text_field 'version', 'description', :size => 60  %></p>
 
-<p><label for="version_effective_date"><%=_('Date')%></label><br/>
+<p><label for="version_effective_date"><%=l(:field_effective_date)%></label><br/>
 <%= date_select 'version', 'effective_date'  %></p>
 <!--[eoform:version]-->
 
diff --git a/redmine/app/views/versions/edit.rhtml b/redmine/app/views/versions/edit.rhtml
index 6db4daa..6851d79 100644
--- a/redmine/app/views/versions/edit.rhtml
+++ b/redmine/app/views/versions/edit.rhtml
@@ -1,8 +1,8 @@
-<h2><%=_('Version')%></h2>
+<h2><%=l(:label_version)%></h2>
 
 <%= start_form_tag :action => 'edit', :id => @version %>
   <%= render :partial => 'form' %>
-  <%= submit_tag _('Save') %>
+  <%= submit_tag l(:button_save) %>
 <%= end_form_tag %>
 
 
diff --git a/redmine/app/views/welcome/index.rhtml b/redmine/app/views/welcome/index.rhtml
index 694de9b..974cc76 100644
--- a/redmine/app/views/welcome/index.rhtml
+++ b/redmine/app/views/welcome/index.rhtml
@@ -1,14 +1,14 @@
 <div class="splitcontentleft">
-    <h2><%= $RDM_WELCOME_TITLE || _('Welcome') %> !</h2>
+    <h2><%= $RDM_WELCOME_TITLE || l(:label_home) %></h2>
     <p><%= $RDM_WELCOME_TEXT %></p>
     
   <div class="box">
-	<h3><%=_('Latest news')%></h3>
+	<h3><%=l(:label_news_latest)%></h3>
 		<% for news in @news %>
 			<p>
 			<b><%= news.title %></b> (<%= link_to_user news.author %> <%= format_time(news.created_on) %> - <%= news.project.name %>)<br />
 			<%= news.summary %><br />
-			[<%= link_to 'Read...', :controller => 'news', :action => 'show', :id => news %>]
+			[<%= link_to l(:label_read), :controller => 'news', :action => 'show', :id => news %>]
 			</p>
 			<hr />
 		<% end %>
@@ -17,15 +17,14 @@
 
 <div class="splitcontentright">
 	<div class="box">
-	<h3><%=_('Latest projects')%></h3>
+	<h3><%=l(:label_project_latest)%></h3>
 		<ul>
 		<% for project in @projects %>
 			<li>
-			<%= link_to project.name, :controller => 'projects', :action => 'show', :id => project %> (added <%= format_time(project.created_on) %>)<br />
+			<%= link_to project.name, :controller => 'projects', :action => 'show', :id => project %> (<%= format_time(project.created_on) %>)<br />
 			<%= project.description %>
 			</li>
 		<% end %>
 		</ul>
-	</div>
-  
+	</div>  
 </div>	
diff --git a/redmine/db/migrate/001_setup.rb b/redmine/db/migrate/001_setup.rb
index 7aa9b5f..65fd234 100644
--- a/redmine/db/migrate/001_setup.rb
+++ b/redmine/db/migrate/001_setup.rb
@@ -78,7 +78,7 @@ class Setup < ActiveRecord::Migration
       t.column "project_id", :integer, :default => 0, :null => false
       t.column "category_id", :integer, :default => 0, :null => false
       t.column "title", :string, :limit => 60, :default => "", :null => false
-      t.column "description", :text, :default => "", :null => false
+      t.column "description", :text, :default => ""
       t.column "created_on", :timestamp
     end
   
@@ -113,7 +113,8 @@ class Setup < ActiveRecord::Migration
       t.column "tracker_id", :integer, :default => 0, :null => false
       t.column "project_id", :integer, :default => 0, :null => false
       t.column "subject", :string, :default => "", :null => false
-      t.column "description", :text, :default => "", :null => false
+      t.column "description", :text, :default => "", :null => false
+      t.column "due_date", :date
       t.column "category_id", :integer
       t.column "status_id", :integer, :default => 0, :null => false
       t.column "assigned_to_id", :integer
@@ -219,55 +220,55 @@ class Setup < ActiveRecord::Migration
     end
   
     # project
-    Permission.create :controller => "projects", :action => "show", :description => "Overview", :sort => 100, :is_public => true
-    Permission.create :controller => "projects", :action => "changelog", :description => "View change log", :sort => 105, :is_public => true
-    Permission.create :controller => "reports", :action => "issue_report", :description => "View reports", :sort => 110, :is_public => true
-    Permission.create :controller => "projects", :action => "settings", :description => "Settings", :sort => 150
-    Permission.create :controller => "projects", :action => "edit", :description => "Edit", :sort => 151
+    Permission.create :controller => "projects", :action => "show", :description => "label_overview", :sort => 100, :is_public => true
+    Permission.create :controller => "projects", :action => "changelog", :description => "label_change_log", :sort => 105, :is_public => true
+    Permission.create :controller => "reports", :action => "issue_report", :description => "label_report_plural", :sort => 110, :is_public => true
+    Permission.create :controller => "projects", :action => "settings", :description => "label_settings", :sort => 150
+    Permission.create :controller => "projects", :action => "edit", :description => "button_edit", :sort => 151
     # members
-    Permission.create :controller => "projects", :action => "list_members", :description => "View list", :sort => 200, :is_public => true
-    Permission.create :controller => "projects", :action => "add_member", :description => "New member", :sort => 220
-    Permission.create :controller => "members", :action => "edit", :description => "Edit", :sort => 221
-    Permission.create :controller => "members", :action => "destroy", :description => "Delete", :sort => 222
+    Permission.create :controller => "projects", :action => "list_members", :description => "button_list", :sort => 200, :is_public => true
+    Permission.create :controller => "projects", :action => "add_member", :description => "button_add", :sort => 220
+    Permission.create :controller => "members", :action => "edit", :description => "button_edit", :sort => 221
+    Permission.create :controller => "members", :action => "destroy", :description => "button_delete", :sort => 222
     # versions
-    Permission.create :controller => "projects", :action => "add_version", :description => "New version", :sort => 320
-    Permission.create :controller => "versions", :action => "edit", :description => "Edit", :sort => 321
-    Permission.create :controller => "versions", :action => "destroy", :description => "Delete", :sort => 322
+    Permission.create :controller => "projects", :action => "add_version", :description => "button_add", :sort => 320
+    Permission.create :controller => "versions", :action => "edit", :description => "button_edit", :sort => 321
+    Permission.create :controller => "versions", :action => "destroy", :description => "button_delete", :sort => 322
     # issue categories
-    Permission.create :controller => "projects", :action => "add_issue_category", :description => "New issue category", :sort => 420
-    Permission.create :controller => "issue_categories", :action => "edit", :description => "Edit", :sort => 421
-    Permission.create :controller => "issue_categories", :action => "destroy", :description => "Delete", :sort => 422
+    Permission.create :controller => "projects", :action => "add_issue_category", :description => "button_add", :sort => 420
+    Permission.create :controller => "issue_categories", :action => "edit", :description => "button_edit", :sort => 421
+    Permission.create :controller => "issue_categories", :action => "destroy", :description => "button_delete", :sort => 422
     # issues
-    Permission.create :controller => "projects", :action => "list_issues", :description => "View list", :sort => 1000, :is_public => true
-    Permission.create :controller => "projects", :action => "export_issues_csv", :description => "Export list to CSV", :sort => 1001, :is_public => true
-    Permission.create :controller => "issues", :action => "show", :description => "View", :sort => 1005, :is_public => true
-    Permission.create :controller => "issues", :action => "download", :description => "Download file", :sort => 1010, :is_public => true
-    Permission.create :controller => "projects", :action => "add_issue", :description => "Report an issue", :sort => 1050, :mail_option => 1, :mail_enabled => 1
-    Permission.create :controller => "issues", :action => "edit", :description => "Edit", :sort => 1055
-    Permission.create :controller => "issues", :action => "change_status", :description => "Change status", :sort => 1060, :mail_option => 1, :mail_enabled => 1
-    Permission.create :controller => "issues", :action => "destroy", :description => "Delete", :sort => 1065
-    Permission.create :controller => "issues", :action => "add_attachment", :description => "Add file", :sort => 1070
-    Permission.create :controller => "issues", :action => "destroy_attachment", :description => "Delete file", :sort => 1075
+    Permission.create :controller => "projects", :action => "list_issues", :description => "button_list", :sort => 1000, :is_public => true
+    Permission.create :controller => "projects", :action => "export_issues_csv", :description => "label_export_csv", :sort => 1001, :is_public => true
+    Permission.create :controller => "issues", :action => "show", :description => "button_view", :sort => 1005, :is_public => true
+    Permission.create :controller => "issues", :action => "download", :description => "button_download", :sort => 1010, :is_public => true
+    Permission.create :controller => "projects", :action => "add_issue", :description => "button_add", :sort => 1050, :mail_option => 1, :mail_enabled => 1
+    Permission.create :controller => "issues", :action => "edit", :description => "button_edit", :sort => 1055
+    Permission.create :controller => "issues", :action => "change_status", :description => "label_change_status", :sort => 1060, :mail_option => 1, :mail_enabled => 1
+    Permission.create :controller => "issues", :action => "destroy", :description => "button_delete", :sort => 1065
+    Permission.create :controller => "issues", :action => "add_attachment", :description => "label_attachment_new", :sort => 1070
+    Permission.create :controller => "issues", :action => "destroy_attachment", :description => "label_attachment_delete", :sort => 1075
     # news
-    Permission.create :controller => "projects", :action => "list_news", :description => "View list", :sort => 1100, :is_public => true
-    Permission.create :controller => "news", :action => "show", :description => "View", :sort => 1101, :is_public => true
-    Permission.create :controller => "projects", :action => "add_news", :description => "Add", :sort => 1120
-    Permission.create :controller => "news", :action => "edit", :description => "Edit", :sort => 1121
-    Permission.create :controller => "news", :action => "destroy", :description => "Delete", :sort => 1122
+    Permission.create :controller => "projects", :action => "list_news", :description => "button_list", :sort => 1100, :is_public => true
+    Permission.create :controller => "news", :action => "show", :description => "button_view", :sort => 1101, :is_public => true
+    Permission.create :controller => "projects", :action => "add_news", :description => "button_add", :sort => 1120
+    Permission.create :controller => "news", :action => "edit", :description => "button_edit", :sort => 1121
+    Permission.create :controller => "news", :action => "destroy", :description => "button_delete", :sort => 1122
     # documents
-    Permission.create :controller => "projects", :action => "list_documents", :description => "View list", :sort => 1200, :is_public => true
-    Permission.create :controller => "documents", :action => "show", :description => "View", :sort => 1201, :is_public => true
-    Permission.create :controller => "documents", :action => "download", :description => "Download", :sort => 1202, :is_public => true
-    Permission.create :controller => "projects", :action => "add_document", :description => "Add", :sort => 1220
-    Permission.create :controller => "documents", :action => "edit", :description => "Edit", :sort => 1221
-    Permission.create :controller => "documents", :action => "destroy", :description => "Delete", :sort => 1222
-    Permission.create :controller => "documents", :action => "add_attachment", :description => "Add file", :sort => 1223
-    Permission.create :controller => "documents", :action => "destroy_attachment", :description => "Delete file", :sort => 1224
+    Permission.create :controller => "projects", :action => "list_documents", :description => "button_list", :sort => 1200, :is_public => true
+    Permission.create :controller => "documents", :action => "show", :description => "button_view", :sort => 1201, :is_public => true
+    Permission.create :controller => "documents", :action => "download", :description => "button_download", :sort => 1202, :is_public => true
+    Permission.create :controller => "projects", :action => "add_document", :description => "button_add", :sort => 1220
+    Permission.create :controller => "documents", :action => "edit", :description => "button_edit", :sort => 1221
+    Permission.create :controller => "documents", :action => "destroy", :description => "button_delete", :sort => 1222
+    Permission.create :controller => "documents", :action => "add_attachment", :description => "label_attachment_new", :sort => 1223
+    Permission.create :controller => "documents", :action => "destroy_attachment", :description => "label_attachment_delete", :sort => 1224
     # files
-    Permission.create :controller => "projects", :action => "list_files", :description => "View list", :sort => 1300, :is_public => true
-    Permission.create :controller => "versions", :action => "download", :description => "Download", :sort => 1301, :is_public => true
-    Permission.create :controller => "projects", :action => "add_file", :description => "Add", :sort => 1320
-    Permission.create :controller => "versions", :action => "destroy_file", :description => "Delete", :sort => 1322
+    Permission.create :controller => "projects", :action => "list_files", :description => "button_list", :sort => 1300, :is_public => true
+    Permission.create :controller => "versions", :action => "download", :description => "button_download", :sort => 1301, :is_public => true
+    Permission.create :controller => "projects", :action => "add_file", :description => "button_add", :sort => 1320
+    Permission.create :controller => "versions", :action => "destroy_file", :description => "button_delete", :sort => 1322
     
     # create default administrator account
     user = User.create :firstname => "redMine", :lastname => "Admin", :mail => "admin@somenet.foo", :mail_notification => true, :language => "en"
diff --git a/redmine/db/migrate/002_default_configuration.rb b/redmine/db/migrate/002_default_configuration.rb
deleted file mode 100644
index 794a96b..0000000
--- a/redmine/db/migrate/002_default_configuration.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class DefaultConfiguration < ActiveRecord::Migration
-  def self.up
-    # roles
-    r = Role.create(:name => "Manager")
-    r.permissions = Permission.find(:all)
-    r = Role.create :name => "Developer"
-    r.permissions = Permission.find(:all)
-    r = Role.create :name => "Reporter"
-    r.permissions = Permission.find(:all)
-    # trackers
-    Tracker.create(:name => "Bug", :is_in_chlog => true)
-    Tracker.create(:name => "Feature request", :is_in_chlog => true)
-    Tracker.create(:name => "Support request", :is_in_chlog => false)
-    # issue statuses
-    IssueStatus.create(:name => "New", :is_closed => false, :is_default => true, :html_color => 'F98787')
-    IssueStatus.create(:name => "Assigned", :is_closed => false, :is_default => false, :html_color => 'C0C0FF')
-    IssueStatus.create(:name => "Resolved", :is_closed => false, :is_default => false, :html_color => '88E0B3')
-    IssueStatus.create(:name => "Feedback", :is_closed => false, :is_default => false, :html_color => 'F3A4F4')
-    IssueStatus.create(:name => "Closed", :is_closed => true, :is_default => false, :html_color => 'DBDBDB')
-    IssueStatus.create(:name => "Rejected", :is_closed => true, :is_default => false, :html_color => 'F5C28B')
-    # workflow
-    Tracker.find(:all).each { |t|
-      Role.find(:all).each { |r|
-        IssueStatus.find(:all).each { |os|
-          IssueStatus.find(:all).each { |ns|
-            Workflow.create(:tracker_id => t.id, :role_id => r.id, :old_status_id => os.id, :new_status_id => ns.id) unless os == ns
-          }        
-        }      
-      }
-    }    
-    # enumeartions
-    Enumeration.create(:opt => "DCAT", :name => 'Uncategorized')
-    Enumeration.create(:opt => "DCAT", :name => 'User documentation')
-    Enumeration.create(:opt => "DCAT", :name => 'Technical documentation')
-    Enumeration.create(:opt => "IPRI", :name => 'Low')
-    Enumeration.create(:opt => "IPRI", :name => 'Normal')
-    Enumeration.create(:opt => "IPRI", :name => 'High')
-    Enumeration.create(:opt => "IPRI", :name => 'Urgent')
-    Enumeration.create(:opt => "IPRI", :name => 'Immediate')
-  end
-
-  def self.down
-  end
-end
diff --git a/redmine/db/redmine_demo.db b/redmine/db/redmine_demo.db
deleted file mode 100644
index 6a19ec527623d26c8b1c9218c7d89b3067f2ad41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 40960
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

diff --git a/redmine/doc/CHANGELOG b/redmine/doc/CHANGELOG
index 99f71ba..5d9140d 100644
--- a/redmine/doc/CHANGELOG
+++ b/redmine/doc/CHANGELOG
@@ -11,19 +11,20 @@ http://redmine.org/
 * token based "lost password" functionality
 * user self-registration functionality (optional)
 * custom fields now available for issues, users and projects
-* new custom field format "text" (textarea) 
-* project & administration drop down menus in navigation bar
+* new custom field format "text" (displayed as a textarea field) 
+* project & administration drop down menus in navigation bar for quicker access
+* "due date" field added on issues
 * error messages internationalization
 * Localization plugin replaced with GLoc 1.1.0
 * new filter in issues list: "Fixed version"
-* colored background for active filters on issues list
+* active filters are displayed with colored background on issues list
 * custom configuration is now defined in config/config_custom.rb
 * user object no more stored in session (only user_id)
 * news summary field is no longer required
 * Fixed: boolean custom field not working
 * Fixed: error messages for custom fields are not displayed
 * Fixed: custom fields values are not validated on issue update
-* Fixed: user unable to choose an empty value for 'List' custom fields
+* Fixed: unable to choose an empty value for 'List' custom fields
 * Fixed: no issue categories sorting
 * Fixed: incorrect versions sorting
 
diff --git a/redmine/doc/docbook/fr/images/issues_list.png b/redmine/doc/docbook/fr/images/issues_list.png
new file mode 100644
index 0000000000000000000000000000000000000000..47eab0fca46c570c533b8851aa0323e70e90b6e9
GIT binary patch
literal 8233
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
R$^DtRs-ouea(RpQ{{w%&p_>2z

literal 0
Hc$@<O00001

diff --git a/redmine/doc/docbook/fr/images/users_list.png b/redmine/doc/docbook/fr/images/users_list.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c9ef86ec6d739f9e86e7d586c3a7581710065fa
GIT binary patch
literal 6502
zc$}SB1yodByB;J20VxrXMnWWq?xBY68sGyFhAu${DH%W-=|;Lmy4#_L5Trvwk%plp
zB`@Ip@Be>y{cGJgYn}7%^X_-QXYaGtexCQ)p&DxP_z#{u0002^iVCt?0KmQNo3<<V
zz1!y-1;HD`2?OiHWL{gC!fakS(&^YZSOCmz960HC_~~q2Z5-)%xVZ)BfItyGei0xq
z9UC{0n|p?n)97a8eVC#u`2Hjo1r7&;hDUPljSI&~!N3Ioz$L!D(MIRt7dK7}D=Aee
z0H87o_reqt03dHxl$FwP|F)g(5Kaa5MA|J>wALScI@rgp17^wZ$3N?#C!QYh%n?N+
zdn!bM)<H|yr-)^aNgoo(4pxvP4x}1k)nXtN4&ctbC!Ku$a#1KujcqIX)OU*54I{O+
zYpt3Z!D|Qga<gg@<=37msB8Yz)YRP6?74b9=02}&%%v`FJbzH0v{UAuArH8{loV>M
z(eGNsT2|K)QBh<LIJa+-cpnBW)33E^#P2!{E9jF&Xkp(?uKya*Gw4EG&qMQ_LYUqd
znqgIJO6ptS*_snL<?6;CI%!nTU`--#$7GdA{ttGXB+vAHK(+n?iVMWK^v%Z9_$-T|
zt<WUO1~I9On3N`n@8!Tz;n3X1<4LaF@#+%knIh>rq$l8e+MUm+>d(8N?-9JdY~MFS
z{5iEO?_?_F7Z%Z_UJ<ofU$%;gvwy9^YMjD+bSfLHpX0az*>o?dHMFO-iMe;~Yn<b7
z^i?xnVk>^0YzcI_oq6UQ9D@i9?m}S5XJ8$ZfA_JnS8@-=;LMW#(aODY6#97ua}qe0
z%Qi5<jDH51!kGCabLRWGBwhlznqW@mZ8|0OtnyOwS{C0P+by39Y+UYkRdr6c1iDUQ
zd}T>!Sp3Si<P+15?m!u?L6RNE7y8BH5+?<Zts%h?NoB%}5fOaJ$!{d0O4}aYa^{Ay
z)>O}$(KaxiQRQ&+JCd>&y>7_vv84=4u6#WPQ&?u=`*oIya-**@MPA}R7j4>l>n+$<
z5N$!mpPkhC``MfQMOI~;PFXxe3}7Kc|6wSp$z%BlcE!n+Z=p?5#n#ZvU{v_3u~ZGE
zuO$`F)FN|^ay9q;+Buy<{+|@HhVRslmh{@cJx4lFZa!aMD_A0wh_r+X95qMx*gU3L
zIb<|gqh!7xWv(eJ**sjnsYx-@D|?#M_KA74T)V@jg-BQu^R?XSMb0W_i38plB(*`e
zqOSkUq0`<mP*nEW_(g`K8Nnf~B}`><K_?u_A}0jMP2|Z>HcFc5tiM8&r#Cw*DI{KB
zAbLNgJY$*QaLjo73rb3>3_6uy6kKz@RWDC}1DVdyP8FmPA{d2TZN%hfoRhI_a^zlW
z6w0U(!7KtS%W>S~FHaH|DutT^^~KQj*@;e!&szlzf+cpi$!I}|oRR!#S=#;bEOOOO
z)=z@Fekq#G{^F{Cg!e5vLHtN{?2(1d*m&8Vw#;|H;O1Yhq_Onu^ChMm)RYv+_;!P|
zN8T#k2V!U6Pfy*eXQ%=mY(clNThjmSW=Me*;hvB>WGIf((uh(MZ!L_74PYi}ylk#@
z>dV`IVi6!7`DE{C99`PS=qsj30qD79bgW2To+Y}r{sf?er^ga&P}5(}BpTCQo$+?l
z^gn>%{mu5boF{|{VBPIm-1bW)5+v7ShXk;Fi;V#*m04(dVlrBZ2%#Q@|C1T?IcriT
zajJ3qIzJDl+X3;Uyt|NFIFtk}Hl+`JsadO=Ig2wF+TPILw~Gk0&y}Xv)heAJV=vLu
zHN+IT`-s%X5Q;LlV^rp}*Iw^(pWaY@ITf|1(?Qc34Q2DD5XPUVeW!Hsa{_8nm+jK|
z*;KcZ!NxtV$aIg5ZFH|=@8k7L=w`A$?H%r*c@faeG&&q4;@h>%HD0cgiq<=v?fpnP
zGL&&(?12IRM5t**+STO-0p}wJYycfd?5A3Wy~9k!w}ZKb2Pw<N=CScR9&V*3VEl%%
z7wL|oVaa_+=o^HGFZ@@DZs_R<0pb;-nr5AaLpHv^G@vy7lGL05i=2Lcu?~?wjb)Uc
zp`=bP6uC9*!+DAQaf;IMEuWTfHSbt;^*n#agc8`n3cdtXIczx_Zw1pN&Y2c=&4SLq
z?m<A@Thb(P>4BCG*hX&l+@dcth8Ydq=}*m=xYrqQ@8co10}1laPWy@FGFmzU&irD)
z&$Pe-Q!1&R)7*n3-wh!HV!0b-d^S)ira(`|0y27oIxVrUF6ohD8_{KHVRRsBUh4-~
z%QB}ewMw+{51$*o?Yl>m8}!P?PmcvPcJ6GB^VHRsy9!P>q5<hBff>cTgm^;OYTjR#
zsVx=9_d$UyLM<P$`>IICCV&}BP1NZnc_KlXyg!*joH$tt6_(EF;f8QAW-5>$*{^_F
zg%?J}y21p?z1J%TczL5Ery>Q!5x90)My77^4%y%EsIT*C=vyGuv<x{CX%!Hb8Yz|p
zcINXZJBfjv(4&KJnS`)%!{m6skWksnr%z7g!SX(Z_E<4s?34a+6@B&IpLy5b{Igfv
z&b3Yoircmf`=3}L@An!IVc6e!_-X<ij9NVvA9rYtIB_yY7Zx@$$bW*mUrK>mt_W?3
zB+{aGUk!w5AS;6vMyRpF6B<AF2%5Fz7#TP_M~s}Pds3QH%O7b(R6xjz5&0xzQ{{_I
zT@ISU$`l~(G3j%EeQIx434598mZjAK6ImWRXk+)IsvUzoB<w;Xq*&XNE<Z-3!jGgo
zcaO?yp|}5McWx4w&tP4VO7`p`VPaU|{a9XWXEibiQo3}XTymM(d$0!Qn?X@hs)1Qc
z(U_OyW99>`Ajz(EQw>Mv<jcOCkOptkB{|zw3P^L;kxaiKIV#{|b$?UbQj;+-dl<<6
zjy=HPoL*a-Y+8U6c=aZEr$vi^8n;_SPJHK{0_S^0l1J@d^`d|3h2>Fv;K2qdKsQCq
zxC_!xwXhiE?k^^rxWD=!;XO2fz+2^lfhU6!dM83J3G0SSie<VoARlNM)Fk*_;pXPT
zmuz2ok6MU_yA-~6D-bQdQxX@*B0#`cQEb&NJ!i<ANA;{Ye(y$Pr>7rzRX?k2yO@X>
zY+|@}#x5Sx{!X3^sdjX=XOsidkSufuW5jY9H|0!-Af?xPdV7yhcF*o7iQ}syr7I&%
zaa{x1UhYkkGZ^689-nB{{owO<6h3FsrhL1|(BdQI9d4#5GpMr}l>K=<wd(P5=n%1c
zZJi#K<4lxWmh5Fu?pRL8?}Mf0ssIt^@Mc3Kbh62Cy^?A!**7CuV*}^8>czI+7W?HX
zJuI~VKe!@%W-6mfnC;nwtN3UtB&=z_spD|y4v5o);FZ=<23<X=i3uI_iPHvI6gZBB
zn^1Neg2zv^bt3SFV2Ah={CEu_6jhx-FN@6`784NS#G|}W*z+~RFH=setnNm&LUB=<
z>r(j7^jzAO)4}i`SoXF8ah%DJd-+z;T#{|@QLaarAKE5@igffMA9_o8{7j?_GX7dR
zysH^C$uIqiJ?KHoF{IFN+*gj{XE*vV@D}5+wMr*xrfYU;PeAh$b*n?Qxs3_4)K~j0
zePc;CB(g38-6G?&-8}tAv;+I}(W&_E&iV4n$wT!F`xT?J{*mn9)cV#cXtCYb^Mu<l
zjmMiuSVg*-@a4}|^{-07pG!5Rm#vk2Qx=L#*<9lE%hu8neAK2^BaycV@9V08?_9cV
zWXIy+t(BoOW`%Z_1N&g7ne!X@U5&?qabkQj6Gx+^l_+nbZ&t`;2`GLTpxcurcMK3T
z1S=BU=TCKb`QolTw7}eYdz*o<%T+Wz#pbJn-RCuhkg<$NQpBWwuYl(Xo33K5o=HW8
zp{@<-`dxmEYzE7Qg_&v}v)%TmfnuQ5_Q9<TFMHIdCBi=eU7fDSC=d+wrMCXft5*w^
z0&5)zp*O4f^#rJylbPI;s3NGD_Z{hBpv2wH*XjoU5-8b!y>^@mLCw`|bo!f2+Tqv6
zkVoB4Op-9FA&%v*n}}nv`g&>R-_KJR^Su^~w;-D6WyO%fgs(r@?8PikQtz)9ejKg-
zArHEMk1&%9NT^1H7jo2kk@9a3c%o5+5(s`%H2Sf5sN?yd-PtJk%4I`dvUR~}DL1A+
zB|Rl0eY=b(^6k@iFtMP}a7bp8U<BEzO1QcHBltkw_0i6S;>TB|v~kRWT1dW>E`DaG
z`O0nbK3miNi7d%S5Uiv91Sa!EXOhkPa*wkW@*T@6?R|^K8Vt!fnrT^|vyMLnw%#Ck
z!cUKkEm)dbFl<E!LyH<J>lCk38(_-O2~VeSobkR^rYKvY8-Fql_&#b5dfstb6%Z2(
zAvXX;TVE{WRx7POxO~01*#H9iC1V*=TdFy^YZAp;uoV<T#gML|A_k$Z;h?1@Tq5|x
z5L%N(bc>=>V?WIlr`W2jqW-vu$Yg2DpkXyo+O7=a*s0$O1v(P{o`A1DralU$;gRAZ
zMdrZH+8?>#rY2c*KlG5C%t1j$RTvzuCE(x75a4A2s(kAh79i(a+(|u7<zpnaQ_j#)
zkB84;N(m`{5gS;c!<UAOv%Fzb)=RWS{=$QBB|f^`W}T&ldWf5fQ`wA{XTO*>nFzl0
zkSuQu`mzt59w&V5E6`NBx~JEZcQgA#FZ9vO_t8*_vcQTr25weT1znr##RsO8F}a^Y
zXZ;I!)DjVUKS_kWN$Nw;+-k45qgbcgLVs$yNAkWhx7hzVGLVF@oYg59-gd%P?(RVE
zqo@%od|wPT4L?s%YHhP{`r$Le@q2}BPjFgiBoyf-^&NVP^0B=+*n<}qmn5bqoxLg8
zkTotd1qc$>9UzUYz^)>!+YVMyHGVm(({(y)+H{~K4r3o51^R{3D^Q#R-M6_daQciP
z6zn4HVK&^@*vN|xud%}omlszSonV>oq>HWIySApKymbP{Eu$BN&cBL^4xT<8*f8<P
zxXIOYVywM=@3$Ff@*$SFr|?S`zN<9nEcR+}A#HNyF}Ys@Hf8EHJq4dvG28$h^l=lr
z2cJ>}GGLotRJ&O?5%_eE-rSK6NkBo-xIkc2J5*WDU<3+QsOf=rynjp5hUMBXButvI
z8efXVk#_hV@rcbnHl{~2rsuQ++^{e_?l-2+6kfEX<=SDsfG(Wn(uCvV@A|ObzESR<
zP;NJGj^kq8=H%*m&6vx=tmA36F-m&%rr0$RenHrzIu<0O--BYCpTNaS*leQN7-R#_
zyBnK&TD^VSGGnhsg;?KxmivQy;0DI`A67nAM&TvLtgXW;1p{Y-n6}%cp<$n5+EXGw
z)8_`EL0Dwo2w9e^%wH~Vt({2h9`VVmtI0}y=?2sYO>NXzS*;@`)LUE*{mBq1M038X
zgO;OUZW`?cuWUd3WyB-P|0|-Kp@mB#B|rP}{Rq3k7;nj1L$8-(O;Zcku=D8;qEnHp
zdX8?V$OC3|6Zq0nE<r@8$?(Ubr6uv0{{^n6o?a^5hLP+4|8ad?0(4h?w+XDyyBXI2
z|7dsYo#vft7V*41_NdPlU24i-0D9Ee#o<yBC^W~KuvnUhwgR(lEyRCh#pLh1v<;4h
zyu90u4ufQr8$W6a#~91`A6G>zY%Bjm5UeSZ{ef-5=Vn1$H`PANF^yR4H9B;><lpE4
zDI=?|S2D;UBQLv?<5g<A_jQ&uCRCyaqqFyqQRk?UbL73|3JENLhS|=-QQUR9*xSXe
z?^m9`_DDeRYHJt3Gr@n#1hIjJf0YSOU-I5aA-Z?e=SgGgBYN1UOJr9btCtAllh$4D
z)9!1PQp2OD>%A}NT-SNlxqxSEG|nvQb#?ao^WK_JGGqq9O4(8IM~|rq|EBJ|$eGJk
zv}@xTe>|_n>RNs4j6h~mT-OkBiAwEu?km(J>EZ6K_+dvRXy%vvdmpRcZb3di+p#$j
zS}~^;-^OSpX|*>L?;$rn1!Z^=YLp8;GU0dYj@tM#r1Ev>O%h(PNwn_~&~T3|2DPxJ
zq6~}`u713m{?O>m!6gLclxmArx!2vV?&BoIGDi%be@#IAdOh<^b$PH_+!DmGcMO1t
z2qZ{36Z)H`C`z?3g8*i;a<WDFNQk7)bX_1N$r)>nYRC<k0>mEEFLI<CMBuEJ_-@a%
z!*9&*0hvjaKBw6;P^O0^Y>hVwE~9rrzoFB&&4xH9OCZUNODkFVODD?}Cs_SL=!Qy0
z_3o(TBb%vSk1?9PrJB|ae{|ihD{SVEvRHg^Qv{C5luNjlBNp%T=ws6wBr4Lu>8eZu
z7}O=^q(@;<(>Px<*EWK+0?2q65EVhHzfOMDZ5$rl6WDXrT!YT#?J?<3Gm$37j*?bo
zH&+D8!Wudk`yNUeebn05#f{@RexHmBT4>le5&xBnFxejzJhb!vXn0Z<1AfnWHAu@o
zdpSUbH*9l#w!V&v4;HP$UVM@AVbO(m>wyLz%?X6abYUtxo9Tvda(p%f=CM&`CKr27
z*qNbuvg($xwqndB!WT|wi`}aF>%Bh@n(zI_KB%EG;9@j5dDe{PFUbmTDA<?fjDjhR
zJ1ab9?h}c>;T`jp9`Q5OPZ|MHLYm^ac#OPoT5HAw_C3xFx;(Jsg5*#-14(9V`Dawn
z)kb1U|GPAfQ2v6Pp<o9LzT)<jC#slf?AN}WNNj6GQ<<k>@{7WePcM{odshZb4k%$$
zHyXr#mVh954~U+^`w=)F_&JiTMm`^UPl;jY$wIsx+(Dan!>g@BO|f##qYAF|E;1J`
zHIow04EMBC9${L^$E*CS3s$7rS`~kB%${N!vq<!MX*bq|rLV|DZ-{na?16t3PdiHe
zG1z*QOJ^~F(%&zHm9=a(0rvrQCqn>2P1Sg>eg^AWkZOn}n;}S@rY*JEPpJXoc2msH
zbt}B3fmg9|M{CoaX?Jf@@dRcj&;i#vNKU1y<<2lypjz*qf2`)Atk!?a3T+O_7UG>p
z2$nG`KaMd;XNDAn)<?fx)3b7h3+m$_k8h|CFLSx&%fQPkX^1aRwD}9xM>~pD#8&?$
zVz@L#%FQ<ppda5<%6`V+=9x;hnMxZps8BD+H&1G0jhk+dJ$g8(M}OHCE{-ms(;hF`
zMW|(PJip_EI3sv{`t<b?qA#LzxlY%7FlUkJ>2Gp6d!36Js|&tLrLF+7<CTpE(bSu3
zBbW@QCcm9{1k-Y{t-`~Nc7tmS*QOyvWtlSM^ZVoia>O(Sp_FC*EAQX_rUhTFWL70F
zrYT~rwP?VZ#>{b6rw)|`En<Db1GWg`sHt6B8IshWKhVw7WeK-%xURei3^lo!D6N)f
z*?42Mk#iOchUID&N1@Kj=j?|)82mMM)~WPn`jaI?&mv?CR{{>!kZu+@Bh2Ta8Aj0$
zduj}=k~odqeRQLcd;12<P9e0J+nbm{_OFej4p$ST1z$jt+bC#hUkRk%p8jl0zMpm<
ztI`tcA{ONU`m<yfUQGw--tTyR$DE4!pR=!@$QA7qAW;cL&6#g6FBaBXGd`{31SvJO
z;7dk0r>l9r3A+00vP)DR<i4Mp@{l)GkxUGPb;xmfMhWN#pYb;WmSyv+Uc=T8`bg^M
zxKW;tf$(zuENBxHsMA}65ShqX<+p7=;{Ky&=q7Bp{ZzMJcwLWeL+y5qL=9_%uhre0
zdjHOom<)f8g?)7>ao>o;zc!ysc>HedyeZ<rsk~7MxiSQTue>afdSw53WR>jMDrGxS
zNZYtOv;CKyF0Z!I;$ocsmzw6N?&2@1&W#yvSEI0DRL%wFZC0<W=Zl83jgyn!tg%e`
zXBT(W<*V?oG>Ng>T=4z9z@5IK!y@f&&bss4V{Jk2w31%df3u&B*P5M|<m!Mxpk@f`
zxNifP%#ruD>w)=#%ig#xo!`(N$>wq<9S82=(yjkx*05*Bt0&oQ#k7IM#5<!ZxVMvN
zm$mc$A{%9nnMXuR$a$AKdh9%5Iz+9coqVw7PfhS;J-L^Z`${?y<29qI;jQlwXbDq!
z5{Tw^$JgfOR~O0gb^$J~cYLb^ZaGgNX4lP*A+1*1Y$tcU8-gcfD8if{)W)HF`_}u;
zLxlNS)L$zxFqGwXcF{%d8IT(MyHzW;c`=~<ZM9bfi3tK><Mq)4cl}^B*)r*u@BRa#
Cjxr|z

literal 0
Hc$@<O00001

diff --git a/redmine/doc/docbook/fr/images/workflow.png b/redmine/doc/docbook/fr/images/workflow.png
new file mode 100644
index 0000000000000000000000000000000000000000..04e79d61e35880369b75e2a38fd631a9537d6637
GIT binary patch
literal 6503
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
H%j5q5u-!hK

literal 0
Hc$@<O00001

diff --git a/redmine/doc/docbook/fr/redmine-userdoc-fr.xml b/redmine/doc/docbook/fr/redmine-userdoc-fr.xml
new file mode 100644
index 0000000..08a4e82
--- /dev/null
+++ b/redmine/doc/docbook/fr/redmine-userdoc-fr.xml
@@ -0,0 +1,400 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<book>
+  <title>Documentation redMine</title>
+
+  <chapter>
+    <title>Administration</title>
+
+    <section>
+      <title>Utilisateurs</title>
+
+      <para>Ces écrans vous permettent de gérer les utilisateurs de
+      l'application.</para>
+
+      <section>
+        <title>Liste des utilisateurs</title>
+
+        <para></para>
+
+        <screenshot>
+          <screeninfo>Liste des utilisateurs</screeninfo>
+
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="images/users_list.png" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+
+        <para>Les boutons Lock/Unlock vous permettent de
+        vérouiller/dévérouiller les comptes utilisateurs.</para>
+
+        <para>Un utilisateur dont le compte est vérouillé ne peut plus
+        s'identifier pour accéder à l'application.</para>
+      </section>
+
+      <section>
+        <title>Création ou modification d'un utilisateur</title>
+
+        <para>En mode modification, laissez le champ Password vide pour
+        laisser le mot de passe de l'utilisateur inchangé.</para>
+
+        <para>Un utilisateur déclaré comme administrateur dispose de toutes
+        les permissions sur l'application et sur tous les projets.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><guilabel>Administrateur</guilabel>: déclare l'utilisateur
+            comme administrateur de l'application.</para>
+          </listitem>
+
+          <listitem>
+            <para><guilabel>Notifications par mail</guilabel>: permet
+            d'activer ou non l'envoi automatique de notifications par mail
+            pour cet utilisateur</para>
+          </listitem>
+
+          <listitem>
+            <para><guilabel>Vérouillé</guilabel>: désactive le compte de
+            l'utilisateur</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+    </section>
+
+    <section>
+      <title>Rôles et permissions</title>
+
+      <para>Les rôles permettent de définir les permissions des différents
+      membres d'un projet. Chaque membre d'un projet dispose d'un rôle unique
+      au sein d'un projet. Un utilisateur peut avoir différents rôles au sein
+      de différents projets.</para>
+
+      <para>Sur l'écran d'édition du rôle, cochez les actions que vous
+      souhaitez autoriser pour le rôle.</para>
+    </section>
+
+    <section>
+      <title>Trackers</title>
+
+      <para>Les trackers permettent de typer les demandes et de définir des
+      workflows spécifiques pour chacun de ces types.</para>
+    </section>
+
+    <section>
+      <title>Champs personnalisés</title>
+
+      <para>Les champs personnalisés vous permettent d'ajouter des
+      informations supplémentaires sur les demandes. Un champ personnalisé
+      peut être de l'un des types suivants:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><guilabel>Integer</guilabel>: entier positif ou négatif</para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>String</guilabel>: chaîne de caractère</para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Date</guilabel>: date</para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Boolean</guilabel>: booléen (case à cocher)</para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>List</guilabel>: valeur à sélectionnée parmi une
+          liste prédéfinie (liste déroulante)</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Des éléments de validation peuvent être définis:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><guilabel>Obligatoire</guilabel>: champ dont la saisie est
+          obligatoire sur les demandes</para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Pour tous les projects</guilabel>: champ
+          automatiquement associé à l'ensemble des projets</para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Min - max length</guilabel>: longueurs minimales et
+          maximales pour les champs en saisie libre (0 signifie qu'il n'y a
+          pas de restriction)</para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Expression régulière</guilabel>: expression
+          régulière permettant de valider la valeur saisie</para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Valeurs possibles</guilabel>: valeurs possibles pour
+          les champs de type "Liste". Les valeurs sont séparées par le
+          caractère |</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Si l'option <guilabel>Pour tous les projets</guilabel> n'est pas
+      activée, chaque projet pourra choisir d'utiliser ou non le champ pour
+      ses demandes.</para>
+    </section>
+
+    <section>
+      <title>Statut des demandes</title>
+
+      <para>Ces écrans vous permettent de définir les différents statuts
+      possibles des demandes.</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><guilabel>Demande fermée</guilabel>: indique que le statut
+          correspond à une demande considérée comme fermée</para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Statut par défaut</guilabel>: statut appliqué par
+          défaut aux nouvelles demandes (seul un statut peut être déclaré
+          comme statut par défaut)</para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Couleur</guilabel>: code couleur HTML (6 caractères)
+          représentant le statut à l'affichage</para>
+        </listitem>
+      </itemizedlist>
+
+      <para></para>
+    </section>
+
+    <section>
+      <title>Workflow</title>
+
+      <para>Le workflow permet de définir les changements que les différents
+      membres d'un projet sont autorisés à effectuer sur les demandes, en
+      fonction de leur type.</para>
+
+      <para>Sélectionnez le rôle et le tracker pour lesquels vous souhaitez
+      modifier le workflow, puis cliquez sur Edit. L'écran vous permet alors
+      de modifier, pour le rôle et le tracker choisi, les changements
+      autorisés. Les lignes représentent les statuts initiaux des demandes.
+      Les colonnes représentent les statuts autorisés à être appliqués.</para>
+
+      <para>Remarque: pour qu'un rôle puisse changer le statut des demandes,
+      la permission doit lui être explicitement donnée indépendemment de la
+      configuration du workflow.</para>
+
+      <para></para>
+
+      <screenshot>
+        <screeninfo>Exemple de configuration d'un workflow</screeninfo>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/workflow.png" />
+          </imageobject>
+        </mediaobject>
+      </screenshot>
+
+      <para>Dans l'exemple ci-dessus, les demandes de type Bug au statut
+      Nouveau pourront être passées au statut Assignée ou Résolue par le rôle
+      Développeur. Celles au statut Assignée pourront être passées au statut
+      Résolue. Le statut de toutes les autres demandes de type Bug ne pourra
+      pas être modifié par le Développeur.</para>
+    </section>
+
+    <section>
+      <title>Listes de valeurs</title>
+
+      <para>Les listes de valeurs utilisées par l'application (exemple: les
+      priorités des demandes) peuvent être personnalisées. Cet écran vous
+      permet de définir les valeurs possibles pour chacune des listes
+      suivantes:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Priorités des demandes</para>
+        </listitem>
+
+        <listitem>
+          <para>Catégories de documents</para>
+        </listitem>
+      </itemizedlist>
+
+      <para></para>
+    </section>
+
+    <section>
+      <title>Notifications par mail</title>
+
+      <para>Cet écran vous permet de sélectionner les actions qui donneront
+      lieu à une notification par mail aux membres du projet.</para>
+
+      <para>Remarque: l'envoi de mails doit être activé dans la configuration
+      de l'application si souhaitez effectuer des notifications.</para>
+    </section>
+
+    <section>
+      <title>Informations</title>
+
+      <para>Affiche des informations relatives à l'application et à son
+      environnement.</para>
+    </section>
+  </chapter>
+
+  <chapter>
+    <title>Projets</title>
+
+    <para></para>
+
+    <section>
+      <title>Aperçu du projet</title>
+
+      <para>L'aperçu vous présente les informations générales relatives au
+      projet, les principaux membres, les dernières annonces, ainsi qu'une
+      synthèse du nombre de demandes ouvertes par tracker.</para>
+
+      <para></para>
+    </section>
+
+    <section>
+      <title>Gestion des demandes</title>
+
+      <para></para>
+
+      <section>
+        <title>Liste des demandes</title>
+
+        <para>Par défaut, l'ensemble des demandes ouvertes du projet sont
+        affichées. Différents filtres vous permettent de sélectionner les
+        demandes à afficher. Si le projet comporte des sous-projets, vous avez
+        la possibilité d'afficher également les demandes relatives aux
+        sous-projets (non affichées par défaut).</para>
+
+        <para>Une fois appliqué, un filtre reste valable durant toute votre
+        session. Vous pouvez le redéfinir, ou le supprimer en cliquant sur
+        Annuler.</para>
+
+        <para></para>
+
+        <screenshot>
+          <screeninfo>Liste des demandes</screeninfo>
+
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="images/issues_list.png" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+
+        <para></para>
+      </section>
+    </section>
+
+    <section>
+      <title>Rapports</title>
+
+      <para>Cet écran présente la synthèse du nombre de demandes par statut et
+      selon différents critères (tracker, priorité, catégorie). Des liens
+      directs permettent d'accéder à la liste détaillée des demandes pour
+      chaque critère.</para>
+    </section>
+
+    <section>
+      <title>Historique</title>
+
+      <para>Cette page présente l'ensemble des demandes résolues dans chacune
+      des versions du projet. Certains types de demande peuvent être exclus de
+      cet affichage.</para>
+    </section>
+
+    <section>
+      <title>Annonces</title>
+
+      <para>Les nouvelles vous permettent d'informer les utilisateurs sur
+      l'activité du projet.</para>
+    </section>
+
+    <section>
+      <title>Documents</title>
+
+      <para>Les documents sont groupés par catégories (voir Listes de
+      valeurs). Un document peut contenir plusieurs fichiers (exemple:
+      révisions ou versions successives).</para>
+    </section>
+
+    <section>
+      <title>Fichiers</title>
+
+      <para>Ce module vous permet de publier les différents fichiers (sources,
+      binaires, ...) pour chaque version de l'application.</para>
+    </section>
+
+    <section>
+      <title>Configuration du projet</title>
+
+      <para></para>
+
+      <section>
+        <title>Propriétés du projet</title>
+
+        <para></para>
+
+        <itemizedlist>
+          <listitem>
+            <para><guilabel>Public</guilabel>: si le projet est public, il
+            sera visible (consultation des demandes, des documents, ...) pour
+            l'ensemble des utilisateurs, y compris ceux qui ne sont pas
+            membres du projet. Si le projet n'est pas public, seuls les
+            membres du projet y ont accès, en fonction de leur rôle.</para>
+          </listitem>
+
+          <listitem>
+            <para><guilabel>Champs personnalisés</guilabel>: sélectionner les
+            champs personnalisés que vous souhaitez utiliser au sein du
+            projet. Seul l'administrateur peut ajouter de nouveaux champs
+            personnalisés.</para>
+          </listitem>
+        </itemizedlist>
+
+        <para></para>
+      </section>
+
+      <section>
+        <title>Membres</title>
+
+        <para>Cet écran vous permet de définir les membres du projet ainsi que
+        leurs rôles respectifs. Un utilisateur ne peut avoir qu'un rôle au
+        sein d'un projet donné. Le rôle d'un membre détermine les permissions
+        dont il bénéficie sur le projet.</para>
+      </section>
+
+      <section>
+        <title>Versions</title>
+
+        <para>Les versions vous permettent de suivre les changements survenus
+        tout au long du projet. A la fermeture d'une demande, vous pouvez par
+        exemple indiquer quelle version la prend en compte. Vous pouvez par
+        ailleurs publier les différentes versions de l'application (voir
+        Fichiers).</para>
+      </section>
+
+      <section>
+        <title>Catégories des demandes</title>
+
+        <para>Les catégories de demande vous permettent de typer les demandes.
+        Les catégories peuvent par exemple correspondre aux différents modules
+        du projet.</para>
+      </section>
+    </section>
+  </chapter>
+</book>
\ No newline at end of file
diff --git a/redmine/lang/en.yml b/redmine/lang/en.yml
index 04d671f..81d5d97 100644
--- a/redmine/lang/en.yml
+++ b/redmine/lang/en.yml
@@ -42,6 +42,7 @@ general_text_No: 'No'
 general_text_Yes: 'Yes'
 general_text_no: 'no'
 general_text_yes: 'yes'
+general_lang_en: 'English'
 
 notice_account_updated: Account was successfully updated.
 notice_account_invalid_creditentials: Invalid user or password
diff --git a/redmine/lang/fr.yml b/redmine/lang/fr.yml
index 560b11b..807a22d 100644
--- a/redmine/lang/fr.yml
+++ b/redmine/lang/fr.yml
@@ -1,4 +1,4 @@
-_gloc_rule_default: '|n| n==1 ? "" : "_plural" '
+_gloc_rule_default: '|n| n<=1 ? "" : "_plural" '
 
 actionview_datehelper_select_day_prefix:
 actionview_datehelper_select_month_names: Janvier,Février,Mars,Avril,Mai,Juin,Juillet,Août,Septembre,Octobre,Novembre,Décembre
@@ -42,6 +42,7 @@ general_text_No: 'Non'
 general_text_Yes: 'Oui'
 general_text_no: 'non'
 general_text_yes: 'oui'
+general_lang_fr: 'Français'
 
 notice_account_updated: Le compte a été mis à jour avec succès.
 notice_account_invalid_creditentials: Identifiant ou mot de passe invalide.
@@ -49,10 +50,11 @@ notice_account_password_updated: Mot de passe mis à jour avec succès.
 notice_account_wrong_password: Mot de passe incorrect
 notice_account_register_done: Un message contenant les instructions pour activer votre compte vous a été envoyé.
 notice_account_unknown_email: Aucun compte ne correspond à cette adresse.
+notice_can_t_change_password: Ce compte utilise une authentification externe. Impossible de changer le mot de passe.
 notice_account_lost_email_sent: Un message contenant les instructions pour choisir un nouveau mot de passe vous a été envoyé.
 notice_account_activated: Votre compte a été activé. Vous pouvez à présent vous connecter.
-notice_successful_update: Mise à jour effectuée avec succès.
 notice_successful_create: Création effectuée avec succès.
+notice_successful_update: Mise à jour effectuée avec succès.
 notice_successful_delete: Suppression effectuée avec succès.
 notice_successful_connection: Connection réussie.
 
@@ -90,6 +92,7 @@ field_is_default: Statut par défaut
 field_html_color: Couleur
 field_tracker: Tracker
 field_subject: Sujet
+field_due_date: Date d'échéance
 field_assigned_to: Assigné à
 field_priority: Priorité
 field_fixed_version: Version corrigée
@@ -127,24 +130,36 @@ label_user_new: Nouvel utilisateur
 label_project: Projet
 label_project_new: Nouveau projet
 label_project_plural: Projets
+label_project_latest: Derniers projets
 label_issue: Demande
 label_issue_new: Nouvelle demande
 label_issue_plural: Demandes
+label_issue_view_all: Voir toutes les demandes
+label_document: Document
+label_document_new: Nouveau document
+label_document_plural: Documents
 label_role: Rôle
 label_role_plural: Rôles
-label_role_add: Nouveau rôle
+label_role_new: Nouveau rôle
 label_role_and_permissions: Rôles et permissions
+label_member: Membre
+label_member_new: Nouveau membre
+label_member_plural: Membres
 label_tracker: Tracker
 label_tracker_plural: Trackers
-label_tracker_add: Nouveau tracker
+label_tracker_new: Nouveau tracker
 label_workflow: Workflow
 label_issue_status: Statut de demandes
 label_issue_status_plural: Statuts de demandes
-label_issue_status_add: Nouveau statut
+label_issue_status_new: Nouveau statut
+label_issue_category: Catégorie de demandes
+label_issue_category_plural: Catégories de demandes
+label_issue_category_new: Nouvelle catégorie
 label_custom_field: Champ personnalisé
 label_custom_field_plural: Champs personnalisés
 label_custom_field_new: Nouveau champ personnalisé
 label_enumerations: Listes de valeurs
+label_enumeration_new: Nouvelle valeur
 label_information: Information
 label_information_plural: Informations
 label_please_login: Identification
@@ -153,6 +168,7 @@ label_password_lost: Mot de passe perdu
 label_home: Accueil
 label_my_page: Ma page
 label_my_account: Mon compte
+label_my_projects: Mes projets
 label_administration: Administration
 label_login: Connexion
 label_logout: Déconnexion
@@ -182,7 +198,45 @@ label_string: Chaîne
 label_text: Texte
 label_attribute: Attribut
 label_attribute_plural: Attributs
-
+label_download: %d Téléchargement
+label_download_plural: %d Téléchargements
+label_no_data: Aucune donnée à afficher
+label_change_status: Changer le statut
+label_history: Historique
+label_attachment: Fichier
+label_attachment_new: Nouveau fichier
+label_attachment_delete: Supprimer le fichier
+label_attachment_plural: Fichiers
+label_report: Rapport
+label_report_plural: Rapports
+label_news: Annonce
+label_news_new: Nouvelle annonce
+label_news_plural: Annonces
+label_news_latest: Dernières annonces
+label_news_view_all: Voir toutes les annonces
+label_change_log: Historique
+label_settings: Configuration
+label_overview: Aperçu
+label_version: Version
+label_version_new: Nouvelle version
+label_version_plural: Versions
+label_confirmation: Confirmation
+label_export_csv: Exporter en CSV
+label_read: Lire...
+label_public_projects: Projets publics
+label_open_issues: Ouverte
+label_open_issues_plural: Ouvertes
+label_closed_issues: Fermée
+label_closed_issues_plural: Fermées
+label_total: Total
+label_permissions: Permissions
+label_current_status: Statut actuel
+label_new_statuses_allowed: Nouveaux statuts autorisés
+label_all: Tous
+label_none: Aucun
+label_next: Suivant
+label_previous: Précédent
+label_used_by: Utilisé par
 
 button_login: Connexion
 button_submit: Soumettre
@@ -192,8 +246,43 @@ button_uncheck_all: Tout décocher
 button_delete: Supprimer
 button_create: Créer
 button_test: Tester
+button_edit: Modifier
+button_add: Ajouter
+button_change: Changer
+button_apply: Appliquer
+button_clear: Effacer
+button_lock: Verrouiller
+button_unlock: Déverrouiller
+button_download: Télécharger
+button_list: Lister
+button_view: Voir
 
 text_select_mail_notifications: Sélectionner les actions pour lesquelles la notification par mail doit être activée.
 text_regexp_info: eg. ^[A-Z0-9]+$
 text_min_max_length_info: 0 pour aucune restriction
-text_possible_values_info: valeurs séparées par |
\ No newline at end of file
+text_possible_values_info: valeurs séparées par |
+text_project_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce projet et tout ce qui lui est rattaché ?
+text_workflow_edit: Sélectionner un tracker et un rôle pour éditer le workflow
+
+default_role_manager: Manager
+default_role_developper: Développeur
+default_role_reporter: Rapporteur
+default_tracker_bug: Anomalie
+default_tracker_feature: Evolution
+default_tracker_support: Assistance
+default_issue_status_new: Nouveau
+default_issue_status_assigned: Assigné
+default_issue_status_resolved: Résolu
+default_issue_status_feedback: Commentaire
+default_issue_status_closed: Fermé
+default_issue_status_rejected: Rejeté
+default_doc_category_user: Documentation utilisateur
+default_doc_category_tech: Documentation technique
+default_priority_low: Bas
+default_priority_normal: Normal
+default_priority_high: Haut
+default_priority_urgent: Urgent
+default_priority_immediate: Immédiat
+
+enumeration_issue_priorities: Priorités des demandes
+enumeration_doc_categories: Catégories des documents
diff --git a/redmine/lib/tasks/load_default_data.rake b/redmine/lib/tasks/load_default_data.rake
new file mode 100644
index 0000000..1cf0f8f
--- /dev/null
+++ b/redmine/lib/tasks/load_default_data.rake
@@ -0,0 +1,43 @@
+desc 'Load default configuration data (using default language)'
+
+task :load_default_data => :environment do
+  include GLoc
+  set_language_if_valid($RDM_DEFAULT_LANG)
+  
+  # roles
+  r = Role.create :name => l(:default_role_manager) 
+  r.permissions = Permission.find(:all, :conditions => ["is_public=?", false])
+  r = Role.create :name => l(:default_role_developper)
+  r.permissions = Permission.find(:all, :conditions => ["is_public=?", false])
+  r = Role.create :name => l(:default_role_reporter)
+  r.permissions = Permission.find(:all, :conditions => ["is_public=?", false])
+  # trackers
+  Tracker.create(:name => l(:default_tracker_bug), :is_in_chlog => true)
+  Tracker.create(:name => l(:default_tracker_feature), :is_in_chlog => true)
+  Tracker.create(:name => l(:default_tracker_support), :is_in_chlog => false)
+  # issue statuses
+  IssueStatus.create(:name => l(:default_issue_status_new), :is_closed => false, :is_default => true, :html_color => 'F98787')
+  IssueStatus.create(:name => l(:default_issue_status_assigned), :is_closed => false, :is_default => false, :html_color => 'C0C0FF')
+  IssueStatus.create(:name => l(:default_issue_status_resolved), :is_closed => false, :is_default => false, :html_color => '88E0B3')
+  IssueStatus.create(:name => l(:default_issue_status_feedback), :is_closed => false, :is_default => false, :html_color => 'F3A4F4')
+  IssueStatus.create(:name => l(:default_issue_status_closed), :is_closed => true, :is_default => false, :html_color => 'DBDBDB')
+  IssueStatus.create(:name => l(:default_issue_status_rejected), :is_closed => true, :is_default => false, :html_color => 'F5C28B')
+  # workflow
+  Tracker.find(:all).each { |t|
+    Role.find(:all).each { |r|
+      IssueStatus.find(:all).each { |os|
+        IssueStatus.find(:all).each { |ns|
+          Workflow.create(:tracker_id => t.id, :role_id => r.id, :old_status_id => os.id, :new_status_id => ns.id) unless os == ns
+        }        
+      }      
+    }
+  }    
+  # enumerations
+  Enumeration.create(:opt => "DCAT", :name => l(:default_doc_category_user))
+  Enumeration.create(:opt => "DCAT", :name => l(:default_doc_category_tech))
+  Enumeration.create(:opt => "IPRI", :name => l(:default_priority_low))
+  Enumeration.create(:opt => "IPRI", :name => l(:default_priority_normal))
+  Enumeration.create(:opt => "IPRI", :name => l(:default_priority_high))
+  Enumeration.create(:opt => "IPRI", :name => l(:default_priority_urgent))
+  Enumeration.create(:opt => "IPRI", :name => l(:default_priority_immediate))
+end
\ No newline at end of file
diff --git a/redmine/test/fixtures/permissions.yml b/redmine/test/fixtures/permissions.yml
index 5ab97fa..81350e1 100644
--- a/redmine/test/fixtures/permissions.yml
+++ b/redmine/test/fixtures/permissions.yml
@@ -2,7 +2,7 @@
 permissions_041: 
   action: add_file
   id: 41
-  description: Add
+  description: button_add
   controller: projects
   mail_enabled: false
   mail_option: false
@@ -11,7 +11,7 @@ permissions_041:
 permissions_030: 
   action: destroy
   id: 30
-  description: Delete
+  description: button_delete
   controller: news
   mail_enabled: false
   mail_option: false
@@ -20,7 +20,7 @@ permissions_030:
 permissions_019: 
   action: download
   id: 19
-  description: Download file
+  description: button_download
   controller: issues
   mail_enabled: false
   mail_option: false
@@ -29,7 +29,7 @@ permissions_019:
 permissions_008: 
   action: edit
   id: 8
-  description: Edit
+  description: button_edit
   controller: members
   mail_enabled: false
   mail_option: false
@@ -38,7 +38,7 @@ permissions_008:
 permissions_042: 
   action: destroy_file
   id: 42
-  description: Delete
+  description: button_delete
   controller: versions
   mail_enabled: false
   mail_option: false
@@ -47,7 +47,7 @@ permissions_042:
 permissions_031: 
   action: list_documents
   id: 31
-  description: View list
+  description: button_list
   controller: projects
   mail_enabled: false
   mail_option: false
@@ -56,7 +56,7 @@ permissions_031:
 permissions_020: 
   action: add_issue
   id: 20
-  description: Report an issue
+  description: button_add
   controller: projects
   mail_enabled: true
   mail_option: true
@@ -65,7 +65,7 @@ permissions_020:
 permissions_009: 
   action: destroy
   id: 9
-  description: Delete
+  description: button_delete
   controller: members
   mail_enabled: false
   mail_option: false
@@ -74,7 +74,7 @@ permissions_009:
 permissions_032: 
   action: show
   id: 32
-  description: View
+  description: button_view
   controller: documents
   mail_enabled: false
   mail_option: false
@@ -83,7 +83,7 @@ permissions_032:
 permissions_021: 
   action: edit
   id: 21
-  description: Edit
+  description: button_edit
   controller: issues
   mail_enabled: false
   mail_option: false
@@ -92,7 +92,7 @@ permissions_021:
 permissions_010: 
   action: add_version
   id: 10
-  description: New version
+  description: button_add
   controller: projects
   mail_enabled: false
   mail_option: false
@@ -101,7 +101,7 @@ permissions_010:
 permissions_033: 
   action: download
   id: 33
-  description: Download
+  description: button_download
   controller: documents
   mail_enabled: false
   mail_option: false
@@ -110,7 +110,7 @@ permissions_033:
 permissions_022: 
   action: change_status
   id: 22
-  description: Change status
+  description: label_change_status
   controller: issues
   mail_enabled: true
   mail_option: true
@@ -119,7 +119,7 @@ permissions_022:
 permissions_011: 
   action: edit
   id: 11
-  description: Edit
+  description: button_edit
   controller: versions
   mail_enabled: false
   mail_option: false
@@ -128,7 +128,7 @@ permissions_011:
 permissions_034: 
   action: add_document
   id: 34
-  description: Add
+  description: button_add
   controller: projects
   mail_enabled: false
   mail_option: false
@@ -137,7 +137,7 @@ permissions_034:
 permissions_023: 
   action: destroy
   id: 23
-  description: Delete
+  description: button_delete
   controller: issues
   mail_enabled: false
   mail_option: false
@@ -146,7 +146,7 @@ permissions_023:
 permissions_012: 
   action: destroy
   id: 12
-  description: Delete
+  description: button_delete
   controller: versions
   mail_enabled: false
   mail_option: false
@@ -155,7 +155,7 @@ permissions_012:
 permissions_001: 
   action: show
   id: 1
-  description: Overview
+  description: label_overview
   controller: projects
   mail_enabled: false
   mail_option: false
@@ -164,7 +164,7 @@ permissions_001:
 permissions_035: 
   action: edit
   id: 35
-  description: Edit
+  description: button_edit
   controller: documents
   mail_enabled: false
   mail_option: false
@@ -173,7 +173,7 @@ permissions_035:
 permissions_024: 
   action: add_attachment
   id: 24
-  description: Add file
+  description: label_attachment_new
   controller: issues
   mail_enabled: false
   mail_option: false
@@ -182,7 +182,7 @@ permissions_024:
 permissions_013: 
   action: add_issue_category
   id: 13
-  description: New issue category
+  description: button_add
   controller: projects
   mail_enabled: false
   mail_option: false
@@ -191,7 +191,7 @@ permissions_013:
 permissions_002: 
   action: changelog
   id: 2
-  description: View change log
+  description: label_change_log
   controller: projects
   mail_enabled: false
   mail_option: false
@@ -200,7 +200,7 @@ permissions_002:
 permissions_036: 
   action: destroy
   id: 36
-  description: Delete
+  description: button_delete
   controller: documents
   mail_enabled: false
   mail_option: false
@@ -209,7 +209,7 @@ permissions_036:
 permissions_025: 
   action: destroy_attachment
   id: 25
-  description: Delete file
+  description: label_attachment_delete
   controller: issues
   mail_enabled: false
   mail_option: false
@@ -218,7 +218,7 @@ permissions_025:
 permissions_014: 
   action: edit
   id: 14
-  description: Edit
+  description: button_edit
   controller: issue_categories
   mail_enabled: false
   mail_option: false
@@ -227,7 +227,7 @@ permissions_014:
 permissions_003: 
   action: issue_report
   id: 3
-  description: View reports
+  description: label_report_plural
   controller: reports
   mail_enabled: false
   mail_option: false
@@ -236,7 +236,7 @@ permissions_003:
 permissions_037: 
   action: add_attachment
   id: 37
-  description: Add file
+  description: label_attachment_new
   controller: documents
   mail_enabled: false
   mail_option: false
@@ -245,7 +245,7 @@ permissions_037:
 permissions_026: 
   action: list_news
   id: 26
-  description: View list
+  description: button_list
   controller: projects
   mail_enabled: false
   mail_option: false
@@ -254,7 +254,7 @@ permissions_026:
 permissions_015: 
   action: destroy
   id: 15
-  description: Delete
+  description: button_delete
   controller: issue_categories
   mail_enabled: false
   mail_option: false
@@ -263,7 +263,7 @@ permissions_015:
 permissions_004: 
   action: settings
   id: 4
-  description: Settings
+  description: label_settings
   controller: projects
   mail_enabled: false
   mail_option: false
@@ -272,7 +272,7 @@ permissions_004:
 permissions_038: 
   action: destroy_attachment
   id: 38
-  description: Delete file
+  description: label_attachment_delete
   controller: documents
   mail_enabled: false
   mail_option: false
@@ -281,7 +281,7 @@ permissions_038:
 permissions_027: 
   action: show
   id: 27
-  description: View
+  description: button_view
   controller: news
   mail_enabled: false
   mail_option: false
@@ -290,7 +290,7 @@ permissions_027:
 permissions_016: 
   action: list_issues
   id: 16
-  description: View list
+  description: button_list
   controller: projects
   mail_enabled: false
   mail_option: false
@@ -299,7 +299,7 @@ permissions_016:
 permissions_005: 
   action: edit
   id: 5
-  description: Edit
+  description: button_edit
   controller: projects
   mail_enabled: false
   mail_option: false
@@ -308,7 +308,7 @@ permissions_005:
 permissions_039: 
   action: list_files
   id: 39
-  description: View list
+  description: button_list
   controller: projects
   mail_enabled: false
   mail_option: false
@@ -317,7 +317,7 @@ permissions_039:
 permissions_028: 
   action: add_news
   id: 28
-  description: Add
+  description: button_add
   controller: projects
   mail_enabled: false
   mail_option: false
@@ -326,7 +326,7 @@ permissions_028:
 permissions_017: 
   action: export_issues_csv
   id: 17
-  description: Export list to CSV
+  description: label_export_csv
   controller: projects
   mail_enabled: false
   mail_option: false
@@ -335,7 +335,7 @@ permissions_017:
 permissions_006: 
   action: list_members
   id: 6
-  description: View list
+  description: button_list
   controller: projects
   mail_enabled: false
   mail_option: false
@@ -344,7 +344,7 @@ permissions_006:
 permissions_040: 
   action: download
   id: 40
-  description: Download
+  description: button_download
   controller: versions
   mail_enabled: false
   mail_option: false
@@ -353,7 +353,7 @@ permissions_040:
 permissions_029: 
   action: edit
   id: 29
-  description: Edit
+  description: button_edit
   controller: news
   mail_enabled: false
   mail_option: false
@@ -362,7 +362,7 @@ permissions_029:
 permissions_018: 
   action: show
   id: 18
-  description: View
+  description: button_view
   controller: issues
   mail_enabled: false
   mail_option: false
@@ -371,7 +371,7 @@ permissions_018:
 permissions_007: 
   action: add_member
   id: 7
-  description: New member
+  description: button_add
   controller: projects
   mail_enabled: false
   mail_option: false
diff --git a/redmine/test/integration/account_test.rb b/redmine/test/integration/account_test.rb
index 832e003..4f5240b 100644
--- a/redmine/test/integration/account_test.rb
+++ b/redmine/test/integration/account_test.rb
@@ -41,10 +41,6 @@ class AccountTest < ActionController::IntegrationTest
     assert_response :success
     assert_tag :tag => "div", :attributes => { :class => "errorExplanation" }
     
-    post "account/change_password", :password => 'admiN', :new_password => "hello", :new_password_confirmation => "hello"
-    assert_response :success
-    assert_equal 'Wrong password', flash[:notice]
-    
     post "account/change_password", :password => 'jsmith', :new_password => "hello", :new_password_confirmation => "hello"
     assert_response :success
     log_user('jsmith', 'hello')