jro_apps/redmine Commit - r2430:fe28193e4eb9

Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2....

Jean-Philippe Lang -

r2430:fe28193e4eb9

parent child

Context file:

r2430:fe28193e4eb9

Expand all files

The requested changes are too big and content was truncated. Show full diff

config/locales/es.yml created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

config/locales/gl.yml created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

config/locales/ko.yml created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

config/locales/sv.yml created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

config/locales/uk.yml created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

config/locales/vi.yml created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/i18n.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

lib/tasks/initializers.rake created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

test/unit/lib/redmine/i18n_test.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/rails_extensions/form_tag_helpers.rb created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

app/controllers/application.rb +21 -14

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             require 'uri'
             require 'cgi'
             class ApplicationController < ActionController::Base
+              include Redmine::I18n
+              # In case the cookie store secret changes
+              rescue_from CGI::Session::CookieStore::TamperedWithCookie do |exception|
+                render :text => 'Your session was invalid and has been reset. Please, reload this page.', :status => 500
+              end
               layout 'base'
               before_filter :user_setup, :check_if_login_required, :set_localization
               filter_parameter_logging :password
               include Redmine::MenuManager::MenuController
               helper Redmine::MenuManager::MenuHelper
               REDMINE_SUPPORTED_SCM.each do |scm|
                 require_dependency "repository/#{scm.underscore}"
               end
               def current_role
                 @current_role ||= User.current.role_for_project(@project)
               end
               def user_setup
                 # Check the settings cache for each request
                 Setting.check_cache
                 # Find the current user
                 User.current = find_current_user
               end
               # Returns the current user or nil if no user is logged in
               def find_current_user
                 if session[:user_id]
                   # existing session
                   (User.active.find(session[:user_id]) rescue nil)
                 elsif cookies[:autologin] && Setting.autologin?
                   # auto-login feature
                   User.find_by_autologin_key(cookies[:autologin])
                 elsif params[:key] && accept_key_auth_actions.include?(params[:action])
                   # RSS key authentication
                   User.find_by_rss_key(params[:key])
                 end
               end
               # check if login is globally required to access the application
               def check_if_login_required
                 # no check needed if user is already logged in
                 return true if User.current.logged?
                 require_login if Setting.login_required?
               end
               def set_localization
-                User.current.language = nil unless User.current.logged?
+                lang = nil
-                lang = begin
+                if User.current.logged?
-                  if !User.current.language.blank? && GLoc.valid_language?(User.current.language)
+                  lang = find_language(User.current.language)
-                    User.current.language
+                end
-                  elsif request.env['HTTP_ACCEPT_LANGUAGE']
+                if lang.nil? && request.env['HTTP_ACCEPT_LANGUAGE']
-                    accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.downcase
+                  accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.downcase
-                    if !accept_lang.blank? && (GLoc.valid_language?(accept_lang) || GLoc.valid_language?(accept_lang = accept_lang.split('-').first))
+                  if !accept_lang.blank?
-                      User.current.language = accept_lang
+                    lang = find_language(accept_lang) || find_language(accept_lang.split('-').first)
-                    end
                   end
-                rescue
+                end
-                  nil
+                lang ||= Setting.default_language
-                end || Setting.default_language
+                set_language_if_valid(lang)
-                set_language_if_valid(lang)
               end
               def require_login
                 if !User.current.logged?
                   redirect_to :controller => "account", :action => "login", :back_url => url_for(params)
                   return false
                 end
                 true
               end
               def require_admin
                 return unless require_login
                 if !User.current.admin?
                   render_403
                   return false
                 end
                 true
               end
               def deny_access
                 User.current.logged? ? render_403 : require_login
               end
               # Authorize the user for the requested action
               def authorize(ctrl = params[:controller], action = params[:action])
                 allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project)
                 allowed ? true : deny_access
               end
               # make sure that the user is a member of the project (or admin) if project is private
               # used as a before_filter for actions that do not require any particular permission on the project
               def check_project_privacy
                 if @project && @project.active?
                   if @project.is_public? || User.current.member_of?(@project) || User.current.admin?
                     true
                   else
                     User.current.logged? ? render_403 : require_login
                   end
                 else
                   @project = nil
                   render_404
                   false
                 end
               end
               def redirect_back_or_default(default)
                 back_url = CGI.unescape(params[:back_url].to_s)
                 if !back_url.blank?
                   begin
                     uri = URI.parse(back_url)
                     # do not redirect user to another host or to the login or register page
                     if (uri.relative? || (uri.host == request.host)) && !uri.path.match(%r{/(login|account/register)})
                       redirect_to(back_url) and return
                     end
                   rescue URI::InvalidURIError
                     # redirect to default
                   end
                 end
                 redirect_to default
               end
               def render_403
                 @project = nil
                 render :template => "common/403", :layout => !request.xhr?, :status => 403
                 return false
               end
               def render_404
                 render :template => "common/404", :layout => !request.xhr?, :status => 404
                 return false
               end
               def render_error(msg)
                 flash.now[:error] = msg
-                render :nothing => true, :layout => !request.xhr?, :status => 500
+                render :text => '', :layout => !request.xhr?, :status => 500
               end
               def render_feed(items, options={})
                 @items = items || []
                 @items.sort! {|x,y| y.event_datetime <=> x.event_datetime }
                 @items = @items.slice(0, Setting.feeds_limit.to_i)
                 @title = options[:title] || Setting.app_title
                 render :template => "common/feed.atom.rxml", :layout => false, :content_type => 'application/atom+xml'
               end
               def self.accept_key_auth(*actions)
                 actions = actions.flatten.map(&:to_s)
                 write_inheritable_attribute('accept_key_auth_actions', actions)
               end
               def accept_key_auth_actions
                 self.class.read_inheritable_attribute('accept_key_auth_actions') || []
               end
               # TODO: move to model
               def attach_files(obj, attachments)
                 attached = []
                 unsaved = []
                 if attachments && attachments.is_a?(Hash)
                   attachments.each_value do |attachment|
                     file = attachment['file']
                     next unless file && file.size > 0
                     a = Attachment.create(:container => obj,
                                           :file => file,
                                           :description => attachment['description'].to_s.strip,
                                           :author => User.current)
                     a.new_record? ? (unsaved << a) : (attached << a)
                   end
                   if unsaved.any?
                     flash[:warning] = l(:warning_attachments_not_saved, unsaved.size)
                   end
                 end
                 attached
               end
               # Returns the number of objects that should be displayed
               # on the paginated list
               def per_page_option
                 per_page = nil
                 if params[:per_page] && Setting.per_page_options_array.include?(params[:per_page].to_s.to_i)
                   per_page = params[:per_page].to_s.to_i
                   session[:per_page] = per_page
                 elsif session[:per_page]
                   per_page = session[:per_page]
                 else
                   per_page = Setting.per_page_options_array.first || 25
                 end
                 per_page
               end
               # qvalues http header parser
               # code taken from webrick
               def parse_qvalues(value)
                 tmp = []
                 if value
                   parts = value.split(/,\s*/)
                   parts.each {|part|
                     if m = %r{^([^\s,]+?)(?:;\s*q=(\d+(?:\.\d+)?))?$}.match(part)
                       val = m[1]
                       q = (m[2] or 1).to_f
                       tmp.push([val, q])
                     end
                   }
                   tmp = tmp.sort_by{|val, q| -q}
                   tmp.collect!{|val, q| val}
                 end
                 return tmp
+              rescue
+                nil
               end
               # Returns a string that can be used as filename value in Content-Disposition header
               def filename_for_content_disposition(name)
                 request.env['HTTP_USER_AGENT'] =~ %r{MSIE} ? ERB::Util.url_encode(name) : name
               end
             end

app/controllers/issues_controller.rb +6 -2

             # Redmine - project management software
             # Copyright (C) 2006-2008  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 IssuesController < ApplicationController
               menu_item :new_issue, :only => :new
               before_filter :find_issue, :only => [:show, :edit, :reply]
               before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]
               before_filter :find_project, :only => [:new, :update_form, :preview]
               before_filter :authorize, :except => [:index, :changes, :gantt, :calendar, :preview, :update_form, :context_menu]
               before_filter :find_optional_project, :only => [:index, :changes, :gantt, :calendar]
               accept_key_auth :index, :changes
               helper :journals
               helper :projects
               include ProjectsHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :issue_relations
               include IssueRelationsHelper
               helper :watchers
               include WatchersHelper
               helper :attachments
               include AttachmentsHelper
               helper :queries
               helper :sort
               include SortHelper
               include IssuesHelper
               helper :timelog
               include Redmine::Export::PDF
               def index
                 retrieve_query
                 sort_init 'id', 'desc'
                 sort_update({'id' => "#{Issue.table_name}.id"}.merge(@query.columns.inject({}) {|h, c| h[c.name.to_s] = c.sortable; h}))
                 if @query.valid?
                   limit = per_page_option
                   respond_to do |format|
                     format.html { }
                     format.atom { }
                     format.csv  { limit = Setting.issues_export_limit.to_i }
                     format.pdf  { limit = Setting.issues_export_limit.to_i }
                   end
                   @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
                   @issue_pages = Paginator.new self, @issue_count, limit, params['page']
                   @issues = Issue.find :all, :order => sort_clause,
                                        :include => [ :assigned_to, :status, :tracker, :project, :priority, :category, :fixed_version ],
                                        :conditions => @query.statement,
                                        :limit  =>  limit,
                                        :offset =>  @issue_pages.current.offset
                   respond_to do |format|
                     format.html { render :template => 'issues/index.rhtml', :layout => !request.xhr? }
                     format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
                     format.csv  { send_data(issues_to_csv(@issues, @project).read, :type => 'text/csv; header=present', :filename => 'export.csv') }
                     format.pdf  { send_data(issues_to_pdf(@issues, @project), :type => 'application/pdf', :filename => 'export.pdf') }
                   end
                 else
                   # Send html if the query is not valid
                   render(:template => 'issues/index.rhtml', :layout => !request.xhr?)
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def changes
                 retrieve_query
                 sort_init 'id', 'desc'
                 sort_update({'id' => "#{Issue.table_name}.id"}.merge(@query.columns.inject({}) {|h, c| h[c.name.to_s] = c.sortable; h}))
                 if @query.valid?
                   @journals = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status]} ],
                                                  :conditions => @query.statement,
                                                  :limit => 25,
                                                  :order => "#{Journal.table_name}.created_on DESC"
                 end
                 @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
                 render :layout => false, :content_type => 'application/atom+xml'
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def show
                 @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
                 @journals.each_with_index {|j,i| j.indice = i+1}
                 @journals.reverse! if User.current.wants_comments_in_reverse_order?
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                 @priorities = Enumeration.priorities
                 @time_entry = TimeEntry.new
                 respond_to do |format|
                   format.html { render :template => 'issues/show.rhtml' }
                   format.atom { render :action => 'changes', :layout => false, :content_type => 'application/atom+xml' }
                   format.pdf  { send_data(issue_to_pdf(@issue), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
                 end
               end
               # Add a new issue
               # The new issue will be created from an existing one if copy_from parameter is given
               def new
                 @issue = Issue.new
                 @issue.copy_from(params[:copy_from]) if params[:copy_from]
                 @issue.project = @project
                 # Tracker must be set before custom field values
                 @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
                 if @issue.tracker.nil?
                   flash.now[:error] = 'No tracker is associated to this project. Please check the Project settings.'
                   render :nothing => true, :layout => true
                   return
                 end
                 if params[:issue].is_a?(Hash)
                   @issue.attributes = params[:issue]
                   @issue.watcher_user_ids = params[:issue]['watcher_user_ids'] if User.current.allowed_to?(:add_issue_watchers, @project)
                 end
                 @issue.author = User.current
                 default_status = IssueStatus.default
                 unless default_status
                   flash.now[:error] = 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
                   render :nothing => true, :layout => true
                   return
                 end
                 @issue.status = default_status
                 @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker)).uniq
                 if request.get? || request.xhr?
                   @issue.start_date ||= Date.today
                 else
                   requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
                   # Check that the user is allowed to apply the requested status
                   @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
                   if @issue.save
                     attach_files(@issue, params[:attachments])
                     flash[:notice] = l(:notice_successful_create)
                     Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
                     call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
                     redirect_to(params[:continue] ? { :action => 'new', :tracker_id => @issue.tracker } :
                                                     { :action => 'show', :id => @issue })
                     return
                   end
                 end
                 @priorities = Enumeration.priorities
                 render :layout => !request.xhr?
               end
               # Attributes that can be updated on workflow transition (without :edit permission)
               # TODO: make it configurable (at least per role)
               UPDATABLE_ATTRS_ON_TRANSITION = %w(status_id assigned_to_id fixed_version_id done_ratio) unless const_defined?(:UPDATABLE_ATTRS_ON_TRANSITION)
               def edit
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                 @priorities = Enumeration.priorities
                 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                 @time_entry = TimeEntry.new
                 @notes = params[:notes]
                 journal = @issue.init_journal(User.current, @notes)
                 # User can change issue attributes only if he has :edit permission or if a workflow transition is allowed
                 if (@edit_allowed || !@allowed_statuses.empty?) && params[:issue]
                   attrs = params[:issue].dup
                   attrs.delete_if {|k,v| !UPDATABLE_ATTRS_ON_TRANSITION.include?(k) } unless @edit_allowed
                   attrs.delete(:status_id) unless @allowed_statuses.detect {|s| s.id.to_s == attrs[:status_id].to_s}
                   @issue.attributes = attrs
                 end
                 if request.post?
                   @time_entry = TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
                   @time_entry.attributes = params[:time_entry]
                   attachments = attach_files(@issue, params[:attachments])
                   attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
                   call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => journal})
                   if (@time_entry.hours.nil? || @time_entry.valid?) && @issue.save
                     # Log spend time
                     if User.current.allowed_to?(:log_time, @project)
                       @time_entry.save
                     end
                     if !journal.new_record?
                       # Only send notification if something was actually changed
                       flash[:notice] = l(:notice_successful_update)
                       Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
                     end
                     call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => journal})
                     redirect_to(params[:back_to] || {:action => 'show', :id => @issue})
                   end
                 end
               rescue ActiveRecord::StaleObjectError
                 # Optimistic locking exception
                 flash.now[:error] = l(:notice_locking_conflict)
               end
               def reply
                 journal = Journal.find(params[:journal_id]) if params[:journal_id]
                 if journal
                   user = journal.user
                   text = journal.notes
                 else
                   user = @issue.author
                   text = @issue.description
                 end
                 content = "#{ll(Setting.default_language, :text_user_wrote, user)}\\n> "
                 content << text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub('"', '\"').gsub(/(\r?\n|\r\n?)/, "\\n> ") + "\\n\\n"
                 render(:update) { |page|
                   page.<< "$('notes').value = \"#{content}\";"
                   page.show 'update'
                   page << "Form.Element.focus('notes');"
                   page << "Element.scrollTo('update');"
                   page << "$('notes').scrollTop = $('notes').scrollHeight - $('notes').clientHeight;"
                 }
               end
               # Bulk edit a set of issues
               def bulk_edit
                 if request.post?
                   status = params[:status_id].blank? ? nil : IssueStatus.find_by_id(params[:status_id])
                   priority = params[:priority_id].blank? ? nil : Enumeration.find_by_id(params[:priority_id])
                   assigned_to = (params[:assigned_to_id].blank? || params[:assigned_to_id] == 'none') ? nil : User.find_by_id(params[:assigned_to_id])
                   category = (params[:category_id].blank? || params[:category_id] == 'none') ? nil : @project.issue_categories.find_by_id(params[:category_id])
                   fixed_version = (params[:fixed_version_id].blank? || params[:fixed_version_id] == 'none') ? nil : @project.versions.find_by_id(params[:fixed_version_id])
                   custom_field_values = params[:custom_field_values] ? params[:custom_field_values].reject {|k,v| v.blank?} : nil
                   unsaved_issue_ids = []
                   @issues.each do |issue|
                     journal = issue.init_journal(User.current, params[:notes])
                     issue.priority = priority if priority
                     issue.assigned_to = assigned_to if assigned_to || params[:assigned_to_id] == 'none'
                     issue.category = category if category || params[:category_id] == 'none'
                     issue.fixed_version = fixed_version if fixed_version || params[:fixed_version_id] == 'none'
                     issue.start_date = params[:start_date] unless params[:start_date].blank?
                     issue.due_date = params[:due_date] unless params[:due_date].blank?
                     issue.done_ratio = params[:done_ratio] unless params[:done_ratio].blank?
                     issue.custom_field_values = custom_field_values if custom_field_values && !custom_field_values.empty?
                     call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
                     # Don't save any change to the issue if the user is not authorized to apply the requested status
                     if (status.nil? || (issue.status.new_status_allowed_to?(status, current_role, issue.tracker) && issue.status = status)) && issue.save
                       # Send notification for each issue (if changed)
                       Mailer.deliver_issue_edit(journal) if journal.details.any? && Setting.notified_events.include?('issue_updated')
                     else
                       # Keep unsaved issue ids to display them in flash error
                       unsaved_issue_ids << issue.id
                     end
                   end
                   if unsaved_issue_ids.empty?
                     flash[:notice] = l(:notice_successful_update) unless @issues.empty?
                   else
-                    flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
+                    flash[:error] = l(:notice_failed_to_save_issues, :count => unsaved_issue_ids.size,
+                                                                     :total => @issues.size,
+                                                                     :ids => '#' + unsaved_issue_ids.join(', #'))
                   end
                   redirect_to(params[:back_to] || {:controller => 'issues', :action => 'index', :project_id => @project})
                   return
                 end
                 # Find potential statuses the user could be allowed to switch issues to
                 @available_statuses = Workflow.find(:all, :include => :new_status,
                                                           :conditions => {:role_id => current_role.id}).collect(&:new_status).compact.uniq.sort
                 @custom_fields = @project.issue_custom_fields.select {|f| f.field_format == 'list'}
               end
               def move
                 @allowed_projects = []
                 # find projects to which the user is allowed to move the issue
                 if User.current.admin?
                   # admin is allowed to move issues to any active (visible) project
                   @allowed_projects = Project.find(:all, :conditions => Project.visible_by(User.current))
                 else
                   User.current.memberships.each {|m| @allowed_projects << m.project if m.role.allowed_to?(:move_issues)}
                 end
                 @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
                 @target_project ||= @project
                 @trackers = @target_project.trackers
                 if request.post?
                   new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
                   unsaved_issue_ids = []
                   @issues.each do |issue|
                     issue.init_journal(User.current)
                     unsaved_issue_ids << issue.id unless issue.move_to(@target_project, new_tracker, params[:copy_options])
                   end
                   if unsaved_issue_ids.empty?
                     flash[:notice] = l(:notice_successful_update) unless @issues.empty?
                   else
-                    flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
+                    flash[:error] = l(:notice_failed_to_save_issues, :count => unsaved_issue_ids.size,
+                                                                     :total => @issues.size,
+                                                                     :ids => '#' + unsaved_issue_ids.join(', #'))
                   end
                   redirect_to :controller => 'issues', :action => 'index', :project_id => @project
                   return
                 end
                 render :layout => false if request.xhr?
               end
               def destroy
                 @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
                 if @hours > 0
                   case params[:todo]
                   when 'destroy'
                     # nothing to do
                   when 'nullify'
                     TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
                   when 'reassign'
                     reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
                     if reassign_to.nil?
                       flash.now[:error] = l(:error_issue_not_found_in_project)
                       return
                     else
                       TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
                     end
                   else
                     # display the destroy form
                     return
                   end
                 end
                 @issues.each(&:destroy)
                 redirect_to :action => 'index', :project_id => @project
               end
               def gantt
                 @gantt = Redmine::Helpers::Gantt.new(params)
                 retrieve_query
                 if @query.valid?
                   events = []
                   # Issues that have start and due dates
                   events += Issue.find(:all,
                                        :order => "start_date, due_date",
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],
                                        :conditions => ["(#{@query.statement}) AND (((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null)", @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to]
                                        )
                   # Issues that don't have a due date but that are assigned to a version with a date
                   events += Issue.find(:all,
                                        :order => "start_date, effective_date",
                                        :include => [:tracker, :status, :assigned_to, :priority, :project, :fixed_version],
                                        :conditions => ["(#{@query.statement}) AND (((start_date>=? and start_date<=?) or (effective_date>=? and effective_date<=?) or (start_date<? and effective_date>?)) and start_date is not null and due_date is null and effective_date is not null)", @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to]
                                        )
                   # Versions
                   events += Version.find(:all, :include => :project,
                                                :conditions => ["(#{@query.project_statement}) AND effective_date BETWEEN ? AND ?", @gantt.date_from, @gantt.date_to])
                   @gantt.events = events
                 end
                 respond_to do |format|
                   format.html { render :template => "issues/gantt.rhtml", :layout => !request.xhr? }
                   format.png  { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{@project.nil? ? '' : "#{@project.identifier}-" }gantt.png") } if @gantt.respond_to?('to_image')
                   format.pdf  { send_data(gantt_to_pdf(@gantt, @project), :type => 'application/pdf', :filename => "#{@project.nil? ? '' : "#{@project.identifier}-" }gantt.pdf") }
                 end
               end
               def calendar
                 if params[:year] and params[:year].to_i > 1900
                   @year = params[:year].to_i
                   if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
                     @month = params[:month].to_i
                   end
                 end
                 @year ||= Date.today.year
                 @month ||= Date.today.month
                 @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
                 retrieve_query
                 if @query.valid?
                   events = []
                   events += Issue.find(:all,
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],
                                        :conditions => ["(#{@query.statement}) AND ((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
                                        )
                   events += Version.find(:all, :include => :project,
                                                :conditions => ["(#{@query.project_statement}) AND effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
                   @calendar.events = events
                 end
                 render :layout => false if request.xhr?
               end
               def context_menu
                 @issues = Issue.find_all_by_id(params[:ids], :include => :project)
                 if (@issues.size == 1)
                   @issue = @issues.first
                   @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                 end
                 projects = @issues.collect(&:project).compact.uniq
                 @project = projects.first if projects.size == 1
                 @can = {:edit => (@project && User.current.allowed_to?(:edit_issues, @project)),
                         :log_time => (@project && User.current.allowed_to?(:log_time, @project)),
                         :update => (@project && (User.current.allowed_to?(:edit_issues, @project) || (User.current.allowed_to?(:change_status, @project) && @allowed_statuses && !@allowed_statuses.empty?))),
                         :move => (@project && User.current.allowed_to?(:move_issues, @project)),
                         :copy => (@issue && @project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
                         :delete => (@project && User.current.allowed_to?(:delete_issues, @project))
                         }
                 if @project
                   @assignables = @project.assignable_users
                   @assignables << @issue.assigned_to if @issue && @issue.assigned_to && !@assignables.include?(@issue.assigned_to)
                 end
                 @priorities = Enumeration.priorities.reverse
                 @statuses = IssueStatus.find(:all, :order => 'position')
                 @back = request.env['HTTP_REFERER']
                 render :layout => false
               end
               def update_form
                 @issue = Issue.new(params[:issue])
                 render :action => :new, :layout => false
               end
               def preview
                 @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
                 @attachements = @issue.attachments if @issue
                 @text = params[:notes] || (params[:issue] ? params[:issue][:description] : nil)
                 render :partial => 'common/preview'
               end
             private
               def find_issue
                 @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
                 @project = @issue.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Filter for bulk operations
               def find_issues
                 @issues = Issue.find_all_by_id(params[:id] || params[:ids])
                 raise ActiveRecord::RecordNotFound if @issues.empty?
                 projects = @issues.collect(&:project).compact.uniq
                 if projects.size == 1
                   @project = projects.first
                 else
                   # TODO: let users bulk edit/move/destroy issues from different projects
                   render_error 'Can not bulk edit/move/destroy issues from different projects' and return false
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_project
                 @project = Project.find(params[:project_id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_optional_project
                 @project = Project.find(params[:project_id]) unless params[:project_id].blank?
                 allowed = User.current.allowed_to?({:controller => params[:controller], :action => params[:action]}, @project, :global => true)
                 allowed ? true : deny_access
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Retrieve query from session or build a new query
               def retrieve_query
                 if !params[:query_id].blank?
                   cond = "project_id IS NULL"
                   cond << " OR project_id = #{@project.id}" if @project
                   @query = Query.find(params[:query_id], :conditions => cond)
                   @query.project = @project
                   session[:query] = {:id => @query.id, :project_id => @query.project_id}
                 else
                   if params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil)
                     # Give it a name, required to be valid
                     @query = Query.new(:name => "_")
                     @query.project = @project
                     if params[:fields] and params[:fields].is_a? Array
                       params[:fields].each do |field|
                         @query.add_filter(field, params[:operators][field], params[:values][field])
                       end
                     else
                       @query.available_filters.keys.each do |field|
                         @query.add_short_filter(field, params[field]) if params[field]
                       end
                     end
                     session[:query] = {:project_id => @query.project_id, :filters => @query.filters}
                   else
                     @query = Query.find_by_id(session[:query][:id]) if session[:query][:id]
                     @query ||= Query.new(:name => "_", :project => @project, :filters => session[:query][:filters])
                     @query.project = @project
                   end
                 end
               end
             end

app/controllers/repositories_controller.rb +1 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             require 'SVG/Graph/Bar'
             require 'SVG/Graph/BarHorizontal'
             require 'digest/sha1'
             class ChangesetNotFound < Exception; end
             class InvalidRevisionParam < Exception; end
             class RepositoriesController < ApplicationController
               menu_item :repository
               before_filter :find_repository, :except => :edit
               before_filter :find_project, :only => :edit
               before_filter :authorize
               accept_key_auth :revisions
               rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
               def edit
                 @repository = @project.repository
                 if !@repository
                   @repository = Repository.factory(params[:repository_scm])
                   @repository.project = @project if @repository
                 end
                 if request.post? && @repository
                   @repository.attributes = params[:repository]
                   @repository.save
                 end
                 render(:update) {|page| page.replace_html "tab-content-repository", :partial => 'projects/settings/repository'}
               end
               def committers
                 @committers = @repository.committers
                 @users = @project.users
                 additional_user_ids = @committers.collect(&:last).collect(&:to_i) - @users.collect(&:id)
                 @users += User.find_all_by_id(additional_user_ids) unless additional_user_ids.empty?
                 @users.compact!
                 @users.sort!
                 if request.post? && params[:committers].is_a?(Hash)
                   # Build a hash with repository usernames as keys and corresponding user ids as values
                   @repository.committer_ids = params[:committers].values.inject({}) {|h, c| h[c.first] = c.last; h}
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'committers', :id => @project
                 end
               end
               def destroy
                 @repository.destroy
                 redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'repository'
               end
               def show
                 # check if new revisions have been committed in the repository
                 @repository.fetch_changesets if Setting.autofetch_changesets?
                 # root entries
                 @entries = @repository.entries('', @rev)
                 # latest changesets
                 @changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC")
                 show_error_not_found unless @entries || @changesets.any?
               end
               def browse
                 @entries = @repository.entries(@path, @rev)
                 if request.xhr?
                   @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
                 else
                   show_error_not_found and return unless @entries
                   @properties = @repository.properties(@path, @rev)
                   render :action => 'browse'
                 end
               end
               def changes
                 @entry = @repository.entry(@path, @rev)
                 show_error_not_found and return unless @entry
                 @changesets = @repository.changesets_for_path(@path, :limit => Setting.repository_log_display_limit.to_i)
                 @properties = @repository.properties(@path, @rev)
               end
               def revisions
                 @changeset_count = @repository.changesets.count
                 @changeset_pages = Paginator.new self, @changeset_count,
             								      per_page_option,
             								      params['page']
                 @changesets = @repository.changesets.find(:all,
             						:limit  =>  @changeset_pages.items_per_page,
             						:offset =>  @changeset_pages.current.offset,
                         :include => :user)
                 respond_to do |format|
                   format.html { render :layout => false if request.xhr? }
                   format.atom { render_feed(@changesets, :title => "#{@project.name}: #{l(:label_revision_plural)}") }
                 end
               end
               def entry
                 @entry = @repository.entry(@path, @rev)
                 show_error_not_found and return unless @entry
                 # If the entry is a dir, show the browser
                 browse and return if @entry.is_dir?
                 @content = @repository.cat(@path, @rev)
                 show_error_not_found and return unless @content
                 if 'raw' == params[:format] || @content.is_binary_data?
                   # Force the download if it's a binary file
                   send_data @content, :filename => @path.split('/').last
                 else
                   # Prevent empty lines when displaying a file with Windows style eol
                   @content.gsub!("\r\n", "\n")
                end
               end
               def annotate
                 @entry = @repository.entry(@path, @rev)
                 show_error_not_found and return unless @entry
                 @annotate = @repository.scm.annotate(@path, @rev)
                 render_error l(:error_scm_annotate) and return if @annotate.nil? || @annotate.empty?
               end
               def revision
                 @changeset = @repository.changesets.find_by_revision(@rev)
                 raise ChangesetNotFound unless @changeset
                 respond_to do |format|
                   format.html
                   format.js {render :layout => false}
                 end
               rescue ChangesetNotFound
                 show_error_not_found
               end
               def diff
                 if params[:format] == 'diff'
                   @diff = @repository.diff(@path, @rev, @rev_to)
                   show_error_not_found and return unless @diff
                   filename = "changeset_r#{@rev}"
                   filename << "_r#{@rev_to}" if @rev_to
                   send_data @diff.join, :filename => "#{filename}.diff",
                                         :type => 'text/x-patch',
                                         :disposition => 'attachment'
                 else
                   @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
                   @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
                   # Save diff type as user preference
                   if User.current.logged? && @diff_type != User.current.pref[:diff_type]
                     User.current.pref[:diff_type] = @diff_type
                     User.current.preference.save
                   end
                   @cache_key = "repositories/diff/#{@repository.id}/" + Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}")
                   unless read_fragment(@cache_key)
                     @diff = @repository.diff(@path, @rev, @rev_to)
                     show_error_not_found unless @diff
                   end
                 end
               end
               def stats
               end
               def graph
                 data = nil
                 case params[:graph]
                 when "commits_per_month"
                   data = graph_commits_per_month(@repository)
                 when "commits_per_author"
                   data = graph_commits_per_author(@repository)
                 end
                 if data
                   headers["Content-Type"] = "image/svg+xml"
                   send_data(data, :type => "image/svg+xml", :disposition => "inline")
                 else
                   render_404
                 end
               end
             private
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               REV_PARAM_RE = %r{^[a-f0-9]*$}
               def find_repository
                 @project = Project.find(params[:id])
                 @repository = @project.repository
                 render_404 and return false unless @repository
                 @path = params[:path].join('/') unless params[:path].nil?
                 @path ||= ''
                 @rev = params[:rev]
                 @rev_to = params[:rev_to]
                 raise InvalidRevisionParam unless @rev.to_s.match(REV_PARAM_RE) && @rev.to_s.match(REV_PARAM_RE)
               rescue ActiveRecord::RecordNotFound
                 render_404
               rescue InvalidRevisionParam
                 show_error_not_found
               end
               def show_error_not_found
                 render_error l(:error_scm_not_found)
               end
               # Handler for Redmine::Scm::Adapters::CommandFailed exception
               def show_error_command_failed(exception)
                 render_error l(:error_scm_command_failed, exception.message)
               end
               def graph_commits_per_month(repository)
                 @date_to = Date.today
                 @date_from = @date_to << 11
                 @date_from = Date.civil(@date_from.year, @date_from.month, 1)
                 commits_by_day = repository.changesets.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
                 commits_by_month = [0] * 12
                 commits_by_day.each {|c| commits_by_month[c.first.to_date.months_ago] += c.last }
                 changes_by_day = repository.changes.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
                 changes_by_month = [0] * 12
                 changes_by_day.each {|c| changes_by_month[c.first.to_date.months_ago] += c.last }
                 fields = []
-                month_names = l(:actionview_datehelper_select_month_names_abbr).split(',')
+.times {|m| fields << month_name(((Date.today.month - 1 - m) % 12) + 1)}
-.times {|m| fields << month_names[((Date.today.month - 1 - m) % 12)]}
                 graph = SVG::Graph::Bar.new(
                   :height => 300,
                   :width => 800,
                   :fields => fields.reverse,
                   :stack => :side,
                   :scale_integers => true,
                   :step_x_labels => 2,
                   :show_data_values => false,
                   :graph_title => l(:label_commits_per_month),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => commits_by_month[0..11].reverse,
                   :title => l(:label_revision_plural)
                 )
                 graph.add_data(
                   :data => changes_by_month[0..11].reverse,
                   :title => l(:label_change_plural)
                 )
                 graph.burn
               end
               def graph_commits_per_author(repository)
                 commits_by_author = repository.changesets.count(:all, :group => :committer)
                 commits_by_author.sort! {|x, y| x.last <=> y.last}
                 changes_by_author = repository.changes.count(:all, :group => :committer)
                 h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o}
                 fields = commits_by_author.collect {|r| r.first}
                 commits_data = commits_by_author.collect {|r| r.last}
                 changes_data = commits_by_author.collect {|r| h[r.first] || 0}
                 fields = fields + [""]*(10 - fields.length) if fields.length<10
                 commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10
                 changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10
                 # Remove email adress in usernames
                 fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') }
                 graph = SVG::Graph::BarHorizontal.new(
                   :height => 400,
                   :width => 800,
                   :fields => fields,
                   :stack => :side,
                   :scale_integers => true,
                   :show_data_values => false,
                   :rotate_y_labels => false,
                   :graph_title => l(:label_commits_per_author),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => commits_data,
                   :title => l(:label_revision_plural)
                 )
                 graph.add_data(
                   :data => changes_data,
                   :title => l(:label_change_plural)
                 )
                 graph.burn
               end
             end
             class Date
               def months_ago(date = Date.today)
                 (date.year - self.year)*12 + (date.month - self.month)
               end
               def weeks_ago(date = Date.today)
                 (date.year - self.year)*52 + (date.cweek - self.cweek)
               end
             end
             class String
               def with_leading_slash
                 starts_with?('/') ? self : "/#{self}"
               end
             end

app/helpers/application_helper.rb +11 -84

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             require 'coderay'
             require 'coderay/helpers/file_type'
             require 'forwardable'
             require 'cgi'
             module ApplicationHelper
               include Redmine::WikiFormatting::Macros::Definitions
+              include Redmine::I18n
               include GravatarHelper::PublicMethods
               extend Forwardable
               def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
               def current_role
                 @current_role ||= User.current.role_for_project(@project)
               end
               # Return true if user is authorized for controller/action, otherwise false
               def authorize_for(controller, action)
                 User.current.allowed_to?({:controller => controller, :action => action}, @project)
               end
               # Display a link if user is authorized
               def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
                 link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
               end
               # Display a link to remote if user is authorized
               def link_to_remote_if_authorized(name, options = {}, html_options = nil)
                 url = options[:url] || {}
                 link_to_remote(name, options, html_options) if authorize_for(url[:controller] || params[:controller], url[:action])
               end
               # Display a link to user's account page
               def link_to_user(user, options={})
                 (user && !user.anonymous?) ? link_to(user.name(options[:format]), :controller => 'account', :action => 'show', :id => user) : 'Anonymous'
               end
               def link_to_issue(issue, options={})
                 options[:class] ||= ''
                 options[:class] << ' issue'
                 options[:class] << ' closed' if issue.closed?
                 link_to "#{issue.tracker.name} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue}, options
               end
               # Generates a link to an attachment.
               # Options:
               # * :text - Link text (default to attachment filename)
               # * :download - Force download (default: false)
               def link_to_attachment(attachment, options={})
                 text = options.delete(:text) || attachment.filename
                 action = options.delete(:download) ? 'download' : 'show'
                 link_to(h(text), {:controller => 'attachments', :action => action, :id => attachment, :filename => attachment.filename }, options)
               end
               def toggle_link(name, id, options={})
                 onclick = "Element.toggle('#{id}'); "
                 onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
                 onclick << "return false;"
                 link_to(name, "#", :onclick => onclick)
               end
               def image_to_function(name, function, html_options = {})
                 html_options.symbolize_keys!
                 tag(:input, html_options.merge({
                     :type => "image", :src => image_path(name),
                     :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};"
                     }))
               end
               def prompt_to_remote(name, text, param, url, html_options = {})
                 html_options[:onclick] = "promptToRemote('#{text}', '#{param}', '#{url_for(url)}'); return false;"
                 link_to name, {}, html_options
               end
-              def format_date(date)
-                return nil unless date
-                # "Setting.date_format.size < 2" is a temporary fix (content of date_format setting changed)
-                @date_format ||= (Setting.date_format.blank? || Setting.date_format.size < 2 ? l(:general_fmt_date) : Setting.date_format)
-                date.strftime(@date_format)
-              end
-              def format_time(time, include_date = true)
-                return nil unless time
-                time = time.to_time if time.is_a?(String)
-                zone = User.current.time_zone
-                local = zone ? time.in_time_zone(zone) : (time.utc? ? time.localtime : time)
-                @date_format ||= (Setting.date_format.blank? || Setting.date_format.size < 2 ? l(:general_fmt_date) : Setting.date_format)
-                @time_format ||= (Setting.time_format.blank? ? l(:general_fmt_time) : Setting.time_format)
-                include_date ? local.strftime("#{@date_format} #{@time_format}") : local.strftime(@time_format)
-              end
               def format_activity_title(text)
-                h(truncate_single_line(text, 100))
+                h(truncate_single_line(text, :length => 100))
               end
               def format_activity_day(date)
                 date == Date.today ? l(:label_today).titleize : format_date(date)
               end
               def format_activity_description(text)
-                h(truncate(text.to_s, 120).gsub(%r{[\r\n]*<(pre|code)>.*$}m, '...')).gsub(/[\r\n]+/, "<br />")
+                h(truncate(text.to_s, :length => 120).gsub(%r{[\r\n]*<(pre|code)>.*$}m, '...')).gsub(/[\r\n]+/, "<br />")
-              end
-              def distance_of_date_in_words(from_date, to_date = 0)
-                from_date = from_date.to_date if from_date.respond_to?(:to_date)
-                to_date = to_date.to_date if to_date.respond_to?(:to_date)
-                distance_in_days = (to_date - from_date).abs
-                lwr(:actionview_datehelper_time_in_words_day, distance_in_days)
               end
               def due_date_distance_in_words(date)
                 if date
                   l((date < Date.today ? :label_roadmap_overdue : :label_roadmap_due_in), distance_of_date_in_words(Date.today, date))
                 end
               end
               def render_page_hierarchy(pages, node=nil)
                 content = ''
                 if pages[node]
                   content << "<ul class=\"pages-hierarchy\">\n"
                   pages[node].each do |page|
                     content << "<li>"
                     content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'index', :id => page.project, :page => page.title},
                                        :title => (page.respond_to?(:updated_on) ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
                     content << "\n" + render_page_hierarchy(pages, page.id) if pages[page.id]
                     content << "</li>\n"
                   end
                   content << "</ul>\n"
                 end
                 content
               end
               # Renders flash messages
               def render_flash_messages
                 s = ''
                 flash.each do |k,v|
                   s << content_tag('div', v, :class => "flash #{k}")
                 end
                 s
               end
               # Renders the project quick-jump box
               def render_project_jump_box
                 # Retrieve them now to avoid a COUNT query
                 projects = User.current.projects.all
                 if projects.any?
                   s = '<select onchange="if (this.value != \'\') { window.location = this.value; }">' +
                         "<option selected='selected'>#{ l(:label_jump_to_a_project) }</option>" +
                         '<option disabled="disabled">---</option>'
                   s << project_tree_options_for_select(projects) do |p|
                     { :value => url_for(:controller => 'projects', :action => 'show', :id => p, :jump => current_menu_item) }
                   end
                   s << '</select>'
                   s
                 end
               end
               def project_tree_options_for_select(projects, options = {})
                 s = ''
                 project_tree(projects) do |project, level|
                   name_prefix = (level > 0 ? ('&nbsp;' * 2 * level + '&#187; ') : '')
                   tag_options = {:value => project.id, :selected => ((project == options[:selected]) ? 'selected' : nil)}
                   tag_options.merge!(yield(project)) if block_given?
                   s << content_tag('option', name_prefix + h(project), tag_options)
                 end
                 s
               end
               # Yields the given block for each project with its level in the tree
               def project_tree(projects, &block)
                 ancestors = []
                 projects.sort_by(&:lft).each do |project|
                   while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
                     ancestors.pop
                   end
                   yield project, ancestors.size
                   ancestors << project
                 end
               end
               def project_nested_ul(projects, &block)
                 s = ''
                 if projects.any?
                   ancestors = []
                   projects.sort_by(&:lft).each do |project|
                     if (ancestors.empty? || project.is_descendant_of?(ancestors.last))
                       s << "<ul>\n"
                     else
                       ancestors.pop
                       s << "</li>"
                       while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
                         ancestors.pop
                         s << "</ul></li>\n"
                       end
                     end
                     s << "<li>"
                     s << yield(project).to_s
                     ancestors << project
                   end
                   s << ("</li></ul>\n" * ancestors.size)
                 end
                 s
               end
               # Truncates and returns the string as a single line
               def truncate_single_line(string, *args)
                 truncate(string, *args).gsub(%r{[\r\n]+}m, ' ')
               end
               def html_hours(text)
                 text.gsub(%r{(\d+)\.(\d+)}, '<span class="hours hours-int">\1</span><span class="hours hours-dec">.\2</span>')
               end
               def authoring(created, author, options={})
                 time_tag = @project.nil? ? content_tag('acronym', distance_of_time_in_words(Time.now, created), :title => format_time(created)) :
                                            link_to(distance_of_time_in_words(Time.now, created),
                                                    {:controller => 'projects', :action => 'activity', :id => @project, :from => created.to_date},
                                                    :title => format_time(created))
                 author_tag = (author.is_a?(User) && !author.anonymous?) ? link_to(h(author), :controller => 'account', :action => 'show', :id => author) : h(author || 'Anonymous')
-                l(options[:label] || :label_added_time_by, author_tag, time_tag)
+                l(options[:label] || :label_added_time_by, :author => author_tag, :age => time_tag)
-              end
-              def l_or_humanize(s, options={})
-                k = "#{options[:prefix]}#{s}".to_sym
-                l_has_string?(k) ? l(k) : s.to_s.humanize
-              end
-              def day_name(day)
-                l(:general_day_names).split(',')[day-1]
-              end
-              def month_name(month)
-                l(:actionview_datehelper_select_month_names).split(',')[month-1]
               end
               def syntax_highlight(name, content)
                 type = CodeRay::FileType[name]
                 type ? CodeRay.scan(content, type).html : h(content)
               end
               def to_path_param(path)
                 path.to_s.split(%r{[/\\]}).select {|p| !p.blank?}
               end
               def pagination_links_full(paginator, count=nil, options={})
                 page_param = options.delete(:page_param) || :page
                 url_param = params.dup
                 # don't reuse query params if filters are present
                 url_param.merge!(:fields => nil, :values => nil, :operators => nil) if url_param.delete(:set_filter)
                 html = ''
                 if paginator.current.previous
                   html << link_to_remote_content_update('&#171; ' + l(:label_previous), url_param.merge(page_param => paginator.current.previous)) + ' '
                 end
                 html << (pagination_links_each(paginator, options) do |n|
                   link_to_remote_content_update(n.to_s, url_param.merge(page_param => n))
                 end || '')
                 if paginator.current.next
                   html << ' ' + link_to_remote_content_update((l(:label_next) + ' &#187;'), url_param.merge(page_param => paginator.current.next))
                 end
                 unless count.nil?
                   html << [
                     " (#{paginator.current.first_item}-#{paginator.current.last_item}/#{count})",
                     per_page_links(paginator.items_per_page)
                   ].compact.join(' | ')
                 end
                 html
               end
               def per_page_links(selected=nil)
                 url_param = params.dup
                 url_param.clear if url_param.has_key?(:set_filter)
                 links = Setting.per_page_options_array.collect do |n|
                   n == selected ? n : link_to_remote(n, {:update => "content",
                                                          :url => params.dup.merge(:per_page => n),
                                                          :method => :get},
                                                         {:href => url_for(url_param.merge(:per_page => n))})
                 end
                 links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
               end
               def breadcrumb(*args)
                 elements = args.flatten
                 elements.any? ? content_tag('p', args.join(' &#187; ') + ' &#187; ', :class => 'breadcrumb') : nil
               end
               def other_formats_links(&block)
-                concat('<p class="other-formats">' + l(:label_export_to), block.binding)
+                concat('<p class="other-formats">' + l(:label_export_to))
                 yield Redmine::Views::OtherFormatsBuilder.new(self)
-                concat('</p>', block.binding)
+                concat('</p>')
               end
               def page_header_title
                 if @project.nil? || @project.new_record?
                   h(Setting.app_title)
                 else
                   b = []
                   ancestors = (@project.root? ? [] : @project.ancestors.visible)
                   if ancestors.any?
                     root = ancestors.shift
                     b << link_to(h(root), {:controller => 'projects', :action => 'show', :id => root, :jump => current_menu_item}, :class => 'root')
                     if ancestors.size > 2
                       b << '&#8230;'
                       ancestors = ancestors[-2, 2]
                     end
                     b += ancestors.collect {|p| link_to(h(p), {:controller => 'projects', :action => 'show', :id => p, :jump => current_menu_item}, :class => 'ancestor') }
                   end
                   b << h(@project)
                   b.join(' &#187; ')
                 end
               end
               def html_title(*args)
                 if args.empty?
                   title = []
                   title << @project.name if @project
                   title += @html_title if @html_title
                   title << Setting.app_title
                   title.compact.join(' - ')
                 else
                   @html_title ||= []
                   @html_title += args
                 end
               end
               def accesskey(s)
                 Redmine::AccessKeys.key_for s
               end
               # Formats text according to system settings.
               # 2 ways to call this method:
               # * with a String: textilizable(text, options)
               # * with an object and one of its attribute: textilizable(issue, :description, options)
               def textilizable(*args)
                 options = args.last.is_a?(Hash) ? args.pop : {}
                 case args.size
                 when 1
                   obj = options[:object]
                   text = args.shift
                 when 2
                   obj = args.shift
                   text = obj.send(args.shift).to_s
                 else
                   raise ArgumentError, 'invalid arguments to textilizable'
                 end
                 return '' if text.blank?
                 only_path = options.delete(:only_path) == false ? false : true
                 # when using an image link, try to use an attachment, if possible
                 attachments = options[:attachments] || (obj && obj.respond_to?(:attachments) ? obj.attachments : nil)
                 if attachments
                   attachments = attachments.sort_by(&:created_on).reverse
                   text = text.gsub(/!((\<|\=|\>)?(\([^\)]+\))?(\[[^\]]+\])?(\{[^\}]+\})?)(\S+\.(bmp|gif|jpg|jpeg|png))!/i) do |m|
                     style = $1
                     filename = $6.downcase
                     # search for the picture in attachments
                     if found = attachments.detect { |att| att.filename.downcase == filename }
                       image_url = url_for :only_path => only_path, :controller => 'attachments', :action => 'download', :id => found
                       desc = found.description.to_s.gsub(/^([^\(\)]*).*$/, "\\1")
                       alt = desc.blank? ? nil : "(#{desc})"
                       "!#{style}#{image_url}#{alt}!"
                     else
                       m
                     end
                   end
                 end
                 text = Redmine::WikiFormatting.to_html(Setting.text_formatting, text) { |macro, args| exec_macro(macro, obj, args) }
                 # different methods for formatting wiki links
                 case options[:wiki_links]
                 when :local
                   # used for local links to html files
                   format_wiki_link = Proc.new {|project, title, anchor| "#{title}.html" }
                 when :anchor
                   # used for single-file wiki export
                   format_wiki_link = Proc.new {|project, title, anchor| "##{title}" }
                 else
                   format_wiki_link = Proc.new {|project, title, anchor| url_for(:only_path => only_path, :controller => 'wiki', :action => 'index', :id => project, :page => title, :anchor => anchor) }
                 end
                 project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
                 # Wiki links
                 #
                 # Examples:
                 #   [[mypage]]
                 #   [[mypage|mytext]]
                 # wiki links can refer other project wikis, using project name or identifier:
                 #   [[project:]] -> wiki starting page
                 #   [[project:|mytext]]
                 #   [[project:mypage]]
                 #   [[project:mypage|mytext]]
                 text = text.gsub(/(!)?(\[\[([^\]\n\|]+)(\|([^\]\n\|]+))?\]\])/) do |m|
                   link_project = project
                   esc, all, page, title = $1, $2, $3, $5
                   if esc.nil?
                     if page =~ /^([^\:]+)\:(.*)$/
                       link_project = Project.find_by_name($1) || Project.find_by_identifier($1)
                       page = $2
                       title ||= $1 if page.blank?
                     end
                     if link_project && link_project.wiki
                       # extract anchor
                       anchor = nil
                       if page =~ /^(.+?)\#(.+)$/
                         page, anchor = $1, $2
                       end
                       # check if page exists
                       wiki_page = link_project.wiki.find_page(page)
                       link_to((title || page), format_wiki_link.call(link_project, Wiki.titleize(page), anchor),
                                                :class => ('wiki-page' + (wiki_page ? '' : ' new')))
                     else
                       # project or wiki doesn't exist
                       all
                     end
                   else
                     all
                   end
                 end
                 # Redmine links
                 #
                 # Examples:
                 #   Issues:
                 #     #52 -> Link to issue #52
                 #   Changesets:
                 #     r52 -> Link to revision 52
                 #     commit:a85130f -> Link to scmid starting with a85130f
                 #   Documents:
                 #     document#17 -> Link to document with id 17
                 #     document:Greetings -> Link to the document with title "Greetings"
                 #     document:"Some document" -> Link to the document with title "Some document"
                 #   Versions:
                 #     version#3 -> Link to version with id 3
                 #     version:1.0.0 -> Link to version named "1.0.0"
                 #     version:"1.0 beta 2" -> Link to version named "1.0 beta 2"
                 #   Attachments:
                 #     attachment:file.zip -> Link to the attachment of the current object named file.zip
                 #   Source files:
                 #     source:some/file -> Link to the file located at /some/file in the project's repository
                 #     source:some/file@52 -> Link to the file's revision 52
                 #     source:some/file#L120 -> Link to line 120 of the file
                 #     source:some/file@52#L120 -> Link to line 120 of the file's revision 52
                 #     export:some/file -> Force the download of the file
                 #  Forum messages:
                 #     message#1218 -> Link to message with id 1218
                 text = text.gsub(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export|message)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|\s|<|$)}) do |m|
                   leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
                   link = nil
                   if esc.nil?
                     if prefix.nil? && sep == 'r'
                       if project && (changeset = project.changesets.find_by_revision(oid))
                         link = link_to("r#{oid}", {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => oid},
                                                   :class => 'changeset',
-                                                  :title => truncate_single_line(changeset.comments, 100))
+                                                  :title => truncate_single_line(changeset.comments, :length => 100))
                       end
                     elsif sep == '#'
                       oid = oid.to_i
                       case prefix
                       when nil
                         if issue = Issue.find_by_id(oid, :include => [:project, :status], :conditions => Project.visible_by(User.current))
                           link = link_to("##{oid}", {:only_path => only_path, :controller => 'issues', :action => 'show', :id => oid},
                                                     :class => (issue.closed? ? 'issue closed' : 'issue'),
-                                                    :title => "#{truncate(issue.subject, 100)} (#{issue.status.name})")
+                                                    :title => "#{truncate(issue.subject, :length => 100)} (#{issue.status.name})")
                           link = content_tag('del', link) if issue.closed?
                         end
                       when 'document'
                         if document = Document.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
                           link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                             :class => 'document'
                         end
                       when 'version'
                         if version = Version.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
                           link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                           :class => 'version'
                         end
                       when 'message'
                         if message = Message.find_by_id(oid, :include => [:parent, {:board => :project}], :conditions => Project.visible_by(User.current))
-                          link = link_to h(truncate(message.subject, 60)), {:only_path => only_path,
+                          link = link_to h(truncate(message.subject, :length => 60)), {:only_path => only_path,
                                                                             :controller => 'messages',
                                                                             :action => 'show',
                                                                             :board_id => message.board,
                                                                             :id => message.root,
                                                                             :anchor => (message.parent ? "message-#{message.id}" : nil)},
                                                              :class => 'message'
                         end
                       end
                     elsif sep == ':'
                       # removes the double quotes if any
                       name = oid.gsub(%r{^"(.*)"$}, "\\1")
                       case prefix
                       when 'document'
                         if project && document = project.documents.find_by_title(name)
                           link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                             :class => 'document'
                         end
                       when 'version'
                         if project && version = project.versions.find_by_name(name)
                           link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                           :class => 'version'
                         end
                       when 'commit'
                         if project && (changeset = project.changesets.find(:first, :conditions => ["scmid LIKE ?", "#{name}%"]))
                           link = link_to h("#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => changeset.revision},
                                                        :class => 'changeset',
-                                                       :title => truncate_single_line(changeset.comments, 100)
+                                                       :title => truncate_single_line(changeset.comments, :length => 100)
                         end
                       when 'source', 'export'
                         if project && project.repository
                           name =~ %r{^[/\\]*(.*?)(@([0-9a-f]+))?(#(L\d+))?$}
                           path, rev, anchor = $1, $3, $5
                           link = link_to h("#{prefix}:#{name}"), {:controller => 'repositories', :action => 'entry', :id => project,
                                                                   :path => to_path_param(path),
                                                                   :rev => rev,
                                                                   :anchor => anchor,
                                                                   :format => (prefix == 'export' ? 'raw' : nil)},
                                                                  :class => (prefix == 'export' ? 'source download' : 'source')
                         end
                       when 'attachment'
                         if attachments && attachment = attachments.detect {|a| a.filename == name }
                           link = link_to h(attachment.filename), {:only_path => only_path, :controller => 'attachments', :action => 'download', :id => attachment},
                                                                  :class => 'attachment'
                         end
                       end
                     end
                   end
                   leading + (link || "#{prefix}#{sep}#{oid}")
                 end
                 text
               end
               # Same as Rails' simple_format helper without using paragraphs
               def simple_format_without_paragraph(text)
                 text.to_s.
                   gsub(/\r\n?/, "\n").                    # \r\n and \r -> \n
                   gsub(/\n\n+/, "<br /><br />").          # 2+ newline  -> 2 br
                   gsub(/([^\n]\n)(?=[^\n])/, '\1<br />')  # 1 newline   -> br
               end
-              def error_messages_for(object_name, options = {})
-                options = options.symbolize_keys
-                object = instance_variable_get("@#{object_name}")
-                if object && !object.errors.empty?
-                  # build full_messages here with controller current language
-                  full_messages = []
-                  object.errors.each do |attr, msg|
-                    next if msg.nil?
-                    msg = [msg] unless msg.is_a?(Array)
-                    if attr == "base"
-                      full_messages << l(*msg)
-                    else
-                      full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(*msg) unless attr == "custom_values"
-                    end
-                  end
-                  # retrieve custom values error messages
-                  if object.errors[:custom_values]
-                    object.custom_values.each do |v|
-                      v.errors.each do |attr, msg|
-                        next if msg.nil?
-                        msg = [msg] unless msg.is_a?(Array)
-                        full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(*msg)
-                      end
-                    end
-                  end
-                  content_tag("div",
-                    content_tag(
-                      options[:header_tag] || "span", lwr(:gui_validation_error, full_messages.length) + ":"
-                    ) +
-                    content_tag("ul", full_messages.collect { |msg| content_tag("li", msg) }),
-                    "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
-                else
-                  ""
-                end
-              end
               def lang_options_for_select(blank=true)
                 (blank ? [["(auto)", ""]] : []) +
-                  GLoc.valid_languages.collect{|lang| [ ll(lang.to_s, :general_lang_name), lang.to_s]}.sort{|x,y| x.last <=> y.last }
+                  valid_languages.collect{|lang| [ ll(lang.to_s, :general_lang_name), lang.to_s]}.sort{|x,y| x.last <=> y.last }
               end
               def label_tag_for(name, option_tags = nil, options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 content_tag("label", label_text)
               end
               def labelled_tabular_form_for(name, object, options, &proc)
                 options[:html] ||= {}
                 options[:html][:class] = 'tabular' unless options[:html].has_key?(:class)
                 form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)
               end
               def back_url_hidden_field_tag
                 back_url = params[:back_url] || request.env['HTTP_REFERER']
                 back_url = CGI.unescape(back_url.to_s)
                 hidden_field_tag('back_url', CGI.escape(back_url)) unless back_url.blank?
               end
               def check_all_links(form_name)
                 link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
                 " | " +
                 link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")
               end
               def progress_bar(pcts, options={})
                 pcts = [pcts, pcts] unless pcts.is_a?(Array)
                 pcts[1] = pcts[1] - pcts[0]
                 pcts << (100 - pcts[1] - pcts[0])
                 width = options[:width] || '100px;'
                 legend = options[:legend] || ''
                 content_tag('table',
                   content_tag('tr',
                     (pcts[0] > 0 ? content_tag('td', '', :style => "width: #{pcts[0].floor}%;", :class => 'closed') : '') +
                     (pcts[1] > 0 ? content_tag('td', '', :style => "width: #{pcts[1].floor}%;", :class => 'done') : '') +
                     (pcts[2] > 0 ? content_tag('td', '', :style => "width: #{pcts[2].floor}%;", :class => 'todo') : '')
                   ), :class => 'progress', :style => "width: #{width};") +
                   content_tag('p', legend, :class => 'pourcent')
               end
               def context_menu_link(name, url, options={})
                 options[:class] ||= ''
                 if options.delete(:selected)
                   options[:class] << ' icon-checked disabled'
                   options[:disabled] = true
                 end
                 if options.delete(:disabled)
                   options.delete(:method)
                   options.delete(:confirm)
                   options.delete(:onclick)
                   options[:class] << ' disabled'
                   url = '#'
                 end
                 link_to name, url, options
               end
               def calendar_for(field_id)
                 include_calendar_headers_tags
                 image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
                 javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
               end
               def include_calendar_headers_tags
                 unless @calendar_headers_tags_included
                   @calendar_headers_tags_included = true
                   content_for :header_tags do
                     javascript_include_tag('calendar/calendar') +
                     javascript_include_tag("calendar/lang/calendar-#{current_language}.js") +
                     javascript_include_tag('calendar/calendar-setup') +
                     stylesheet_link_tag('calendar')
                   end
                 end
               end
               def content_for(name, content = nil, &block)
                 @has_content ||= {}
                 @has_content[name] = true
                 super(name, content, &block)
               end
               def has_content?(name)
                 (@has_content && @has_content[name]) || false
               end
               # Returns the avatar image tag for the given +user+ if avatars are enabled
               # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>')
               def avatar(user, options = { })
                 if Setting.gravatar_enabled?
                   email = nil
                   if user.respond_to?(:mail)
                     email = user.mail
                   elsif user.to_s =~ %r{<(.+?)>}
                     email = $1
                   end
                   return gravatar(email.to_s.downcase, options) unless email.blank? rescue nil
                 end
               end
               private
               def wiki_helper
                 helper = Redmine::WikiFormatting.helper_for(Setting.text_formatting)
                 extend helper
                 return self
               end
               def link_to_remote_content_update(text, url_params)
                 link_to_remote(text,
                   {:url => url_params, :method => :get, :update => 'content', :complete => 'window.scrollTo(0,0)'},
                   {:href => url_for(:params => url_params)}
                 )
               end
             end

app/helpers/issues_helper.rb +1 -1

             # 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.
             require 'csv'
             module IssuesHelper
               include ApplicationHelper
               def render_issue_tooltip(issue)
                 @cached_label_start_date ||= l(:field_start_date)
                 @cached_label_due_date ||= l(:field_due_date)
                 @cached_label_assigned_to ||= l(:field_assigned_to)
                 @cached_label_priority ||= l(:field_priority)
                 link_to_issue(issue) + ": #{h(issue.subject)}<br /><br />" +
                   "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />" +
                   "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />" +
                   "<strong>#{@cached_label_assigned_to}</strong>: #{issue.assigned_to}<br />" +
                   "<strong>#{@cached_label_priority}</strong>: #{issue.priority.name}"
               end
               # Returns a string of css classes that apply to the given issue
               def css_issue_classes(issue)
                 s = "issue status-#{issue.status.position} priority-#{issue.priority.position}"
                 s << ' closed' if issue.closed?
                 s << ' overdue' if issue.overdue?
                 s
               end
               def sidebar_queries
                 unless @sidebar_queries
                   # User can see public queries and his own queries
                   visible = ARCondition.new(["is_public = ? OR user_id = ?", true, (User.current.logged? ? User.current.id : 0)])
                   # Project specific queries and global queries
                   visible << (@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id])
                   @sidebar_queries = Query.find(:all,
                                                 :order => "name ASC",
                                                 :conditions => visible.conditions)
                 end
                 @sidebar_queries
               end
               def show_detail(detail, no_html=false)
                 case detail.property
                 when 'attr'
                   label = l(("field_" + detail.prop_key.to_s.gsub(/\_id$/, "")).to_sym)
                   case detail.prop_key
                   when 'due_date', 'start_date'
                     value = format_date(detail.value.to_date) if detail.value
                     old_value = format_date(detail.old_value.to_date) if detail.old_value
                   when 'project_id'
                     p = Project.find_by_id(detail.value) and value = p.name if detail.value
                     p = Project.find_by_id(detail.old_value) and old_value = p.name if detail.old_value
                   when 'status_id'
                     s = IssueStatus.find_by_id(detail.value) and value = s.name if detail.value
                     s = IssueStatus.find_by_id(detail.old_value) and old_value = s.name if detail.old_value
                   when 'tracker_id'
                     t = Tracker.find_by_id(detail.value) and value = t.name if detail.value
                     t = Tracker.find_by_id(detail.old_value) and old_value = t.name if detail.old_value
                   when 'assigned_to_id'
                     u = User.find_by_id(detail.value) and value = u.name if detail.value
                     u = User.find_by_id(detail.old_value) and old_value = u.name if detail.old_value
                   when 'priority_id'
                     e = Enumeration.find_by_id(detail.value) and value = e.name if detail.value
                     e = Enumeration.find_by_id(detail.old_value) and old_value = e.name if detail.old_value
                   when 'category_id'
                     c = IssueCategory.find_by_id(detail.value) and value = c.name if detail.value
                     c = IssueCategory.find_by_id(detail.old_value) and old_value = c.name if detail.old_value
                   when 'fixed_version_id'
                     v = Version.find_by_id(detail.value) and value = v.name if detail.value
                     v = Version.find_by_id(detail.old_value) and old_value = v.name if detail.old_value
                   when 'estimated_hours'
                     value = "%0.02f" % detail.value.to_f unless detail.value.blank?
                     old_value = "%0.02f" % detail.old_value.to_f unless detail.old_value.blank?
                   end
                 when 'cf'
                   custom_field = CustomField.find_by_id(detail.prop_key)
                   if custom_field
                     label = custom_field.name
                     value = format_value(detail.value, custom_field.field_format) if detail.value
                     old_value = format_value(detail.old_value, custom_field.field_format) if detail.old_value
                   end
                 when 'attachment'
                   label = l(:label_attachment)
                 end
                 call_hook(:helper_issues_show_detail_after_setting, {:detail => detail, :label => label, :value => value, :old_value => old_value })
                 label ||= detail.prop_key
                 value ||= detail.value
                 old_value ||= detail.old_value
                 unless no_html
                   label = content_tag('strong', label)
                   old_value = content_tag("i", h(old_value)) if detail.old_value
                   old_value = content_tag("strike", old_value) if detail.old_value and (!detail.value or detail.value.empty?)
                   if detail.property == 'attachment' && !value.blank? && a = Attachment.find_by_id(detail.prop_key)
                     # Link to the attachment if it has not been removed
                     value = link_to_attachment(a)
                   else
                     value = content_tag("i", h(value)) if value
                   end
                 end
                 if !detail.value.blank?
                   case detail.property
                   when 'attr', 'cf'
                     if !detail.old_value.blank?
-                      label + " " + l(:text_journal_changed, old_value, value)
+                      label + " " + l(:text_journal_changed, :old => old_value, :new => value)
                     else
                       label + " " + l(:text_journal_set_to, value)
                     end
                   when 'attachment'
                     "#{label} #{value} #{l(:label_added)}"
                   end
                 else
                   case detail.property
                   when 'attr', 'cf'
                     label + " " + l(:text_journal_deleted) + " (#{old_value})"
                   when 'attachment'
                     "#{label} #{old_value} #{l(:label_deleted)}"
                   end
                 end
               end
               def issues_to_csv(issues, project = nil)
                 ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')
                 decimal_separator = l(:general_csv_decimal_separator)
                 export = StringIO.new
                 CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
                   # csv header fields
                   headers = [ "#",
                               l(:field_status),
                               l(:field_project),
                               l(:field_tracker),
                               l(:field_priority),
                               l(:field_subject),
                               l(:field_assigned_to),
                               l(:field_category),
                               l(:field_fixed_version),
                               l(:field_author),
                               l(:field_start_date),
                               l(:field_due_date),
                               l(:field_done_ratio),
                               l(:field_estimated_hours),
                               l(:field_created_on),
                               l(:field_updated_on)
                               ]
                   # Export project custom fields if project is given
                   # otherwise export custom fields marked as "For all projects"
                   custom_fields = project.nil? ? IssueCustomField.for_all : project.all_issue_custom_fields
                   custom_fields.each {|f| headers << f.name}
                   # Description in the last column
                   headers << l(:field_description)
                   csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
                   # csv lines
                   issues.each do |issue|
                     fields = [issue.id,
                               issue.status.name,
                               issue.project.name,
                               issue.tracker.name,
                               issue.priority.name,
                               issue.subject,
                               issue.assigned_to,
                               issue.category,
                               issue.fixed_version,
                               issue.author.name,
                               format_date(issue.start_date),
                               format_date(issue.due_date),
                               issue.done_ratio,
                               issue.estimated_hours.to_s.gsub('.', decimal_separator),
                               format_time(issue.created_on),
                               format_time(issue.updated_on)
                               ]
                     custom_fields.each {|f| fields << show_value(issue.custom_value_for(f)) }
                     fields << issue.description
                     csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
                   end
                 end
                 export.rewind
                 export
               end
             end

app/helpers/messages_helper.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             module MessagesHelper
               def link_to_message(message)
                 return '' unless message
-                link_to h(truncate(message.subject, 60)), :controller => 'messages',
+                link_to h(truncate(message.subject, :length => 60)), :controller => 'messages',
                                                        :action => 'show',
                                                        :board_id => message.board_id,
                                                        :id => message.root,
                                                        :anchor => (message.parent_id ? "message-#{message.id}" : nil)
               end
             end

app/helpers/settings_helper.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             module SettingsHelper
               def administration_settings_tabs
                 tabs = [{:name => 'general', :partial => 'settings/general', :label => :label_general},
                         {:name => 'display', :partial => 'settings/display', :label => :label_display},
                         {:name => 'authentication', :partial => 'settings/authentication', :label => :label_authentication},
                         {:name => 'projects', :partial => 'settings/projects', :label => :label_project_plural},
                         {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking},
-                        {:name => 'notifications', :partial => 'settings/notifications', :label => l(:field_mail_notification)},
+                        {:name => 'notifications', :partial => 'settings/notifications', :label => :field_mail_notification},
-                        {:name => 'mail_handler', :partial => 'settings/mail_handler', :label => l(:label_incoming_emails)},
+                        {:name => 'mail_handler', :partial => 'settings/mail_handler', :label => :label_incoming_emails},
                         {:name => 'repositories', :partial => 'settings/repositories', :label => :label_repository_plural}
                         ]
               end
             end

app/models/changeset.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2008  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.
             require 'iconv'
             class Changeset < ActiveRecord::Base
               belongs_to :repository
               belongs_to :user
               has_many :changes, :dependent => :delete_all
               has_and_belongs_to_many :issues
               acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.revision}" + (o.short_comments.blank? ? '' : (': ' + o.short_comments))},
                             :description => :long_comments,
                             :datetime => :committed_on,
                             :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project_id, :rev => o.revision}}
               acts_as_searchable :columns => 'comments',
                                  :include => {:repository => :project},
                                  :project_key => "#{Repository.table_name}.project_id",
                                  :date_column => 'committed_on'
               acts_as_activity_provider :timestamp => "#{table_name}.committed_on",
                                         :author_key => :user_id,
                                         :find_options => {:include => {:repository => :project}}
               validates_presence_of :repository_id, :revision, :committed_on, :commit_date
               validates_uniqueness_of :revision, :scope => :repository_id
               validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
               def revision=(r)
                 write_attribute :revision, (r.nil? ? nil : r.to_s)
               end
               def comments=(comment)
                 write_attribute(:comments, Changeset.normalize_comments(comment))
               end
               def committed_on=(date)
                 self.commit_date = date
                 super
               end
               def project
                 repository.project
               end
               def author
                 user || committer.to_s.split('<').first
               end
               def before_create
                 self.user = repository.find_committer_user(committer)
               end
               def after_create
                 scan_comment_for_issue_ids
               end
               require 'pp'
               def scan_comment_for_issue_ids
                 return if comments.blank?
                 # keywords used to reference issues
                 ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)
                 # keywords used to fix issues
                 fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)
                 # status and optional done ratio applied
                 fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)
                 done_ratio = Setting.commit_fix_done_ratio.blank? ? nil : Setting.commit_fix_done_ratio.to_i
                 kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")
                 return if kw_regexp.blank?
                 referenced_issues = []
                 if ref_keywords.delete('*')
                   # find any issue ID in the comments
                   target_issue_ids = []
                   comments.scan(%r{([\s\(,-]|^)#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] }
                   referenced_issues += repository.project.issues.find_all_by_id(target_issue_ids)
                 end
                 comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|
                   action = match[0]
                   target_issue_ids = match[1].scan(/\d+/)
                   target_issues = repository.project.issues.find_all_by_id(target_issue_ids)
                   if fix_status && fix_keywords.include?(action.downcase)
                     # update status of issues
                     logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?
                     target_issues.each do |issue|
                       # the issue may have been updated by the closure of another one (eg. duplicate)
                       issue.reload
                       # don't change the status is the issue is closed
                       next if issue.status.is_closed?
                       csettext = "r#{self.revision}"
                       if self.scmid && (! (csettext =~ /^r[0-9]+$/))
                         csettext = "commit:\"#{self.scmid}\""
                       end
-                      journal = issue.init_journal(user || User.anonymous, l(:text_status_changed_by_changeset, csettext))
+                      journal = issue.init_journal(user || User.anonymous, ll(Setting.default_language, :text_status_changed_by_changeset, csettext))
                       issue.status = fix_status
                       issue.done_ratio = done_ratio if done_ratio
                       issue.save
                       Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
                     end
                   end
                   referenced_issues += target_issues
                 end
                 self.issues = referenced_issues.uniq
               end
               def short_comments
                 @short_comments || split_comments.first
               end
               def long_comments
                 @long_comments || split_comments.last
               end
               # Returns the previous changeset
               def previous
                 @previous ||= Changeset.find(:first, :conditions => ['id < ? AND repository_id = ?', self.id, self.repository_id], :order => 'id DESC')
               end
               # Returns the next changeset
               def next
                 @next ||= Changeset.find(:first, :conditions => ['id > ? AND repository_id = ?', self.id, self.repository_id], :order => 'id ASC')
               end
               # Strips and reencodes a commit log before insertion into the database
               def self.normalize_comments(str)
                 to_utf8(str.to_s.strip)
               end
               private
               def split_comments
                 comments =~ /\A(.+?)\r?\n(.*)$/m
                 @short_comments = $1 || comments
                 @long_comments = $2.to_s.strip
                 return @short_comments, @long_comments
               end
               def self.to_utf8(str)
                 return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
                 encoding = Setting.commit_logs_encoding.to_s.strip
                 unless encoding.blank? || encoding == 'UTF-8'
                   begin
                     return Iconv.conv('UTF-8', encoding, str)
                   rescue Iconv::Failure
                     # do nothing here
                   end
                 end
                 str
               end
             end

app/models/custom_field.rb +3 -3

             # 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 CustomField < ActiveRecord::Base
               has_many :custom_values, :dependent => :delete_all
               acts_as_list :scope => 'type = \'#{self.class}\''
               serialize :possible_values
               FIELD_FORMATS = { "string" => { :name => :label_string, :order => 1 },
                                 "text" => { :name => :label_text, :order => 2 },
                                 "int" => { :name => :label_integer, :order => 3 },
                                 "float" => { :name => :label_float, :order => 4 },
                                 "list" => { :name => :label_list, :order => 5 },
             			        "date" => { :name => :label_date, :order => 6 },
             			        "bool" => { :name => :label_boolean, :order => 7 }
               }.freeze
               validates_presence_of :name, :field_format
               validates_uniqueness_of :name, :scope => :type
               validates_length_of :name, :maximum => 30
               validates_format_of :name, :with => /^[\w\s\.\'\-]*$/i
               validates_inclusion_of :field_format, :in => FIELD_FORMATS.keys
               def initialize(attributes = nil)
                 super
                 self.possible_values ||= []
               end
               def before_validation
                 # make sure these fields are not searchable
                 self.searchable = false if %w(int float date bool).include?(field_format)
                 true
               end
               def validate
                 if self.field_format == "list"
-                  errors.add(:possible_values, :activerecord_error_blank) if self.possible_values.nil? || self.possible_values.empty?
+                  errors.add(:possible_values, :blank) if self.possible_values.nil? || self.possible_values.empty?
-                  errors.add(:possible_values, :activerecord_error_invalid) unless self.possible_values.is_a? Array
+                  errors.add(:possible_values, :invalid) unless self.possible_values.is_a? Array
                 end
                 # validate default value
                 v = CustomValue.new(:custom_field => self.clone, :value => default_value, :customized => nil)
                 v.custom_field.is_required = false
-                errors.add(:default_value, :activerecord_error_invalid) unless v.valid?
+                errors.add(:default_value, :invalid) unless v.valid?
               end
               # Makes possible_values accept a multiline string
               def possible_values=(arg)
                 if arg.is_a?(Array)
                   write_attribute(:possible_values, arg.compact.collect(&:strip).select {|v| !v.blank?})
                 else
                   self.possible_values = arg.to_s.split(/[\n\r]+/)
                 end
               end
               # Returns a ORDER BY clause that can used to sort customized
               # objects by their value of the custom field.
               # Returns false, if the custom field can not be used for sorting.
               def order_statement
                 case field_format
                   when 'string', 'text', 'list', 'date', 'bool'
                     # COALESCE is here to make sure that blank and NULL values are sorted equally
                     "COALESCE((SELECT cv_sort.value FROM #{CustomValue.table_name} cv_sort" +
                       " WHERE cv_sort.customized_type='#{self.class.customized_class.name}'" +
                       " AND cv_sort.customized_id=#{self.class.customized_class.table_name}.id" +
                       " AND cv_sort.custom_field_id=#{id} LIMIT 1), '')"
                   when 'int', 'float'
                     # Make the database cast values into numeric
                     # Postgresql will raise an error if a value can not be casted!
                     # CustomValue validations should ensure that it doesn't occur
                     "(SELECT CAST(cv_sort.value AS decimal(60,3)) FROM #{CustomValue.table_name} cv_sort" +
                       " WHERE cv_sort.customized_type='#{self.class.customized_class.name}'" +
                       " AND cv_sort.customized_id=#{self.class.customized_class.table_name}.id" +
                       " AND cv_sort.custom_field_id=#{id} AND cv_sort.value <> '' AND cv_sort.value IS NOT NULL LIMIT 1)"
                   else
                     nil
                 end
               end
               def <=>(field)
                 position <=> field.position
               end
               def self.customized_class
                 self.name =~ /^(.+)CustomField$/
                 begin; $1.constantize; rescue nil; end
               end
               # to move in project_custom_field
               def self.for_all
                 find(:all, :conditions => ["is_for_all=?", true], :order => 'position')
               end
               def type_name
                 nil
               end
             end

app/models/custom_value.rb +8 -8

             # 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 CustomValue < ActiveRecord::Base
               belongs_to :custom_field
               belongs_to :customized, :polymorphic => true
               def after_initialize
                 if custom_field && new_record? && (customized_type.blank? || (customized && customized.new_record?))
                   self.value ||= custom_field.default_value
                 end
               end
               # Returns true if the boolean custom value is true
               def true?
                 self.value == '1'
               end
               def editable?
                 custom_field.editable?
               end
               def required?
                 custom_field.is_required?
               end
               def to_s
                 value.to_s
               end
             protected
               def validate
                 if value.blank?
-                  errors.add(:value, :activerecord_error_blank) if custom_field.is_required? and value.blank?
+                  errors.add(:value, :blank) if custom_field.is_required? and value.blank?
                 else
-                  errors.add(:value, :activerecord_error_invalid) unless custom_field.regexp.blank? or value =~ Regexp.new(custom_field.regexp)
+                  errors.add(:value, :invalid) unless custom_field.regexp.blank? or value =~ Regexp.new(custom_field.regexp)
-                  errors.add(:value, :activerecord_error_too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length
+                  errors.add(:value, :too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length
-                  errors.add(:value, :activerecord_error_too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
+                  errors.add(:value, :too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
                   # Format specific validations
                   case custom_field.field_format
                   when 'int'
-                    errors.add(:value, :activerecord_error_not_a_number) unless value =~ /^[+-]?\d+$/
+                    errors.add(:value, :not_a_number) unless value =~ /^[+-]?\d+$/
                   when 'float'
-                    begin; Kernel.Float(value); rescue; errors.add(:value, :activerecord_error_invalid) end
+                    begin; Kernel.Float(value); rescue; errors.add(:value, :invalid) end
                   when 'date'
-                    errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/
+                    errors.add(:value, :not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/
                   when 'list'
-                    errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include?(value)
+                    errors.add(:value, :inclusion) unless custom_field.possible_values.include?(value)
                   end
                 end
               end
             end

app/models/issue.rb +4 -4

             # redMine - project management software
             # Copyright (C) 2006-2007  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 Issue < ActiveRecord::Base
               belongs_to :project
               belongs_to :tracker
               belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
               belongs_to :assigned_to, :class_name => 'User', :foreign_key => 'assigned_to_id'
               belongs_to :fixed_version, :class_name => 'Version', :foreign_key => 'fixed_version_id'
               belongs_to :priority, :class_name => 'Enumeration', :foreign_key => 'priority_id'
               belongs_to :category, :class_name => 'IssueCategory', :foreign_key => 'category_id'
               has_many :journals, :as => :journalized, :dependent => :destroy
               has_many :time_entries, :dependent => :delete_all
               has_and_belongs_to_many :changesets, :order => "#{Changeset.table_name}.committed_on ASC, #{Changeset.table_name}.id ASC"
               has_many :relations_from, :class_name => 'IssueRelation', :foreign_key => 'issue_from_id', :dependent => :delete_all
               has_many :relations_to, :class_name => 'IssueRelation', :foreign_key => 'issue_to_id', :dependent => :delete_all
               acts_as_attachable :after_remove => :attachment_removed
               acts_as_customizable
               acts_as_watchable
               acts_as_searchable :columns => ['subject', "#{table_name}.description", "#{Journal.table_name}.notes"],
                                  :include => [:project, :journals],
                                  # sort by id so that limited eager loading doesn't break with postgresql
                                  :order_column => "#{table_name}.id"
               acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id}: #{o.subject}"},
                             :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}},
                             :type => Proc.new {|o| 'issue' + (o.closed? ? ' closed' : '') }
               acts_as_activity_provider :find_options => {:include => [:project, :author, :tracker]},
                                         :author_key => :author_id
               validates_presence_of :subject, :priority, :project, :tracker, :author, :status
               validates_length_of :subject, :maximum => 255
               validates_inclusion_of :done_ratio, :in => 0..100
               validates_numericality_of :estimated_hours, :allow_nil => true
               named_scope :visible, lambda {|*args| { :include => :project,
                                                       :conditions => Project.allowed_to_condition(args.first || User.current, :view_issues) } }
               # Returns true if usr or current user is allowed to view the issue
               def visible?(usr=nil)
                 (usr || User.current).allowed_to?(:view_issues, self.project)
               end
               def after_initialize
                 if new_record?
                   # set default values for new records only
                   self.status ||= IssueStatus.default
                   self.priority ||= Enumeration.priorities.default
                 end
               end
               # Overrides Redmine::Acts::Customizable::InstanceMethods#available_custom_fields
               def available_custom_fields
                 (project && tracker) ? project.all_issue_custom_fields.select {|c| tracker.custom_fields.include? c } : []
               end
               def copy_from(arg)
                 issue = arg.is_a?(Issue) ? arg : Issue.find(arg)
                 self.attributes = issue.attributes.dup
                 self.custom_values = issue.custom_values.collect {|v| v.clone}
                 self
               end
               # Moves/copies an issue to a new project and tracker
               # Returns the moved/copied issue on success, false on failure
               def move_to(new_project, new_tracker = nil, options = {})
                 options ||= {}
                 issue = options[:copy] ? self.clone : self
                 transaction do
                   if new_project && issue.project_id != new_project.id
                     # delete issue relations
                     unless Setting.cross_project_issue_relations?
                       issue.relations_from.clear
                       issue.relations_to.clear
                     end
                     # issue is moved to another project
                     # reassign to the category with same name if any
                     new_category = issue.category.nil? ? nil : new_project.issue_categories.find_by_name(issue.category.name)
                     issue.category = new_category
                     issue.fixed_version = nil
                     issue.project = new_project
                   end
                   if new_tracker
                     issue.tracker = new_tracker
                   end
                   if options[:copy]
                     issue.custom_field_values = self.custom_field_values.inject({}) {|h,v| h[v.custom_field_id] = v.value; h}
                     issue.status = self.status
                   end
                   if issue.save
                     unless options[:copy]
                       # Manually update project_id on related time entries
                       TimeEntry.update_all("project_id = #{new_project.id}", {:issue_id => id})
                     end
                   else
                     Issue.connection.rollback_db_transaction
                     return false
                   end
                 end
                 return issue
               end
               def priority_id=(pid)
                 self.priority = nil
                 write_attribute(:priority_id, pid)
               end
               def estimated_hours=(h)
                 write_attribute :estimated_hours, (h.is_a?(String) ? h.to_hours : h)
               end
               def validate
                 if self.due_date.nil? && @attributes['due_date'] && !@attributes['due_date'].empty?
-                  errors.add :due_date, :activerecord_error_not_a_date
+                  errors.add :due_date, :not_a_date
                 end
                 if self.due_date and self.start_date and self.due_date < self.start_date
-                  errors.add :due_date, :activerecord_error_greater_than_start_date
+                  errors.add :due_date, :greater_than_start_date
                 end
                 if start_date && soonest_start && start_date < soonest_start
-                  errors.add :start_date, :activerecord_error_invalid
+                  errors.add :start_date, :invalid
                 end
               end
               def validate_on_create
-                errors.add :tracker_id, :activerecord_error_invalid unless project.trackers.include?(tracker)
+                errors.add :tracker_id, :invalid unless project.trackers.include?(tracker)
               end
               def before_create
                 # default assignment based on category
                 if assigned_to.nil? && category && category.assigned_to
                   self.assigned_to = category.assigned_to
                 end
               end
               def before_save
                 if @current_journal
                   # attributes changes
                   (Issue.column_names - %w(id description)).each {|c|
                     @current_journal.details << JournalDetail.new(:property => 'attr',
                                                                   :prop_key => c,
                                                                   :old_value => @issue_before_change.send(c),
                                                                   :value => send(c)) unless send(c)==@issue_before_change.send(c)
                   }
                   # custom fields changes
                   custom_values.each {|c|
                     next if (@custom_values_before_change[c.custom_field_id]==c.value ||
                               (@custom_values_before_change[c.custom_field_id].blank? && c.value.blank?))
                     @current_journal.details << JournalDetail.new(:property => 'cf',
                                                                   :prop_key => c.custom_field_id,
                                                                   :old_value => @custom_values_before_change[c.custom_field_id],
                                                                   :value => c.value)
                   }
                   @current_journal.save
                 end
                 # Save the issue even if the journal is not saved (because empty)
                 true
               end
               def after_save
                 # Reload is needed in order to get the right status
                 reload
                 # Update start/due dates of following issues
                 relations_from.each(&:set_issue_to_dates)
                 # Close duplicates if the issue was closed
                 if @issue_before_change && !@issue_before_change.closed? && self.closed?
                   duplicates.each do |duplicate|
                     # Reload is need in case the duplicate was updated by a previous duplicate
                     duplicate.reload
                     # Don't re-close it if it's already closed
                     next if duplicate.closed?
                     # Same user and notes
                     duplicate.init_journal(@current_journal.user, @current_journal.notes)
                     duplicate.update_attribute :status, self.status
                   end
                 end
               end
               def init_journal(user, notes = "")
                 @current_journal ||= Journal.new(:journalized => self, :user => user, :notes => notes)
                 @issue_before_change = self.clone
                 @issue_before_change.status = self.status
                 @custom_values_before_change = {}
                 self.custom_values.each {|c| @custom_values_before_change.store c.custom_field_id, c.value }
                 # Make sure updated_on is updated when adding a note.
                 updated_on_will_change!
                 @current_journal
               end
               # Return true if the issue is closed, otherwise false
               def closed?
                 self.status.is_closed?
               end
               # Returns true if the issue is overdue
               def overdue?
                 !due_date.nil? && (due_date < Date.today) && !status.is_closed?
               end
               # Users the issue can be assigned to
               def assignable_users
                 project.assignable_users
               end
               # Returns an array of status that user is able to apply
               def new_statuses_allowed_to(user)
                 statuses = status.find_new_statuses_allowed_to(user.role_for_project(project), tracker)
                 statuses << status unless statuses.empty?
                 statuses.uniq.sort
               end
               # Returns the mail adresses of users that should be notified for the issue
               def recipients
                 recipients = project.recipients
                 # Author and assignee are always notified unless they have been locked
                 recipients << author.mail if author && author.active?
                 recipients << assigned_to.mail if assigned_to && assigned_to.active?
                 recipients.compact.uniq
               end
               def spent_hours
                 @spent_hours ||= time_entries.sum(:hours) || 0
               end
               def relations
                 (relations_from + relations_to).sort
               end
               def all_dependent_issues
                 dependencies = []
                 relations_from.each do |relation|
                   dependencies << relation.issue_to
                   dependencies += relation.issue_to.all_dependent_issues
                 end
                 dependencies
               end
               # Returns an array of issues that duplicate this one
               def duplicates
                 relations_to.select {|r| r.relation_type == IssueRelation::TYPE_DUPLICATES}.collect {|r| r.issue_from}
               end
               # Returns the due date or the target due date if any
               # Used on gantt chart
               def due_before
                 due_date || (fixed_version ? fixed_version.effective_date : nil)
               end
               def duration
                 (start_date && due_date) ? due_date - start_date : 0
               end
               def soonest_start
                 @soonest_start ||= relations_to.collect{|relation| relation.successor_soonest_start}.compact.min
               end
               def to_s
                 "#{tracker} ##{id}: #{subject}"
               end
               private
               # Callback on attachment deletion
               def attachment_removed(obj)
                 journal = init_journal(User.current)
                 journal.details << JournalDetail.new(:property => 'attachment',
                                                      :prop_key => obj.id,
                                                      :old_value => obj.filename)
                 journal.save
               end
             end

app/models/issue_relation.rb +3 -3

             # redMine - project management software
             # Copyright (C) 2006-2007  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 IssueRelation < ActiveRecord::Base
               belongs_to :issue_from, :class_name => 'Issue', :foreign_key => 'issue_from_id'
               belongs_to :issue_to, :class_name => 'Issue', :foreign_key => 'issue_to_id'
               TYPE_RELATES      = "relates"
               TYPE_DUPLICATES   = "duplicates"
               TYPE_BLOCKS       = "blocks"
               TYPE_PRECEDES     = "precedes"
               TYPES = { TYPE_RELATES =>     { :name => :label_relates_to, :sym_name => :label_relates_to, :order => 1 },
                         TYPE_DUPLICATES =>  { :name => :label_duplicates, :sym_name => :label_duplicated_by, :order => 2 },
                         TYPE_BLOCKS =>      { :name => :label_blocks, :sym_name => :label_blocked_by, :order => 3 },
                         TYPE_PRECEDES =>    { :name => :label_precedes, :sym_name => :label_follows, :order => 4 },
                       }.freeze
               validates_presence_of :issue_from, :issue_to, :relation_type
               validates_inclusion_of :relation_type, :in => TYPES.keys
               validates_numericality_of :delay, :allow_nil => true
               validates_uniqueness_of :issue_to_id, :scope => :issue_from_id
               attr_protected :issue_from_id, :issue_to_id
               def validate
                 if issue_from && issue_to
-                  errors.add :issue_to_id, :activerecord_error_invalid if issue_from_id == issue_to_id
+                  errors.add :issue_to_id, :invalid if issue_from_id == issue_to_id
-                  errors.add :issue_to_id, :activerecord_error_not_same_project unless issue_from.project_id == issue_to.project_id || Setting.cross_project_issue_relations?
+                  errors.add :issue_to_id, :not_same_project unless issue_from.project_id == issue_to.project_id || Setting.cross_project_issue_relations?
-                  errors.add_to_base :activerecord_error_circular_dependency if issue_to.all_dependent_issues.include? issue_from
+                  errors.add_to_base :circular_dependency if issue_to.all_dependent_issues.include? issue_from
                 end
               end
               def other_issue(issue)
                 (self.issue_from_id == issue.id) ? issue_to : issue_from
               end
               def label_for(issue)
                 TYPES[relation_type] ? TYPES[relation_type][(self.issue_from_id == issue.id) ? :name : :sym_name] : :unknow
               end
               def before_save
                 if TYPE_PRECEDES == relation_type
                   self.delay ||= 0
                 else
                   self.delay = nil
                 end
                 set_issue_to_dates
               end
               def set_issue_to_dates
                 soonest_start = self.successor_soonest_start
                 if soonest_start && (!issue_to.start_date || issue_to.start_date < soonest_start)
                   issue_to.start_date, issue_to.due_date = successor_soonest_start, successor_soonest_start + issue_to.duration
                   issue_to.save
                 end
               end
               def successor_soonest_start
                 return nil unless (TYPE_PRECEDES == self.relation_type) && (issue_from.start_date || issue_from.due_date)
                 (issue_from.due_date || issue_from.start_date) + 1 + delay
               end
               def <=>(relation)
                 TYPES[self.relation_type][:order] <=> TYPES[relation.relation_type][:order]
               end
             end

app/models/mail_handler.rb +5 0

             # redMine - project management software
             # Copyright (C) 2006-2007  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 MailHandler < ActionMailer::Base
               include ActionView::Helpers::SanitizeHelper
               class UnauthorizedAction < StandardError; end
               class MissingInformation < StandardError; end
               attr_reader :email, :user
               def self.receive(email, options={})
                 @@handler_options = options.dup
                 @@handler_options[:issue] ||= {}
                 @@handler_options[:allow_override] = @@handler_options[:allow_override].split(',').collect(&:strip) if @@handler_options[:allow_override].is_a?(String)
                 @@handler_options[:allow_override] ||= []
                 # Project needs to be overridable if not specified
                 @@handler_options[:allow_override] << 'project' unless @@handler_options[:issue].has_key?(:project)
                 # Status overridable by default
                 @@handler_options[:allow_override] << 'status' unless @@handler_options[:issue].has_key?(:status)
                 super email
               end
               # Processes incoming emails
               def receive(email)
                 @email = email
                 @user = User.active.find_by_mail(email.from.first.to_s.strip)
                 unless @user
                   # Unknown user => the email is ignored
                   # TODO: ability to create the user's account
                   logger.info "MailHandler: email submitted by unknown user [#{email.from.first}]" if logger && logger.info
                   return false
                 end
                 User.current = @user
                 dispatch
               end
               private
               MESSAGE_ID_RE = %r{^<redmine\.([a-z0-9_]+)\-(\d+)\.\d+@}
               ISSUE_REPLY_SUBJECT_RE = %r{\[[^\]]+#(\d+)\]}
               MESSAGE_REPLY_SUBJECT_RE = %r{\[[^\]]+msg(\d+)\]}
               def dispatch
                 headers = [email.in_reply_to, email.references].flatten.compact
                 if headers.detect {|h| h.to_s =~ MESSAGE_ID_RE}
                   klass, object_id = $1, $2.to_i
                   method_name = "receive_#{klass}_reply"
                   if self.class.private_instance_methods.include?(method_name)
                     send method_name, object_id
                   else
                     # ignoring it
                   end
                 elsif m = email.subject.match(ISSUE_REPLY_SUBJECT_RE)
                   receive_issue_reply(m[1].to_i)
                 elsif m = email.subject.match(MESSAGE_REPLY_SUBJECT_RE)
                   receive_message_reply(m[1].to_i)
                 else
                   receive_issue
                 end
               rescue ActiveRecord::RecordInvalid => e
                 # TODO: send a email to the user
                 logger.error e.message if logger
                 false
               rescue MissingInformation => e
                 logger.error "MailHandler: missing information from #{user}: #{e.message}" if logger
                 false
               rescue UnauthorizedAction => e
                 logger.error "MailHandler: unauthorized attempt from #{user}" if logger
                 false
               end
               # Creates a new issue
               def receive_issue
                 project = target_project
                 tracker = (get_keyword(:tracker) && project.trackers.find_by_name(get_keyword(:tracker))) || project.trackers.find(:first)
                 category = (get_keyword(:category) && project.issue_categories.find_by_name(get_keyword(:category)))
                 priority = (get_keyword(:priority) && Enumeration.find_by_opt_and_name('IPRI', get_keyword(:priority)))
                 status =  (get_keyword(:status) && IssueStatus.find_by_name(get_keyword(:status)))
                 # check permission
                 raise UnauthorizedAction unless user.allowed_to?(:add_issues, project)
                 issue = Issue.new(:author => user, :project => project, :tracker => tracker, :category => category, :priority => priority)
                 # check workflow
                 if status && issue.new_statuses_allowed_to(user).include?(status)
                   issue.status = status
                 end
                 issue.subject = email.subject.chomp.toutf8
                 issue.description = plain_text_body
                 # custom fields
                 issue.custom_field_values = issue.available_custom_fields.inject({}) do |h, c|
                   if value = get_keyword(c.name, :override => true)
                     h[c.id] = value
                   end
                   h
                 end
                 issue.save!
                 add_attachments(issue)
                 logger.info "MailHandler: issue ##{issue.id} created by #{user}" if logger && logger.info
                 # add To and Cc as watchers
                 add_watchers(issue)
                 # send notification after adding watchers so that they can reply to Redmine
                 Mailer.deliver_issue_add(issue) if Setting.notified_events.include?('issue_added')
                 issue
               end
               def target_project
                 # TODO: other ways to specify project:
                 # * parse the email To field
                 # * specific project (eg. Setting.mail_handler_target_project)
                 target = Project.find_by_identifier(get_keyword(:project))
                 raise MissingInformation.new('Unable to determine target project') if target.nil?
                 target
               end
               # Adds a note to an existing issue
               def receive_issue_reply(issue_id)
                 status =  (get_keyword(:status) && IssueStatus.find_by_name(get_keyword(:status)))
                 issue = Issue.find_by_id(issue_id)
                 return unless issue
                 # check permission
                 raise UnauthorizedAction unless user.allowed_to?(:add_issue_notes, issue.project) || user.allowed_to?(:edit_issues, issue.project)
                 raise UnauthorizedAction unless status.nil? || user.allowed_to?(:edit_issues, issue.project)
                 # add the note
                 journal = issue.init_journal(user, plain_text_body)
                 add_attachments(issue)
                 # check workflow
                 if status && issue.new_statuses_allowed_to(user).include?(status)
                   issue.status = status
                 end
                 issue.save!
                 logger.info "MailHandler: issue ##{issue.id} updated by #{user}" if logger && logger.info
                 Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
                 journal
               end
               # Reply will be added to the issue
               def receive_journal_reply(journal_id)
                 journal = Journal.find_by_id(journal_id)
                 if journal && journal.journalized_type == 'Issue'
                   receive_issue_reply(journal.journalized_id)
                 end
               end
               # Receives a reply to a forum message
               def receive_message_reply(message_id)
                 message = Message.find_by_id(message_id)
                 if message
                   message = message.root
                   if user.allowed_to?(:add_messages, message.project) && !message.locked?
                     reply = Message.new(:subject => email.subject.gsub(%r{^.*msg\d+\]}, '').strip,
                                         :content => plain_text_body)
                     reply.author = user
                     reply.board = message.board
                     message.children << reply
                     add_attachments(reply)
                     reply
                   else
                     raise UnauthorizedAction
                   end
                 end
               end
               def add_attachments(obj)
                 if email.has_attachments?
                   email.attachments.each do |attachment|
                     Attachment.create(:container => obj,
                                       :file => attachment,
                                       :author => user,
                                       :content_type => attachment.content_type)
                   end
                 end
               end
               # Adds To and Cc as watchers of the given object if the sender has the
               # appropriate permission
               def add_watchers(obj)
                 if user.allowed_to?("add_#{obj.class.name.underscore}_watchers".to_sym, obj.project)
                   addresses = [email.to, email.cc].flatten.compact.uniq.collect {|a| a.strip.downcase}
                   unless addresses.empty?
                     watchers = User.active.find(:all, :conditions => ['LOWER(mail) IN (?)', addresses])
                     watchers.each {|w| obj.add_watcher(w)}
                   end
                 end
               end
               def get_keyword(attr, options={})
                 @keywords ||= {}
                 if @keywords.has_key?(attr)
                   @keywords[attr]
                 else
                   @keywords[attr] = begin
                     if (options[:override] || @@handler_options[:allow_override].include?(attr.to_s)) && plain_text_body.gsub!(/^#{attr}:[ \t]*(.+)\s*$/i, '')
                       $1.strip
                     elsif !@@handler_options[:issue][attr].blank?
                       @@handler_options[:issue][attr]
                     end
                   end
                 end
               end
               # Returns the text/plain part of the email
               # If not found (eg. HTML-only email), returns the body with tags removed
               def plain_text_body
                 return @plain_text_body unless @plain_text_body.nil?
                 parts = @email.parts.collect {|c| (c.respond_to?(:parts) && !c.parts.empty?) ? c.parts : c}.flatten
                 if parts.empty?
                   parts << @email
                 end
                 plain_text_part = parts.detect {|p| p.content_type == 'text/plain'}
                 if plain_text_part.nil?
                   # no text/plain part found, assuming html-only email
                   # strip html tags and remove doctype directive
                   @plain_text_body = strip_tags(@email.body.to_s)
                   @plain_text_body.gsub! %r{^<!DOCTYPE .*$}, ''
                 else
                   @plain_text_body = plain_text_part.body.to_s
                 end
                 @plain_text_body.strip!
               end
+              def self.full_sanitizer
+                @full_sanitizer ||= HTML::FullSanitizer.new
+              end
             end

app/models/mailer.rb +1 0

             # redMine - project management software
             # Copyright (C) 2006-2007  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 Mailer < ActionMailer::Base
               helper :application
               helper :issues
               helper :custom_fields
               include ActionController::UrlWriter
+              include Redmine::I18n
               def issue_add(issue)
                 redmine_headers 'Project' => issue.project.identifier,
                                 'Issue-Id' => issue.id,
                                 'Issue-Author' => issue.author.login
                 redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
                 message_id issue
                 recipients issue.recipients
                 cc(issue.watcher_recipients - @recipients)
                 subject "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] (#{issue.status.name}) #{issue.subject}"
                 body :issue => issue,
                      :issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)
               end
               def issue_edit(journal)
                 issue = journal.journalized
                 redmine_headers 'Project' => issue.project.identifier,
                                 'Issue-Id' => issue.id,
                                 'Issue-Author' => issue.author.login
                 redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
                 message_id journal
                 references issue
                 @author = journal.user
                 recipients issue.recipients
                 # Watchers in cc
                 cc(issue.watcher_recipients - @recipients)
                 s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] "
                 s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
                 s << issue.subject
                 subject s
                 body :issue => issue,
                      :journal => journal,
                      :issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)
               end
               def reminder(user, issues, days)
                 set_language_if_valid user.language
                 recipients user.mail
                 subject l(:mail_subject_reminder, issues.size)
                 body :issues => issues,
                      :days => days,
                      :issues_url => url_for(:controller => 'issues', :action => 'index', :set_filter => 1, :assigned_to_id => user.id, :sort_key => 'due_date', :sort_order => 'asc')
               end
               def document_added(document)
                 redmine_headers 'Project' => document.project.identifier
                 recipients document.project.recipients
                 subject "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
                 body :document => document,
                      :document_url => url_for(:controller => 'documents', :action => 'show', :id => document)
               end
               def attachments_added(attachments)
                 container = attachments.first.container
                 added_to = ''
                 added_to_url = ''
                 case container.class.name
                 when 'Project'
                   added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container)
                   added_to = "#{l(:label_project)}: #{container}"
                 when 'Version'
                   added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container.project_id)
                   added_to = "#{l(:label_version)}: #{container.name}"
                 when 'Document'
                   added_to_url = url_for(:controller => 'documents', :action => 'show', :id => container.id)
                   added_to = "#{l(:label_document)}: #{container.title}"
                 end
                 redmine_headers 'Project' => container.project.identifier
                 recipients container.project.recipients
                 subject "[#{container.project.name}] #{l(:label_attachment_new)}"
                 body :attachments => attachments,
                      :added_to => added_to,
                      :added_to_url => added_to_url
               end
               def news_added(news)
                 redmine_headers 'Project' => news.project.identifier
                 message_id news
                 recipients news.project.recipients
                 subject "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
                 body :news => news,
                      :news_url => url_for(:controller => 'news', :action => 'show', :id => news)
               end
               def message_posted(message, recipients)
                 redmine_headers 'Project' => message.project.identifier,
                                 'Topic-Id' => (message.parent_id || message.id)
                 message_id message
                 references message.parent unless message.parent.nil?
                 recipients(recipients)
                 subject "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
                 body :message => message,
                      :message_url => url_for(:controller => 'messages', :action => 'show', :board_id => message.board_id, :id => message.root)
               end
               def account_information(user, password)
                 set_language_if_valid user.language
                 recipients user.mail
                 subject l(:mail_subject_register, Setting.app_title)
                 body :user => user,
                      :password => password,
                      :login_url => url_for(:controller => 'account', :action => 'login')
               end
               def account_activation_request(user)
                 # Send the email to all active administrators
                 recipients User.active.find(:all, :conditions => {:admin => true}).collect { |u| u.mail }.compact
                 subject l(:mail_subject_account_activation_request, Setting.app_title)
                 body :user => user,
                      :url => url_for(:controller => 'users', :action => 'index', :status => User::STATUS_REGISTERED, :sort_key => 'created_on', :sort_order => 'desc')
               end
               # A registered user's account was activated by an administrator
               def account_activated(user)
                 set_language_if_valid user.language
                 recipients user.mail
                 subject l(:mail_subject_register, Setting.app_title)
                 body :user => user,
                      :login_url => url_for(:controller => 'account', :action => 'login')
               end
               def lost_password(token)
                 set_language_if_valid(token.user.language)
                 recipients token.user.mail
                 subject l(:mail_subject_lost_password, Setting.app_title)
                 body :token => token,
                      :url => url_for(:controller => 'account', :action => 'lost_password', :token => token.value)
               end
               def register(token)
                 set_language_if_valid(token.user.language)
                 recipients token.user.mail
                 subject l(:mail_subject_register, Setting.app_title)
                 body :token => token,
                      :url => url_for(:controller => 'account', :action => 'activate', :token => token.value)
               end
               def test(user)
                 set_language_if_valid(user.language)
                 recipients user.mail
                 subject 'Redmine test'
                 body :url => url_for(:controller => 'welcome')
               end
               # Overrides default deliver! method to prevent from sending an email
               # with no recipient, cc or bcc
               def deliver!(mail = @mail)
                 return false if (recipients.nil? || recipients.empty?) &&
                                 (cc.nil? || cc.empty?) &&
                                 (bcc.nil? || bcc.empty?)
                 # Set Message-Id and References
                 if @message_id_object
                   mail.message_id = self.class.message_id_for(@message_id_object)
                 end
                 if @references_objects
                   mail.references = @references_objects.collect {|o| self.class.message_id_for(o)}
                 end
                 super(mail)
               end
               # Sends reminders to issue assignees
               # Available options:
               # * :days     => how many days in the future to remind about (defaults to 7)
               # * :tracker  => id of tracker for filtering issues (defaults to all trackers)
               # * :project  => id or identifier of project to process (defaults to all projects)
               def self.reminders(options={})
                 days = options[:days] || 7
                 project = options[:project] ? Project.find(options[:project]) : nil
                 tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil
                 s = ARCondition.new ["#{IssueStatus.table_name}.is_closed = ? AND #{Issue.table_name}.due_date <= ?", false, days.day.from_now.to_date]
                 s << "#{Issue.table_name}.assigned_to_id IS NOT NULL"
                 s << "#{Project.table_name}.status = #{Project::STATUS_ACTIVE}"
                 s << "#{Issue.table_name}.project_id = #{project.id}" if project
                 s << "#{Issue.table_name}.tracker_id = #{tracker.id}" if tracker
                 issues_by_assignee = Issue.find(:all, :include => [:status, :assigned_to, :project, :tracker],
                                                       :conditions => s.conditions
                                                 ).group_by(&:assigned_to)
                 issues_by_assignee.each do |assignee, issues|
                   deliver_reminder(assignee, issues, days) unless assignee.nil?
                 end
               end
               private
               def initialize_defaults(method_name)
                 super
                 set_language_if_valid Setting.default_language
                 from Setting.mail_from
                 # URL options
                 h = Setting.host_name
                 h = h.to_s.gsub(%r{\/.*$}, '') unless Redmine::Utils.relative_url_root.blank?
                 default_url_options[:host] = h
                 default_url_options[:protocol] = Setting.protocol
                 # Common headers
                 headers 'X-Mailer' => 'Redmine',
                         'X-Redmine-Host' => Setting.host_name,
                         'X-Redmine-Site' => Setting.app_title
               end
               # Appends a Redmine header field (name is prepended with 'X-Redmine-')
               def redmine_headers(h)
                 h.each { |k,v| headers["X-Redmine-#{k}"] = v }
               end
               # Overrides the create_mail method
               def create_mail
                 # Removes the current user from the recipients and cc
                 # if he doesn't want to receive notifications about what he does
                 @author ||= User.current
                 if @author.pref[:no_self_notified]
                   recipients.delete(@author.mail) if recipients
                   cc.delete(@author.mail) if cc
                 end
                 # Blind carbon copy recipients
                 if Setting.bcc_recipients?
                   bcc([recipients, cc].flatten.compact.uniq)
                   recipients []
                   cc []
                 end
                 super
               end
               # Renders a message with the corresponding layout
               def render_message(method_name, body)
                 layout = method_name.to_s.match(%r{text\.html\.(rhtml|rxml)}) ? 'layout.text.html.rhtml' : 'layout.text.plain.rhtml'
                 body[:content_for_layout] = render(:file => method_name, :body => body)
                 ActionView::Base.new(template_root, body, self).render(:file => "mailer/#{layout}", :use_full_path => true)
               end
               # for the case of plain text only
               def body(*params)
                 value = super(*params)
                 if Setting.plain_text_mail?
                   templates = Dir.glob("#{template_path}/#{@template}.text.plain.{rhtml,erb}")
                   unless String === @body or templates.empty?
                     template = File.basename(templates.first)
                     @body[:content_for_layout] = render(:file => template, :body => @body)
                     @body = ActionView::Base.new(template_root, @body, self).render(:file => "mailer/layout.text.plain.rhtml", :use_full_path => true)
                     return @body
                   end
                 end
                 return value
               end
               # Makes partial rendering work with Rails 1.2 (retro-compatibility)
               def self.controller_path
                 ''
               end unless respond_to?('controller_path')
               # Returns a predictable Message-Id for the given object
               def self.message_id_for(object)
                 # id + timestamp should reduce the odds of a collision
                 # as far as we don't send multiple emails for the same object
                 hash = "redmine.#{object.class.name.demodulize.underscore}-#{object.id}.#{object.created_on.strftime("%Y%m%d%H%M%S")}"
                 host = Setting.mail_from.to_s.gsub(%r{^.*@}, '')
                 host = "#{::Socket.gethostname}.redmine" if host.empty?
                 "<#{hash}@#{host}>"
               end
               private
               def message_id(object)
                 @message_id_object = object
               end
               def references(object)
                 @references_objects ||= []
                 @references_objects << object
               end
             end
             # Patch TMail so that message_id is not overwritten
             module TMail
               class Mail
                 def add_message_id( fqdn = nil )
                   self.message_id ||= ::TMail::new_message_id(fqdn)
                 end
               end
             end

app/models/member.rb +1 -1

             # 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 Member < ActiveRecord::Base
               belongs_to :user
               belongs_to :role
               belongs_to :project
               validates_presence_of :role, :user, :project
               validates_uniqueness_of :user_id, :scope => :project_id
               def validate
-                errors.add :role_id, :activerecord_error_invalid if role && !role.member?
+                errors.add :role_id, :invalid if role && !role.member?
               end
               def name
                 self.user.name
               end
               def <=>(member)
                 role == member.role ? (user <=> member.user) : (role <=> member.role)
               end
               def before_destroy
                 # remove category based auto assignments for this member
                 IssueCategory.update_all "assigned_to_id = NULL", ["project_id = ? AND assigned_to_id = ?", project.id, user.id]
               end
             end

app/models/project.rb +1 -1

             # 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 Project < ActiveRecord::Base
               # Project statuses
               STATUS_ACTIVE     = 1
               STATUS_ARCHIVED   = 9
               has_many :members, :include => :user, :conditions => "#{User.table_name}.status=#{User::STATUS_ACTIVE}"
               has_many :users, :through => :members
               has_many :enabled_modules, :dependent => :delete_all
               has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
               has_many :issues, :dependent => :destroy, :order => "#{Issue.table_name}.created_on DESC", :include => [:status, :tracker]
               has_many :issue_changes, :through => :issues, :source => :journals
               has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"
               has_many :time_entries, :dependent => :delete_all
               has_many :queries, :dependent => :delete_all
               has_many :documents, :dependent => :destroy
               has_many :news, :dependent => :delete_all, :include => :author
               has_many :issue_categories, :dependent => :delete_all, :order => "#{IssueCategory.table_name}.name"
               has_many :boards, :dependent => :destroy, :order => "position ASC"
               has_one :repository, :dependent => :destroy
               has_many :changesets, :through => :repository
               has_one :wiki, :dependent => :destroy
               # Custom field for the project issues
               has_and_belongs_to_many :issue_custom_fields,
                                       :class_name => 'IssueCustomField',
                                       :order => "#{CustomField.table_name}.position",
                                       :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}",
                                       :association_foreign_key => 'custom_field_id'
               acts_as_nested_set :order => 'name', :dependent => :destroy
               acts_as_attachable :view_permission => :view_files,
                                  :delete_permission => :manage_files
               acts_as_customizable
               acts_as_searchable :columns => ['name', 'description'], :project_key => 'id', :permission => nil
               acts_as_event :title => Proc.new {|o| "#{l(:label_project)}: #{o.name}"},
                             :url => Proc.new {|o| {:controller => 'projects', :action => 'show', :id => o.id}},
                             :author => nil
               attr_protected :status, :enabled_module_names
               validates_presence_of :name, :identifier
               validates_uniqueness_of :name, :identifier
               validates_associated :repository, :wiki
               validates_length_of :name, :maximum => 30
               validates_length_of :homepage, :maximum => 255
               validates_length_of :identifier, :in => 2..20
               validates_format_of :identifier, :with => /^[a-z0-9\-]*$/
               before_destroy :delete_all_members
               named_scope :has_module, lambda { |mod| { :conditions => ["#{Project.table_name}.id IN (SELECT em.project_id FROM #{EnabledModule.table_name} em WHERE em.name=?)", mod.to_s] } }
               named_scope :active, { :conditions => "#{Project.table_name}.status = #{STATUS_ACTIVE}"}
               named_scope :public, { :conditions => { :is_public => true } }
               named_scope :visible, lambda { { :conditions => Project.visible_by(User.current) } }
               def identifier=(identifier)
                 super unless identifier_frozen?
               end
               def identifier_frozen?
                 errors[:identifier].nil? && !(new_record? || identifier.blank?)
               end
               def issues_with_subprojects(include_subprojects=false)
                 conditions = nil
                 if include_subprojects
                   ids = [id] + descendants.collect(&:id)
                   conditions = ["#{Project.table_name}.id IN (#{ids.join(',')}) AND #{Project.visible_by}"]
                 end
                 conditions ||= ["#{Project.table_name}.id = ?", id]
                 # Quick and dirty fix for Rails 2 compatibility
                 Issue.send(:with_scope, :find => { :conditions => conditions }) do
                   Version.send(:with_scope, :find => { :conditions => conditions }) do
                     yield
                   end
                 end
               end
               # returns latest created projects
               # non public projects will be returned only if user is a member of those
               def self.latest(user=nil, count=5)
                 find(:all, :limit => count, :conditions => visible_by(user), :order => "created_on DESC")
               end
               def self.visible_by(user=nil)
                 user ||= User.current
                 if user && user.admin?
                   return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
                 elsif user && user.memberships.any?
                   return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND (#{Project.table_name}.is_public = #{connection.quoted_true} or #{Project.table_name}.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')}))"
                 else
                   return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND #{Project.table_name}.is_public = #{connection.quoted_true}"
                 end
               end
               def self.allowed_to_condition(user, permission, options={})
                 statements = []
                 base_statement = "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
                 if perm = Redmine::AccessControl.permission(permission)
                   unless perm.project_module.nil?
                     # If the permission belongs to a project module, make sure the module is enabled
                     base_statement << " AND EXISTS (SELECT em.id FROM #{EnabledModule.table_name} em WHERE em.name='#{perm.project_module}' AND em.project_id=#{Project.table_name}.id)"
                   end
                 end
                 if options[:project]
                   project_statement = "#{Project.table_name}.id = #{options[:project].id}"
                   project_statement << " OR (#{Project.table_name}.lft > #{options[:project].lft} AND #{Project.table_name}.rgt < #{options[:project].rgt})" if options[:with_subprojects]
                   base_statement = "(#{project_statement}) AND (#{base_statement})"
                 end
                 if user.admin?
                   # no restriction
                 else
                   statements << "1=0"
                   if user.logged?
                     statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" if Role.non_member.allowed_to?(permission)
                     allowed_project_ids = user.memberships.select {|m| m.role.allowed_to?(permission)}.collect {|m| m.project_id}
                     statements << "#{Project.table_name}.id IN (#{allowed_project_ids.join(',')})" if allowed_project_ids.any?
                   elsif Role.anonymous.allowed_to?(permission)
                     # anonymous user allowed on public project
                     statements << "#{Project.table_name}.is_public = #{connection.quoted_true}"
                   else
                     # anonymous user is not authorized
                   end
                 end
                 statements.empty? ? base_statement : "((#{base_statement}) AND (#{statements.join(' OR ')}))"
               end
               def project_condition(with_subprojects)
                 cond = "#{Project.table_name}.id = #{id}"
                 cond = "(#{cond} OR (#{Project.table_name}.lft > #{lft} AND #{Project.table_name}.rgt < #{rgt}))" if with_subprojects
                 cond
               end
               def self.find(*args)
                 if args.first && args.first.is_a?(String) && !args.first.match(/^\d*$/)
                   project = find_by_identifier(*args)
                   raise ActiveRecord::RecordNotFound, "Couldn't find Project with identifier=#{args.first}" if project.nil?
                   project
                 else
                   super
                 end
               end
               def to_param
                 # id is used for projects with a numeric identifier (compatibility)
                 @to_param ||= (identifier.to_s =~ %r{^\d*$} ? id : identifier)
               end
               def active?
                 self.status == STATUS_ACTIVE
               end
               # Archives the project and its descendants recursively
               def archive
                 # Archive subprojects if any
                 children.each do |subproject|
                   subproject.archive
                 end
                 update_attribute :status, STATUS_ARCHIVED
               end
               # Unarchives the project
               # All its ancestors must be active
               def unarchive
                 return false if ancestors.detect {|a| !a.active?}
                 update_attribute :status, STATUS_ACTIVE
               end
               # Returns an array of projects the project can be moved to
               def possible_parents
                 @possible_parents ||= (Project.active.find(:all) - self_and_descendants)
               end
               # Sets the parent of the project
               # Argument can be either a Project, a String, a Fixnum or nil
               def set_parent!(p)
                 unless p.nil? || p.is_a?(Project)
                   if p.to_s.blank?
                     p = nil
                   else
                     p = Project.find_by_id(p)
                     return false unless p
                   end
                 end
                 if p == parent && !p.nil?
                   # Nothing to do
                   true
                 elsif p.nil? || (p.active? && move_possible?(p))
                   # Insert the project so that target's children or root projects stay alphabetically sorted
                   sibs = (p.nil? ? self.class.roots : p.children)
                   to_be_inserted_before = sibs.detect {|c| c.name.to_s.downcase > name.to_s.downcase }
                   if to_be_inserted_before
                     move_to_left_of(to_be_inserted_before)
                   elsif p.nil?
                     if sibs.empty?
                       # move_to_root adds the project in first (ie. left) position
                       move_to_root
                     else
                       move_to_right_of(sibs.last) unless self == sibs.last
                     end
                   else
                     # move_to_child_of adds the project in last (ie.right) position
                     move_to_child_of(p)
                   end
                   true
                 else
                   # Can not move to the given target
                   false
                 end
               end
               # Returns an array of the trackers used by the project and its active sub projects
               def rolled_up_trackers
                 @rolled_up_trackers ||=
                   Tracker.find(:all, :include => :projects,
                                      :select => "DISTINCT #{Tracker.table_name}.*",
                                      :conditions => ["#{Project.table_name}.lft >= ? AND #{Project.table_name}.rgt <= ? AND #{Project.table_name}.status = #{STATUS_ACTIVE}", lft, rgt],
                                      :order => "#{Tracker.table_name}.position")
               end
               # Deletes all project's members
               def delete_all_members
                 Member.delete_all(['project_id = ?', id])
               end
               # Users issues can be assigned to
               def assignable_users
                 members.select {|m| m.role.assignable?}.collect {|m| m.user}.sort
               end
               # Returns the mail adresses of users that should be always notified on project events
               def recipients
                 members.select {|m| m.mail_notification? || m.user.mail_notification?}.collect {|m| m.user.mail}
               end
               # Returns an array of all custom fields enabled for project issues
               # (explictly associated custom fields and custom fields enabled for all projects)
               def all_issue_custom_fields
                 @all_issue_custom_fields ||= (IssueCustomField.for_all + issue_custom_fields).uniq.sort
               end
               def project
                 self
               end
               def <=>(project)
                 name.downcase <=> project.name.downcase
               end
               def to_s
                 name
               end
               # Returns a short description of the projects (first lines)
               def short_description(length = 255)
                 description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
               end
               def allows_to?(action)
                 if action.is_a? Hash
                   allowed_actions.include? "#{action[:controller]}/#{action[:action]}"
                 else
                   allowed_permissions.include? action
                 end
               end
               def module_enabled?(module_name)
                 module_name = module_name.to_s
                 enabled_modules.detect {|m| m.name == module_name}
               end
               def enabled_module_names=(module_names)
                 if module_names && module_names.is_a?(Array)
                   module_names = module_names.collect(&:to_s)
                   # remove disabled modules
                   enabled_modules.each {|mod| mod.destroy unless module_names.include?(mod.name)}
                   # add new modules
                   module_names.each {|name| enabled_modules << EnabledModule.new(:name => name)}
                 else
                   enabled_modules.clear
                 end
               end
               # Returns an auto-generated project identifier based on the last identifier used
               def self.next_identifier
                 p = Project.find(:first, :order => 'created_on DESC')
                 p.nil? ? nil : p.identifier.to_s.succ
               end
             protected
               def validate
-                errors.add(:identifier, :activerecord_error_invalid) if !identifier.blank? && identifier.match(/^\d*$/)
+                errors.add(:identifier, :invalid) if !identifier.blank? && identifier.match(/^\d*$/)
               end
             private
               def allowed_permissions
                 @allowed_permissions ||= begin
                   module_names = enabled_modules.collect {|m| m.name}
                   Redmine::AccessControl.modules_permissions(module_names).collect {|p| p.name}
                 end
               end
               def allowed_actions
                 @actions_allowed ||= allowed_permissions.inject([]) { |actions, permission| actions += Redmine::AccessControl.allowed_actions(permission) }.flatten
               end
             end

app/models/query.rb +2 -4

             # Redmine - project management software
             # Copyright (C) 2006-2008  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 QueryColumn
               attr_accessor :name, :sortable, :default_order
-              include GLoc
+              include Redmine::I18n
               def initialize(name, options={})
                 self.name = name
                 self.sortable = options[:sortable]
                 self.default_order = options[:default_order]
               end
               def caption
-                set_language_if_valid(User.current.language)
                 l("field_#{name}")
               end
             end
             class QueryCustomFieldColumn < QueryColumn
               def initialize(custom_field)
                 self.name = "cf_#{custom_field.id}".to_sym
                 self.sortable = custom_field.order_statement || false
                 @cf = custom_field
               end
               def caption
                 @cf.name
               end
               def custom_field
                 @cf
               end
             end
             class Query < ActiveRecord::Base
               belongs_to :project
               belongs_to :user
               serialize :filters
               serialize :column_names
               attr_protected :project_id, :user_id
               validates_presence_of :name, :on => :save
               validates_length_of :name, :maximum => 255
               @@operators = { "="   => :label_equals,
                               "!"   => :label_not_equals,
                               "o"   => :label_open_issues,
                               "c"   => :label_closed_issues,
                               "!*"  => :label_none,
                               "*"   => :label_all,
                               ">="   => '>=',
                               "<="   => '<=',
                               "<t+" => :label_in_less_than,
                               ">t+" => :label_in_more_than,
                               "t+"  => :label_in,
                               "t"   => :label_today,
                               "w"   => :label_this_week,
                               ">t-" => :label_less_than_ago,
                               "<t-" => :label_more_than_ago,
                               "t-"  => :label_ago,
                               "~"   => :label_contains,
                               "!~"  => :label_not_contains }
               cattr_reader :operators
               @@operators_by_filter_type = { :list => [ "=", "!" ],
                                              :list_status => [ "o", "=", "!", "c", "*" ],
                                              :list_optional => [ "=", "!", "!*", "*" ],
                                              :list_subprojects => [ "*", "!*", "=" ],
                                              :date => [ "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-" ],
                                              :date_past => [ ">t-", "<t-", "t-", "t", "w" ],
                                              :string => [ "=", "~", "!", "!~" ],
                                              :text => [  "~", "!~" ],
                                              :integer => [ "=", ">=", "<=", "!*", "*" ] }
               cattr_reader :operators_by_filter_type
               @@available_columns = [
                 QueryColumn.new(:tracker, :sortable => "#{Tracker.table_name}.position"),
                 QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position"),
                 QueryColumn.new(:priority, :sortable => "#{Enumeration.table_name}.position", :default_order => 'desc'),
                 QueryColumn.new(:subject, :sortable => "#{Issue.table_name}.subject"),
                 QueryColumn.new(:author),
                 QueryColumn.new(:assigned_to, :sortable => ["#{User.table_name}.lastname", "#{User.table_name}.firstname"]),
                 QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on", :default_order => 'desc'),
                 QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name"),
                 QueryColumn.new(:fixed_version, :sortable => ["#{Version.table_name}.effective_date", "#{Version.table_name}.name"], :default_order => 'desc'),
                 QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
                 QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
                 QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),
                 QueryColumn.new(:done_ratio, :sortable => "#{Issue.table_name}.done_ratio"),
                 QueryColumn.new(:created_on, :sortable => "#{Issue.table_name}.created_on", :default_order => 'desc'),
               ]
               cattr_reader :available_columns
               def initialize(attributes = nil)
                 super attributes
                 self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
-                set_language_if_valid(User.current.language)
               end
               def after_initialize
                 # Store the fact that project is nil (used in #editable_by?)
                 @is_for_all = project.nil?
               end
               def validate
                 filters.each_key do |field|
-                  errors.add label_for(field), :activerecord_error_blank unless
+                  errors.add label_for(field), :blank unless
                       # filter requires one or more values
                       (values_for(field) and !values_for(field).first.blank?) or
                       # filter doesn't require any value
                       ["o", "c", "!*", "*", "t", "w"].include? operator_for(field)
                 end if filters
               end
               def editable_by?(user)
                 return false unless user
                 # Admin can edit them all and regular users can edit their private queries
                 return true if user.admin? || (!is_public && self.user_id == user.id)
                 # Members can not edit public queries that are for all project (only admin is allowed to)
                 is_public && !@is_for_all && user.allowed_to?(:manage_public_queries, project)
               end
               def available_filters
                 return @available_filters if @available_filters
                 trackers = project.nil? ? Tracker.find(:all, :order => 'position') : project.rolled_up_trackers
                 @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },
                                        "tracker_id" => { :type => :list, :order => 2, :values => trackers.collect{|s| [s.name, s.id.to_s] } },
                                        "priority_id" => { :type => :list, :order => 3, :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI'], :order => 'position').collect{|s| [s.name, s.id.to_s] } },
                                        "subject" => { :type => :text, :order => 8 },
                                        "created_on" => { :type => :date_past, :order => 9 },
                                        "updated_on" => { :type => :date_past, :order => 10 },
                                        "start_date" => { :type => :date, :order => 11 },
                                        "due_date" => { :type => :date, :order => 12 },
                                        "estimated_hours" => { :type => :integer, :order => 13 },
                                        "done_ratio" =>  { :type => :integer, :order => 14 }}
                 user_values = []
                 user_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
                 if project
                   user_values += project.users.sort.collect{|s| [s.name, s.id.to_s] }
                 else
                   # members of the user's projects
                   user_values += User.current.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] }
                 end
                 @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values } unless user_values.empty?
                 @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values } unless user_values.empty?
                 if User.current.logged?
                   @available_filters["watcher_id"] = { :type => :list, :order => 15, :values => [["<< #{l(:label_me)} >>", "me"]] }
                 end
                 if project
                   # project specific filters
                   unless @project.issue_categories.empty?
                     @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
                   end
                   unless @project.versions.empty?
                     @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.sort.collect{|s| [s.name, s.id.to_s] } }
                   end
                   unless @project.descendants.active.empty?
                     @available_filters["subproject_id"] = { :type => :list_subprojects, :order => 13, :values => @project.descendants.visible.collect{|s| [s.name, s.id.to_s] } }
                   end
                   add_custom_fields_filters(@project.all_issue_custom_fields)
                 else
                   # global filters for cross project issue list
                   add_custom_fields_filters(IssueCustomField.find(:all, :conditions => {:is_filter => true, :is_for_all => true}))
                 end
                 @available_filters
               end
               def add_filter(field, operator, values)
                 # values must be an array
                 return unless values and values.is_a? Array # and !values.first.empty?
                 # check if field is defined as an available filter
                 if available_filters.has_key? field
                   filter_options = available_filters[field]
                   # check if operator is allowed for that filter
                   #if @@operators_by_filter_type[filter_options[:type]].include? operator
                   #  allowed_values = values & ([""] + (filter_options[:values] || []).collect {|val| val[1]})
                   #  filters[field] = {:operator => operator, :values => allowed_values } if (allowed_values.first and !allowed_values.first.empty?) or ["o", "c", "!*", "*", "t"].include? operator
                   #end
                   filters[field] = {:operator => operator, :values => values }
                 end
               end
               def add_short_filter(field, expression)
                 return unless expression
                 parms = expression.scan(/^(o|c|\!|\*)?(.*)$/).first
                 add_filter field, (parms[0] || "="), [parms[1] || ""]
               end
               def has_filter?(field)
                 filters and filters[field]
               end
               def operator_for(field)
                 has_filter?(field) ? filters[field][:operator] : nil
               end
               def values_for(field)
                 has_filter?(field) ? filters[field][:values] : nil
               end
               def label_for(field)
                 label = available_filters[field][:name] if available_filters.has_key?(field)
                 label ||= field.gsub(/\_id$/, "")
               end
               def available_columns
                 return @available_columns if @available_columns
                 @available_columns = Query.available_columns
                 @available_columns += (project ?
                                         project.all_issue_custom_fields :
                                         IssueCustomField.find(:all, :conditions => {:is_for_all => true})
                                        ).collect {|cf| QueryCustomFieldColumn.new(cf) }
               end
               def columns
                 if has_default_columns?
                   available_columns.select {|c| Setting.issue_list_default_columns.include?(c.name.to_s) }
                 else
                   # preserve the column_names order
                   column_names.collect {|name| available_columns.find {|col| col.name == name}}.compact
                 end
               end
               def column_names=(names)
                 names = names.select {|n| n.is_a?(Symbol) || !n.blank? } if names
                 names = names.collect {|n| n.is_a?(Symbol) ? n : n.to_sym } if names
                 write_attribute(:column_names, names)
               end
               def has_column?(column)
                 column_names && column_names.include?(column.name)
               end
               def has_default_columns?
                 column_names.nil? || column_names.empty?
               end
               def project_statement
                 project_clauses = []
                 if project && !@project.descendants.active.empty?
                   ids = [project.id]
                   if has_filter?("subproject_id")
                     case operator_for("subproject_id")
                     when '='
                       # include the selected subprojects
                       ids += values_for("subproject_id").each(&:to_i)
                     when '!*'
                       # main project only
                     else
                       # all subprojects
                       ids += project.descendants.collect(&:id)
                     end
                   elsif Setting.display_subprojects_issues?
                     ids += project.descendants.collect(&:id)
                   end
                   project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
                 elsif project
                   project_clauses << "#{Project.table_name}.id = %d" % project.id
                 end
                 project_clauses <<  Project.allowed_to_condition(User.current, :view_issues)
                 project_clauses.join(' AND ')
               end
               def statement
                 # filters clauses
                 filters_clauses = []
                 filters.each_key do |field|
                   next if field == "subproject_id"
                   v = values_for(field).clone
                   next unless v and !v.empty?
                   operator = operator_for(field)
                   # "me" value subsitution
                   if %w(assigned_to_id author_id watcher_id).include?(field)
                     v.push(User.current.logged? ? User.current.id.to_s : "0") if v.delete("me")
                   end
                   sql = ''
                   if field =~ /^cf_(\d+)$/
                     # custom field
                     db_table = CustomValue.table_name
                     db_field = 'value'
                     is_custom_filter = true
                     sql << "#{Issue.table_name}.id IN (SELECT #{Issue.table_name}.id FROM #{Issue.table_name} LEFT OUTER JOIN #{db_table} ON #{db_table}.customized_type='Issue' AND #{db_table}.customized_id=#{Issue.table_name}.id AND #{db_table}.custom_field_id=#{$1} WHERE "
                     sql << sql_for_field(field, operator, v, db_table, db_field, true) + ')'
                   elsif field == 'watcher_id'
                     db_table = Watcher.table_name
                     db_field = 'user_id'
                     sql << "#{Issue.table_name}.id #{ operator == '=' ? 'IN' : 'NOT IN' } (SELECT #{db_table}.watchable_id FROM #{db_table} WHERE #{db_table}.watchable_type='Issue' AND "
                     sql << sql_for_field(field, '=', v, db_table, db_field) + ')'
                   else
                     # regular field
                     db_table = Issue.table_name
                     db_field = field
                     sql << '(' + sql_for_field(field, operator, v, db_table, db_field) + ')'
                   end
                   filters_clauses << sql
                 end if filters and valid?
                 (filters_clauses << project_statement).join(' AND ')
               end
               private
               # Helper method to generate the WHERE sql for a +field+, +operator+ and a +value+
               def sql_for_field(field, operator, value, db_table, db_field, is_custom_filter=false)
                 sql = ''
                 case operator
                 when "="
                   sql = "#{db_table}.#{db_field} IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
                 when "!"
                   sql = "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + "))"
                 when "!*"
                   sql = "#{db_table}.#{db_field} IS NULL"
                   sql << " OR #{db_table}.#{db_field} = ''" if is_custom_filter
                 when "*"
                   sql = "#{db_table}.#{db_field} IS NOT NULL"
                   sql << " AND #{db_table}.#{db_field} <> ''" if is_custom_filter
                 when ">="
                   sql = "#{db_table}.#{db_field} >= #{value.first.to_i}"
                 when "<="
                   sql = "#{db_table}.#{db_field} <= #{value.first.to_i}"
                 when "o"
                   sql = "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id"
                 when "c"
                   sql = "#{IssueStatus.table_name}.is_closed=#{connection.quoted_true}" if field == "status_id"
                 when ">t-"
                   sql = date_range_clause(db_table, db_field, - value.first.to_i, 0)
                 when "<t-"
                   sql = date_range_clause(db_table, db_field, nil, - value.first.to_i)
                 when "t-"
                   sql = date_range_clause(db_table, db_field, - value.first.to_i, - value.first.to_i)
                 when ">t+"
                   sql = date_range_clause(db_table, db_field, value.first.to_i, nil)
                 when "<t+"
                   sql = date_range_clause(db_table, db_field, 0, value.first.to_i)
                 when "t+"
                   sql = date_range_clause(db_table, db_field, value.first.to_i, value.first.to_i)
                 when "t"
                   sql = date_range_clause(db_table, db_field, 0, 0)
                 when "w"
                   from = l(:general_first_day_of_week) == '7' ?
                   # week starts on sunday
                   ((Date.today.cwday == 7) ? Time.now.at_beginning_of_day : Time.now.at_beginning_of_week - 1.day) :
                     # week starts on monday (Rails default)
                     Time.now.at_beginning_of_week
                   sql = "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(from), connection.quoted_date(from + 7.days)]
                 when "~"
                   sql = "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(value.first)}%'"
                 when "!~"
                   sql = "#{db_table}.#{db_field} NOT LIKE '%#{connection.quote_string(value.first)}%'"
                 end
                 return sql
               end
               def add_custom_fields_filters(custom_fields)
                 @available_filters ||= {}
                 custom_fields.select(&:is_filter?).each do |field|
                   case field.field_format
                   when "text"
                     options = { :type => :text, :order => 20 }
                   when "list"
                     options = { :type => :list_optional, :values => field.possible_values, :order => 20}
                   when "date"
                     options = { :type => :date, :order => 20 }
                   when "bool"
                     options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }
                   else
                     options = { :type => :string, :order => 20 }
                   end
                   @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })
                 end
               end
               # Returns a SQL clause for a date or datetime field.
               def date_range_clause(table, field, from, to)
                 s = []
                 if from
                   s << ("#{table}.#{field} > '%s'" % [connection.quoted_date((Date.yesterday + from).to_time.end_of_day)])
                 end
                 if to
                   s << ("#{table}.#{field} <= '%s'" % [connection.quoted_date((Date.today + to).to_time.end_of_day)])
                 end
                 s.join(' AND ')
               end
             end

app/models/repository.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  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 Repository < ActiveRecord::Base
               belongs_to :project
               has_many :changesets, :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC"
               has_many :changes, :through => :changesets
               # Raw SQL to delete changesets and changes in the database
               # has_many :changesets, :dependent => :destroy is too slow for big repositories
               before_destroy :clear_changesets
               # Checks if the SCM is enabled when creating a repository
-              validate_on_create { |r| r.errors.add(:type, :activerecord_error_invalid) unless Setting.enabled_scm.include?(r.class.name.demodulize) }
+              validate_on_create { |r| r.errors.add(:type, :invalid) unless Setting.enabled_scm.include?(r.class.name.demodulize) }
               # Removes leading and trailing whitespace
               def url=(arg)
                 write_attribute(:url, arg ? arg.to_s.strip : nil)
               end
               # Removes leading and trailing whitespace
               def root_url=(arg)
                 write_attribute(:root_url, arg ? arg.to_s.strip : nil)
               end
               def scm
                 @scm ||= self.scm_adapter.new url, root_url, login, password
                 update_attribute(:root_url, @scm.root_url) if root_url.blank?
                 @scm
               end
               def scm_name
                 self.class.scm_name
               end
               def supports_cat?
                 scm.supports_cat?
               end
               def supports_annotate?
                 scm.supports_annotate?
               end
               def entry(path=nil, identifier=nil)
                 scm.entry(path, identifier)
               end
               def entries(path=nil, identifier=nil)
                 scm.entries(path, identifier)
               end
               def properties(path, identifier=nil)
                 scm.properties(path, identifier)
               end
               def cat(path, identifier=nil)
                 scm.cat(path, identifier)
               end
               def diff(path, rev, rev_to)
                 scm.diff(path, rev, rev_to)
               end
               # Default behaviour: we search in cached changesets
               def changesets_for_path(path, options={})
                 path = "/#{path}" unless path.starts_with?('/')
                 Change.find(:all, :include => {:changeset => :user},
                                   :conditions => ["repository_id = ? AND path = ?", id, path],
                                   :order => "committed_on DESC, #{Changeset.table_name}.id DESC",
                                   :limit => options[:limit]).collect(&:changeset)
               end
               # Returns a path relative to the url of the repository
               def relative_path(path)
                 path
               end
               def latest_changeset
                 @latest_changeset ||= changesets.find(:first)
               end
               def scan_changesets_for_issue_ids
                 self.changesets.each(&:scan_comment_for_issue_ids)
               end
               # Returns an array of committers usernames and associated user_id
               def committers
                 @committers ||= Changeset.connection.select_rows("SELECT DISTINCT committer, user_id FROM #{Changeset.table_name} WHERE repository_id = #{id}")
               end
               # Maps committers username to a user ids
               def committer_ids=(h)
                 if h.is_a?(Hash)
                   committers.each do |committer, user_id|
                     new_user_id = h[committer]
                     if new_user_id && (new_user_id.to_i != user_id.to_i)
                       new_user_id = (new_user_id.to_i > 0 ? new_user_id.to_i : nil)
                       Changeset.update_all("user_id = #{ new_user_id.nil? ? 'NULL' : new_user_id }", ["repository_id = ? AND committer = ?", id, committer])
                     end
                   end
                   @committers = nil
                   true
                 else
                   false
                 end
               end
               # Returns the Redmine User corresponding to the given +committer+
               # It will return nil if the committer is not yet mapped and if no User
               # with the same username or email was found
               def find_committer_user(committer)
                 if committer
                   c = changesets.find(:first, :conditions => {:committer => committer}, :include => :user)
                   if c && c.user
                     c.user
                   elsif committer.strip =~ /^([^<]+)(<(.*)>)?$/
                     username, email = $1.strip, $3
                     u = User.find_by_login(username)
                     u ||= User.find_by_mail(email) unless email.blank?
                     u
                   end
                 end
               end
               # fetch new changesets for all repositories
               # can be called periodically by an external script
               # eg. ruby script/runner "Repository.fetch_changesets"
               def self.fetch_changesets
                 find(:all).each(&:fetch_changesets)
               end
               # scan changeset comments to find related and fixed issues for all repositories
               def self.scan_changesets_for_issue_ids
                 find(:all).each(&:scan_changesets_for_issue_ids)
               end
               def self.scm_name
                 'Abstract'
               end
               def self.available_scm
                 subclasses.collect {|klass| [klass.scm_name, klass.name]}
               end
               def self.factory(klass_name, *args)
                 klass = "Repository::#{klass_name}".constantize
                 klass.new(*args)
               rescue
                 nil
               end
               private
               def before_save
                 # Strips url and root_url
                 url.strip!
                 root_url.strip!
                 true
               end
               def clear_changesets
                 connection.delete("DELETE FROM changes WHERE changes.changeset_id IN (SELECT changesets.id FROM changesets WHERE changesets.repository_id = #{id})")
                 connection.delete("DELETE FROM changesets_issues WHERE changesets_issues.changeset_id IN (SELECT changesets.id FROM changesets WHERE changesets.repository_id = #{id})")
                 connection.delete("DELETE FROM changesets WHERE changesets.repository_id = #{id}")
               end
             end

app/models/time_entry.rb +5 -5

             # redMine - project management software
             # Copyright (C) 2006-2008  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 TimeEntry < ActiveRecord::Base
               # could have used polymorphic association
               # project association here allows easy loading of time entries at project level with one database trip
               belongs_to :project
               belongs_to :issue
               belongs_to :user
               belongs_to :activity, :class_name => 'Enumeration', :foreign_key => :activity_id
               attr_protected :project_id, :user_id, :tyear, :tmonth, :tweek
               acts_as_customizable
-              acts_as_event :title => Proc.new {|o| "#{o.user}: #{lwr(:label_f_hour, o.hours)} (#{(o.issue || o.project).event_title})"},
+              acts_as_event :title => Proc.new {|o| "#{o.user}: #{l_hours(o.hours)} (#{(o.issue || o.project).event_title})"},
                             :url => Proc.new {|o| {:controller => 'timelog', :action => 'details', :project_id => o.project}},
                             :author => :user,
                             :description => :comments
               validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
-              validates_numericality_of :hours, :allow_nil => true, :message => :activerecord_error_invalid
+              validates_numericality_of :hours, :allow_nil => true, :message => :invalid
               validates_length_of :comments, :maximum => 255, :allow_nil => true
               def after_initialize
                 if new_record? && self.activity.nil?
                   if default_activity = Enumeration.activities.default
                     self.activity_id = default_activity.id
                   end
                 end
               end
               def before_validation
                 self.project = issue.project if issue && project.nil?
               end
               def validate
-                errors.add :hours, :activerecord_error_invalid if hours && (hours < 0 || hours >= 1000)
+                errors.add :hours, :invalid if hours && (hours < 0 || hours >= 1000)
-                errors.add :project_id, :activerecord_error_invalid if project.nil?
+                errors.add :project_id, :invalid if project.nil?
-                errors.add :issue_id, :activerecord_error_invalid if (issue_id && !issue) || (issue && project!=issue.project)
+                errors.add :issue_id, :invalid if (issue_id && !issue) || (issue && project!=issue.project)
               end
               def hours=(h)
                 write_attribute :hours, (h.is_a?(String) ? (h.to_hours || h) : h)
               end
               # tyear, tmonth, tweek assigned where setting spent_on attributes
               # these attributes make time aggregations easier
               def spent_on=(date)
                 super
                 self.tyear = spent_on ? spent_on.year : nil
                 self.tmonth = spent_on ? spent_on.month : nil
                 self.tweek = spent_on ? Date.civil(spent_on.year, spent_on.month, spent_on.day).cweek : nil
               end
               # Returns true if the time entry can be edited by usr, otherwise false
               def editable_by?(usr)
                 (usr == user && usr.allowed_to?(:edit_own_time_entries, project)) || usr.allowed_to?(:edit_time_entries, project)
               end
               def self.visible_by(usr)
                 with_scope(:find => { :conditions => Project.allowed_to_condition(usr, :view_time_entries) }) do
                   yield
                 end
               end
             end

app/models/version.rb +1 -1

             # 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 Version < ActiveRecord::Base
               before_destroy :check_integrity
               belongs_to :project
               has_many :fixed_issues, :class_name => 'Issue', :foreign_key => 'fixed_version_id'
               acts_as_attachable :view_permission => :view_files,
                                  :delete_permission => :manage_files
               validates_presence_of :name
               validates_uniqueness_of :name, :scope => [:project_id]
               validates_length_of :name, :maximum => 60
-              validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => 'activerecord_error_not_a_date', :allow_nil => true
+              validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => :not_a_date, :allow_nil => true
               def start_date
                 effective_date
               end
               def due_date
                 effective_date
               end
               # Returns the total estimated time for this version
               def estimated_hours
                 @estimated_hours ||= fixed_issues.sum(:estimated_hours).to_f
               end
               # Returns the total reported time for this version
               def spent_hours
                 @spent_hours ||= TimeEntry.sum(:hours, :include => :issue, :conditions => ["#{Issue.table_name}.fixed_version_id = ?", id]).to_f
               end
               # Returns true if the version is completed: due date reached and no open issues
               def completed?
                 effective_date && (effective_date <= Date.today) && (open_issues_count == 0)
               end
               def completed_pourcent
                 if issues_count == 0
                 elsif open_issues_count == 0
                 else
                   issues_progress(false) + issues_progress(true)
                 end
               end
               def closed_pourcent
                 if issues_count == 0
                 else
                   issues_progress(false)
                 end
               end
               # Returns true if the version is overdue: due date reached and some open issues
               def overdue?
                 effective_date && (effective_date < Date.today) && (open_issues_count > 0)
               end
               # Returns assigned issues count
               def issues_count
                 @issue_count ||= fixed_issues.count
               end
               def open_issues_count
                 @open_issues_count ||= Issue.count(:all, :conditions => ["fixed_version_id = ? AND is_closed = ?", self.id, false], :include => :status)
               end
               def closed_issues_count
                 @closed_issues_count ||= Issue.count(:all, :conditions => ["fixed_version_id = ? AND is_closed = ?", self.id, true], :include => :status)
               end
               def wiki_page
                 if project.wiki && !wiki_page_title.blank?
                   @wiki_page ||= project.wiki.find_page(wiki_page_title)
                 end
                 @wiki_page
               end
               def to_s; name end
               # Versions are sorted by effective_date and name
               # Those with no effective_date are at the end, sorted by name
               def <=>(version)
                 if self.effective_date
                   version.effective_date ? (self.effective_date == version.effective_date ? self.name <=> version.name : self.effective_date <=> version.effective_date) : -1
                 else
                   version.effective_date ? 1 : (self.name <=> version.name)
                 end
               end
             private
               def check_integrity
                 raise "Can't delete version" if self.fixed_issues.find(:first)
               end
               # Returns the average estimated time of assigned issues
               # or 1 if no issue has an estimated time
               # Used to weigth unestimated issues in progress calculation
               def estimated_average
                 if @estimated_average.nil?
                   average = fixed_issues.average(:estimated_hours).to_f
                   if average == 0
                     average = 1
                   end
                   @estimated_average = average
                 end
                 @estimated_average
               end
               # Returns the total progress of open or closed issues
               def issues_progress(open)
                 @issues_progress ||= {}
                 @issues_progress[open] ||= begin
                   progress = 0
                   if issues_count > 0
                     ratio = open ? 'done_ratio' : 100
                     done = fixed_issues.sum("COALESCE(estimated_hours, #{estimated_average}) * #{ratio}",
                                               :include => :status,
                                               :conditions => ["is_closed = ?", !open]).to_f
                     progress = done / (estimated_average * issues_count)
                   end
                   progress
                 end
               end
             end

app/models/watcher.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  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 Watcher < ActiveRecord::Base
               belongs_to :watchable, :polymorphic => true
               belongs_to :user
               validates_presence_of :user
               validates_uniqueness_of :user_id, :scope => [:watchable_type, :watchable_id]
               protected
               def validate
-                errors.add :user_id, :activerecord_error_invalid unless user.nil? || user.active?
+                errors.add :user_id, :invalid unless user.nil? || user.active?
               end
             end

app/models/wiki_page.rb +3 -3

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             require 'diff'
             require 'enumerator'
             class WikiPage < ActiveRecord::Base
               belongs_to :wiki
               has_one :content, :class_name => 'WikiContent', :foreign_key => 'page_id', :dependent => :destroy
               acts_as_attachable :delete_permission => :delete_wiki_pages_attachments
               acts_as_tree :order => 'title'
               acts_as_event :title => Proc.new {|o| "#{l(:label_wiki)}: #{o.title}"},
                             :description => :text,
                             :datetime => :created_on,
                             :url => Proc.new {|o| {:controller => 'wiki', :id => o.wiki.project_id, :page => o.title}}
               acts_as_searchable :columns => ['title', 'text'],
                                  :include => [{:wiki => :project}, :content],
                                  :project_key => "#{Wiki.table_name}.project_id"
               attr_accessor :redirect_existing_links
               validates_presence_of :title
               validates_format_of :title, :with => /^[^,\.\/\?\;\|\s]*$/
               validates_uniqueness_of :title, :scope => :wiki_id, :case_sensitive => false
               validates_associated :content
               def title=(value)
                 value = Wiki.titleize(value)
                 @previous_title = read_attribute(:title) if @previous_title.blank?
                 write_attribute(:title, value)
               end
               def before_save
                 self.title = Wiki.titleize(title)
                 # Manage redirects if the title has changed
                 if !@previous_title.blank? && (@previous_title != title) && !new_record?
                   # Update redirects that point to the old title
                   wiki.redirects.find_all_by_redirects_to(@previous_title).each do |r|
                     r.redirects_to = title
                     r.title == r.redirects_to ? r.destroy : r.save
                   end
                   # Remove redirects for the new title
                   wiki.redirects.find_all_by_title(title).each(&:destroy)
                   # Create a redirect to the new title
                   wiki.redirects << WikiRedirect.new(:title => @previous_title, :redirects_to => title) unless redirect_existing_links == "0"
                   @previous_title = nil
                 end
               end
               def before_destroy
                 # Remove redirects to this page
                 wiki.redirects.find_all_by_redirects_to(title).each(&:destroy)
               end
               def pretty_title
                 WikiPage.pretty_title(title)
               end
               def content_for_version(version=nil)
                 result = content.versions.find_by_version(version.to_i) if version
                 result ||= content
                 result
               end
               def diff(version_to=nil, version_from=nil)
                 version_to = version_to ? version_to.to_i : self.content.version
                 version_from = version_from ? version_from.to_i : version_to - 1
                 version_to, version_from = version_from, version_to unless version_from < version_to
                 content_to = content.versions.find_by_version(version_to)
                 content_from = content.versions.find_by_version(version_from)
                 (content_to && content_from) ? WikiDiff.new(content_to, content_from) : nil
               end
               def annotate(version=nil)
                 version = version ? version.to_i : self.content.version
                 c = content.versions.find_by_version(version)
                 c ? WikiAnnotate.new(c) : nil
               end
               def self.pretty_title(str)
                 (str && str.is_a?(String)) ? str.tr('_', ' ') : str
               end
               def project
                 wiki.project
               end
               def text
                 content.text if content
               end
               # Returns true if usr is allowed to edit the page, otherwise false
               def editable_by?(usr)
                 !protected? || usr.allowed_to?(:protect_wiki_pages, wiki.project)
               end
               def attachments_deletable?(usr=User.current)
                 editable_by?(usr) && super(usr)
               end
               def parent_title
                 @parent_title || (self.parent && self.parent.pretty_title)
               end
               def parent_title=(t)
                 @parent_title = t
                 parent_page = t.blank? ? nil : self.wiki.find_page(t)
                 self.parent = parent_page
               end
               protected
               def validate
-                errors.add(:parent_title, :activerecord_error_invalid) if !@parent_title.blank? && parent.nil?
+                errors.add(:parent_title, :invalid) if !@parent_title.blank? && parent.nil?
-                errors.add(:parent_title, :activerecord_error_circular_dependency) if parent && (parent == self || parent.ancestors.include?(self))
+                errors.add(:parent_title, :circular_dependency) if parent && (parent == self || parent.ancestors.include?(self))
-                errors.add(:parent_title, :activerecord_error_not_same_project) if parent && (parent.wiki_id != wiki_id)
+                errors.add(:parent_title, :not_same_project) if parent && (parent.wiki_id != wiki_id)
               end
             end
             class WikiDiff
               attr_reader :diff, :words, :content_to, :content_from
               def initialize(content_to, content_from)
                 @content_to = content_to
                 @content_from = content_from
                 @words = content_to.text.split(/(\s+)/)
                 @words = @words.select {|word| word != ' '}
                 words_from = content_from.text.split(/(\s+)/)
                 words_from = words_from.select {|word| word != ' '}
                 @diff = words_from.diff @words
               end
             end
             class WikiAnnotate
               attr_reader :lines, :content
               def initialize(content)
                 @content = content
                 current = content
                 current_lines = current.text.split(/\r?\n/)
                 @lines = current_lines.collect {|t| [nil, nil, t]}
                 positions = []
                 current_lines.size.times {|i| positions << i}
                 while (current.previous)
                   d = current.previous.text.split(/\r?\n/).diff(current.text.split(/\r?\n/)).diffs.flatten
                   d.each_slice(3) do |s|
                     sign, line = s[0], s[1]
                     if sign == '+' && positions[line] && positions[line] != -1
                       if @lines[positions[line]][0].nil?
                         @lines[positions[line]][0] = current.version
                         @lines[positions[line]][1] = current.author
                       end
                     end
                   end
                   d.each_slice(3) do |s|
                     sign, line = s[0], s[1]
                     if sign == '-'
                       positions.insert(line, -1)
                     else
                       positions[line] = nil
                     end
                   end
                   positions.compact!
                   # Stop if every line is annotated
                   break unless @lines.detect { |line| line[0].nil? }
                   current = current.previous
                 end
                 @lines.each { |line| line[0] ||= current.version }
               end
             end

app/views/common/_calendar.rhtml +1 -1

             <table class="cal">
             <thead>
             <tr><td></td><% 7.times do |i| %><th><%= day_name( (calendar.first_wday+i)%7 ) %></th><% end %></tr>
             </thead>
             <tbody>
             <tr>
             <% day = calendar.startdt
             while day <= calendar.enddt %>
             <%= "<th>#{day.cweek}</th>" if day.cwday == calendar.first_wday %>
             <td class="<%= day.month==calendar.month ? 'even' : 'odd' %><%= ' today' if Date.today == day %>">
             <p class="day-num"><%= day.day %></p>
             <% calendar.events_on(day).each do |i| %>
               <% if i.is_a? Issue %>
               <div class="tooltip">
               <%= if day == i.start_date && day == i.due_date
                     image_tag('arrow_bw.png')
                   elsif day == i.start_date
                     image_tag('arrow_from.png')
                   elsif day == i.due_date
             		image_tag('arrow_to.png')
                   end %>
               <%= h("#{i.project} -") unless @project && @project == i.project %>
-              <%= link_to_issue i %>: <%= h(truncate(i.subject, 30)) %>
+              <%= link_to_issue i %>: <%= h(truncate(i.subject, :length => 30)) %>
               <span class="tip"><%= render_issue_tooltip i %></span>
               </div>
               <% else %>
               <span class="icon icon-package">
                 <%= h("#{i.project} -") unless @project && @project == i.project %>
                 <%= link_to_version i%>
               </span>
               <% end %>
             <% end %>
             </td>
             <%= '</tr><tr>' if day.cwday==calendar.last_wday and day!=calendar.enddt %>
             <% day = day + 1
             end %>
             </tr>
             </tbody>
             </table>

app/views/common/feed.atom.rxml +3 -3

             xml.instruct!
             xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
-              xml.title   truncate_single_line(@title, 100)
+              xml.title   truncate_single_line(@title, :length => 100)
               xml.link    "rel" => "self", "href" => url_for(params.merge({:format => nil, :only_path => false}))
               xml.link    "rel" => "alternate", "href" => url_for(:controller => 'welcome', :only_path => false)
               xml.id      url_for(:controller => 'welcome', :only_path => false)
               xml.updated((@items.first ? @items.first.event_datetime : Time.now).xmlschema)
               xml.author  { xml.name "#{Setting.app_title}" }
               xml.generator(:uri => Redmine::Info.url) { xml.text! Redmine::Info.app_name; }
               @items.each do |item|
                 xml.entry do
                   url = url_for(item.event_url(:only_path => false))
                   if @project
-                    xml.title truncate_single_line(item.event_title, 100)
+                    xml.title truncate_single_line(item.event_title, :length => 100)
                   else
-                    xml.title truncate_single_line("#{item.project} - #{item.event_title}", 100)
+                    xml.title truncate_single_line("#{item.project} - #{item.event_title}", :length => 100)
                   end
                   xml.link "rel" => "alternate", "href" => url
                   xml.id url
                   xml.updated item.event_datetime.xmlschema
                   author = item.event_author if item.respond_to?(:event_author)
                   xml.author do
                     xml.name(author)
                     xml.email(author.mail) if author.respond_to?(:mail) && !author.mail.blank?
                   end if author
                   xml.content "type" => "html" do
                     xml.text! textilizable(item.event_description)
                   end
                 end
               end
             end

app/views/custom_fields/index.rhtml +1 -1

             <h2><%=l(:label_custom_field_plural)%></h2>
             <% selected_tab = params[:tab] ? params[:tab].to_s : custom_fields_tabs.first[:name] %>
             <div class="tabs">
             <ul>
             <% custom_fields_tabs.each do |tab| -%>
                 <li><%= link_to l(tab[:label]), { :tab => tab[:name] },
                                                 :id => "tab-#{tab[:name]}",
                                                 :class => (tab[:name] != selected_tab ? nil : 'selected'),
                                                 :onclick => "showTab('#{tab[:name]}'); this.blur(); return false;" %></li>
             <% end -%>
             </ul>
             </div>
             <% custom_fields_tabs.each do |tab| %>
             <div id="tab-content-<%= tab[:name] %>" class="tab-content" style="<%= tab[:name] != selected_tab ? 'display:none' : nil %>">
             <table class="list">
               <thead><tr>
             	<th width="30%"><%=l(:field_name)%></th>
             	<th><%=l(:field_field_format)%></th>
             	<th><%=l(:field_is_required)%></th>
             	<% if tab[:name] == 'IssueCustomField' %>
             	<th><%=l(:field_is_for_all)%></th>
             	<th><%=l(:label_used_by)%></th>
             	<% end %>
             	<th><%=l(:button_sort)%></th>
             	<th width="10%"></th>
               </tr></thead>
               <tbody>
             <% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
               <tr class="<%= cycle("odd", "even") %>">
             	<td><%= link_to custom_field.name, :action => 'edit', :id => custom_field %></td>
             	<td align="center"><%= l(CustomField::FIELD_FORMATS[custom_field.field_format][:name]) %></td>
             	<td align="center"><%= image_tag 'true.png' if custom_field.is_required? %></td>
             	<% if tab[:name] == 'IssueCustomField' %>
             	<td align="center"><%= image_tag 'true.png' if custom_field.is_for_all? %></td>
-            	<td align="center"><%= custom_field.projects.count.to_s + ' ' + lwr(:label_project, custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td>
+            	<td align="center"><%= l(:label_x_projects, :count => custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td>
             	<% end %>
                 <td align="center" style="width:15%;">
                     <%= link_to image_tag('2uparrow.png', :alt => l(:label_sort_highest)), {:action => 'move', :id => custom_field, :position => 'highest'}, :method => :post, :title => l(:label_sort_highest) %>
                     <%= link_to image_tag('1uparrow.png', :alt => l(:label_sort_higher)), {:action => 'move', :id => custom_field, :position => 'higher'}, :method => :post, :title => l(:label_sort_higher) %> -
                     <%= link_to image_tag('1downarrow.png', :alt => l(:label_sort_lower)), {:action => 'move', :id => custom_field, :position => 'lower'}, :method => :post, :title => l(:label_sort_lower) %>
                     <%= link_to image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), {:action => 'move', :id => custom_field, :position => 'lowest'}, :method => :post, :title => l(:label_sort_lowest) %>
                 </td>
             	<td align="center">
             	   <%= button_to l(:button_delete), { :action => 'destroy', :id => custom_field }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
                 </td>
               </tr>
             <% end; reset_cycle %>
               </tbody>
             </table>
             <p><%= link_to l(:label_custom_field_new), {:action => 'new', :type => tab[:name]}, :class => 'icon icon-add' %></p>
             </div>
             <% end %>
             <% html_title(l(:label_custom_field_plural)) -%>

app/views/documents/_document.rhtml +1 -1

             <p><%= link_to h(document.title), :controller => 'documents', :action => 'show', :id => document %><br />
-            <% unless document.description.blank? %><%=h(truncate(document.description, 250)) %><br /><% end %>
+            <% unless document.description.blank? %><%=h(truncate(document.description, :length => 250)) %><br /><% end %>
             <em><%= format_time(document.created_on) %></em></p>

app/views/issues/_relations.rhtml +1 -1

             <div class="contextual">
             <% if authorize_for('issue_relations', 'new') %>
                 <%= toggle_link l(:button_add), 'new-relation-form'%>
             <% end %>
             </div>
             <p><strong><%=l(:label_related_issues)%></strong></p>
             <% if @issue.relations.any? %>
             <table style="width:100%">
             <% @issue.relations.select {|r| r.other_issue(@issue).visible? }.each do |relation| %>
             <tr>
-            <td><%= l(relation.label_for(@issue)) %> <%= "(#{lwr(:actionview_datehelper_time_in_words_day, relation.delay)})" if relation.delay && relation.delay != 0 %>
+            <td><%= l(relation.label_for(@issue)) %> <%= "(#{l('datetime.distance_in_words.x_days', :count => relation.delay)})" if relation.delay && relation.delay != 0 %>
                 <%= h(relation.other_issue(@issue).project) + ' - ' if Setting.cross_project_issue_relations? %> <%= link_to_issue relation.other_issue(@issue) %></td>
             <td><%=h relation.other_issue(@issue).subject %></td>
             <td><%= relation.other_issue(@issue).status.name %></td>
             <td><%= format_date(relation.other_issue(@issue).start_date) %></td>
             <td><%= format_date(relation.other_issue(@issue).due_date) %></td>
             <td><%= link_to_remote(image_tag('delete.png'), { :url => {:controller => 'issue_relations', :action => 'destroy', :issue_id => @issue, :id => relation},
                                                               :method => :post
                                                             }, :title => l(:label_relation_delete)) if authorize_for('issue_relations', 'destroy') %></td>
             </tr>
             <% end %>
             </table>
             <% end %>
             <% remote_form_for(:relation, @relation,
                              :url => {:controller => 'issue_relations', :action => 'new', :issue_id => @issue},
                              :method => :post,
                              :html => {:id => 'new-relation-form', :style => (@relation ? '' : 'display: none;')}) do |f| %>
             <%= render :partial => 'issue_relations/form', :locals => {:f => f}%>
             <% end %>

app/views/issues/show.rhtml +2 -2

             <div class="contextual">
             <%= link_to_if_authorized(l(:button_update), {:controller => 'issues', :action => 'edit', :id => @issue }, :onclick => 'showAndScrollTo("update", "notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit)) %>
             <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, :class => 'icon icon-time-add' %>
             <%= watcher_tag(@issue, User.current) %>
             <%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-copy' %>
             <%= link_to_if_authorized l(:button_move), {:controller => 'issues', :action => 'move', :id => @issue }, :class => 'icon icon-move' %>
             <%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
             </div>
             <h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>
             <div class="<%= css_issue_classes(@issue) %>">
                     <%= avatar(@issue.author, :size => "64") %>
                     <h3><%=h @issue.subject %></h3>
                     <p class="author">
                     <%= authoring @issue.created_on, @issue.author %>.
                     <%= l(:label_updated_time, distance_of_time_in_words(Time.now, @issue.updated_on)) + '.' if @issue.created_on != @issue.updated_on %>
                     </p>
             <table width="100%">
             <tr>
                 <td style="width:15%" class="status"><b><%=l(:field_status)%>:</b></td><td style="width:35%" class="status"><%= @issue.status.name %></td>
                 <td style="width:15%" class="start-date"><b><%=l(:field_start_date)%>:</b></td><td style="width:35%"><%= format_date(@issue.start_date) %></td>
             </tr>
             <tr>
                 <td class="priority"><b><%=l(:field_priority)%>:</b></td><td class="priority"><%= @issue.priority.name %></td>
                 <td class="due-date"><b><%=l(:field_due_date)%>:</b></td><td class="due-date"><%= format_date(@issue.due_date) %></td>
             </tr>
             <tr>
                 <td class="assigned-to"><b><%=l(:field_assigned_to)%>:</b></td><td><%= avatar(@issue.assigned_to, :size => "14") %><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
                 <td class="progress"><b><%=l(:field_done_ratio)%>:</b></td><td class="progress"><%= progress_bar @issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%" %></td>
             </tr>
             <tr>
                 <td class="category"><b><%=l(:field_category)%>:</b></td><td><%=h @issue.category ? @issue.category.name : "-" %></td>
                 <% if User.current.allowed_to?(:view_time_entries, @project) %>
                 <td class="spent-time"><b><%=l(:label_spent_time)%>:</b></td>
-                <td class="spent-hours"><%= @issue.spent_hours > 0 ? (link_to lwr(:label_f_hour, @issue.spent_hours), {:controller => 'timelog', :action => 'details', :project_id => @project, :issue_id => @issue}) : "-" %></td>
+                <td class="spent-hours"><%= @issue.spent_hours > 0 ? (link_to l_hours(@issue.spent_hours), {:controller => 'timelog', :action => 'details', :project_id => @project, :issue_id => @issue}) : "-" %></td>
                 <% end %>
             </tr>
             <tr>
                 <td class="fixed-version"><b><%=l(:field_fixed_version)%>:</b></td><td><%= @issue.fixed_version ? link_to_version(@issue.fixed_version) : "-" %></td>
                 <% if @issue.estimated_hours %>
-                <td class="estimated-hours"><b><%=l(:field_estimated_hours)%>:</b></td><td><%= lwr(:label_f_hour, @issue.estimated_hours) %></td>
+                <td class="estimated-hours"><b><%=l(:field_estimated_hours)%>:</b></td><td><%= l_hours(@issue.estimated_hours) %></td>
                 <% end %>
             </tr>
             <tr>
             <% n = 0 -%>
             <% @issue.custom_values.each do |value| -%>
                 <td valign="top"><b><%=h value.custom_field.name %>:</b></td><td valign="top"><%= simple_format(h(show_value(value))) %></td>
             <% n = n + 1
                if (n > 1)
                     n = 0 %>
                     </tr><tr>
              <%end
             end %>
             </tr>
             <%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
             </table>
             <hr />
             <div class="contextual">
             <%= link_to_remote_if_authorized(l(:button_quote), { :url => {:action => 'reply', :id => @issue} }, :class => 'icon icon-comment') unless @issue.description.blank? %>
             </div>
             <p><strong><%=l(:field_description)%></strong></p>
             <div class="wiki">
             <%= textilizable @issue, :description, :attachments => @issue.attachments %>
             </div>
             <%= link_to_attachments @issue %>
             <% if authorize_for('issue_relations', 'new') || @issue.relations.any? %>
             <hr />
             <div id="relations">
             <%= render :partial => 'relations' %>
             </div>
             <% end %>
             <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
                     (@issue.watchers.any? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
             <hr />
             <div id="watchers">
             <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
             </div>
             <% end %>
             </div>
             <% if @issue.changesets.any? && User.current.allowed_to?(:view_changesets, @project) %>
             <div id="issue-changesets">
             <h3><%=l(:label_associated_revisions)%></h3>
             <%= render :partial => 'changesets', :locals => { :changesets => @issue.changesets} %>
             </div>
             <% end %>
             <% if @journals.any? %>
             <div id="history">
             <h3><%=l(:label_history)%></h3>
             <%= render :partial => 'history', :locals => { :journals => @journals } %>
             </div>
             <% end %>
             <div style="clear: both;"></div>
             <% if authorize_for('issues', 'edit') %>
               <div id="update" style="display:none;">
               <h3><%= l(:button_update) %></h3>
               <%= render :partial => 'edit' %>
               </div>
             <% end %>
             <% other_formats_links do |f| %>
             	<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
             	<%= f.link_to 'PDF' %>
             <% end %>
             <% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
             <% content_for :sidebar do %>
                 <%= render :partial => 'issues/sidebar' %>
             <% end %>
             <% content_for :header_tags do %>
                 <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
                 <%= stylesheet_link_tag 'scm' %>
             <% end %>

app/views/mailer/issue_add.text.html.rhtml +1 -1

-            <%= l(:text_issue_added, "##{@issue.id}", @issue.author) %>
+            <%= l(:text_issue_added, :id => "##{@issue.id}", :author => @issue.author) %>
             <hr />
             <%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>

app/views/mailer/issue_add.text.plain.rhtml +1 -1

-            <%= l(:text_issue_added, "##{@issue.id}", @issue.author) %>
+            <%= l(:text_issue_added, :id => "##{@issue.id}", :author => @issue.author) %>
             ----------------------------------------
             <%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>

app/views/mailer/issue_edit.text.html.rhtml +1 -1

-            <%= l(:text_issue_updated, "##{@issue.id}", @journal.user) %>
+            <%= l(:text_issue_updated, :id => "##{@issue.id}", :author => @journal.user) %>
             <ul>
             <% for detail in @journal.details %>
                 <li><%= show_detail(detail, true) %></li>
             <% end %>
             </ul>
             <%= textilizable(@journal, :notes, :only_path => false) %>
             <hr />
             <%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>

app/views/mailer/issue_edit.text.plain.rhtml +1 -1

-            <%= l(:text_issue_updated, "##{@issue.id}", @journal.user) %>
+            <%= l(:text_issue_updated, :id => "##{@issue.id}", :author => @journal.user) %>
             <% for detail in @journal.details -%>
             <%= show_detail(detail, true) %>
             <% end -%>
             <%= @journal.notes if @journal.notes? %>
             ----------------------------------------
             <%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>

app/views/mailer/reminder.text.html.rhtml +1 -1

-            <p><%= l(:mail_body_reminder, @issues.size, @days) %></p>
+            <p><%= l(:mail_body_reminder, :count => @issues.size, :days => @days) %></p>
             <ul>
             <% @issues.each do |issue| -%>
                 <li><%=h "#{issue.project} - #{issue.tracker} ##{issue.id}: #{issue.subject}" %></li>
             <% end -%>
             </ul>
             <p><%= link_to l(:label_issue_view_all), @issues_url %></p>

app/views/mailer/reminder.text.plain.rhtml +1 -1

-            <%= l(:mail_body_reminder, @issues.size, @days) %>:
+            <%= l(:mail_body_reminder, :count => @issues.size, :days => @days) %>:
             <% @issues.each do |issue| -%>
             * <%= "#{issue.project} - #{issue.tracker} ##{issue.id}: #{issue.subject}" %>
             <% end -%>
             <%= @issues_url %>

app/views/my/blocks/_issueswatched.rhtml +2 -1

-            <h3><%=l(:label_watched_issues)%></h3>
+            <h3><%=l(:label_watched_issues)%> (<%= Issue.visible.count(:include => :watchers,
+            												 																	 :conditions => ["#{Watcher.table_name}.user_id = ?", user.id]) %>)</h3>
             <% watched_issues = Issue.visible.find(:all,
                                            :include => [:status, :project, :tracker, :watchers],
                                            :limit => 10,
                                            :conditions => ["#{Watcher.table_name}.user_id = ?", user.id],
                                            :order => "#{Issue.table_name}.updated_on DESC") %>
             <%= render :partial => 'issues/list_simple', :locals => { :issues => watched_issues } %>
             <% if watched_issues.length > 0 %>
             <p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :set_filter => 1, :watcher_id => 'me' %></p>
             <% end %>

app/views/news/_news.rhtml +1 -1

             <p><%= link_to(h(news.project.name), :controller => 'projects', :action => 'show', :id => news.project) + ': ' unless @project %>
             <%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %>
-            <%= "(#{news.comments_count} #{lwr(:label_comment, news.comments_count).downcase})" if news.comments_count > 0 %>
+            <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %>
             <br />
             <% unless news.summary.blank? %><span class="summary"><%=h news.summary %></span><br /><% end %>
             <span class="author"><%= authoring news.created_on, news.author %></span></p>

app/views/news/index.rhtml +1 -1

             <div class="contextual">
             <%= link_to_if_authorized(l(:label_news_new),
                                       {:controller => 'news', :action => 'new', :project_id => @project},
                                       :class => 'icon icon-add',
                                       :onclick => 'Element.show("add-news"); Form.Element.focus("news_title"); return false;') if @project %>
             </div>
             <div id="add-news" style="display:none;">
             <h2><%=l(:label_news_new)%></h2>
             <% labelled_tabular_form_for :news, @news, :url => { :controller => 'news', :action => 'new', :project_id => @project },
                                                        :html => { :id => 'news-form' } do |f| %>
             <%= render :partial => 'news/form', :locals => { :f => f } %>
             <%= submit_tag l(:button_create) %>
             <%= link_to_remote l(:label_preview),
                                { :url => { :controller => 'news', :action => 'preview', :project_id => @project },
                                  :method => 'post',
                                  :update => 'preview',
                                  :with => "Form.serialize('news-form')"
                                }, :accesskey => accesskey(:preview) %> |
             <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-news")' %>
             <% end if @project %>
             <div id="preview" class="wiki"></div>
             </div>
             <h2><%=l(:label_news_plural)%></h2>
             <% if @newss.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% else %>
             <% @newss.each do |news| %>
                 <h3><%= link_to(h(news.project.name), :controller => 'projects', :action => 'show', :id => news.project) + ': ' unless news.project == @project %>
                 <%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %>
-                <%= "(#{news.comments_count} #{lwr(:label_comment, news.comments_count).downcase})" if news.comments_count > 0 %></h3>
+                <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %></h3>
                 <p class="author"><%= authoring news.created_on, news.author %></p>
                 <div class="wiki">
                 <%= textilizable(news.description) %>
                 </div>
             <% end %>
             <% end %>
             <p class="pagination"><%= pagination_links_full @news_pages %></p>
             <% other_formats_links do |f| %>
             	<%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %>
             <% end %>
             <% content_for :header_tags do %>
               <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
             <% end %>
             <% html_title(l(:label_news_plural)) -%>

app/views/projects/_form.rhtml +1 -1

             <%= error_messages_for 'project' %>
             <div class="box">
             <!--[form:project]-->
             <p><%= f.text_field :name, :required => true %><br /><em><%= l(:text_caracters_maximum, 30) %></em></p>
             <% if User.current.admin? && !@project.possible_parents.empty? %>
                 <p><label><%= l(:field_parent) %></label><%= parent_project_select_tag(@project) %></p>
             <% end %>
             <p><%= f.text_area :description, :rows => 5, :class => 'wiki-edit' %></p>
             <p><%= f.text_field :identifier, :required => true, :disabled => @project.identifier_frozen? %>
             <% unless @project.identifier_frozen? %>
-            <br /><em><%= l(:text_length_between, 2, 20) %> <%= l(:text_project_identifier_info) %></em>
+            <br /><em><%= l(:text_length_between, :min => 2, :max => 20) %> <%= l(:text_project_identifier_info) %></em>
             <% end %></p>
             <p><%= f.text_field :homepage, :size => 60 %></p>
             <p><%= f.check_box :is_public %></p>
             <%= wikitoolbar_for 'project_description' %>
             <% @project.custom_field_values.each do |value| %>
             	<p><%= custom_field_tag_with_label :project, value %></p>
             <% end %>
             <%= call_hook(:view_projects_form, :project => @project, :form => f) %>
             </div>
             <% unless @trackers.empty? %>
             <fieldset class="box"><legend><%=l(:label_tracker_plural)%></legend>
             <% @trackers.each do |tracker| %>
                 <label class="floating">
                 <%= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.include?(tracker) %>
                 <%= tracker %>
                 </label>
             <% end %>
             <%= hidden_field_tag 'project[tracker_ids][]', '' %>
             </fieldset>
             <% end %>
             <% unless @issue_custom_fields.empty? %>
             <fieldset class="box"><legend><%=l(:label_custom_field_plural)%></legend>
             <% @issue_custom_fields.each do |custom_field| %>
                 <label class="floating">
             	<%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
             	<%= custom_field.name %>
             	</label>
             <% end %>
             <%= hidden_field_tag 'project[issue_custom_field_ids][]', '' %>
             </fieldset>
             <% end %>
             <!--[eoform:project]-->

app/views/projects/add.rhtml +1 -1

             <h2><%=l(:label_project_new)%></h2>
             <% labelled_tabular_form_for :project, @project, :url => { :action => "add" } do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <fieldset class="box"><legend><%= l(:label_module_plural) %></legend>
             <% Redmine::AccessControl.available_project_modules.each do |m| %>
                 <label class="floating">
                 <%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) %>
-                <%= (l_has_string?("project_module_#{m}".to_sym) ? l("project_module_#{m}".to_sym) : m.to_s.humanize) %>
+                <%= l_or_humanize(m, :prefix => "project_module_") %>
                 </label>
             <% end %>
             </fieldset>
             <%= submit_tag l(:button_save) %>
             <%= javascript_tag "Form.Element.focus('project_name');" %>
             <% end %>

app/views/projects/settings/_modules.rhtml +1 -1

             <% form_for :project, @project,
                         :url => { :action => 'modules', :id => @project },
                         :html => {:id => 'modules-form'} do |f| %>
             <div class=box>
             <strong><%= l(:text_select_project_modules) %></strong>
             <% Redmine::AccessControl.available_project_modules.each do |m| %>
             <p><label><%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) -%>
-             <%= (l_has_string?("project_module_#{m}".to_sym) ? l("project_module_#{m}".to_sym) : m.to_s.humanize) %></label></p>
+             <%= l_or_humanize(m, :prefix => "project_module_") %></label></p>
             <% end %>
             </div>
             <p><%= check_all_links 'modules-form' %></p>
             <p><%= submit_tag l(:button_save) %></p>
             <% end %>

app/views/projects/show.rhtml +4 -3

             <h2><%=l(:label_overview)%></h2>
             <div class="splitcontentleft">
             	<%= textilizable @project.description %>
             	<ul>
             	<% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= link_to(h(@project.homepage), @project.homepage) %></li><% end %>
               <% if @subprojects.any? %>
              	<li><%=l(:label_subproject_plural)%>:
             	    <%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join(", ") %></li>
               <% end %>
             	<% @project.custom_values.each do |custom_value| %>
             	<% if !custom_value.value.empty? %>
             	   <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
             	<% end %>
             	<% end %>
             	</ul>
               <% if User.current.allowed_to?(:view_issues, @project) %>
               <div class="box">
                 <h3 class="icon22 icon22-tracker"><%=l(:label_issue_tracking)%></h3>
                 <ul>
                 <% for tracker in @trackers %>
                   <li><%= link_to tracker.name, :controller => 'issues', :action => 'index', :project_id => @project,
                                                             :set_filter => 1,
                                                             "tracker_id" => tracker.id %>:
-                  <%= @open_issues_by_tracker[tracker] || 0 %> <%= lwr(:label_open_issues, @open_issues_by_tracker[tracker] || 0) %>
+            					<%= l(:label_x_open_issues_abbr_on_total, :count => @open_issues_by_tracker[tracker].to_i,
-                  <%= l(:label_on) %> <%= @total_issues_by_tracker[tracker] || 0 %></li>
+            																										:total => @total_issues_by_tracker[tracker].to_i) %>
+            			</li>
                 <% end %>
                 </ul>
                 <p><%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 %></p>
               </div>
               <% end %>
             </div>
             <div class="splitcontentright">
                 <% if @members_by_role.any? %>
             	<div class="box">
             		<h3 class="icon22 icon22-users"><%=l(:label_member_plural)%></h3>
             		<p><% @members_by_role.keys.sort.each do |role| %>
             		<%= role.name %>:
             		<%= @members_by_role[role].collect(&:user).sort.collect{|u| link_to_user u}.join(", ") %>
             		<br />
             		<% end %></p>
             	</div>
             	<% end %>
               <% if @news.any? && authorize_for('news', 'index') %>
               <div class="box">
                 <h3><%=l(:label_news_latest)%></h3>
                 <%= render :partial => 'news/news', :collection => @news %>
                 <p><%= link_to l(:label_news_view_all), :controller => 'news', :action => 'index', :project_id => @project %></p>
               </div>
               <% end %>
             </div>
             <% content_for :sidebar do %>
                 <% planning_links = []
                   planning_links << link_to_if_authorized(l(:label_calendar), :controller => 'issues', :action => 'calendar', :project_id => @project)
                   planning_links << link_to_if_authorized(l(:label_gantt), :controller => 'issues', :action => 'gantt', :project_id => @project)
                   planning_links.compact!
                   unless planning_links.empty? %>
                 <h3><%= l(:label_planning) %></h3>
                 <p><%= planning_links.join(' | ') %></p>
                 <% end %>
                 <% if @total_hours && User.current.allowed_to?(:view_time_entries, @project) %>
                 <h3><%= l(:label_spent_time) %></h3>
-                <p><span class="icon icon-time"><%= lwr(:label_f_hour, @total_hours) %></span></p>
+                <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p>
                 <p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'details', :project_id => @project}) %> |
                 <%= link_to(l(:label_report), {:controller => 'timelog', :action => 'report', :project_id => @project}) %></p>
                 <% end %>
             <% end %>
             <% content_for :header_tags do %>
             <%= auto_discovery_link_tag(:atom, {:action => 'activity', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
             <% end %>
             <% html_title(l(:label_overview)) -%>

app/views/repositories/_dir_list_content.rhtml +1 -1

             <% @entries.each do |entry| %>
             <% tr_id = Digest::MD5.hexdigest(entry.path)
                depth = params[:depth].to_i %>
             <tr id="<%= tr_id %>" class="<%= params[:parent_id] %> entry <%= entry.kind %>">
             <td style="padding-left: <%=18 * depth%>px;" class="filename">
             <% if entry.is_dir? %>
             <span class="expander" onclick="<%=  remote_function :url => {:action => 'browse', :id => @project, :path => to_path_param(entry.path), :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
                               :update => { :success => tr_id },
                               :position => :after,
                               :success => "scmEntryLoaded('#{tr_id}')",
                               :condition => "scmEntryClick('#{tr_id}')"%>">&nbsp</span>
             <% end %>
             <%=  link_to h(entry.name),
                       {:action => (entry.is_dir? ? 'browse' : 'changes'), :id => @project, :path => to_path_param(entry.path), :rev => @rev},
                       :class => (entry.is_dir? ? 'icon icon-folder' : 'icon icon-file')%>
             </td>
             <td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
             <% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %>
             <td class="revision"><%= link_to(format_revision(entry.lastrev.name), :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td>
             <td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
             <td class="author"><%= changeset.nil? ? h(entry.lastrev.author.to_s.split('<').first) : changeset.author if entry.lastrev %></td>
-            <td class="comments"><%=h truncate(changeset.comments, 50) unless changeset.nil? %></td>
+            <td class="comments"><%=h truncate(changeset.comments, :length => 50) unless changeset.nil? %></td>
             </tr>
             <% end %>

app/views/search/index.rhtml +1 -1

             <h2><%= l(:label_search) %></h2>
             <div class="box">
             <% form_tag({}, :method => :get) do %>
             <p><%= text_field_tag 'q', @question, :size => 60, :id => 'search-input' %>
             <%= javascript_tag "Field.focus('search-input')" %>
             <%= project_select_tag %>
             <label><%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %></label>
             <label><%= check_box_tag 'titles_only', 1, @titles_only %> <%= l(:label_search_titles_only) %></label>
             </p>
             <p>
             <% @object_types.each do |t| %>
             <label><%= check_box_tag t, 1, @scope.include?(t) %> <%= type_label(t) %></label>
             <% end %>
             </p>
             <p><%= submit_tag l(:button_submit), :name => 'submit' %></p>
             <% end %>
             </div>
             <% if @results %>
                 <div id="search-results-counts">
                 <%= render_results_by_type(@results_by_type) unless @scope.size == 1 %>
                 </div>
                 <h3><%= l(:label_result_plural) %> (<%= @results_by_type.values.sum %>)</h3>
                 <dl id="search-results">
                   <% @results.each do |e| %>
-                    <dt class="<%= e.event_type %>"><%= content_tag('span', h(e.project), :class => 'project') unless @project == e.project %> <%= link_to highlight_tokens(truncate(e.event_title, 255), @tokens), e.event_url %></dt>
+                    <dt class="<%= e.event_type %>"><%= content_tag('span', h(e.project), :class => 'project') unless @project == e.project %> <%= link_to highlight_tokens(truncate(e.event_title, :length => 255), @tokens), e.event_url %></dt>
                     <dd><span class="description"><%= highlight_tokens(e.event_description, @tokens) %></span>
                     <span class="author"><%= format_time(e.event_datetime) %></span></dd>
                   <% end %>
                 </dl>
             <% end %>
             <p><center>
             <% if @pagination_previous_date %>
             <%= link_to_remote ('&#171; ' + l(:label_previous)),
                                {:update => :content,
                                 :url => params.merge(:previous => 1, :offset => @pagination_previous_date.strftime("%Y%m%d%H%M%S"))
                                }, :href => url_for(params.merge(:previous => 1, :offset => @pagination_previous_date.strftime("%Y%m%d%H%M%S"))) %>&nbsp;
             <% end %>
             <% if @pagination_next_date %>
             <%= link_to_remote (l(:label_next) + ' &#187;'),
                                {:update => :content,
                                 :url => params.merge(:previous => nil, :offset => @pagination_next_date.strftime("%Y%m%d%H%M%S"))
                                }, :href => url_for(params.merge(:previous => nil, :offset => @pagination_next_date.strftime("%Y%m%d%H%M%S"))) %>
             <% end %>
             </center></p>
             <% html_title(l(:label_search)) -%>

app/views/settings/_authentication.rhtml +1 -1

             <% form_tag({:action => 'edit', :tab => 'authentication'}) do %>
             <div class="box tabular settings">
             <p><label><%= l(:setting_login_required) %></label>
             <%= check_box_tag 'settings[login_required]', 1, Setting.login_required? %><%= hidden_field_tag 'settings[login_required]', 0 %></p>
             <p><label><%= l(:setting_autologin) %></label>
-            <%= select_tag 'settings[autologin]', options_for_select( [[l(:label_disabled), "0"]] + [1, 7, 30, 365].collect{|days| [lwr(:actionview_datehelper_time_in_words_day, days), days.to_s]}, Setting.autologin) %></p>
+            <%= select_tag 'settings[autologin]', options_for_select( [[l(:label_disabled), "0"]] + [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]}, Setting.autologin) %></p>
             <p><label><%= l(:setting_self_registration) %></label>
             <%= select_tag 'settings[self_registration]',
                   options_for_select( [[l(:label_disabled), "0"],
                                        [l(:label_registration_activation_by_email), "1"],
                                        [l(:label_registration_manual_activation), "2"],
                                        [l(:label_registration_automatic_activation), "3"]
                                       ], Setting.self_registration ) %></p>
             <p><label><%= l(:label_password_lost) %></label>
             <%= check_box_tag 'settings[lost_password]', 1, Setting.lost_password? %><%= hidden_field_tag 'settings[lost_password]', 0 %></p>
             <p><label><%= l(:setting_openid) %></label>
             <%= check_box_tag 'settings[openid]', 1, Setting.openid?, :disabled => !Object.const_defined?(:OpenID) %><%= hidden_field_tag 'settings[openid]', 0 %></p>
             </div>
             <div style="float:right;">
                 <%= link_to l(:label_ldap_authentication), :controller => 'auth_sources', :action => 'list' %>
             </div>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/timelog/_list.rhtml +1 -1

             <table class="list time-entries">
             <thead>
             <tr>
             <%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
             <%= sort_header_tag('user', :caption => l(:label_member)) %>
             <%= sort_header_tag('activity', :caption => l(:label_activity)) %>
             <%= sort_header_tag('project', :caption => l(:label_project)) %>
             <%= sort_header_tag('issue', :caption => l(:label_issue), :default_order => 'desc') %>
             <th><%= l(:field_comments) %></th>
             <%= sort_header_tag('hours', :caption => l(:field_hours)) %>
             <th></th>
             </tr>
             </thead>
             <tbody>
             <% entries.each do |entry| -%>
             <tr class="time-entry <%= cycle("odd", "even") %>">
             <td class="spent_on"><%= format_date(entry.spent_on) %></td>
             <td class="user"><%=h entry.user %></td>
             <td class="activity"><%=h entry.activity %></td>
             <td class="project"><%=h entry.project %></td>
             <td class="subject">
             <% if entry.issue -%>
-            <%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) -%>
+            <%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, :length => 50)) -%>
             <% end -%>
             </td>
             <td class="comments"><%=h entry.comments %></td>
             <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
             <td align="center">
             <% if entry.editable_by?(User.current) -%>
                 <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry, :project_id => nil},
                                                    :title => l(:button_edit) %>
                 <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry, :project_id => nil},
                                                      :confirm => l(:text_are_you_sure),
                                                      :method => :post,
                                                      :title => l(:button_delete) %>
             <% end -%>
             </td>
             </tr>
             <% end -%>
             </tbody>
             </table>

app/views/timelog/details.rhtml +1 -1

             <div class="contextual">
             <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time-add' %>
             </div>
             <%= render_timelog_breadcrumb %>
             <h2><%= l(:label_spent_time) %></h2>
             <% form_remote_tag( :url => {}, :html => {:method => :get}, :method => :get, :update => 'content' ) do %>
             <%# TOOD: remove the project_id and issue_id hidden fields, that information is
             already in the URI %>
             <%= hidden_field_tag 'project_id', params[:project_id] %>
             <%= hidden_field_tag 'issue_id', params[:issue_id] if @issue %>
             <%= render :partial => 'date_range' %>
             <% end %>
             <div class="total-hours">
-            <p><%= l(:label_total) %>: <%= html_hours(lwr(:label_f_hour, @total_hours)) %></p>
+            <p><%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %></p>
             </div>
             <% unless @entries.empty? %>
             <%= render :partial => 'list', :locals => { :entries => @entries }%>
             <p class="pagination"><%= pagination_links_full @entry_pages, @entry_count %></p>
             <% other_formats_links do |f| %>
             	<%= f.link_to 'Atom', :url => params.merge({:issue_id => @issue, :key => User.current.rss_key}) %>
             	<%= f.link_to 'CSV', :url => params %>
             <% end %>
             <% end %>
             <% html_title l(:label_spent_time), l(:label_details) %>
             <% content_for :header_tags do %>
                 <%= auto_discovery_link_tag(:atom, {:issue_id => @issue, :format => 'atom', :key => User.current.rss_key}, :title => l(:label_spent_time)) %>
             <% end %>

app/views/timelog/report.rhtml +3 -3

             <div class="contextual">
             <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time-add' %>
             </div>
             <%= render_timelog_breadcrumb %>
             <h2><%= l(:label_spent_time) %></h2>
             <% form_remote_tag(:url => {}, :html => {:method => :get}, :method => :get, :update => 'content') do %>
               <% @criterias.each do |criteria| %>
                 <%= hidden_field_tag 'criterias[]', criteria, :id => nil %>
               <% end %>
               <%# TODO: get rid of the project_id field, that should already be in the URL %>
               <%= hidden_field_tag 'project_id', params[:project_id] %>
               <%= render :partial => 'date_range' %>
               <p><%= l(:label_details) %>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
                                                                                         [l(:label_month), 'month'],
                                                                                         [l(:label_week), 'week'],
                                                                                         [l(:label_day_plural).titleize, 'day']], @columns),
                                                                     :onchange => "this.form.onsubmit();" %>
-              <%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l(@available_criterias[k][:label]), k]}),
+              <%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l_or_humanize(@available_criterias[k][:label]), k]}),
                                                                       :onchange => "this.form.onsubmit();",
                                                                       :style => 'width: 200px',
                                                                       :id => nil,
                                                                       :disabled => (@criterias.length >= 3)) %>
                  <%= link_to_remote l(:button_clear), {:url => {:project_id => @project, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @columns},
                                                        :method => :get,
                                                        :update => 'content'
                                                       }, :class => 'icon icon-reload' %></p>
             <% end %>
             <% unless @criterias.empty? %>
             <div class="total-hours">
-            <p><%= l(:label_total) %>: <%= html_hours(lwr(:label_f_hour, @total_hours)) %></p>
+            <p><%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %></p>
             </div>
             <% unless @hours.empty? %>
             <table class="list" id="time-report">
             <thead>
             <tr>
             <% @criterias.each do |criteria| %>
-              <th><%= l(@available_criterias[criteria][:label]) %></th>
+              <th><%= l_or_humanize(@available_criterias[criteria][:label]) %></th>
             <% end %>
             <% columns_width = (40 / (@periods.length+1)).to_i %>
             <% @periods.each do |period| %>
               <th class="period" width="<%= columns_width %>%"><%= period %></th>
             <% end %>
               <th class="total" width="<%= columns_width %>%"><%= l(:label_total) %></th>
             </tr>
             </thead>
             <tbody>
             <%= render :partial => 'report_criteria', :locals => {:criterias => @criterias, :hours => @hours, :level => 0} %>
               <tr class="total">
               <td><%= l(:label_total) %></td>
               <%= '<td></td>' * (@criterias.size - 1) %>
               <% total = 0 -%>
               <% @periods.each do |period| -%>
                 <% sum = sum_hours(select_hours(@hours, @columns, period.to_s)); total += sum -%>
                 <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
               <% end -%>
               <td class="hours"><%= html_hours("%.2f" % total) if total > 0 %></td>
               </tr>
             </tbody>
             </table>
             <% other_formats_links do |f| %>
             	<%= f.link_to 'CSV', :url => params %>
             <% end %>
             <% end %>
             <% end %>
             <% html_title l(:label_spent_time), l(:label_report) %>

app/views/versions/_overview.rhtml +2 -4

             <% if version.completed? %>
               <p><%= format_date(version.effective_date) %></p>
             <% elsif version.effective_date %>
               <p><strong><%= due_date_distance_in_words(version.effective_date) %></strong> (<%= format_date(version.effective_date) %>)</p>
             <% end %>
             <p><%=h version.description %></p>
             <% if version.fixed_issues.count > 0 %>
                 <%= progress_bar([version.closed_pourcent, version.completed_pourcent], :width => '40em', :legend => ('%0.0f%' % version.completed_pourcent)) %>
                 <p class="progress-info">
-                    <%= link_to(version.closed_issues_count, :controller => 'issues', :action => 'index', :project_id => version.project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %>
+                    <%= link_to_if(version.closed_issues_count > 0, l(:label_x_closed_issues_abbr, :count => version.closed_issues_count), :controller => 'issues', :action => 'index', :project_id => version.project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %>
-                    <%= lwr(:label_closed_issues, version.closed_issues_count) %>
                     (<%= '%0.0f' % (version.closed_issues_count.to_f / version.fixed_issues.count * 100) %>%)
                     &#160;
-                    <%= link_to(version.open_issues_count, :controller => 'issues', :action => 'index', :project_id => version.project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %>
+                    <%= link_to_if(version.open_issues_count > 0, l(:label_x_open_issues_abbr, :count => version.open_issues_count), :controller => 'issues', :action => 'index', :project_id => version.project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %>
-                    <%= lwr(:label_open_issues, version.open_issues_count)%>
                     (<%= '%0.0f' % (version.open_issues_count.to_f / version.fixed_issues.count * 100) %>%)
                 </p>
             <% else %>
                 <p><em><%= l(:label_roadmap_no_issues) %></em></p>
             <% end %>

app/views/versions/show.rhtml +2 -2

             <div class="contextual">
             <%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %>
             </div>
             <h2><%= h(@version.name) %></h2>
             <div id="version-summary">
             <% if @version.estimated_hours > 0 || User.current.allowed_to?(:view_time_entries, @project) %>
             <fieldset><legend><%= l(:label_time_tracking) %></legend>
             <table>
             <tr>
                 <td width="130px" align="right"><%= l(:field_estimated_hours) %></td>
-                <td width="240px" class="total-hours"width="130px" align="right"><%= html_hours(lwr(:label_f_hour, @version.estimated_hours)) %></td>
+                <td width="240px" class="total-hours"width="130px" align="right"><%= html_hours(l_hours(@version.estimated_hours)) %></td>
             </tr>
             <% if User.current.allowed_to?(:view_time_entries, @project) %>
             <tr>
                 <td width="130px" align="right"><%= l(:label_spent_time) %></td>
-                <td width="240px" class="total-hours"><%= html_hours(lwr(:label_f_hour, @version.spent_hours)) %></td>
+                <td width="240px" class="total-hours"><%= html_hours(l_hours(@version.spent_hours)) %></td>
             </tr>
             <% end %>
             </table>
             </fieldset>
             <% end %>
             <div id="status_by">
             <%= render_issue_status_by(@version, params[:status_by]) if @version.fixed_issues.count > 0 %>
             </div>
             </div>
             <div id="roadmap">
             <%= render :partial => 'versions/overview', :locals => {:version => @version} %>
             <%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
             <% issues = @version.fixed_issues.find(:all,
                                                    :include => [:status, :tracker],
                                                    :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") %>
             <% if issues.size > 0 %>
             <fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
             <ul>
             <% issues.each do |issue| -%>
                 <li><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
             <% end -%>
             </ul>
             </fieldset>
             <% end %>
             </div>
             <%= call_hook :view_versions_show_bottom, :version => @version %>
             <% html_title @version.name %>

config/boot.rb +5 -5

             # Don't change this file!
             # Configure your app in config/environment.rb and config/environments/*.rb
             RAILS_ROOT = File.expand_path("#{File.dirname(__FILE__)}/..") unless defined?(RAILS_ROOT)
             module Rails
               class << self
                 def boot!
                   unless booted?
                     preinitialize
                     pick_boot.run
                   end
                 end
                 def booted?
                   defined? Rails::Initializer
                 end
                 def pick_boot
                   (vendor_rails? ? VendorBoot : GemBoot).new
                 end
                 def vendor_rails?
                   File.exist?("#{RAILS_ROOT}/vendor/rails")
                 end
                 def preinitialize
                   load(preinitializer_path) if File.exist?(preinitializer_path)
                 end
                 def preinitializer_path
                   "#{RAILS_ROOT}/config/preinitializer.rb"
                 end
               end
               class Boot
                 def run
                   load_initializer
                   Rails::Initializer.run(:set_load_path)
                 end
               end
               class VendorBoot < Boot
                 def load_initializer
                   require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
                   Rails::Initializer.run(:install_gem_spec_stubs)
                 end
               end
               class GemBoot < Boot
                 def load_initializer
                   self.class.load_rubygems
                   load_rails_gem
                   require 'initializer'
                 end
                 def load_rails_gem
                   if version = self.class.gem_version
                     gem 'rails', version
                   else
                     gem 'rails'
                   end
                 rescue Gem::LoadError => load_error
                   $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
                   exit 1
                 end
                 class << self
                   def rubygems_version
-                    Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
+                    Gem::RubyGemsVersion rescue nil
                   end
                   def gem_version
                     if defined? RAILS_GEM_VERSION
                       RAILS_GEM_VERSION
                     elsif ENV.include?('RAILS_GEM_VERSION')
                       ENV['RAILS_GEM_VERSION']
                     else
                       parse_gem_version(read_environment_rb)
                     end
                   end
                   def load_rubygems
                     require 'rubygems'
+                    min_version = '1.3.1'
-                    unless rubygems_version >= '0.9.4'
+                    unless rubygems_version >= min_version
-                      $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
+                      $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
                       exit 1
                     end
                   rescue LoadError
-                    $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+                    $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
                     exit 1
                   end
                   def parse_gem_version(text)
                     $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
                   end
                   private
                     def read_environment_rb
                       File.read("#{RAILS_ROOT}/config/environment.rb")
                     end
                 end
               end
             end
             # All that for this:
             Rails.boot!

config/environment.rb +1 -6

             # Be sure to restart your web server when you modify this file.
             # Uncomment below to force Rails into production mode when
             # you don't control web/app server and can't set it the proper way
             # ENV['RAILS_ENV'] ||= 'production'
             # Specifies gem version of Rails to use when vendor/rails is not present
-            RAILS_GEM_VERSION = '2.1.2' unless defined? RAILS_GEM_VERSION
+            RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
             # Bootstrap the Rails environment, frameworks, and default configuration
             require File.join(File.dirname(__FILE__), 'boot')
             # Load Engine plugin if available
             begin
               require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')
             rescue LoadError
               # Not available
             end
             Rails::Initializer.run do |config|
               # Settings in config/environments/* take precedence those specified here
               # Skip frameworks you're not going to use
               # config.frameworks -= [ :action_web_service, :action_mailer ]
               # Add additional load paths for sweepers
               config.load_paths += %W( #{RAILS_ROOT}/app/sweepers )
               # Force all environments to use the same logger level
               # (by default production uses :info, the others :debug)
               # config.log_level = :debug
-              # Use the database for sessions instead of the file system
-              # (create the session table with 'rake db:sessions:create')
-              # config.action_controller.session_store = :active_record_store
-              config.action_controller.session_store = :PStore
               # Enable page/fragment caching by setting a file-based store
               # (remember to create the caching directory and make it readable to the application)
               # config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/cache"
               # Activate observers that should always be running
               # config.active_record.observers = :cacher, :garbage_collector
               config.active_record.observers = :message_observer
               # Make Active Record use UTC-base instead of local time
               # config.active_record.default_timezone = :utc
               # Use Active Record's schema dumper instead of SQL when creating the test database
               # (enables use of different database adapters for development and test environments)
               # config.active_record.schema_format = :ruby
               # Deliveries are disabled by default. Do NOT modify this section.
               # Define your email configuration in email.yml instead.
               # It will automatically turn deliveries on
               config.action_mailer.perform_deliveries = false
             end

config/environments/test.rb +5 0

             # Settings specified here will take precedence over those in config/environment.rb
             # The test environment is used exclusively to run your application's
             # test suite.  You never need to work with it otherwise.  Remember that
             # your test database is "scratch space" for the test suite and is wiped
             # and recreated between test runs.  Don't rely on the data there!
             config.cache_classes = true
             # Log error messages when you accidentally call methods on nil.
             config.whiny_nils    = true
             # Show full error reports and disable caching
             config.action_controller.consider_all_requests_local = true
             config.action_controller.perform_caching             = false
             config.action_mailer.perform_deliveries = true
             config.action_mailer.delivery_method = :test
+            config.action_controller.session = {
+              :session_key => "_test_session",
+              :secret => "some secret phrase for the tests."
+            }

config/environments/test_pgsql.rb +5 0

             # Settings specified here will take precedence over those in config/environment.rb
             # The test environment is used exclusively to run your application's
             # test suite.  You never need to work with it otherwise.  Remember that
             # your test database is "scratch space" for the test suite and is wiped
             # and recreated between test runs.  Don't rely on the data there!
             config.cache_classes = true
             # Log error messages when you accidentally call methods on nil.
             config.whiny_nils    = true
             # Show full error reports and disable caching
             config.action_controller.consider_all_requests_local = true
             config.action_controller.perform_caching             = false
             config.action_mailer.perform_deliveries = true
             config.action_mailer.delivery_method = :test
+            config.action_controller.session = {
+              :session_key => "_test_session",
+              :secret => "some secret phrase for the tests."
+            }

config/environments/test_sqlite3.rb +5 0

             # Settings specified here will take precedence over those in config/environment.rb
             # The test environment is used exclusively to run your application's
             # test suite.  You never need to work with it otherwise.  Remember that
             # your test database is "scratch space" for the test suite and is wiped
             # and recreated between test runs.  Don't rely on the data there!
             config.cache_classes = true
             # Log error messages when you accidentally call methods on nil.
             config.whiny_nils    = true
             # Show full error reports and disable caching
             config.action_controller.consider_all_requests_local = true
             config.action_controller.perform_caching             = false
             config.action_mailer.perform_deliveries = true
             config.action_mailer.delivery_method = :test
+            config.action_controller.session = {
+              :session_key => "_test_session",
+              :secret => "some secret phrase for the tests."
+            }

config/initializers/10-patches.rb +33 -14

@@ -1,31 +1,50
1		1
2	ActiveRecord::Errors.default_error_messages = {	2	require 'activerecord'
3	:inclusion => "activerecord_error_inclusion",	3
4	:exclusion => "activerecord_error_exclusion",	4	module ActiveRecord
5	:invalid => "activerecord_error_invalid",	5	class Base
6	:confirmation => "activerecord_error_confirmation",	6	include Redmine::I18n
7	:accepted => "activerecord_error_accepted",	7
8	:empty => "activerecord_error_empty",	8	# Translate attribute names for validation errors display
9	:blank => "activerecord_error_blank",	9	def self.human_attribute_name(attr)
10	:too_long => "activerecord_error_too_long",	10	l("field_#{attr.to_s.gsub(/_id$/, '')}")
11	:too_short => "activerecord_error_too_short",	11	end
12	:wrong_length => "activerecord_error_wrong_length",	12	end
13	:taken => "activerecord_error_taken",	13	end
14	:not_a_number => "activerecord_error_not_a_number"	14
15	} if ActiveRecord::Errors.respond_to?('default_error_messages=')	15	module ActionView
		16	module Helpers
		17	module DateHelper
		18	# distance_of_time_in_words breaks when difference is greater than 30 years
		19	def distance_of_date_in_words(from_date, to_date = 0, options = {})
		20	from_date = from_date.to_date if from_date.respond_to?(:to_date)
		21	to_date = to_date.to_date if to_date.respond_to?(:to_date)
		22	distance_in_days = (to_date - from_date).abs
		23
		24	I18n.with_options :locale => options[:locale], :scope => :'datetime.distance_in_words' do \|locale\|
		25	case distance_in_days
		26	when 0..60 then locale.t :x_days, :count => distance_in_days
		27	when 61..720 then locale.t :about_x_months, :count => (distance_in_days / 30).round
		28	else locale.t :over_x_years, :count => (distance_in_days / 365).round
		29	end
		30	end
		31	end
		32	end
		33	end
		34	end
16		35
17	ActionView::Base.field_error_proc = Proc.new{ \|html_tag, instance\| "#{html_tag}" }	36	ActionView::Base.field_error_proc = Proc.new{ \|html_tag, instance\| "#{html_tag}" }
18		37
19	# Adds :async_smtp and :async_sendmail delivery methods	38	# Adds :async_smtp and :async_sendmail delivery methods
20	# to perform email deliveries asynchronously	39	# to perform email deliveries asynchronously
21	module AsynchronousMailer	40	module AsynchronousMailer
22	%w(smtp sendmail).each do \|type\|	41	%w(smtp sendmail).each do \|type\|
23	define_method("perform_delivery_async_#{type}") do \|mail\|	42	define_method("perform_delivery_async_#{type}") do \|mail\|
24	Thread.start do	43	Thread.start do
25	send "perform_delivery_#{type}", mail	44	send "perform_delivery_#{type}", mail
26	end	45	end
27	end	46	end
28	end	47	end
29	end	48	end
30		49
31	ActionMailer::Base.send :include, AsynchronousMailer	50	ActionMailer::Base.send :include, AsynchronousMailer

config/initializers/30-redmine.rb +1 -5

@@ -1,7 +1,3
1	GLoc.set_config :default_language => :en	1	I18n.default_locale = 'en'
2	GLoc.clear_strings
3	GLoc.set_kcode
4	GLoc.load_localized_strings
5	GLoc.set_config(:raise_string_not_found_errors => false)
6		2
7	require 'redmine'	3	require 'redmine'

config/locales/bg.yml ~~lang/bg.yml~~ renamed +771 -707

This diff has been collapsed as it changes many lines, (1478 lines changed) Show them Hide them
	@@ -1,709 +1,773
	1	_gloc_rule_default: '\|n\| n==1 ? "" : "_plural" '	1	bg:
			2	date:
			3	formats:
			4	# Use the strftime parameters for formats.
			5	# When no format has been given, it uses default.
			6	# You can provide other formats here if you like!
			7	default: "%Y-%m-%d"
			8	short: "%b %d"
			9	long: "%B %d, %Y"
			10
			11	day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
			12	abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
			13
			14	# Don't forget the nil at the beginning; there's no such thing as a 0th month
			15	month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
			16	abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
			17	# Used in date_select and datime_select.
			18	order: [ :year, :month, :day ]
	2		19
	3	actionview_datehelper_select_day_prefix:	20	time:
	4	actionview_datehelper_select_month_names: Януари,Февруари,Март,Април,Май,Юни,Юли,Август,Септември,Октомври,Ноември,Декември	21	formats:
	5	actionview_datehelper_select_month_names_abbr: Яну,Фев,Мар,Апр,Май,Юни,Юли,Авг,Сеп,Окт,Ное,Дек	22	default: "%a, %d %b %Y %H:%M:%S %z"
	6	actionview_datehelper_select_month_prefix:	23	short: "%d %b %H:%M"
	7	actionview_datehelper_select_year_prefix:	24	long: "%B %d, %Y %H:%M"
	8	actionview_datehelper_time_in_words_day: 1 ден	25	am: "am"
	9	actionview_datehelper_time_in_words_day_plural: %d дни	26	pm: "pm"
	10	actionview_datehelper_time_in_words_hour_about: около час	27
	11	actionview_datehelper_time_in_words_hour_about_plural: около %d часа	28	datetime:
	12	actionview_datehelper_time_in_words_hour_about_single: около час	29	distance_in_words:
	13	actionview_datehelper_time_in_words_minute: 1 минута	30	half_a_minute: "half a minute"
	14	actionview_datehelper_time_in_words_minute_half: половин минута	31	less_than_x_seconds:
	15	actionview_datehelper_time_in_words_minute_less_than: по-малко от минута	32	one: "less than 1 second"
	16	actionview_datehelper_time_in_words_minute_plural: %d минути	33	other: "less than {{count}} seconds"
	17	actionview_datehelper_time_in_words_minute_single: 1 минута	34	x_seconds:
	18	actionview_datehelper_time_in_words_second_less_than: по-малко от секунда	35	one: "1 second"
	19	actionview_datehelper_time_in_words_second_less_than_plural: по-малко от %d секунди	36	other: "{{count}} seconds"
	20	actionview_instancetag_blank_option: Изберете	37	less_than_x_minutes:
			38	one: "less than a minute"
			39	other: "less than {{count}} minutes"
			40	x_minutes:
			41	one: "1 minute"
			42	other: "{{count}} minutes"
			43	about_x_hours:
			44	one: "about 1 hour"
			45	other: "about {{count}} hours"
			46	x_days:
			47	one: "1 day"
			48	other: "{{count}} days"
			49	about_x_months:
			50	one: "about 1 month"
			51	other: "about {{count}} months"
			52	x_months:
			53	one: "1 month"
			54	other: "{{count}} months"
			55	about_x_years:
			56	one: "about 1 year"
			57	other: "about {{count}} years"
			58	over_x_years:
			59	one: "over 1 year"
			60	other: "over {{count}} years"
			61
			62	# Used in array.to_sentence.
			63	support:
			64	array:
			65	sentence_connector: "and"
			66	skip_last_comma: false
			67
			68	activerecord:
			69	errors:
			70	messages:
			71	inclusion: "не съществува в списъка"
			72	exclusion: "е запазено"
			73	invalid: "е невалидно"
			74	confirmation: "липсва одобрение"
			75	accepted: "трябва да се приеме"
			76	empty: "не може да е празно"
			77	blank: "не може да е празно"
			78	too_long: "е прекалено дълго"
			79	too_short: "е прекалено късо"
			80	wrong_length: "е с грешна дължина"
			81	taken: "вече съществува"
			82	not_a_number: "не е число"
			83	not_a_date: "е невалидна дата"
			84	greater_than: "must be greater than {{count}}"
			85	greater_than_or_equal_to: "must be greater than or equal to {{count}}"
			86	equal_to: "must be equal to {{count}}"
			87	less_than: "must be less than {{count}}"
			88	less_than_or_equal_to: "must be less than or equal to {{count}}"
			89	odd: "must be odd"
			90	even: "must be even"
			91	greater_than_start_date: "трябва да е след началната дата"
			92	not_same_project: "не е от същия проект"
			93	circular_dependency: "Тази релация ще доведе до безкрайна зависимост"
	21		94
	22	activerecord_error_inclusion: не съществува в списъка	95	actionview_instancetag_blank_option: Изберете
	23	activerecord_error_exclusion: е запазено	96
	24	activerecord_error_invalid: е невалидно	97	general_text_No: 'Не'
	25	activerecord_error_confirmation: липсва одобрение	98	general_text_Yes: 'Да'
	26	activerecord_error_accepted: трябва да се приеме	99	general_text_no: 'не'
	27	activerecord_error_empty: не може да е празно	100	general_text_yes: 'да'
	28	activerecord_error_blank: не може да е празно	101	general_lang_name: 'Bulgarian'
	29	activerecord_error_too_long: е прекалено дълго	102	general_csv_separator: ','
	30	activerecord_error_too_short: е прекалено късо	103	general_csv_decimal_separator: '.'
	31	activerecord_error_wrong_length: е с грешна дължина	104	general_csv_encoding: UTF-8
	32	activerecord_error_taken: вече съществува	105	general_pdf_encoding: UTF-8
	33	activerecord_error_not_a_number: не е число	106	general_first_day_of_week: '1'
	34	activerecord_error_not_a_date: е невалидна дата	107
	35	activerecord_error_greater_than_start_date: трябва да е след началната дата	108	notice_account_updated: Профилът е обновен успешно.
	36	activerecord_error_not_same_project: не е от същия проект	109	notice_account_invalid_creditentials: Невалиден потребител или парола.
	37	activerecord_error_circular_dependency: Тази релация ще доведе до безкрайна зависимост	110	notice_account_password_updated: Паролата е успешно променена.
	38		111	notice_account_wrong_password: Грешна парола
	39	general_fmt_age: %d yr	112	notice_account_register_done: Профилът е създаден успешно.
	40	general_fmt_age_plural: %d yrs	113	notice_account_unknown_email: Непознат e-mail.
	41	general_fmt_date: %%d.%%m.%%Y	114	notice_can_t_change_password: Този профил е с външен метод за оторизация. Невъзможна смяна на паролата.
	42	general_fmt_datetime: %%d.%%m.%%Y %%H:%%M	115	notice_account_lost_email_sent: Изпратен ви е e-mail с инструкции за избор на нова парола.
	43	general_fmt_datetime_short: %%b %%d, %%H:%%M	116	notice_account_activated: Профилът ви е активиран. Вече може да влезете в системата.
	44	general_fmt_time: %%H:%%M	117	notice_successful_create: Успешно създаване.
	45	general_text_No: 'Не'	118	notice_successful_update: Успешно обновяване.
	46	general_text_Yes: 'Да'	119	notice_successful_delete: Успешно изтриване.
	47	general_text_no: 'не'	120	notice_successful_connection: Успешно свързване.
	48	general_text_yes: 'да'	121	notice_file_not_found: Несъществуваща или преместена страница.
	49	general_lang_name: 'Bulgarian'	122	notice_locking_conflict: Друг потребител променя тези данни в момента.
	50	general_csv_separator: ','	123	notice_not_authorized: Нямате право на достъп до тази страница.
	51	general_csv_decimal_separator: '.'	124	notice_email_sent: "Изпратен e-mail на {{value}}"
	52	general_csv_encoding: UTF-8	125	notice_email_error: "Грешка при изпращане на e-mail ({{value}})"
	53	general_pdf_encoding: UTF-8	126	notice_feeds_access_key_reseted: Вашия ключ за RSS достъп беше променен.
	54	general_day_names: Понеделник,Вторник,Сряда,Четвъртък,Петък,Събота,Неделя	127
	55	general_first_day_of_week: '1'	128	error_scm_not_found: Несъществуващ обект в хранилището.
	56		129	error_scm_command_failed: "Грешка при опит за комуникация с хранилище: {{value}}"
	57	notice_account_updated: Профилът е обновен успешно.	130
	58	notice_account_invalid_creditentials: Невалиден потребител или парола.	131	mail_subject_lost_password: "Вашата парола ({{value}})"
	59	notice_account_password_updated: Паролата е успешно променена.	132	mail_body_lost_password: 'За да смените паролата си, използвайте следния линк:'
	60	notice_account_wrong_password: Грешна парола	133	mail_subject_register: "Активация на профил ({{value}})"
	61	notice_account_register_done: Профилът е създаден успешно.	134	mail_body_register: 'За да активирате профила си използвайте следния линк:'
	62	notice_account_unknown_email: Непознат e-mail.	135
	63	notice_can_t_change_password: Този профил е с външен метод за оторизация. Невъзможна смяна на паролата.	136	gui_validation_error: 1 грешка
	64	notice_account_lost_email_sent: Изпратен ви е e-mail с инструкции за избор на нова парола.	137	gui_validation_error_plural: "{{count}} грешки"
	65	notice_account_activated: Профилът ви е активиран. Вече може да влезете в системата.	138
	66	notice_successful_create: Успешно създаване.	139	field_name: Име
	67	notice_successful_update: Успешно обновяване.	140	field_description: Описание
	68	notice_successful_delete: Успешно изтриване.	141	field_summary: Групиран изглед
	69	notice_successful_connection: Успешно свързване.	142	field_is_required: Задължително
	70	notice_file_not_found: Несъществуваща или преместена страница.	143	field_firstname: Име
	71	notice_locking_conflict: Друг потребител променя тези данни в момента.	144	field_lastname: Фамилия
	72	notice_not_authorized: Нямате право на достъп до тази страница.	145	field_mail: Email
	73	notice_email_sent: Изпратен e-mail на %s	146	field_filename: Файл
	74	notice_email_error: Грешка при изпращане на e-mail (%s)	147	field_filesize: Големина
	75	notice_feeds_access_key_reseted: Вашия ключ за RSS достъп беше променен.	148	field_downloads: Downloads
	76		149	field_author: Автор
	77	error_scm_not_found: Несъществуващ обект в хранилището.	150	field_created_on: От дата
	78	error_scm_command_failed: "Грешка при опит за комуникация с хранилище: %s"	151	field_updated_on: Обновена
	79		152	field_field_format: Тип
	80	mail_subject_lost_password: Вашата парола (%s)	153	field_is_for_all: За всички проекти
	81	mail_body_lost_password: 'За да смените паролата си, използвайте следния линк:'	154	field_possible_values: Възможни стойности
	82	mail_subject_register: Активация на профил (%s)	155	field_regexp: Регулярен израз
	83	mail_body_register: 'За да активирате профила си използвайте следния линк:'	156	field_min_length: Мин. дължина
	84		157	field_max_length: Макс. дължина
	85	gui_validation_error: 1 грешка	158	field_value: Стойност
	86	gui_validation_error_plural: %d грешки	159	field_category: Категория
	87		160	field_title: Заглавие
	88	field_name: Име	161	field_project: Проект
	89	field_description: Описание	162	field_issue: Задача
	90	field_summary: Групиран изглед	163	field_status: Статус
	91	field_is_required: Задължително	164	field_notes: Бележка
	92	field_firstname: Име	165	field_is_closed: Затворена задача
	93	field_lastname: Фамилия	166	field_is_default: Статус по подразбиране
	94	field_mail: Email	167	field_tracker: Тракер
	95	field_filename: Файл	168	field_subject: Относно
	96	field_filesize: Големина	169	field_due_date: Крайна дата
	97	field_downloads: Downloads	170	field_assigned_to: Възложена на
	98	field_author: Автор	171	field_priority: Приоритет
	99	field_created_on: От дата	172	field_fixed_version: Планувана версия
	100	field_updated_on: Обновена	173	field_user: Потребител
	101	field_field_format: Тип	174	field_role: Роля
	102	field_is_for_all: За всички проекти	175	field_homepage: Начална страница
	103	field_possible_values: Възможни стойности	176	field_is_public: Публичен
	104	field_regexp: Регулярен израз	177	field_parent: Подпроект на
	105	field_min_length: Мин. дължина	178	field_is_in_chlog: Да се вижда ли в Изменения
	106	field_max_length: Макс. дължина	179	field_is_in_roadmap: Да се вижда ли в Пътна карта
	107	field_value: Стойност	180	field_login: Потребител
	108	field_category: Категория	181	field_mail_notification: Известия по пощата
	109	field_title: Заглавие	182	field_admin: Администратор
	110	field_project: Проект	183	field_last_login_on: Последно свързване
	111	field_issue: Задача	184	field_language: Език
	112	field_status: Статус	185	field_effective_date: Дата
	113	field_notes: Бележка	186	field_password: Парола
	114	field_is_closed: Затворена задача	187	field_new_password: Нова парола
	115	field_is_default: Статус по подразбиране	188	field_password_confirmation: Потвърждение
	116	field_tracker: Тракер	189	field_version: Версия
	117	field_subject: Относно	190	field_type: Тип
	118	field_due_date: Крайна дата	191	field_host: Хост
	119	field_assigned_to: Възложена на	192	field_port: Порт
	120	field_priority: Приоритет	193	field_account: Профил
	121	field_fixed_version: Планувана версия	194	field_base_dn: Base DN
	122	field_user: Потребител	195	field_attr_login: Login attribute
	123	field_role: Роля	196	field_attr_firstname: Firstname attribute
	124	field_homepage: Начална страница	197	field_attr_lastname: Lastname attribute
	125	field_is_public: Публичен	198	field_attr_mail: Email attribute
	126	field_parent: Подпроект на	199	field_onthefly: Динамично създаване на потребител
	127	field_is_in_chlog: Да се вижда ли в Изменения	200	field_start_date: Начална дата
	128	field_is_in_roadmap: Да се вижда ли в Пътна карта	201	field_done_ratio: %% Прогрес
	129	field_login: Потребител	202	field_auth_source: Начин на оторизация
	130	field_mail_notification: Известия по пощата	203	field_hide_mail: Скрий e-mail адреса ми
	131	field_admin: Администратор	204	field_comments: Коментар
	132	field_last_login_on: Последно свързване	205	field_url: Адрес
	133	field_language: Език	206	field_start_page: Начална страница
	134	field_effective_date: Дата	207	field_subproject: Подпроект
	135	field_password: Парола	208	field_hours: Часове
	136	field_new_password: Нова парола	209	field_activity: Дейност
	137	field_password_confirmation: Потвърждение	210	field_spent_on: Дата
	138	field_version: Версия	211	field_identifier: Идентификатор
	139	field_type: Тип	212	field_is_filter: Използва се за филтър
	140	field_host: Хост	213	field_issue_to_id: Свързана задача
	141	field_port: Порт	214	field_delay: Отместване
	142	field_account: Профил	215	field_assignable: Възможно е възлагане на задачи за тази роля
	143	field_base_dn: Base DN	216	field_redirect_existing_links: Пренасочване на съществуващи линкове
	144	field_attr_login: Login attribute	217	field_estimated_hours: Изчислено време
	145	field_attr_firstname: Firstname attribute	218	field_default_value: Стойност по подразбиране
	146	field_attr_lastname: Lastname attribute	219
	147	field_attr_mail: Email attribute	220	setting_app_title: Заглавие
	148	field_onthefly: Динамично създаване на потребител	221	setting_app_subtitle: Описание
	149	field_start_date: Начална дата	222	setting_welcome_text: Допълнителен текст
	150	field_done_ratio: %% Прогрес	223	setting_default_language: Език по подразбиране
	151	field_auth_source: Начин на оторизация	224	setting_login_required: Изискване за вход в системата
	152	field_hide_mail: Скрий e-mail адреса ми	225	setting_self_registration: Регистрация от потребители
	153	field_comments: Коментар	226	setting_attachment_max_size: Максимална големина на прикачен файл
	154	field_url: Адрес	227	setting_issues_export_limit: Лимит за експорт на задачи
	155	field_start_page: Начална страница	228	setting_mail_from: E-mail адрес за емисии
	156	field_subproject: Подпроект	229	setting_host_name: Хост
	157	field_hours: Часове	230	setting_text_formatting: Форматиране на текста
	158	field_activity: Дейност	231	setting_wiki_compression: Wiki компресиране на историята
	159	field_spent_on: Дата	232	setting_feeds_limit: Лимит на Feeds
	160	field_identifier: Идентификатор	233	setting_autofetch_changesets: Автоматично обработване на ревизиите
	161	field_is_filter: Използва се за филтър	234	setting_sys_api_enabled: Разрешаване на WS за управление
	162	field_issue_to_id: Свързана задача	235	setting_commit_ref_keywords: Отбелязващи ключови думи
	163	field_delay: Отместване	236	setting_commit_fix_keywords: Приключващи ключови думи
	164	field_assignable: Възможно е възлагане на задачи за тази роля	237	setting_autologin: Автоматичен вход
	165	field_redirect_existing_links: Пренасочване на съществуващи линкове	238	setting_date_format: Формат на датата
	166	field_estimated_hours: Изчислено време	239	setting_cross_project_issue_relations: Релации на задачи между проекти
	167	field_default_value: Стойност по подразбиране	240
	168		241	label_user: Потребител
	169	setting_app_title: Заглавие	242	label_user_plural: Потребители
	170	setting_app_subtitle: Описание	243	label_user_new: Нов потребител
	171	setting_welcome_text: Допълнителен текст	244	label_project: Проект
	172	setting_default_language: Език по подразбиране	245	label_project_new: Нов проект
	173	setting_login_required: Изискване за вход в системата	246	label_project_plural: Проекти
	174	setting_self_registration: Регистрация от потребители	247	label_x_projects:
	175	setting_attachment_max_size: Максимална големина на прикачен файл	248	zero: no projects
	176	setting_issues_export_limit: Лимит за експорт на задачи	249	one: 1 project
	177	setting_mail_from: E-mail адрес за емисии	250	other: "{{count}} projects"
	178	setting_host_name: Хост	251	label_project_all: Всички проекти
	179	setting_text_formatting: Форматиране на текста	252	label_project_latest: Последни проекти
	180	setting_wiki_compression: Wiki компресиране на историята	253	label_issue: Задача
	181	setting_feeds_limit: Лимит на Feeds	254	label_issue_new: Нова задача
	182	setting_autofetch_changesets: Автоматично обработване на ревизиите	255	label_issue_plural: Задачи
	183	setting_sys_api_enabled: Разрешаване на WS за управление	256	label_issue_view_all: Всички задачи
	184	setting_commit_ref_keywords: Отбелязващи ключови думи	257	label_document: Документ
	185	setting_commit_fix_keywords: Приключващи ключови думи	258	label_document_new: Нов документ
	186	setting_autologin: Автоматичен вход	259	label_document_plural: Документи
	187	setting_date_format: Формат на датата	260	label_role: Роля
	188	setting_cross_project_issue_relations: Релации на задачи между проекти	261	label_role_plural: Роли
	189		262	label_role_new: Нова роля
	190	label_user: Потребител	263	label_role_and_permissions: Роли и права
	191	label_user_plural: Потребители	264	label_member: Член
	192	label_user_new: Нов ~~потребител~~	265	label_member_new: Нов член
	193	label_project: Проект	266	label_member_plural: Членове
	194	label_project_new: Нов проект	267	label_tracker: Тракер
	195	label_~~project~~_plural: ~~Проект~~и	268	label_tracker_plural: Тракери
	196	label_project_all: Всички проекти	269	label_tracker_new: Нов тракер
	197	label_project_latest: Последни проекти	270	label_workflow: Работен процес
	198	label_issue: Задача	271	label_issue_status: Статус на задача
	199	label_issue_new: Нова задача	272	label_issue_status_plural: Статуси на задачи
	200	label_issue_plural: Задачи	273	label_issue_status_new: Нов статус
	201	label_issue_view_all: Всички задачи	274	label_issue_category: Категория задача
	202	label_document: Документ	275	label_issue_category_plural: Категории задачи
	203	label_document_new: Нов документ	276	label_issue_category_new: Нова категория
	204	label_document_plural: Документи	277	label_custom_field: Потребителско поле
	205	label_role: Роля	278	label_custom_field_plural: Потребителски полета
	206	label_role_plural: Роли	279	label_custom_field_new: Ново потребителско поле
	207	label_role_new: Нова роля	280	label_enumerations: Списъци
	208	label_role_and_permissions: Роли и права	281	label_enumeration_new: Нова стойност
	209	label_member: Член	282	label_information: Информация
	210	label_member_new: Нов член	283	label_information_plural: Информация
	211	label_member_plural: Членове	284	label_please_login: Вход
	212	label_tracker: Тракер	285	label_register: Регистрация
	213	label_tracker_plural: Тракери	286	label_password_lost: Забравена парола
	214	label_tracker_new: Нов тракер	287	label_home: Начало
	215	label_workflow: Работен процес	288	label_my_page: Лична страница
	216	label_issue_status: Статус на задача	289	label_my_account: Профил
	217	label_issue_status_plural: Статуси на задачи	290	label_my_projects: Проекти, в които участвам
	218	label_issue_status_new: Нов статус	291	label_administration: Администрация
	219	label_issue_category: Категория задача	292	label_login: Вход
	220	label_issue_category_plural: Категории задачи	293	label_logout: Изход
	221	label_issue_category_new: Нова категория	294	label_help: Помощ
	222	label_custom_field: Потребителско поле	295	label_reported_issues: Публикувани задачи
	223	label_custom_field_plural: Потребителски полета	296	label_assigned_to_me_issues: Възложени на мен
	224	label_custom_field_new: Ново потребителско поле	297	label_last_login: Последно свързване
	225	label_enumerations: Списъци	298	label_registered_on: Регистрация
	226	label_enumeration_new: Нова стойност	299	label_activity: Дейност
	227	label_information: Информация	300	label_new: Нов
	228	label_information_plural: Информация	301	label_logged_as: Логнат като
	229	label_please_login: Вход	302	label_environment: Среда
	230	label_register: Регистрация	303	label_authentication: Оторизация
	231	label_password_lost: Забравена парола	304	label_auth_source: Начин на оторозация
	232	label_home: Начало	305	label_auth_source_new: Нов начин на оторизация
	233	label_my_page: Лична страница	306	label_auth_source_plural: Начини на оторизация
	234	label_my_account: Профил	307	label_subproject_plural: Подпроекти
	235	label_my_projects: Проекти, в които участвам	308	label_min_max_length: Мин. - Макс. дължина
	236	label_administration: Администрация	309	label_list: Списък
	237	label_login: Вход	310	label_date: Дата
	238	label_logout: Изход	311	label_integer: Целочислен
	239	label_help: Помощ	312	label_boolean: Чекбокс
	240	label_reported_issues: Публикувани задачи	313	label_string: Текст
	241	label_assigned_to_me_issues: Възложени на мен	314	label_text: Дълъг текст
	242	label_last_login: Последно свързване	315	label_attribute: Атрибут
	243	label_last_updates: Последно обновена	316	label_attribute_plural: Атрибути
	244	label_last_updates_plural: %d последно обновени	317	label_download: "{{count}} Download"
	245	label_registered_on: Регистрация	318	label_download_plural: "{{count}} Downloads"
	246	label_activity: Дейност	319	label_no_data: Няма изходни данни
	247	label_new: Нов	320	label_change_status: Промяна на статуса
	248	label_logged_as: Логнат като	321	label_history: История
	249	label_environment: Среда	322	label_attachment: Файл
	250	label_authentication: Оторизация	323	label_attachment_new: Нов файл
	251	label_auth_source: Начин на оторозация	324	label_attachment_delete: Изтриване
	252	label_auth_source_new: Нов начин на оторизация	325	label_attachment_plural: Файлове
	253	label_auth_source_plural: Начини на оторизация	326	label_report: Справка
	254	label_~~subprojec~~t_plural: ~~Подпроект~~и	327	label_report_plural: Справки
	255	label_min_max_length: Мин. - Макс. дължина	328	label_news: Новини
	256	label_list: Списък	329	label_news_new: Добави
	257	label_date: Дата	330	label_news_plural: Новини
	258	label_integer: Целочислен	331	label_news_latest: Последни новини
	259	label_boolean: Чекбокс	332	label_news_view_all: Виж всички
	260	label_string: Текст	333	label_change_log: Изменения
	261	label_text: Дълъг текст	334	label_settings: Настройки
	262	label_attribute: Атрибут	335	label_overview: Общ изглед
	263	label_attribute_plural: Атрибути	336	label_version: Версия
	264	label_download: %d Download	337	label_version_new: Нова версия
	265	label_download_plural: %d Downloads	338	label_version_plural: Версии
	266	label_no_data: Няма изходни данни	339	label_confirmation: Одобрение
	267	label_change_status: Промяна на статуса	340	label_export_to: Експорт към
	268	label_history: История	341	label_read: Read...
	269	label_attachment: Файл	342	label_public_projects: Публични проекти
	270	label_attachment_new: Нов файл	343	label_open_issues: отворена
	271	label_attachment_delete: Изтриване	344	label_open_issues_plural: отворени
	272	label_attachment_plural: Файлове	345	label_closed_issues: затворена
	273	label_report: Справка	346	label_closed_issues_plural: затворени
	274	label_report_plural: Справки	347	label_x_open_issues_abbr_on_total:
	275	label_news: Новини	348	zero: 0 open / {{total}}
	276	label_news_new: Добави	349	one: 1 open / {{total}}
	277	label_news_plural: Новини	350	other: "{{count}} open / {{total}}"
	278	label_news_latest: Последни новини	351	label_x_open_issues_abbr:
	279	label_news_view_all: Виж всички	352	zero: 0 open
	280	label_change_log: Изменения	353	one: 1 open
	281	label_settings: Настройки	354	other: "{{count}} open"
	282	label_overview: Общ изглед	355	label_x_closed_issues_abbr:
	283	label_version: Версия	356	zero: 0 closed
	284	label_version_new: Нова версия	357	one: 1 closed
	285	label_version_plural: Версии	358	other: "{{count}} closed"
	286	label_confirmation: Одобрение	359	label_total: Общо
	287	label_export_to: Експорт към	360	label_permissions: Права
	288	label_read: Read...	361	label_current_status: Текущ статус
	289	label_public_projects: Публични проекти	362	label_new_statuses_allowed: Позволени статуси
	290	label_open_issues: отворена	363	label_all: всички
	291	label_open_issues_plural: отворени	364	label_none: никакви
	292	label_closed_issues: затворена	365	label_next: Следващ
	293	label_closed_issues_plural: затворени	366	label_previous: Предишен
	294	label_total: Общо	367	label_used_by: Използва се от
	295	label_permissions: Права	368	label_details: Детайли
	296	label_current_status: Текущ статус	369	label_add_note: Добавяне на бележка
	297	label_new_statuses_allowed: Позволени статуси	370	label_per_page: На страница
	298	label_all: всички	371	label_calendar: Календар
	299	label_none: никакви	372	label_months_from: месеца от
	300	label_next: Следващ	373	label_gantt: Gantt
	301	label_previous: Предишен	374	label_internal: Вътрешен
	302	label_used_by: Използва се от	375	label_last_changes: "последни {{count}} промени"
	303	label_details: Детайли	376	label_change_view_all: Виж всички промени
	304	label_add_note: Добавяне на бележка	377	label_personalize_page: Персонализиране
	305	label_per_page: На страница	378	label_comment: Коментар
	306	label_calendar: Календар	379	label_comment_plural: Коментари
	307	label_months_from: месеца от	380	label_x_comments:
	308	label_gantt: Gantt	381	zero: no comments
	309	label_internal: Вътрешен	382	one: 1 comment
	310	label_last_changes: последни %d промени	383	other: "{{count}} comments"
	311	label_change_view_all: Виж всички промени	384	label_comment_add: Добавяне на коментар
	312	label_personalize_page: Персонализиране	385	label_comment_added: Добавен коментар
	313	label_comment: Коментар	386	label_comment_delete: Изтриване на коментари
	314	label_comment_plural: Коментари	387	label_query: Потребителска справка
	315	label_comment_add: Добавяне на коментар	388	label_query_plural: Потребителски справки
	316	label_comment_added: Добавен коментар	389	label_query_new: Нова заявка
	317	label_comment_delete: Изтриване на коментари	390	label_filter_add: Добави филтър
	318	label_query: Потребителска справка	391	label_filter_plural: Филтри
	319	label_query_plural: Потребителски справки	392	label_equals: е
	320	label_query_new: Нова заявка	393	label_not_equals: не е
	321	label_filter_add: Добави филтър	394	label_in_less_than: след по-малко от
	322	label_filter_plural: Филтри	395	label_in_more_than: след повече от
	323	label_equals: е	396	label_in: в следващите
	324	label_not_equals: не е	397	label_today: днес
	325	label_in_less_than: след по-малко от	398	label_this_week: тази седмица
	326	label_in_more_than: след повече от	399	label_less_than_ago: преди по-малко от
	327	label_in: в следващите	400	label_more_than_ago: преди повече от
	328	label_today: днес	401	label_ago: преди
	329	label_this_week: тази седмица	402	label_contains: съдържа
	330	label_less_than_ago: преди по-малко от	403	label_not_contains: не съдържа
	331	label_more_than_ago: преди повече от	404	label_day_plural: дни
	332	label_ago: преди	405	label_repository: Хранилище
	333	label_contains: съдържа	406	label_browse: Разглеждане
	334	label_not_contains: не съдържа	407	label_modification: "{{count}} промяна"
	335	label_day_plural: дни	408	label_modification_plural: "{{count}} промени"
	336	label_repository: Хранилище	409	label_revision: Ревизия
	337	label_browse: Разглеждане	410	label_revision_plural: Ревизии
	338	label_modification: %d промяна	411	label_added: добавено
	339	label_modifi~~cation_plural~~: %d промени	412	label_modified: променено
	340	label_revision: Ревизия	413	label_deleted: изтрито
	341	label_revision_plural: Ревизии	414	label_latest_revision: Последна ревизия
	342	label_added: добавено	415	label_latest_revision_plural: Последни ревизии
	343	label_modified: променено	416	label_view_revisions: Виж ревизиите
	344	label_deleted: изтрито	417	label_max_size: Максимална големина
	345	label_latest_revision: Последна ревизия	418	label_sort_highest: Премести най-горе
	346	label_latest_revision_plural: Последни ревизии	419	label_sort_higher: Премести по-горе
	347	label_view_revisions: Виж ревизиите	420	label_sort_lower: Премести по-долу
	348	label_max_size: Максимална големина	421	label_sort_lowest: Премести най-долу
	349	label_on: 'от'	422	label_roadmap: Пътна карта
	350	label_sort_highest: Премести най-горе	423	label_roadmap_due_in: "Излиза след {{value}}"
	351	label_sort_higher: Премести по-горе	424	label_roadmap_overdue: "{{value}} закъснение"
	352	label_sort_lower: Премести по-долу	425	label_roadmap_no_issues: Няма задачи за тази версия
	353	label_sort_lowest: Премести най-долу	426	label_search: Търсене
	354	label_roadmap: Пътна карта	427	label_result_plural: Pезултати
	355	label_roadmap_due_in: Излиза след %s	428	label_all_words: Всички думи
	356	label_roadmap_overdue: %s закъснение	429	label_wiki: Wiki
	357	label_roadmap_no_issues: Няма задачи за тази версия	430	label_wiki_edit: Wiki редакция
	358	label_search: Търсене	431	label_wiki_edit_plural: Wiki редакции
	359	label_result_plural: Pезултати	432	label_wiki_page: Wiki page
	360	label_all_words: Всички думи	433	label_wiki_page_plural: Wiki pages
	361	label_wiki: Wiki	434	label_index_by_title: Индекс
	362	label_wiki_edit: Wiki редакция	435	label_index_by_date: Индекс по дата
	363	label_wiki_edit_plural: Wiki редакции	436	label_current_version: Текуща версия
	364	label_wiki_page: Wiki page	437	label_preview: Преглед
	365	label_~~wiki_page~~_plural: ~~Wiki page~~s	438	label_feed_plural: Feeds
	366	label_index_by_title: Индекс	439	label_changes_details: Подробни промени
	367	label_index_by_date: Индекс по дата	440	label_issue_tracking: Тракинг
	368	label_current_version: Текуща версия	441	label_spent_time: Отделено време
	369	label_preview: Преглед	442	label_f_hour: "{{value}} час"
	370	label_feed_plural: Feeds	443	label_f_hour_plural: "{{value}} часа"
	371	label_changes_details: Подробни промени	444	label_time_tracking: Отделяне на време
	372	label_issue_tracking: Тракинг	445	label_change_plural: Промени
	373	label_spent_time: Отделено време	446	label_statistics: Статистики
	374	label_f_hour: %.2f час	447	label_commits_per_month: Ревизии по месеци
	375	label_f_hour_plural: %.2f часа	448	label_commits_per_author: Ревизии по автор
	376	label_time_tracking: Отделяне на време	449	label_view_diff: Виж разликите
	377	label_change_plural: Промени	450	label_diff_inline: хоризонтално
	378	label_statistics: Статистики	451	label_diff_side_by_side: вертикално
	379	label_commits_per_month: Ревизии по месеци	452	label_options: Опции
	380	label_commits_per_author: Ревизии по автор	453	label_copy_workflow_from: Копирай работния процес от
	381	label_view_diff: Виж разликите	454	label_permissions_report: Справка за права
	382	label_diff_inline: хоризонтално	455	label_watched_issues: Наблюдавани задачи
	383	label_diff_side_by_side: вертикално	456	label_related_issues: Свързани задачи
	384	label_options: Опции	457	label_applied_status: Промени статуса на
	385	label_copy_workflow_from: Копирай работния процес от	458	label_loading: Зареждане...
	386	label_permissions_report: Справка за права	459	label_relation_new: Нова релация
	387	label_watched_issues: Наблюдавани задачи	460	label_relation_delete: Изтриване на релация
	388	label_relate~~d_issues~~: ~~Свързани~~ ~~задачи~~	461	label_relates_to: свързана със
	389	label_applied_status: Промени статуса на	462	label_duplicates: дублира
	390	label_loading: Зареждане...	463	label_blocks: блокира
	391	label_relation_new: Нова релация	464	label_blocked_by: блокирана от
	392	label_relation_delete: Изтриване на релация	465	label_precedes: предшества
	393	label_relates_to: свързана със	466	label_follows: изпълнява се след
	394	label_duplicates: дублира	467	label_end_to_start: end to start
	395	label_blocks: блокира	468	label_end_to_end: end to end
	396	label_blocked_by: блокирана от	469	label_start_to_start: start to start
	397	label_precedes: предшества	470	label_start_to_end: start to end
	398	label_follows: изпълнява се след	471	label_stay_logged_in: Запомни ме
	399	label_end_to_start: end to start	472	label_disabled: забранено
	400	label_end_to_end: end to end	473	label_show_completed_versions: Показване на реализирани версии
	401	label_start_to_start: start to start	474	label_me: аз
	402	label_start_to_end: start to end	475	label_board: Форум
	403	label_stay_logged_in: Запомни ме	476	label_board_new: Нов форум
	404	label_disabled: забранено	477	label_board_plural: Форуми
	405	label_show_completed_versions: Показване на реализирани версии	478	label_topic_plural: Теми
	406	label_me: аз	479	label_message_plural: Съобщения
	407	label_board: Форум	480	label_message_last: Последно съобщение
	408	label_~~board~~_new: Нов ~~форум~~	481	label_message_new: Нова тема
	409	label_~~board~~_plural: ~~Форум~~и	482	label_reply_plural: Отговори
	410	label_topic_plural: Теми	483	label_send_information: Изпращане на информацията до потребителя
	411	label_message_plural: Съобщения	484	label_year: Година
	412	label_message_last: Последно съобщение	485	label_month: Месец
	413	label_message_new: Нова тема	486	label_week: Седмица
	414	label_reply_plural: Отговори	487	label_date_from: От
	415	label_send_information: Изпращане на информацията до потребителя	488	label_date_to: До
	416	label_year: Година	489	label_language_based: В зависимост от езика
	417	label_month: Месец	490	label_sort_by: "Сортиране по {{value}}"
	418	label_week: Седмица	491	label_send_test_email: Изпращане на тестов e-mail
	419	label_date_from: От	492	label_feeds_access_key_created_on: "{{value}} от създаването на RSS ключа"
	420	label_date_to: До	493	label_module_plural: Модули
	421	label_language_based: В зависимост от езика	494	label_added_time_by: "Публикувана от {{author}} преди {{age}}"
	422	label_sort_by: Сортиране по %s	495	label_updated_time: "Обновена преди {{value}}"
	423	label_send_test_email: Изпращане на тестов e-mail	496	label_jump_to_a_project: Проект...
	424	label_feeds_access_key_created_on: %s от създаването на RSS ключа	497
	425	label_module_plural: Модули	498	button_login: Вход
	426	label_added_time_by: Публикувана от %s преди %s	499	button_submit: Прикачване
	427	label_updated_time: Обновена преди %s	500	button_save: Запис
	428	label_jump_to_a_project: Проект...	501	button_check_all: Избор на всички
	429		502	button_uncheck_all: Изчистване на всички
	430	button_login: Вход	503	button_delete: Изтриване
	431	button_submit: Прикачване	504	button_create: Създаване
	432	button_save: Запис	505	button_test: Тест
	433	button_check_all: Избор на всички	506	button_edit: Редакция
	434	button_uncheck_all: Изчистване на всички	507	button_add: Добавяне
	435	button_delete: Изтриване	508	button_change: Промяна
	436	button_create: Създаване	509	button_apply: Приложи
	437	button_~~test~~: ~~Тест~~	510	button_clear: Изчисти
	438	button_edit: Редакция	511	button_lock: Заключване
	439	button_add: Добавяне	512	button_unlock: Отключване
	440	button_change: Промяна	513	button_download: Download
	441	button_apply: Приложи	514	button_list: Списък
	442	button_clear: Изчисти	515	button_view: Преглед
	443	button_lock: Заключване	516	button_move: Преместване
	444	button_unlock: Отключване	517	button_back: Назад
	445	button_download: Download	518	button_cancel: Отказ
	446	button_list: Списък	519	button_activate: Активация
	447	button_view: Преглед	520	button_sort: Сортиране
	448	button_move: Преместване	521	button_log_time: Отделяне на време
	449	button_back: Назад	522	button_rollback: Върни се към тази ревизия
	450	button_cancel: Отказ	523	button_watch: Наблюдавай
	451	button_activate: Активация	524	button_unwatch: Спри наблюдението
	452	button_sort: Сортиране	525	button_reply: Отговор
	453	button_log_time: Отделяне на време	526	button_archive: Архивиране
	454	button_rollback: Върни се към тази ревизия	527	button_unarchive: Разархивиране
	455	button_watch: Наблюдавай	528	button_reset: Генериране наново
	456	button_unwatch: Спри наблюдението	529	button_rename: Преименуване
	457	button_reply: Отговор	530
	458	button_archive: Архивиране	531	status_active: активен
	459	button_unarchive: Разархивиране	532	status_registered: регистриран
	460	button_reset: Генериране наново	533	status_locked: заключен
	461	button_rename: Преименуване	534
	462		535	text_select_mail_notifications: Изберете събития за изпращане на e-mail.
	463	status_active: активен	536	text_regexp_info: пр. ^[A-Z0-9]+$
	464	status_registered: регистриран	537	text_min_max_length_info: 0 - без ограничения
	465	status_locked: заключен	538	text_project_destroy_confirmation: Сигурни ли сте, че искате да изтриете проекта и данните в него?
	466		539	text_workflow_edit: Изберете роля и тракер за да редактирате работния процес
	467	text_select_mail_notifications: Изберете събития за изпращане на e-mail.	540	text_are_you_sure: Сигурни ли сте?
	468	text_regexp_info: пр. ^[A-Z0-9]+$	541	text_journal_changed: "промяна от {{old}} на {{new}}"
	469	text_min_max_length_info: 0 - без ограничения	542	text_journal_set_to: "установено на {{value}}"
	470	text_project_destroy_confirmation: Сигурни ли сте, че искате да изтриете проекта и данните в него?	543	text_journal_deleted: изтрито
	471	text_workflow_edit: Изберете роля и тракер за да редактирате работния процес	544	text_tip_task_begin_day: задача започваща този ден
	472	text_are_you_sure: Сигурни ли сте?	545	text_tip_task_end_day: задача завършваща този ден
	473	text_journal_changed: промяна от %s на %s	546	text_tip_task_begin_end_day: задача започваща и завършваща този ден
	474	text_journal_set_to: установено на %s	547	text_project_identifier_info: 'Позволени са малки букви (a-z), цифри и тирета.<br />Невъзможна промяна след запис.'
	475	text_journal_deleted: изтрито	548	text_caracters_maximum: "До {{count}} символа."
	476	text_tip_task_begin_day: задача започваща този ден	549	text_length_between: "От {{min}} до {{max}} символа."
	477	text_tip_task_end_day: задача завършваща този ден	550	text_tracker_no_workflow: Няма дефиниран работен процес за този тракер
	478	text_tip_task_begin_end_day: задача започваща и завършваща този ден	551	text_unallowed_characters: Непозволени символи
	479	text_project_identifier_info: 'Позволени са малки букви (a-z), цифри и тирета.<br />Невъзможна промяна след запис.'	552	text_comma_separated: Позволено е изброяване (с разделител запетая).
	480	text_caracters_maximum: До %d символа.	553	text_issues_ref_in_commit_messages: Отбелязване и приключване на задачи от ревизии
	481	text_length_between: От %d до %d символа.	554	text_issue_added: "Публикувана е нова задача с номер {{id}} (от {{author}})."
	482	text_tracker_no_workflow: Няма дефиниран работен процес за този тракер	555	text_issue_updated: "Задача {{id}} е обновена (от {{author}})."
	483	text_unallowed_characters: Непозволени символи	556	text_wiki_destroy_confirmation: Сигурни ли сте, че искате да изтриете това Wiki и цялото му съдържание?
	484	text_comma_separated: Позволено е изброяване (с разделител запетая).	557	text_issue_category_destroy_question: "Има задачи ({{count}}) обвързани с тази категория. Какво ще изберете?"
	485	text_issues_ref_in_commit_messages: Отбелязване и приключване на задачи от ревизии	558	text_issue_category_destroy_assignments: Премахване на връзките с категорията
	486	text_issue_added: Публикувана е нова задача с номер %s (от %s).	559	text_issue_category_reassign_to: Преобвързване с категория
	487	text_issue_updated: Задача %s е обновена (от %s).	560
	488	text_wiki_destroy_confirmation: Сигурни ли сте, че искате да изтриете това Wiki и цялото му съдържание?	561	default_role_manager: Мениджър
	489	text_issue_category_destroy_question: Има задачи (%d) обвързани с тази категория. Какво ще изберете?	562	default_role_developper: Разработчик
	490	text_issue_category_destroy_assignments: Премахване на връзките с категорията	563	default_role_reporter: Публикуващ
	491	text_issue_category_reassign_to: Преобвързване с категория	564	default_tracker_bug: Бъг
	492		565	default_tracker_feature: Функционалност
	493	default_role_manager: Мениджър	566	default_tracker_support: Поддръжка
	494	default_role_developper: Разработчик	567	default_issue_status_new: Нова
	495	default_role_reporter: Публикуващ	568	default_issue_status_assigned: Възложена
	496	default_tracker_bug: Бъг	569	default_issue_status_resolved: Приключена
	497	default_tracker_feature: Функционалност	570	default_issue_status_feedback: Обратна връзка
	498	default_tracker_support: Поддръжка	571	default_issue_status_closed: Затворена
	499	default_issue_status_~~new~~: ~~Нов~~а	572	default_issue_status_rejected: Отхвърлена
	500	default_issue_status_assigned: Възложена	573	default_doc_category_user: Документация за потребителя
	501	default_issue_status_resolved: Приключена	574	default_doc_category_tech: Техническа документация
	502	default_issue_status_feedback: Обратна връзка	575	default_priority_low: Нисък
	503	default_issue_status_closed: Затворена	576	default_priority_normal: Нормален
	504	default_issue_status_rejected: Отхвърлена	577	default_priority_high: Висок
	505	default_doc_category_user: Документация за потребителя	578	default_priority_urgent: Спешен
	506	default_doc_category_tech: Техническа документация	579	default_priority_immediate: Веднага
	507	default_priority_low: Нисък	580	default_activity_design: Дизайн
	508	default_priority_normal: Нормален	581	default_activity_development: Разработка
	509	default_priority_high: Висок	582
	510	default_priority_urgent: Спешен	583	enumeration_issue_priorities: Приоритети на задачи
	511	default_priority_immediate: Веднага	584	enumeration_doc_categories: Категории документи
	512	default_activity_design: Дизайн	585	enumeration_activities: Дейности (time tracking)
	513	default_activity_development: Разработка	586	label_file_plural: Файлове
	514		587	label_changeset_plural: Ревизии
	515	enumeration_issue_priorities: Приоритети на задачи	588	field_column_names: Колони
	516	enumeration_doc_categories: Категории документи	589	label_default_columns: По подразбиране
	517	enumeration_activities: Дейности (time tracking)	590	setting_issue_list_default_columns: Показвани колони по подразбиране
	518	label_file_plural: Файлове	591	setting_repositories_encodings: Кодови таблици
	519	label_changeset_plural: Ревизии	592	notice_no_issue_selected: "Няма избрани задачи."
	520	field_column_names: Колони	593	label_bulk_edit_selected_issues: Редактиране на задачи
	521	label_default_columns: По подразбиране	594	label_no_change_option: (Без промяна)
	522	setting_issue_list_default_columns: Показвани колони по подразбиране	595	notice_failed_to_save_issues: "Неуспешен запис на {{count}} задачи от {{total}} избрани: {{ids}}."
	523	setting_repositories_encodings: Кодови таблици	596	label_theme: Тема
	524	notice_no_issue_selected: "Няма избрани задачи."	597	label_default: По подразбиране
	525	label_bulk_edit_selected_issues: Редактиране на задачи	598	label_search_titles_only: Само в заглавията
	526	label_no_change_option: (Без промяна)	599	label_nobody: никой
	527	notice_failed_to_save_issues: "Неуспешен запис на %d задачи от %d избрани: %s."	600	button_change_password: Промяна на парола
	528	label_theme: Тема	601	text_user_mail_option: "За неизбраните проекти, ще получавате известия само за наблюдавани дейности или в които участвате (т.е. автор или назначени на мен)."
	529	label_default: По подразбиране	602	label_user_mail_option_selected: "За всички събития само в избраните проекти..."
	530	label_search_titles_only: Само в заглавията	603	label_user_mail_option_all: "За всяко събитие в проектите, в които участвам"
	531	label_nobody: никой	604	label_user_mail_option_none: "Само за наблюдавани или в които участвам (автор или назначени на мен)"
	532	button_change_password: Промяна на парола	605	setting_emails_footer: Подтекст за e-mail
	533	text_user_mail_option: "За неизбраните проекти, ще получавате известия само за наблюдавани дейности или в които участвате (т.е. автор или назначени на мен)."	606	label_float: Дробно
	534	label_user_mail_option_selected: "За всички събития само в избраните проекти..."	607	button_copy: Копиране
	535	label_user_mail_option_all: "За всяко събитие в проектите, в които участвам"	608	mail_body_account_information_external: "Можете да използвате вашия {{value}} профил за вход."
	536	label_user_mail_option_none: "Само за наблюдавани или в които участвам (автор или назначени на мен)"	609	mail_body_account_information: Информацията за профила ви
	537	setting_emails_footer: Подтекст за e-mail	610	setting_protocol: Протокол
	538	label_float: Дробно	611	label_user_mail_no_self_notified: "Не искам известия за извършени от мен промени"
	539	button_copy: Копиране	612	setting_time_format: Формат на часа
	540	mail_body_account_information_external: Можете да използвате вашия "%s" профил за вход.	613	label_registration_activation_by_email: активиране на профила по email
	541	mail_body_account_information: Информацията за профила ви	614	mail_subject_account_activation_request: "Заявка за активиране на профил в {{value}}"
	542	setting_protocol: Протокол	615	mail_body_account_activation_request: "Има новорегистриран потребител ({{value}}), очакващ вашето одобрение:'"
	543	label_user_mail_no_self_notified: "Не искам известия за извършени от мен промени"	616	label_registration_automatic_activation: автоматично активиране
	544	setting_time_format: Формат на часа	617	label_registration_manual_activation: ръчно активиране
	545	label_registration_activation_by_email: активиране на профила по email	618	notice_account_pending: "Профилът Ви е създаден и очаква одобрение от администратор."
	546	mail_subject_account_activation_request: Заявка за активиране на профил в %s	619	field_time_zone: Часова зона
	547	mail_body_account_activation_request: 'Има новорегистриран потребител (%s), очакващ вашето одобрение:'	620	text_caracters_minimum: "Минимум {{count}} символа."
	548	label_registration_automatic_activation: автоматично активиране	621	setting_bcc_recipients: Получатели на скрито копие (bcc)
	549	label_registration_manual_activation: ръчно активиране	622	button_annotate: Анотация
	550	notice_account_pending: "Профилът Ви е създаден и очаква одобрение от администратор."	623	label_issues_by: "Задачи по {{value}}"
	551	field_time_zone: Часова зона	624	field_searchable: С възможност за търсене
	552	text_caracters_minimum: Минимум %d символа.	625	label_display_per_page: "На страница по: {{value}}'"
	553	setting_bcc_recipients: Получатели на скрито копие (bcc)	626	setting_per_page_options: Опции за страниране
	554	button_annotate: Анотация	627	label_age: Възраст
	555	label_issues_by: Задачи по %s	628	notice_default_data_loaded: Примерната информацията е успешно заредена.
	556	field_searchable: С възможност за търсене	629	text_load_default_configuration: Зареждане на примерна информация
	557	label_display_per_page: 'На страница по: %s'	630	text_no_configuration_data: "Все още не са конфигурирани Роли, тракери, статуси на задачи и работен процес.\nСтрого се препоръчва зареждането на примерната информация. Веднъж заредена ще имате възможност да я редактирате."
	558	setting_per_page_options: Опции за страниране	631	error_can_t_load_default_data: "Грешка при зареждане на примерната информация: {{value}}"
	559	label_age: Възраст	632	button_update: Обновяване
	560	notice_default_data_loaded: Примерната информацията е успешно заредена.	633	label_change_properties: Промяна на настройки
	561	text_load_default_configuration: Зареждане на примерна информация	634	label_general: Основни
	562	text_no_configuration_data: "Все още не са конфигурирани Роли, тракери, статуси на задачи и работен процес.\nСтрого се препоръчва зареждането на примерната информация. Веднъж заредена ще имате възможност да я редактирате."	635	label_repository_plural: Хранилища
	563	error_can_t_load_default_data: "Грешка при зареждане на примерната информация: %s"	636	label_associated_revisions: Асоциирани ревизии
	564	button_update: Обновяване	637	setting_user_format: Потребителски формат
	565	label_change_properties: Промяна на настройки	638	text_status_changed_by_changeset: "Приложено с ревизия {{value}}."
	566	label_general: Основни	639	label_more: Още
	567	label_repository_plural: Хранилища	640	text_issues_destroy_confirmation: 'Сигурни ли сте, че искате да изтриете избраните задачи?'
	568	label_associated_revisions: Асоциирани ревизии	641	label_scm: SCM (Система за контрол на кода)
	569	setting_user_format: Потребителски формат	642	text_select_project_modules: 'Изберете активните модули за този проект:'
	570	text_status_changed_by_changeset: Приложено с ревизия %s.	643	label_issue_added: Добавена задача
	571	label_more: Още	644	label_issue_updated: Обновена задача
	572	text_issues_destroy_confirmation: 'Сигурни ли сте, че искате да изтриете избраните задачи?'	645	label_document_added: Добавен документ
	573	label_scm: SCM (Система за контрол на кода)	646	label_message_posted: Добавено съобщение
	574	text_select_project_modules: 'Изберете активните модули за този проект:'	647	label_file_added: Добавен файл
	575	label_~~issue~~_added: Добавена ~~задач~~а	648	label_news_added: Добавена новина
	576	label_issue_updated: Обновена задача	649	project_module_boards: Форуми
	577	label_document_added: Добавен документ	650	project_module_issue_tracking: Тракинг
	578	label_message_posted: Добавено съобщение	651	project_module_wiki: Wiki
	579	label_file_added: Добавен файл	652	project_module_files: Файлове
	580	label_news_added: Добавена новина	653	project_module_documents: Документи
	581	project_module_~~boards~~: ~~Форуми~~	654	project_module_repository: Хранилище
	582	project_module_issue_tracking: Тракинг	655	project_module_news: Новини
	583	project_module_wiki: Wiki	656	project_module_time_tracking: Отделяне на време
	584	project_module_files: Файлове	657	text_file_repository_writable: Възможност за писане в хранилището с файлове
	585	project_module_documents: Документи	658	text_default_administrator_account_changed: Сменен фабричния администраторски профил
	586	project_module_repository: Хранилище	659	text_rmagick_available: Наличен RMagick (по избор)
	587	project_module_news: Новини	660	button_configure: Конфигуриране
	588	project_module_time_tracking: Отделяне на време	661	label_plugins: Плъгини
	589	text_file_repository_writable: Възможност за писане в хранилището с файлове	662	label_ldap_authentication: LDAP оторизация
	590	text_default_administrator_account_changed: Сменен фабричния администраторски профил	663	label_downloads_abbr: D/L
	591	text_rmagick_available: Наличен RMagick (по избор)	664	label_this_month: текущия месец
	592	button_configure: Конфигуриране	665	label_last_n_days: "последните {{count}} дни"
	593	label_plugins: Плъгини	666	label_all_time: всички
	594	label_ldap_authentication: LDAP оторизация	667	label_this_year: текущата година
	595	label_downloads_abbr: D/L	668	label_date_range: Период
	596	label_this_month: текущия месец	669	label_last_week: последната седмица
	597	label_last_n_days: последните %d дни	670	label_yesterday: вчера
	598	label_all_time: всички	671	label_last_month: последния месец
	599	label_this_year: текущата година	672	label_add_another_file: Добавяне на друг файл
	600	label_date_range: Период	673	label_optional_description: Незадължително описание
	601	label_last_week: последната седмица	674	text_destroy_time_entries_question: %.02f часа са отделени на задачите, които искате да изтриете. Какво избирате?
	602	label_yesterday: вчера	675	error_issue_not_found_in_project: 'Задачата не е намерена или не принадлежи на този проект'
	603	label_last_month: последния месец	676	text_assign_time_entries_to_project: Прехвърляне на отделеното време към проект
	604	label_add_another_file: Добавяне на друг файл	677	text_destroy_time_entries: Изтриване на отделеното време
	605	label_optional_description: Незадължително описание	678	text_reassign_time_entries: 'Прехвърляне на отделеното време към задача:'
	606	text_destroy_time_entries_question: %.02f часа са отделени на задачите, които искате да изтриете. Какво избирате?	679	setting_activity_days_default: Брой дни показвани на таб Дейност
	607	error_issue_not_found_in_project: 'Задачата не е намерена или не принадлежи на този проект'	680	label_chronological_order: Хронологичен ред
	608	text_assign_time_entries_to_project: Прехвърляне на отделеното време към проект	681	field_comments_sorting: Сортиране на коментарите
	609	text_destroy_time_entries: Изтриване на отделеното време	682	label_reverse_chronological_order: Обратен хронологичен ред
	610	text_reassign_time_entries: 'Прехвърляне на отделеното време към задача:'	683	label_preferences: Предпочитания
	611	setting_activity_days_default: Брой дни показвани на таб Дейност	684	setting_display_subprojects_issues: Показване на подпроектите в проектите по подразбиране
	612	label_chronological_order: Хронологичен ред	685	label_overall_activity: Цялостна дейност
	613	field_comments_sorting: Сортиране на коментарите	686	setting_default_projects_public: Новите проекти са публични по подразбиране
	614	label_reverse_chronological_order: Обратен хронологичен ред	687	error_scm_annotate: "Обектът не съществува или не може да бъде анотиран."
	615	label_preferences: Предпочитания	688	label_planning: Планиране
	616	setting_display_subprojects_issues: Показване на подпроектите в проектите по подразбиране	689	text_subprojects_destroy_warning: "Its subproject(s): {{value}} will be also deleted.'"
	617	label_overall_activity: Цялостна дейност	690	label_and_its_subprojects: "{{value}} and its subprojects"
	618	setting_default_projects_public: Новите проекти са публични по подразбиране	691	mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:"
	619	error_scm_annotate: "Обектът не съществува или не може да бъде анотиран."	692	mail_subject_reminder: "{{count}} issue(s) due in the next days"
	620	label_planning: Планиране	693	text_user_wrote: "{{value}} wrote:'"
	621	text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'	694	label_duplicated_by: duplicated by
	622	label_and_its_subprojects: %s and its subprojects	695	setting_enabled_scm: Enabled SCM
	623	mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"	696	text_enumeration_category_reassign_to: 'Reassign them to this value:'
	624	mail_subject_reminder: "%d issue(s) due in the next days"	697	text_enumeration_destroy_question: "{{count}} objects are assigned to this value.'"
	625	text_user_wrote: '%s wrote:'	698	label_incoming_emails: Incoming emails
	626	label_duplicated_by: duplicated by	699	label_generate_key: Generate a key
	627	setting_enabled_scm: Enabled SCM	700	setting_mail_handler_api_enabled: Enable WS for incoming emails
	628	text_enumeration_category_reassign_to: 'Reassign them to this value:'	701	setting_mail_handler_api_key: API key
	629	text_enumeration_destroy_question: '%d objects are assigned to this value.'	702	text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
	630	label_incoming_emails: Incoming emails	703	field_parent_title: Parent page
	631	label_generate_key: Generate a key	704	label_issue_watchers: Watchers
	632	setting_mail_handler_api_enabled: Enable WS for incoming emails	705	setting_commit_logs_encoding: Commit messages encoding
	633	setting_mail_handler_api_key: API key	706	button_quote: Quote
	634	text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."	707	setting_sequential_project_identifiers: Generate sequential project identifiers
	635	field_parent_title: Parent page	708	notice_unable_delete_version: Unable to delete version
	636	label_issue_watchers: Watchers	709	label_renamed: renamed
	637	setting_commit_logs_encoding: Commit messages encoding	710	label_copied: copied
	638	button_quote: Quote	711	setting_plain_text_mail: plain text only (no HTML)
	639	setting_sequential_project_identifiers: Generate sequential project identifiers	712	permission_view_files: View files
	640	notice_unable_delete_version: Unable to delete version	713	permission_edit_issues: Edit issues
	641	label_renamed: renamed	714	permission_edit_own_time_entries: Edit own time logs
	642	label_copied: copied	715	permission_manage_public_queries: Manage public queries
	643	setting_plain_text_mail: plain text only (no HTML)	716	permission_add_issues: Add issues
	644	permission_view_files: View files	717	permission_log_time: Log spent time
	645	permission_edit_issues: Edit issues	718	permission_view_changesets: View changesets
	646	permission_~~edit_own~~_time_entries: ~~Edit~~ ~~own~~ time ~~logs~~	719	permission_view_time_entries: View spent time
	647	permission_manage_~~public_querie~~s: Manage ~~public querie~~s	720	permission_manage_versions: Manage versions
	648	permission_add_issues: Add issues	721	permission_manage_wiki: Manage wiki
	649	permission_log_time: Log spent time	722	permission_manage_categories: Manage issue categories
	650	permission_view_changesets: View changesets	723	permission_protect_wiki_pages: Protect wiki pages
	651	permission_view_time_entries: View spent time	724	permission_comment_news: Comment news
	652	permission_manage_versions: Manage versions	725	permission_delete_messages: Delete messages
	653	permission_manage_wiki: Manage wiki	726	permission_select_project_modules: Select project modules
	654	permission_manage_~~categorie~~s: Manage ~~issue categorie~~s	727	permission_manage_documents: Manage documents
	655	permission_~~protec~~t_wiki_pages: ~~Protec~~t wiki pages	728	permission_edit_wiki_pages: Edit wiki pages
	656	permission_comment_news: Comment news	729	permission_add_issue_watchers: Add watchers
	657	permission_delete_messages: Delete messages	730	permission_view_gantt: View gantt chart
	658	permission_select_project_modules: Select project modules	731	permission_move_issues: Move issues
	659	permission_manage_~~document~~s: Manage ~~document~~s	732	permission_manage_issue_relations: Manage issue relations
	660	permission_~~edit~~_wiki_pages: ~~Edit~~ wiki pages	733	permission_delete_wiki_pages: Delete wiki pages
	661	permission_add_issue_watchers: Add watchers	734	permission_manage_boards: Manage boards
	662	permission_view_gantt: View gantt chart	735	permission_delete_wiki_pages_attachments: Delete attachments
	663	permission_move_issues: Move issues	736	permission_view_wiki_edits: View wiki history
	664	permission_manage_issue_relations: Manage issue relations	737	permission_add_messages: Post messages
	665	permission_delete_wiki_pages: Delete wiki pages	738	permission_view_messages: View messages
	666	permission_manage_~~board~~s: Manage ~~board~~s	739	permission_manage_files: Manage files
	667	permission_delete_wiki_pages_attachments: Delete attachments	740	permission_edit_issue_notes: Edit notes
	668	permission_view_wiki_edits: View wiki history	741	permission_manage_news: Manage news
	669	permission_add_messages: Post messages	742	permission_view_calendar: View calendrier
	670	permission_view_messages: View messages	743	permission_manage_members: Manage members
	671	permission_manage_files: Manage files	744	permission_edit_messages: Edit messages
	672	permission_edit_issu~~e_not~~es: ~~Edit~~ ~~not~~es	745	permission_delete_issues: Delete issues
	673	permission_manage_news: Manage news	746	permission_view_issue_watchers: View watchers list
	674	permission_view_calendar: View calendrier	747	permission_manage_repository: Manage repository
	675	permission_manage_members: Manage members	748	permission_commit_access: Commit access
	676	permission_edit_messages: Edit messages	749	permission_browse_repository: Browse repository
	677	permission_delete_issues: Delete issues	750	permission_view_documents: View documents
	678	permission_view_issue_watchers: View watchers list	751	permission_edit_project: Edit project
	679	permission_manage_repository: Manage repository	752	permission_add_issue_notes: Add notes
	680	permission_commit_access: Commit access	753	permission_save_queries: Save queries
	681	permission_browse_repository: Browse repository	754	permission_view_wiki_pages: View wiki
	682	permission_view_documents: View documents	755	permission_rename_wiki_pages: Rename wiki pages
	683	permission_edit_~~project~~: Edit ~~projec~~t	756	permission_edit_time_entries: Edit time logs
	684	permission_~~add~~_issue_notes: ~~Add~~ notes	757	permission_edit_own_issue_notes: Edit own notes
	685	permission_save_queries: Save queries	758	setting_gravatar_enabled: Use Gravatar user icons
	686	permission_view_wiki_pages: View wiki	759	label_example: Example
	687	permission_rename_wiki_pages: Rename wiki pages	760	text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
	688	permission_edit_~~time_entri~~es: Edit ~~time~~ ~~log~~s	761	permission_edit_own_messages: Edit own messages
	689	permission_~~edit_own_issue_not~~es: ~~Edit~~ own ~~not~~es	762	permission_delete_own_messages: Delete own messages
	690	setting_gravatar_enabled: Use Gravatar user icons	763	label_user_activity: "{{value}}'s activity"
	691	label_example: Example	764	label_updated_time_by: "Updated by {{author}} {{age}} ago"
	692	text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."	765	text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
	693	permission_edit_own_messages: Edit own messages	766	setting_diff_max_lines_displayed: Max number of diff lines displayed
	694	permission_delete_own_messages: Delete own messages	767	text_plugin_assets_writable: Plugin assets directory writable
	695	label_user_activity: "%s's activity"	768	warning_attachments_not_saved: "{{count}} file(s) could not be saved."
	696	label_updated_time_by: Updated by %s %s ago	769	button_create_and_continue: Create and continue
	697	text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'	770	text_custom_field_possible_values_info: 'One line for each value'
	698	setting_diff_max_lines_displayed: Max number of diff lines displayed	771	label_display: Display
	699	text_plugin_assets_writable: Plugin assets directory writable	772	field_editable: Editable
	700	warning_attachments_not_saved: "%d file(s) could not be saved."	773	setting_repository_log_display_limit: Maximum number of revisions displayed on file log
	701	button_create_and_continue: Create and continue
	702	text_custom_field_possible_values_info: 'One line for each value'
	703	label_display: Display
	704	field_editable: Editable
	705	setting_repository_log_display_limit: Maximum number of revisions displayed on file log
	706	field_identity_url: OpenID URL
	707	setting_openid: Allow OpenID login and registration
	708	label_login_with_open_id_option: or login with OpenID
	709	field_watcher: Watcher

config/locales/ca.yml ~~lang/ca.yml~~ renamed +772 -708

This diff has been collapsed as it changes many lines, (1480 lines changed) Show them Hide them
	@@ -1,710 +1,774
	1	_gloc_rule_default: '\|n\| n==1 ? "" : "_plural" '	1	ca:
			2	date:
			3	formats:
			4	# Use the strftime parameters for formats.
			5	# When no format has been given, it uses default.
			6	# You can provide other formats here if you like!
			7	default: "%Y-%m-%d"
			8	short: "%b %d"
			9	long: "%B %d, %Y"
			10
			11	day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
			12	abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
			13
			14	# Don't forget the nil at the beginning; there's no such thing as a 0th month
			15	month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
			16	abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
			17	# Used in date_select and datime_select.
			18	order: [ :year, :month, :day ]
	2		19
	3	actionview_datehelper_select_day_prefix:	20	time:
	4	actionview_datehelper_select_month_names: Gener,Febrer,Març,Abril,Maig,Juny,Juliol,Agost,Setembre,Octubre,Novembre,Desembre	21	formats:
	5	actionview_datehelper_select_month_names_abbr: Gen,Feb,Mar,Abr,Mai,Jun,Jul,Ago,Set,Oct,Nov,Dec	22	default: "%a, %d %b %Y %H:%M:%S %z"
	6	actionview_datehelper_select_month_prefix:	23	short: "%d %b %H:%M"
	7	actionview_datehelper_select_year_prefix:	24	long: "%B %d, %Y %H:%M"
	8	actionview_datehelper_time_in_words_day: 1 dia	25	am: "am"
	9	actionview_datehelper_time_in_words_day_plural: %d dies	26	pm: "pm"
	10	actionview_datehelper_time_in_words_hour_about: aproximadament una hora	27
	11	actionview_datehelper_time_in_words_hour_about_plural: aproximadament %d hores	28	datetime:
	12	actionview_datehelper_time_in_words_hour_about_single: aproximadament una hora	29	distance_in_words:
	13	actionview_datehelper_time_in_words_minute: 1 minut	30	half_a_minute: "half a minute"
	14	actionview_datehelper_time_in_words_minute_half: mig minut	31	less_than_x_seconds:
	15	actionview_datehelper_time_in_words_minute_less_than: "menys d'un minut"	32	one: "less than 1 second"
	16	actionview_datehelper_time_in_words_minute_plural: %d minuts	33	other: "less than {{count}} seconds"
	17	actionview_datehelper_time_in_words_minute_single: 1 minut	34	x_seconds:
	18	actionview_datehelper_time_in_words_second_less_than: "menys d'un segon"	35	one: "1 second"
	19	actionview_datehelper_time_in_words_second_less_than_plural: menys de %d segons	36	other: "{{count}} seconds"
	20	actionview_instancetag_blank_option: Seleccioneu	37	less_than_x_minutes:
			38	one: "less than a minute"
			39	other: "less than {{count}} minutes"
			40	x_minutes:
			41	one: "1 minute"
			42	other: "{{count}} minutes"
			43	about_x_hours:
			44	one: "about 1 hour"
			45	other: "about {{count}} hours"
			46	x_days:
			47	one: "1 day"
			48	other: "{{count}} days"
			49	about_x_months:
			50	one: "about 1 month"
			51	other: "about {{count}} months"
			52	x_months:
			53	one: "1 month"
			54	other: "{{count}} months"
			55	about_x_years:
			56	one: "about 1 year"
			57	other: "about {{count}} years"
			58	over_x_years:
			59	one: "over 1 year"
			60	other: "over {{count}} years"
			61
			62	# Used in array.to_sentence.
			63	support:
			64	array:
			65	sentence_connector: "and"
			66	skip_last_comma: false
			67
			68	activerecord:
			69	errors:
			70	messages:
			71	inclusion: "no està inclòs a la llista"
			72	exclusion: "està reservat"
			73	invalid: "no és vàlid"
			74	confirmation: "la confirmació no coincideix"
			75	accepted: "s'ha d'acceptar"
			76	empty: "no pot estar buit"
			77	blank: "no pot estar en blanc"
			78	too_long: "és massa llarg"
			79	too_short: "és massa curt"
			80	wrong_length: "la longitud és incorrecta"
			81	taken: "ja s'està utilitzant"
			82	not_a_number: "no és un número"
			83	not_a_date: "no és una data vàlida"
			84	greater_than: "must be greater than {{count}}"
			85	greater_than_or_equal_to: "must be greater than or equal to {{count}}"
			86	equal_to: "must be equal to {{count}}"
			87	less_than: "must be less than {{count}}"
			88	less_than_or_equal_to: "must be less than or equal to {{count}}"
			89	odd: "must be odd"
			90	even: "must be even"
			91	greater_than_start_date: "ha de ser superior que la data inicial"
			92	not_same_project: "no pertany al mateix projecte"
			93	circular_dependency: "Aquesta relació crearia una dependència circular"
	21		94
	22	activerecord_error_inclusion: no està inclòs a la llista	95	actionview_instancetag_blank_option: Seleccioneu
	23	activerecord_error_exclusion: està reservat	96
	24	activerecord_error_invalid: no és vàlid	97	general_text_No: 'No'
	25	activerecord_error_confirmation: la confirmació no coincideix	98	general_text_Yes: 'Si'
	26	activerecord_error_accepted: "s'ha d'acceptar"	99	general_text_no: 'no'
	27	activerecord_error_empty: no pot estar buit	100	general_text_yes: 'si'
	28	activerecord_error_blank: no pot estar en blanc	101	general_lang_name: 'Català'
	29	activerecord_error_too_long: és massa llarg	102	general_csv_separator: ';'
	30	activerecord_error_too_short: és massa curt	103	general_csv_decimal_separator: ','
	31	activerecord_error_wrong_length: la longitud és incorrecta	104	general_csv_encoding: ISO-8859-15
	32	activerecord_error_taken: "ja s'està utilitzant"	105	general_pdf_encoding: ISO-8859-15
	33	activerecord_error_not_a_number: no és un número	106	general_first_day_of_week: '1'
	34	activerecord_error_not_a_date: no és una data vàlida	107
	35	activerecord_error_greater_than_start_date: ha de ser superior que la data inicial	108	notice_account_updated: "El compte s'ha actualitzat correctament."
	36	activerecord_error_not_same_project: no pertany al mateix projecte	109	notice_account_invalid_creditentials: Usuari o contrasenya invàlid
	37	activerecord_error_circular_dependency: Aquesta relació crearia una dependència circular	110	notice_account_password_updated: "La contrasenya s'ha modificat correctament."
	38		111	notice_account_wrong_password: Contrasenya incorrecta
	39	general_fmt_age: %d any	112	notice_account_register_done: "El compte s'ha creat correctament. Per a activar el compte, feu clic en l'enllaç que us han enviat per correu electrònic."
	40	general_fmt_age_plural: %d anys	113	notice_account_unknown_email: Usuari desconegut.
	41	general_fmt_date: %%d/%%m/%%Y	114	notice_can_t_change_password: "Aquest compte utilitza una font d'autenticació externa. No és possible canviar la contrasenya."
	42	general_fmt_datetime: %%d/%%m/%%Y %%H:%%M	115	notice_account_lost_email_sent: "S'ha enviat un correu electrònic amb instruccions per a seleccionar una contrasenya nova."
	43	general_fmt_datetime_short: %%d/%%m %%H:%%M	116	notice_account_activated: "El compte s'ha activat. Ara podeu entrar."
	44	general_fmt_time: %%H:%%M	117	notice_successful_create: "S'ha creat correctament."
	45	general_text_No: 'No'	118	notice_successful_update: "S'ha modificat correctament."
	46	general_text_Yes: 'Si'	119	notice_successful_delete: "S'ha suprimit correctament."
	47	general_text_no: 'no'	120	notice_successful_connection: "S'ha connectat correctament."
	48	general_text_yes: 'si'	121	notice_file_not_found: "La pàgina a la que intenteu accedir no existeix o s'ha suprimit."
	49	general_lang_name: 'Català'	122	notice_locking_conflict: Un altre usuari ha actualitzat les dades.
	50	general_csv_separator: ';'	123	notice_not_authorized: No teniu permís per a accedir a aquesta pàgina.
	51	general_csv_decimal_separator: ','	124	notice_email_sent: "S'ha enviat un correu electrònic a {{value}}"
	52	general_csv_encoding: ISO-8859-15	125	notice_email_error: "S'ha produït un error en enviar el correu ({{value}})"
	53	general_pdf_encoding: ISO-8859-15	126	notice_feeds_access_key_reseted: "S'ha reiniciat la clau d'accés del RSS."
	54	general_day_names: Dilluns,Dimarts,Dimecres,Dijous,Divendres,Dissabte,Diumenge	127	notice_failed_to_save_issues: "No s'han pogut desar %s assumptes de {{count}} seleccionats: {{value}}."
	55	general_first_day_of_week: '1'	128	notice_no_issue_selected: "No s'ha seleccionat cap assumpte. Activeu els assumptes que voleu editar."
	56		129	notice_account_pending: "S'ha creat el compte i ara està pendent de l'aprovació de l'administrador."
	57	notice_account_updated: "El compte s'ha actualitzat correctament."	130	notice_default_data_loaded: "S'ha carregat correctament la configuració predeterminada."
	58	notice_account_invalid_creditentials: Usuari o contrasenya invàlid	131	notice_unable_delete_version: "No s'ha pogut suprimir la versió."
	59	notice_account_password_updated: "La contrasenya s'ha modificat correctament."	132
	60	notice_account_wrong_password: Contrasenya incorrecta	133	error_can_t_load_default_data: "No s'ha pogut carregar la configuració predeterminada: {{value}} "
	61	notice_account_register_done: "El compte s'ha creat correctament. Per a activar el compte, feu clic en l'enllaç que us han enviat per correu electrònic."	134	error_scm_not_found: "No s'ha trobat l'entrada o la revisió en el dipòsit."
	62	notice_account_unknown_email: Usuari desconegut.	135	error_scm_command_failed: "S'ha produït un error en intentar accedir al dipòsit: {{value}}"
	63	notice_can_t_change_password: "Aquest compte utilitza una font d'autenticació externa. No és possible canviar la contrasenya."	136	error_scm_annotate: "L'entrada no existeix o no s'ha pogut anotar."
	64	notice_account_lost_email_sent: "S'ha enviat un correu electrònic amb instruccions per a seleccionar una contrasenya nova."	137	error_issue_not_found_in_project: "No s'ha trobat l'assumpte o no pertany a aquest projecte"
	65	notice_account_activated: "El compte s'ha activat. Ara podeu entrar."	138
	66	notice_successful_create: "S'ha creat correctament."	139	mail_subject_lost_password: "Contrasenya de {{value}}"
	67	notice_successful_update: "S'ha modificat correctament."	140	mail_body_lost_password: "Per a canviar la contrasenya, feu clic en l'enllaç següent:"
	68	notice_successful_delete: "S'ha suprimit correctament."	141	mail_subject_register: "Activació del compte de {{value}}"
	69	notice_successful_connection: "S'ha connectat correctament."	142	mail_body_register: "Per a activar el compte, feu clic en l'enllaç següent:"
	70	notice_file_not_found: "La pàgina a la que intenteu accedir no existeix o s'ha suprimit."	143	mail_body_account_information_external: "Podeu utilitzar el compte «{{value}}» per a entrar."
	71	notice_locking_conflict: Un altre usuari ha actualitzat les dades.	144	mail_body_account_information: Informació del compte
	72	notice_not_authorized: No teniu permís per a accedir a aquesta pàgina.	145	mail_subject_account_activation_request: "Sol·licitud d'activació del compte de {{value}}"
	73	notice_email_sent: "S'ha enviat un correu electrònic a %s"	146	mail_body_account_activation_request: "S'ha registrat un usuari nou ({{value}}). El seu compte està pendent d'aprovació:"
	74	notice_email_error: "S'ha produït un error en enviar el correu (%s)"	147	mail_subject_reminder: "%d assumptes venceran els següents {{count}} dies"
	75	notice_feeds_access_key_reseted: "S'ha reiniciat la clau d'accés del RSS."	148	mail_body_reminder: "{{count}} assumptes que teniu assignades venceran els següents {{days}} dies:"
	76	notice_failed_to_save_issues: "No s'han pogut desar %s assumptes de %d seleccionats: %s."	149
	77	notice_no_issue_selected: "No s'ha seleccionat cap assumpte. Activeu els assumptes que voleu editar."	150	gui_validation_error: 1 error
	78	notice_account_pending: "S'ha creat el compte i ara està pendent de l'aprovació de l'administrador."	151	gui_validation_error_plural: "{{count}} errors"
	79	notice_default_data_loaded: "S'ha carregat correctament la configuració predeterminada."	152
	80	notice_unable_delete_version: "No s'ha pogut suprimir la versió."	153	field_name: Nom
	81		154	field_description: Descripció
	82	error_can_t_load_default_data: "No s'ha pogut carregar la configuració predeterminada: %s"	155	field_summary: Resum
	83	error_scm_not_found: "No s'ha trobat l'entrada o la revisió en el dipòsit."	156	field_is_required: Necessari
	84	error_scm_command_failed: "S'ha produït un error en intentar accedir al dipòsit: %s"	157	field_firstname: Nom
	85	error_scm_annotate: "L'entrada no existeix o no s'ha pogut anotar."	158	field_lastname: Cognom
	86	error_issue_not_found_in_project: "No s'ha trobat l'assumpte o no pertany a aquest projecte"	159	field_mail: Correu electrònic
	87		160	field_filename: Fitxer
	88	mail_subject_lost_password: Contrasenya de %s	161	field_filesize: Mida
	89	mail_body_lost_password: "Per a canviar la contrasenya, feu clic en l'enllaç següent:"	162	field_downloads: Baixades
	90	mail_subject_register: Activació del compte de %s	163	field_author: Autor
	91	mail_body_register: "Per a activar el compte, feu clic en l'enllaç següent:"	164	field_created_on: Creat
	92	mail_body_account_information_external: Podeu utilitzar el compte «%s» per a entrar.	165	field_updated_on: Actualitzat
	93	mail_body_account_information: Informació del compte	166	field_field_format: Format
	94	mail_subject_account_activation_request: "Sol·licitud d'activació del compte de %s"	167	field_is_for_all: Per a tots els projectes
	95	mail_body_account_activation_request: "S'ha registrat un usuari nou (%s). El seu compte està pendent d'aprovació:"	168	field_possible_values: Valores possibles
	96	mail_subject_reminder: "%d assumptes venceran els següents %d dies"	169	field_regexp: Expressió regular
	97	mail_body_reminder: "%d assumptes que teniu assignades venceran els següents %d dies:"	170	field_min_length: Longitud mínima
	98		171	field_max_length: Longitud màxima
	99	gui_validation_error: 1 error	172	field_value: Valor
	100	gui_validation_error_plural: %d errors	173	field_category: Categoria
	101		174	field_title: Títol
	102	field_name: Nom	175	field_project: Projecte
	103	field_description: Descripció	176	field_issue: Assumpte
	104	field_summary: Resum	177	field_status: Estat
	105	field_is_required: Necessari	178	field_notes: Notes
	106	field_firstname: Nom	179	field_is_closed: Assumpte tancat
	107	field_lastname: Cognom	180	field_is_default: Estat predeterminat
	108	field_mail: Correu electrònic	181	field_tracker: Seguidor
	109	field_filename: Fitxer	182	field_subject: Tema
	110	field_filesize: Mida	183	field_due_date: Data de venciment
	111	field_downloads: Baixades	184	field_assigned_to: Assignat a
	112	field_author: Autor	185	field_priority: Prioritat
	113	field_created_on: Creat	186	field_fixed_version: Versió objectiu
	114	field_updated_on: Actualitzat	187	field_user: Usuari
	115	field_field_format: Format	188	field_role: Rol
	116	field_is_for_all: Per a tots els projectes	189	field_homepage: Pàgina web
	117	field_possible_values: Valores possibles	190	field_is_public: Públic
	118	field_regexp: Expressió regular	191	field_parent: Subprojecte de
	119	field_min_length: Longitud mínima	192	field_is_in_chlog: Assumptes mostrats en el registre de canvis
	120	field_max_length: Longitud màxima	193	field_is_in_roadmap: Assumptes mostrats en la planificació
	121	field_value: Valor	194	field_login: Entrada
	122	field_category: Categoria	195	field_mail_notification: Notificacions per correu electrònic
	123	field_title: Títol	196	field_admin: Administrador
	124	field_project: Projecte	197	field_last_login_on: Última connexió
	125	field_issue: Assumpte	198	field_language: Idioma
	126	field_status: Estat	199	field_effective_date: Data
	127	field_notes: Notes	200	field_password: Contrasenya
	128	field_is_closed: Assumpte tancat	201	field_new_password: Contrasenya nova
	129	field_is_default: Estat predeterminat	202	field_password_confirmation: Confirmació
	130	field_tracker: Seguidor	203	field_version: Versió
	131	field_subject: Tema	204	field_type: Tipus
	132	field_due_date: Data de venciment	205	field_host: Ordinador
	133	field_assigned_to: Assignat a	206	field_port: Port
	134	field_priority: Prioritat	207	field_account: Compte
	135	field_fixed_version: Versió objectiu	208	field_base_dn: Base DN
	136	field_user: Usuari	209	field_attr_login: "Atribut d'entrada"
	137	field_role: Rol	210	field_attr_firstname: Atribut del nom
	138	field_homepage: Pàgina web	211	field_attr_lastname: Atribut del cognom
	139	field_is_public: Públic	212	field_attr_mail: Atribut del correu electrònic
	140	field_parent: Subprojecte de	213	field_onthefly: "Creació de l'usuari «al vol»"
	141	field_is_in_chlog: Assumptes mostrats en el registre de canvis	214	field_start_date: Inici
	142	field_is_in_roadmap: Assumptes mostrats en la planificació	215	field_done_ratio: %% realitzat
	143	field_login: Entrada	216	field_auth_source: "Mode d'autenticació"
	144	field_mail_notification: Notificacions per correu electrònic	217	field_hide_mail: "Oculta l'adreça de correu electrònic"
	145	field_admin: Administrador	218	field_comments: Comentari
	146	field_last_login_on: Última connexió	219	field_url: URL
	147	field_language: Idioma	220	field_start_page: Pàgina inicial
	148	field_effective_date: Data	221	field_subproject: Subprojecte
	149	field_password: Contrasenya	222	field_hours: Hores
	150	field_new_password: Contrasenya nova	223	field_activity: Activitat
	151	field_password_confirmation: Confirmació	224	field_spent_on: Data
	152	field_version: Versió	225	field_identifier: Identificador
	153	field_type: Tipus	226	field_is_filter: "S'ha utilitzat com a filtre"
	154	field_host: Ordinador	227	field_issue_to_id: Assumpte relacionat
	155	field_port: Port	228	field_delay: Retard
	156	field_account: Compte	229	field_assignable: Es poden assignar assumptes a aquest rol
	157	field_base_dn: Base DN	230	field_redirect_existing_links: Redirigeix els enllaços existents
	158	field_attr_login: "Atribut d'entrada"	231	field_estimated_hours: Temps previst
	159	field_attr_firstname: Atribut del nom	232	field_column_names: Columnes
	160	field_attr_lastname: Atribut del cognom	233	field_time_zone: Zona horària
	161	field_attr_mail: Atribut del correu electrònic	234	field_searchable: Es pot cercar
	162	field_onthefly: "Creació de l'usuari «al vol»"	235	field_default_value: Valor predeterminat
	163	field_start_date: Inici	236	field_comments_sorting: Mostra els comentaris
	164	field_done_ratio: %% realitzat	237	field_parent_title: Pàgina pare
	165	field_auth_source: "Mode d'autenticació"	238
	166	field_hide_mail: "Oculta l'adreça de correu electrònic"	239	setting_app_title: "Títol de l'aplicació"
	167	field_comments: Comentari	240	setting_app_subtitle: "Subtítol de l'aplicació"
	168	field_url: URL	241	setting_welcome_text: Text de benvinguda
	169	field_start_page: Pàgina inicial	242	setting_default_language: Idioma predeterminat
	170	field_subproject: Subprojecte	243	setting_login_required: Es necessita autenticació
	171	field_hours: Hores	244	setting_self_registration: Registre automàtic
	172	field_activity: Activitat	245	setting_attachment_max_size: Mida màxima dels adjunts
	173	field_spent_on: Data	246	setting_issues_export_limit: "Límit d'exportació d'assumptes"
	174	field_identifier: Identificador	247	setting_mail_from: "Adreça de correu electrònic d'emissió"
	175	field_is_filter: "S'ha utilitzat com a filtre"	248	setting_bcc_recipients: Vincula els destinataris de les còpies amb carbó (bcc)
	176	field_issue_to_id: Assumpte relacionat	249	setting_host_name: "Nom de l'ordinador"
	177	field_delay: Retard	250	setting_text_formatting: Format del text
	178	field_assignable: Es poden assignar assumptes a aquest rol	251	setting_wiki_compression: "Comprimeix l'historial del wiki"
	179	field_redirect_existing_links: Redirigeix els enllaços existents	252	setting_feeds_limit: Límit de contingut del canal
	180	field_estimated_hours: Temps previst	253	setting_default_projects_public: Els projectes nous són públics per defecte
	181	field_column_names: Columnes	254	setting_autofetch_changesets: Omple automàticament les publicacions
	182	field_time_zone: Zona horària	255	setting_sys_api_enabled: Habilita el WS per a la gestió del dipòsit
	183	field_searchable: Es pot cercar	256	setting_commit_ref_keywords: Paraules claus per a la referència
	184	field_default_value: Valor predeterminat	257	setting_commit_fix_keywords: Paraules claus per a la correcció
	185	field_comments_sorting: Mostra els comentaris	258	setting_autologin: Entrada automàtica
	186	field_parent_title: Pàgina pare	259	setting_date_format: Format de la data
	187		260	setting_time_format: Format de hora
	188	setting_app_title: "Títol de l'aplicació"	261	setting_cross_project_issue_relations: "Permet les relacions d'assumptes entre projectes"
	189	setting_app_subtitle: "Subtítol de l'aplicació"	262	setting_issue_list_default_columns: "Columnes mostrades per defecte en la llista d'assumptes"
	190	setting_welcome_text: Text de benvinguda	263	setting_repositories_encodings: Codificacions del dipòsit
	191	setting_default_language: Idioma predeterminat	264	setting_commit_logs_encoding: Codificació dels missatges publicats
	192	setting_login_required: Es necessita autenticació	265	setting_emails_footer: Peu dels correus electrònics
	193	setting_self_registration: Registre automàtic	266	setting_protocol: Protocol
	194	setting_attachment_max_size: Mida màxima dels adjunts	267	setting_per_page_options: Opcions dels objectes per pàgina
	195	setting_issues_export_limit: "Límit d'exportació d'assumptes"	268	setting_user_format: "Format de com mostrar l'usuari"
	196	setting_mail_from: "Adreça de correu electrònic d'emissió"	269	setting_activity_days_default: "Dies a mostrar l'activitat del projecte"
	197	setting_bcc_recipients: Vincula els destinataris de les còpies amb carbó (bcc)	270	setting_display_subprojects_issues: "Mostra els assumptes d'un subprojecte en el projecte pare per defecte"
	198	setting_host_name: "Nom de l'ordinador"	271	setting_enabled_scm: "Habilita l'SCM"
	199	setting_text_formatting: Format del text	272	setting_mail_handler_api_enabled: "Habilita el WS per correus electrònics d'entrada"
	200	setting_wiki_compression: "Comprimeix l'historial del wiki"	273	setting_mail_handler_api_key: Clau API
	201	setting_feeds_limit: Límit de contingut del canal	274	setting_sequential_project_identifiers: Genera identificadors de projecte seqüencials
	202	setting_default_projects_public: Els projectes nous són públics per defecte	275
	203	setting_autofetch_changesets: Omple automàticament les publicacions	276	project_module_issue_tracking: "Seguidor d'assumptes"
	204	setting_sys_api_enabled: Habilita el WS per a la gestió del dipòsit	277	project_module_time_tracking: Seguidor de temps
	205	setting_commit_ref_keywords: Paraules claus per a la referència	278	project_module_news: Noticies
	206	setting_commit_fix_keywords: Paraules claus per a la correcció	279	project_module_documents: Documents
	207	setting_autologin: Entrada automàtica	280	project_module_files: Fitxers
	208	setting_date_format: Format de la data	281	project_module_wiki: Wiki
	209	setting_time_format: Format de hora	282	project_module_repository: Dipòsit
	210	setting_cross_project_issue_relations: "Permet les relacions d'assumptes entre projectes"	283	project_module_boards: Taulers
	211	setting_issue_list_default_columns: "Columnes mostrades per defecte en la llista d'assumptes"	284
	212	setting_repositories_encodings: Codificacions del dipòsit	285	label_user: Usuari
	213	setting_commit_logs_encoding: Codificació dels missatges publicats	286	label_user_plural: Usuaris
	214	setting_emails_footer: Peu dels correus electrònics	287	label_user_new: Usuari nou
	215	setting_protocol: Protocol	288	label_project: Projecte
	216	setting_per_page_options: Opcions dels objectes per pàgina	289	label_project_new: Projecte nou
	217	setting_user_format: "Format de com mostrar l'usuari"	290	label_project_plural: Projectes
	218	setting_activity_days_default: "Dies a mostrar l'activitat del projecte"	291	label_x_projects:
	219	setting_display_subprojects_issues: "Mostra els assumptes d'un subprojecte en el projecte pare per defecte"	292	zero: no projects
	220	setting_enabled_scm: "Habilita l'SCM"	293	one: 1 project
	221	setting_mail_handler_api_enabled: "Habilita el WS per correus electrònics d'entrada"	294	other: "{{count}} projects"
	222	setting_mail_handler_api_key: Clau API	295	label_project_all: Tots els projectes
	223	setting_sequential_project_identifiers: Genera identificadors de projecte seqüencials	296	label_project_latest: Els últims projectes
	224		297	label_issue: Assumpte
	225	project_module_issue_tracking: "Seguidor d'assumptes"	298	label_issue_new: Assumpte nou
	226	project_module_time_tracking: Seguidor de temps	299	label_issue_plural: Assumptes
	227	project_module_news: Noticies	300	label_issue_view_all: Visualitza tots els assumptes
	228	project_module_documents: Documents	301	label_issues_by: "Assumptes per {{value}}"
	229	project_module_files: Fitxers	302	label_issue_added: Assumpte afegit
	230	project_module_wiki: Wiki	303	label_issue_updated: Assumpte actualitzat
	231	project_module_repository: Dipòsit	304	label_document: Document
	232	project_module_boards: Taulers	305	label_document_new: Document nou
	233		306	label_document_plural: Documents
	234	label_user: Usuari	307	label_document_added: Document afegit
	235	label_user_plural: Usuaris	308	label_role: Rol
	236	label_user_new: Usuari nou	309	label_role_plural: Rols
	237	label_project: Projecte	310	label_role_new: Rol nou
	238	label_project_new: Projecte nou	311	label_role_and_permissions: Rols i permisos
	239	label_project_plural: Projectes	312	label_member: Membre
	240	label_project_all: Tots els projectes	313	label_member_new: Membre nou
	241	label_project_latest: Els últims projectes	314	label_member_plural: Membres
	242	label_issue: Assumpte	315	label_tracker: Seguidor
	243	label_issue_new: Assumpte nou	316	label_tracker_plural: Seguidors
	244	label_issue_plural: Assumptes	317	label_tracker_new: Seguidor nou
	245	label_issue_view_all: Visualitza tots els assumptes	318	label_workflow: Flux de treball
	246	label_issues_by: Assumptes per %s	319	label_issue_status: "Estat de l'assumpte"
	247	label_issue_added: Assumpte afegit	320	label_issue_status_plural: "Estats de l'assumpte"
	248	label_issue_updated: Assumpte actualitzat	321	label_issue_status_new: Estat nou
	249	label_document: Document	322	label_issue_category: "Categoria de l'assumpte"
	250	label_document_new: Document nou	323	label_issue_category_plural: "Categories de l'assumpte"
	251	label_document_plural: Documents	324	label_issue_category_new: Categoria nova
	252	label_document_added: Document afegit	325	label_custom_field: Camp personalitzat
	253	label_role: Rol	326	label_custom_field_plural: Camps personalitzats
	254	label_role_plural: Rols	327	label_custom_field_new: Camp personalitzat nou
	255	label_role_new: Rol nou	328	label_enumerations: Enumeracions
	256	label_role_and_permissions: Rols i permisos	329	label_enumeration_new: Valor nou
	257	label_member: Membre	330	label_information: Informació
	258	label_member_new: Membre nou	331	label_information_plural: Informació
	259	label_member_plural: Membres	332	label_please_login: Entreu
	260	label_t~~rack~~er: ~~Seguidor~~	333	label_register: Registre
	261	label_tracker_plural: Seguidors	334	label_password_lost: Contrasenya perduda
	262	label_tracker_new: Seguidor nou	335	label_home: Inici
	263	label_workflow: Flux de treball	336	label_my_page: La meva pàgina
	264	label_issue_status: "Estat de l'assumpte"	337	label_my_account: El meu compte
	265	label_issue_status_plural: "Estats de l'assumpte"	338	label_my_projects: Els meus projectes
	266	label_issue_status_new: Estat nou	339	label_administration: Administració
	267	label_issue_category: "Categoria de l'assumpte"	340	label_login: Entra
	268	label_issue_category_plural: "Categories de l'assumpte"	341	label_logout: Surt
	269	label_issue_category_new: Categoria nova	342	label_help: Ajuda
	270	label_custom_field: Camp personalitzat	343	label_reported_issues: Assumptes informats
	271	label_custom_field_plural: Camps personalitzats	344	label_assigned_to_me_issues: Assumptes assignats a mi
	272	label_custom_field_new: Camp personalitzat nou	345	label_last_login: Última connexió
	273	label_enumerations: Enumeracions	346	label_registered_on: Informat el
	274	label_enumeration_new: Valor nou	347	label_activity: Activitat
	275	label_information: Informació	348	label_overall_activity: Activitat global
	276	label_information_plural: Informació	349	label_new: Nou
	277	label_please_login: Entreu	350	label_logged_as: Heu entrat com a
	278	label_register: Registre	351	label_environment: Entorn
	279	label_password_lost: Contrasenya perduda	352	label_authentication: Autenticació
	280	label_home: Inici	353	label_auth_source: "Mode d'autenticació"
	281	label_my_page: La meva pàgina	354	label_auth_source_new: "Mode d'autenticació nou"
	282	label_my_account: El meu compte	355	label_auth_source_plural: "Modes d'autenticació"
	283	label_~~my_projects~~: ~~Els meus~~ projectes	356	label_subproject_plural: Subprojectes
	284	label_administration: Administració	357	label_and_its_subprojects: "{{value}} i els seus subprojectes"
	285	label_login: Entra	358	label_min_max_length: Longitud mín - max
	286	label_logout: Surt	359	label_list: Llist
	287	label_help: Ajuda	360	label_date: Data
	288	label_reported_issues: Assumptes informats	361	label_integer: Enter
	289	label_assigned_to_me_issues: Assumptes assignats a mi	362	label_float: Flotant
	290	label_last_login: Última connexió	363	label_boolean: Booleà
	291	label_last_updates: Última actualització	364	label_string: Text
	292	label_last_updates_plural: %d última actualització	365	label_text: Text llarg
	293	label_registered_on: Informat el	366	label_attribute: Atribut
	294	label_activity: Activitat	367	label_attribute_plural: Atributs
	295	label_overall_activity: Activitat global	368	label_download: "{{count}} baixada"
	296	label_new: Nou	369	label_download_plural: "{{count}} baixades"
	297	label_logged_as: Heu entrat com a	370	label_no_data: Sense dades a mostrar
	298	label_environment: Entorn	371	label_change_status: "Canvia l'estat"
	299	label_authentication: Autenticació	372	label_history: Historial
	300	label_auth_source: "Mode d'autenticació"	373	label_attachment: Fitxer
	301	label_auth_source_new: "Mode d'autenticació nou"	374	label_attachment_new: Fitxer nou
	302	label_auth_source_plural: "Modes d'autenticació"	375	label_attachment_delete: Suprimeix el fitxer
	303	label_subproject_plural: Subprojectes	376	label_attachment_plural: Fitxers
	304	label_and_its_subprojects: %s i els seus subprojectes	377	label_file_added: Fitxer afegit
	305	label_min_max_length: Longitud mín - max	378	label_report: Informe
	306	label_list: Llist	379	label_report_plural: Informes
	307	label_date: Data	380	label_news: Noticies
	308	label_integer: Enter	381	label_news_new: Afegeix noticies
	309	label_float: Flotant	382	label_news_plural: Noticies
	310	label_boolean: Booleà	383	label_news_latest: Últimes noticies
	311	label_string: Text	384	label_news_view_all: Visualitza totes les noticies
	312	label_text: Text llarg	385	label_news_added: Noticies afegides
	313	label_attribute: Atribut	386	label_change_log: Registre de canvis
	314	label_attribute_plural: Atributs	387	label_settings: Paràmetres
	315	label_download: %d baixada	388	label_overview: Resum
	316	label_download_plural: %d baixades	389	label_version: Versió
	317	label_no_data: Sense dades a mostrar	390	label_version_new: Versió nova
	318	label_change_status: "Canvia l'estat"	391	label_version_plural: Versions
	319	label_history: Historial	392	label_confirmation: Confirmació
	320	label_attachment: Fitxer	393	label_export_to: 'També disponible a:'
	321	label_attachment_new: Fitxer nou	394	label_read: Llegeix...
	322	label_attachment_delete: Suprimeix el fitxer	395	label_public_projects: Projectes públics
	323	label_attachment_plural: Fitxers	396	label_open_issues: obert
	324	label_file_added: Fitxer afegit	397	label_open_issues_plural: oberts
	325	label_report: Informe	398	label_closed_issues: tancat
	326	label_report_plural: Informes	399	label_closed_issues_plural: tancats
	327	label_news: Noticies	400	label_x_open_issues_abbr_on_total:
	328	label_news_new: Afegeix noticies	401	zero: 0 open / {{total}}
	329	label_news_plural: Noticies	402	one: 1 open / {{total}}
	330	label_news_latest: Últimes noticies	403	other: "{{count}} open / {{total}}"
	331	label_news_view_all: Visualitza totes les noticies	404	label_x_open_issues_abbr:
	332	label_news_added: Noticies afegides	405	zero: 0 open
	333	label_change_log: Registre de canvis	406	one: 1 open
	334	label_settings: Paràmetres	407	other: "{{count}} open"
	335	label_overview: Resum	408	label_x_closed_issues_abbr:
	336	label_version: Versió	409	zero: 0 closed
	337	label_version_new: Versió nova	410	one: 1 closed
	338	label_version_plural: Versions	411	other: "{{count}} closed"
	339	label_confirmation: Confirmació	412	label_total: Total
	340	label_export_to: 'També disponible a:'	413	label_permissions: Permisos
	341	label_read: Llegeix...	414	label_current_status: Estat actual
	342	label_public_projects: Projectes públics	415	label_new_statuses_allowed: Nous estats autoritzats
	343	label_open_issues: obert	416	label_all: tots
	344	label_open_issues_plural: oberts	417	label_none: cap
	345	label_closed_issues: tancat	418	label_nobody: ningú
	346	label_closed_issues_plural: tancats	419	label_next: Següent
	347	label_total: Total	420	label_previous: Anterior
	348	label_permissions: Permisos	421	label_used_by: Utilitzat per
	349	label_current_status: Estat actual	422	label_details: Detalls
	350	label_new_statuses_allowed: Nous estats autoritzats	423	label_add_note: Afegeix una nota
	351	label_all: tots	424	label_per_page: Per pàgina
	352	label_none: cap	425	label_calendar: Calendari
	353	label_nobody: ningú	426	label_months_from: mesos des de
	354	label_~~nex~~t: ~~Següen~~t	427	label_gantt: Gantt
	355	label_previous: Anterior	428	label_internal: Intern
	356	label_used_by: Utilitzat per	429	label_last_changes: "últims {{count}} canvis"
	357	label_details: Detalls	430	label_change_view_all: Visualitza tots els canvis
	358	label_add_note: Afegeix una nota	431	label_personalize_page: Personalitza aquesta pàgina
	359	label_per_page: Per pàgina	432	label_comment: Comentari
	360	label_calendar: Calendari	433	label_comment_plural: Comentaris
	361	label_months_from: mesos des de	434	label_x_comments:
	362	label_gantt: Gantt	435	zero: no comments
	363	label_internal: Intern	436	one: 1 comment
	364	label_last_changes: últims %d canvis	437	other: "{{count}} comments"
	365	label_change_view_all: Visualitza tots els canvis	438	label_comment_add: Afegeix un comentari
	366	label_personalize_page: Personalitza aquesta pàgina	439	label_comment_added: Comentari afegit
	367	label_comment: Comentari	440	label_comment_delete: Suprimeix comentaris
	368	label_comment_plural: Comentaris	441	label_query: Consulta personalitzada
	369	label_comment_add: Afegeix un comentari	442	label_query_plural: Consultes personalitzades
	370	label_comment_added: Comentari afegit	443	label_query_new: Consulta nova
	371	label_comment_delete: Suprimeix comentaris	444	label_filter_add: Afegeix un filtre
	372	label_query: Consulta personalitzada	445	label_filter_plural: Filtres
	373	label_query_plural: Consultes personalitzades	446	label_equals: és
	374	label_query_new: Consulta nova	447	label_not_equals: no és
	375	label_filter_add: Afegeix un filtre	448	label_in_less_than: en menys de
	376	label_filter_plural: Filtres	449	label_in_more_than: en més de
	377	label_equals: és	450	label_in: en
	378	label_not_equals: no és	451	label_today: avui
	379	label_in_less_than: en menys de	452	label_all_time: tot el temps
	380	label_in_more_than: en més de	453	label_yesterday: ahir
	381	label_in: en	454	label_this_week: aquesta setmana
	382	label_today: avui	455	label_last_week: "l'última setmana"
	383	label_all_time: tot el temps	456	label_last_n_days: "els últims {{count}} dies"
	384	label_yesterday: ahir	457	label_this_month: aquest més
	385	label_this_week: aquesta setmana	458	label_last_month: "l'últim més"
	386	label_last_week: "l'última setmana"	459	label_this_year: aquest any
	387	label_last_n_days: els últims %d dies	460	label_date_range: Abast de les dates
	388	label_this_month: aquest més	461	label_less_than_ago: fa menys de
	389	label_last_month: "l'últim més"	462	label_more_than_ago: fa més de
	390	label_this_year: aquest any	463	label_ago: fa
	391	label_date_range: Abast de les dates	464	label_contains: conté
	392	label_less_than_ago: fa menys de	465	label_not_contains: no conté
	393	label_more_than_ago: fa més de	466	label_day_plural: dies
	394	label_ago: fa	467	label_repository: Dipòsit
	395	label_contains: conté	468	label_repository_plural: Dipòsits
	396	label_not_contains: no conté	469	label_browse: Navega
	397	label_day_plural: dies	470	label_modification: "{{count}} canvi"
	398	label_repository: Dipòsit	471	label_modification_plural: "{{count}} canvis"
	399	label_repository_plural: Dipòsits	472	label_revision: Revisió
	400	label_browse: Navega	473	label_revision_plural: Revisions
	401	label_modification: %d canvi	474	label_associated_revisions: Revisions associades
	402	label_modification_plural: %d canvis	475	label_added: afegit
	403	label_revision: Revisió	476	label_modified: modificat
	404	label_revision_plural: Revisions	477	label_renamed: reanomenat
	405	label_associated_revisions: Revisions associades	478	label_copied: copiat
	406	label_added: afegit	479	label_deleted: suprimit
	407	label_modified: modificat	480	label_latest_revision: Última revisió
	408	label_renamed: reanomenat	481	label_latest_revision_plural: Últimes revisions
	409	label_copied: copiat	482	label_view_revisions: Visualitza les revisions
	410	label_deleted: suprimit	483	label_max_size: Mida màxima
	411	label_latest_revision: Última revisió	484	label_sort_highest: Mou a la part superior
	412	label_latest_revision_plural: Últimes revisions	485	label_sort_higher: Mou cap amunt
	413	label_view_revisions: Visualitza les revisions	486	label_sort_lower: Mou cap avall
	414	label_max_size: Mida màxima	487	label_sort_lowest: Mou a la part inferior
	415	label_on: 'de'	488	label_roadmap: Planificació
	416	label_sort_highest: Mou a la part superior	489	label_roadmap_due_in: "Venç en {{value}}"
	417	label_sort_higher: Mou cap amunt	490	label_roadmap_overdue: "{{value}} tard"
	418	label_sort_lower: Mou cap avall	491	label_roadmap_no_issues: No hi ha assumptes per a aquesta versió
	419	label_sort_lowest: Mou a la part inferior	492	label_search: Cerca
	420	label_roadmap: Planificació	493	label_result_plural: Resultats
	421	label_roadmap_due_in: Venç en %s	494	label_all_words: Totes les paraules
	422	label_roadmap_overdue: %s tard	495	label_wiki: Wiki
	423	label_roadmap_no_issues: No hi ha assumptes per a aquesta versió	496	label_wiki_edit: Edició wiki
	424	label_search: Cerca	497	label_wiki_edit_plural: Edicions wiki
	425	label_result_plural: Resultats	498	label_wiki_page: Pàgina wiki
	426	label_all_words: Totes les paraules	499	label_wiki_page_plural: Pàgines wiki
	427	label_wiki: Wiki	500	label_index_by_title: Índex per títol
	428	label_wiki_edit: Edició wiki	501	label_index_by_date: Índex per data
	429	label_wiki_edit_plural: Edicions wiki	502	label_current_version: Versió actual
	430	label_wiki_page: Pàgina wiki	503	label_preview: Previsualització
	431	label_wiki_page_plural: Pàgines wiki	504	label_feed_plural: Canals
	432	label_index_by_title: Índex per títol	505	label_changes_details: Detalls de tots els canvis
	433	label_index_by_date: Índex per data	506	label_issue_tracking: "Seguiment d'assumptes"
	434	label_current_version: Versió actual	507	label_spent_time: Temps invertit
	435	label_preview: Previsualització	508	label_f_hour: "{{value}} hora"
	436	label_feed_plural: Canals	509	label_f_hour_plural: "{{value}} hores"
	437	label_changes_details: Detalls de tots els canvis	510	label_time_tracking: Temps de seguiment
	438	label_issue_tracking: "Seguiment d'assumptes"	511	label_change_plural: Canvis
	439	label_spent_time: Temps invertit	512	label_statistics: Estadístiques
	440	label_f_hour: %.2f hora	513	label_commits_per_month: Publicacions per mes
	441	label_f_hour_plural: %.2f hores	514	label_commits_per_author: Publicacions per autor
	442	label_time_tracking: Temps de seguiment	515	label_view_diff: Visualitza les diferències
	443	label_change_plural: Canvis	516	label_diff_inline: en línia
	444	label_statistics: Estadístiques	517	label_diff_side_by_side: costat per costat
	445	label_commits_per_month: Publicacions per mes	518	label_options: Opcions
	446	label_commits_per_author: Publicacions per autor	519	label_copy_workflow_from: Copia el flux de treball des de
	447	label_view_diff: Visualitza les diferències	520	label_permissions_report: Informe de permisos
	448	label_diff_inline: en línia	521	label_watched_issues: Assumptes vigilats
	449	label_diff_side_by_side: costat per costat	522	label_related_issues: Assumptes relacionats
	450	label_options: Opcions	523	label_applied_status: Estat aplicat
	451	label_copy_workflow_from: Copia el flux de treball des de	524	label_loading: "S'està carregant..."
	452	label_permissions_report: Informe de permisos	525	label_relation_new: Relació nova
	453	label_watched_issues: Assumptes vigilats	526	label_relation_delete: Suprimeix la relació
	454	label_relate~~d_issues~~: ~~Assumptes~~ ~~relacionats~~	527	label_relates_to: relacionat amb
	455	label_applied_status: Estat aplicat	528	label_duplicates: duplicats
	456	label_loading: "S'està carregant..."	529	label_duplicated_by: duplicat per
	457	label_relation_new: Relació nova	530	label_blocks: bloqueja
	458	label_relation_delete: Suprimeix la relació	531	label_blocked_by: bloquejats per
	459	label_relates_to: relacionat amb	532	label_precedes: anterior a
	460	label_duplicates: duplicats	533	label_follows: posterior a
	461	label_duplicated_by: duplicat per	534	label_end_to_start: final al començament
	462	label_blocks: bloqueja	535	label_end_to_end: final al final
	463	label_blocked_by: bloquejats per	536	label_start_to_start: començament al començament
	464	label_precedes: anterior a	537	label_start_to_end: començament al final
	465	label_follows: posterior a	538	label_stay_logged_in: "Manté l'entrada"
	466	label_end_to_start: final al començament	539	label_disabled: inhabilitat
	467	label_end_to_end: final al final	540	label_show_completed_versions: Mostra les versions completes
	468	label_start_to_start: començament al començament	541	label_me: jo mateix
	469	label_start_to_end: començament al final	542	label_board: Fòrum
	470	label_stay_logged_in: "Manté l'entrada"	543	label_board_new: Fòrum nou
	471	label_disabled: inhabilitat	544	label_board_plural: Fòrums
	472	label_show_completed_versions: Mostra les versions completes	545	label_topic_plural: Temes
	473	label_me: jo mateix	546	label_message_plural: Missatges
	474	label_board: Fòrum	547	label_message_last: Últim missatge
	475	label_board_new: Fòrum nou	548	label_message_new: Missatge nou
	476	label_board_plural: Fòrums	549	label_message_posted: Missatge afegit
	477	label_~~topic~~_plural: ~~Tem~~es	550	label_reply_plural: Respostes
	478	label_message_plural: Missatges	551	label_send_information: "Envia la informació del compte a l'usuari"
	479	label_message_last: Últim missatge	552	label_year: Any
	480	label_message_new: Missatge nou	553	label_month: Mes
	481	label_message_posted: Missatge afegit	554	label_week: Setmana
	482	label_reply_plural: Respostes	555	label_date_from: Des de
	483	label_send_information: "Envia la informació del compte a l'usuari"	556	label_date_to: A
	484	label_year: Any	557	label_language_based: "Basat en l'idioma de l'usuari"
	485	label_month: Mes	558	label_sort_by: "Ordena per {{value}}"
	486	label_week: Setmana	559	label_send_test_email: Envia un correu electrònic de prova
	487	label_date_from: Des de	560	label_feeds_access_key_created_on: "Clau d'accés del RSS creada fa {{value}}"
	488	label_date_to: A	561	label_module_plural: Mòduls
	489	label_language_based: "Basat en l'idioma de l'usuari"	562	label_added_time_by: "Afegit per {{author}} fa {{age}}"
	490	label_sort_by: Ordena per %s	563	label_updated_time: "Actualitzat fa {{value}}"
	491	label_send_test_email: Envia un correu electrònic de prova	564	label_jump_to_a_project: Salta al projecte...
	492	label_feeds_access_key_created_on: "Clau d'accés del RSS creada fa %s"	565	label_file_plural: Fitxers
	493	label_module_plural: Mòduls	566	label_changeset_plural: Conjunt de canvis
	494	label_added_time_by: Afegit per %s fa %s	567	label_default_columns: Columnes predeterminades
	495	label_updated_time: Actualitzat fa %s	568	label_no_change_option: (sense canvis)
	496	label_jump_to_a_project: Salta al projecte...	569	label_bulk_edit_selected_issues: Edita en bloc els assumptes seleccionats
	497	label_file_plural: Fitxers	570	label_theme: Tema
	498	label_changeset_plural: Conjunt de canvis	571	label_default: Predeterminat
	499	label_default_columns: Columnes predeterminades	572	label_search_titles_only: Cerca només en els títols
	500	label_no_change_option: (sense canvis)	573	label_user_mail_option_all: "Per qualsevol esdeveniment en tots els meus projectes"
	501	label_bulk_edit_selected_issues: Edita en bloc els assumptes seleccionats	574	label_user_mail_option_selected: "Per qualsevol esdeveniment en els projectes seleccionats..."
	502	label_theme: Tema	575	label_user_mail_option_none: "Només per les coses que vigilo o hi estic implicat"
	503	label_default: Predeterminat	576	label_user_mail_no_self_notified: "No vull ser notificat pels canvis que faig jo mateix"
	504	label_search_titles_only: Cerca només en els títols	577	label_registration_activation_by_email: activació del compte per correu electrònic
	505	label_user_mail_option_all: "Per qualsevol esdeveniment en tots els meus projectes"	578	label_registration_manual_activation: activació del compte manual
	506	label_user_mail_option_selected: "Per qualsevol esdeveniment en els projectes seleccionats..."	579	label_registration_automatic_activation: activació del compte automàtica
	507	label_user_mail_option_none: "Només per les coses que vigilo o hi estic implicat"	580	label_display_per_page: "Per pàgina: {{value}}'"
	508	label_user_mail_no_self_notified: "No vull ser notificat pels canvis que faig jo mateix"	581	label_age: Edat
	509	label_registration_activation_by_email: activació del compte per correu electrònic	582	label_change_properties: Canvia les propietats
	510	label_registration_manual_activation: activació del compte manual	583	label_general: General
	511	label_registration_automatic_activation: activació del compte automàtica	584	label_more: Més
	512	label_display_per_page: 'Per pàgina: %s'	585	label_scm: SCM
	513	label_age: Edat	586	label_plugins: Connectors
	514	label_change_properties: Canvia les propietats	587	label_ldap_authentication: Autenticació LDAP
	515	label_general: General	588	label_downloads_abbr: Baixades
	516	label_more: Més	589	label_optional_description: Descripció opcional
	517	label_scm: SCM	590	label_add_another_file: Afegeix un altre fitxer
	518	label_plugins: Connectors	591	label_preferences: Preferències
	519	label_ldap_authentication: Autenticació LDAP	592	label_chronological_order: En ordre cronològic
	520	label_downloads_abbr: Baixades	593	label_reverse_chronological_order: En ordre cronològic invers
	521	label_optional_description: Descripció opcional	594	label_planning: Planificació
	522	label_add_another_file: Afegeix un altre fitxer	595	label_incoming_emails: "Correu electrònics d'entrada"
	523	label_preferences: Preferències	596	label_generate_key: Genera una clau
	524	label_chronological_order: En ordre cronològic	597	label_issue_watchers: Vigilants
	525	label_reverse_chronological_order: En ordre cronològic invers	598
	526	label_planning: Planificació	599	button_login: Entra
	527	label_incoming_emails: "Correu electrònics d'entrada"	600	button_submit: Tramet
	528	label_generate_key: Genera una clau	601	button_save: Desa
	529	label_issue_watchers: Vigilants	602	button_check_all: Activa-ho tot
	530		603	button_uncheck_all: Desactiva-ho tot
	531	button_login: Entra	604	button_delete: Suprimeix
	532	button_submit: Tramet	605	button_create: Crea
	533	button_~~save~~: ~~Desa~~	606	button_test: Test
	534	button_check_all: Activa-ho tot	607	button_edit: Edit
	535	button_uncheck_all: Desactiva-ho tot	608	button_add: Afegeix
	536	button_delete: Suprimeix	609	button_change: Canvia
	537	button_create: Crea	610	button_apply: Aplica
	538	button_test: Test	611	button_clear: Neteja
	539	button_edit: Edit	612	button_lock: Bloca
	540	button_add: Afegeix	613	button_unlock: Desbloca
	541	button_change: Canvia	614	button_download: Baixa
	542	button_~~apply~~: ~~Aplic~~a	615	button_list: Llista
	543	button_clear: Neteja	616	button_view: Visualitza
	544	button_~~lock~~: ~~Bloca~~	617	button_move: Mou
	545	button_unlock: Desbloca	618	button_back: Enrere
	546	button_download: Baixa	619	button_cancel: Cancel·la
	547	button_list: Llista	620	button_activate: Activa
	548	button_view: Visualitza	621	button_sort: Ordena
	549	button_move: Mou	622	button_log_time: "Hora d'entrada"
	550	button_back: Enrere	623	button_rollback: Torna a aquesta versió
	551	button_cancel: Cancel·la	624	button_watch: Vigila
	552	button_activate: Activa	625	button_unwatch: No vigilis
	553	button_sort: Ordena	626	button_reply: Resposta
	554	button_log_time: "Hora d'entrada"	627	button_archive: Arxiva
	555	button_rollback: Torna a aquesta versió	628	button_unarchive: Desarxiva
	556	button_watch: Vigila	629	button_reset: Reinicia
	557	button_unwatch: No vigilis	630	button_rename: Reanomena
	558	button_reply: Resposta	631	button_change_password: Canvia la contrasenya
	559	button_archive: Arxiva	632	button_copy: Copia
	560	button_unarchive: Desarxiva	633	button_annotate: Anota
	561	button_reset: Reinicia	634	button_update: Actualitza
	562	button_rename: Reanomena	635	button_configure: Configura
	563	button_change_password: Canvia la contrasenya	636	button_quote: Cita
	564	button_copy: Copia	637
	565	button_annotate: Anota	638	status_active: actiu
	566	button_update: Actualitza	639	status_registered: informat
	567	button_configure: Configura	640	status_locked: bloquejat
	568	button_quote: Cita	641
	569		642	text_select_mail_notifications: "Seleccioneu les accions per les quals s'hauria d'enviar una notificació per correu electrònic."
	570	status_active: actiu	643	text_regexp_info: ex. ^[A-Z0-9]+$
	571	status_registered: informat	644	text_min_max_length_info: 0 significa sense restricció
	572	status_locked: bloquejat	645	text_project_destroy_confirmation: Segur que voleu suprimir aquest projecte i les dades relacionades?
	573		646	text_subprojects_destroy_warning: "També seran suprimits els seus subprojectes: {{value}}."
	574	text_select_mail_notifications: "Seleccioneu les accions per les quals s'hauria d'enviar una notificació per correu electrònic."	647	text_workflow_edit: Seleccioneu un rol i un seguidor per a editar el flux de treball
	575	text_regexp_info: ex. ^[A-Z0-9]+$	648	text_are_you_sure: Segur?
	576	text_min_max_length_info: 0 significa sense restricció	649	text_journal_changed: "canviat des de {{old}} a {{new}}"
	577	text_project_destroy_confirmation: Segur que voleu suprimir aquest projecte i les dades relacionades?	650	text_journal_set_to: "establert a {{value}}"
	578	text_subprojects_destroy_warning: "També seran suprimits els seus subprojectes: %s."	651	text_journal_deleted: suprimit
	579	text_workflow_edit: Seleccioneu un rol i un seguidor per a editar el flux de treball	652	text_tip_task_begin_day: "tasca que s'inicia aquest dia"
	580	text_are_you_sure: Segur?	653	text_tip_task_end_day: tasca que finalitza aquest dia
	581	text_journal_changed: canviat des de %s a %s	654	text_tip_task_begin_end_day: "tasca que s'inicia i finalitza aquest dia"
	582	text_journal_set_to: establert a %s	655	text_project_identifier_info: "Es permeten lletres en minúscules (a-z), números i guions.<br />Un cop desat, l'identificador no es pot modificar."
	583	text_journal_deleted: suprimit	656	text_caracters_maximum: "{{count}} caràcters com a màxim."
	584	text_tip_task_begin_day: "tasca que s'inicia aquest dia"	657	text_caracters_minimum: "Com a mínim ha de tenir {{count}} caràcters."
	585	text_tip_task_end_day: tasca que finalitza aquest dia	658	text_length_between: "Longitud entre {{min}} i {{max}} caràcters."
	586	text_tip_task_begin_end_day: "tasca que s'inicia i finalitza aquest dia"	659	text_tracker_no_workflow: "No s'ha definit cap flux de treball per a aquest seguidor"
	587	text_project_identifier_info: "Es permeten lletres en minúscules (a-z), números i guions.<br />Un cop desat, l'identificador no es pot modificar."	660	text_unallowed_characters: Caràcters no permesos
	588	text_caracters_maximum: %d caràcters com a màxim.	661	text_comma_separated: Es permeten valors múltiples (separats per una coma).
	589	text_caracters_minimum: Com a mínim ha de tenir %d caràcters.	662	text_issues_ref_in_commit_messages: Referència i soluciona els assumptes en els missatges publicats
	590	text_length_between: Longitud entre %d i %d caràcters.	663	text_issue_added: "L'assumpte {{id}} ha sigut informat per {{author}}."
	591	text_tracker_no_workflow: "No s'ha definit cap flux de treball per a aquest seguidor"	664	text_issue_updated: "L'assumpte {{id}} ha sigut actualitzat per {{author}}."
	592	text_unallowed_characters: Caràcters no permesos	665	text_wiki_destroy_confirmation: Segur que voleu suprimir aquest wiki i tots els seus continguts?
	593	text_comma_separated: Es permeten valors múltiples (separats per una coma).	666	text_issue_category_destroy_question: "Alguns assumptes ({{count}}) estan assignats a aquesta categoria. Què voleu fer?"
	594	text_issues_ref_in_commit_messages: Referència i soluciona els assumptes en els missatges publicats	667	text_issue_category_destroy_assignments: Suprimeix les assignacions de la categoria
	595	text_issue_added: "L'assumpte %s ha sigut informat per %s."	668	text_issue_category_reassign_to: Torna a assignar els assumptes a aquesta categoria
	596	text_issue_updated: "L'assumpte %s ha sigut actualitzat per %s."	669	text_user_mail_option: "Per als projectes no seleccionats, només rebreu notificacions sobre les coses que vigileu o que hi esteu implicat (ex. assumptes que en sou l'autor o hi esteu assignat)."
	597	text_wiki_destroy_confirmation: Segur que voleu suprimir aquest wiki i tots els seus continguts?	670	text_no_configuration_data: "Encara no s'han configurat els rols, seguidors, estats de l'assumpte i flux de treball.\nÉs altament recomanable que carregueu la configuració predeterminada. Podreu modificar-la un cop carregada."
	598	text_issue_category_destroy_question: Alguns assumptes (%d) estan assignats a aquesta categoria. Què voleu fer?	671	text_load_default_configuration: Carrega la configuració predeterminada
	599	text_issue_category_destroy_assignments: Suprimeix les assignacions de la categoria	672	text_status_changed_by_changeset: "Aplicat en el conjunt de canvis {{value}}."
	600	text_issue_category_reassign_to: Torna a assignar els assumptes a aquesta categoria	673	text_issues_destroy_confirmation: "Segur que voleu suprimir els assumptes seleccionats?"
	601	text_user_mail_option: "Per als projectes no seleccionats, només rebreu notificacions sobre les coses que vigileu o que hi esteu implicat (ex. assumptes que en sou l'autor o hi esteu assignat)."	674	text_select_project_modules: "Seleccioneu els mòduls a habilitar per a aquest projecte:"
	602	text_no_configuration_data: "Encara no s'han configurat els rols, seguidors, estats de l'assumpte i flux de treball.\nÉs altament recomanable que carregueu la configuració predeterminada. Podreu modificar-la un cop carregada."	675	text_default_administrator_account_changed: "S'ha canviat el compte d'administrador predeterminat"
	603	text_load_default_configuration: Carrega la configuració predeterminada	676	text_file_repository_writable: Es pot escriure en el dipòsit de fitxers
	604	text_status_changed_by_changeset: Aplicat en el conjunt de canvis %s.	677	text_rmagick_available: RMagick disponible (opcional)
	605	text_issues_destroy_confirmation: "Segur que voleu suprimir els assumptes seleccionats?"	678	text_destroy_time_entries_question: "S'han informat %.02f hores en els assumptes que aneu a suprimir. Què voleu fer?"
	606	text_select_project_modules: "Seleccioneu els mòduls a habilitar per a aquest projecte:"	679	text_destroy_time_entries: Suprimeix les hores informades
	607	text_default_administrator_account_changed: "S'ha canviat el compte d'administrador predeterminat"	680	text_assign_time_entries_to_project: Assigna les hores informades al projecte
	608	text_file_repository_writable: Es pot escriure en el dipòsit de fitxers	681	text_reassign_time_entries: 'Torna a assignar les hores informades a aquest assumpte:'
	609	text_rmagick_available: RMagick disponible (opcional)	682	text_user_wrote: "{{value}} va escriure:'"
	610	text_destroy_time_entries_question: "S'han informat %.02f hores en els assumptes que aneu a suprimir. Què voleu fer?"	683	text_enumeration_destroy_question: "{{count}} objectes estan assignats a aquest valor.'"
	611	text_destroy_time_entries: Suprimeix les hores informades	684	text_enumeration_category_reassign_to: 'Torna a assignar-los a aquest valor:'
	612	text_assign_time_entries_to_project: Assigna les hores informades al projecte	685	text_email_delivery_not_configured: "El lliurament per correu electrònic no està configurat i les notificacions estan inhabilitades.\nConfigureu el servidor SMTP a config/email.yml i reinicieu l'aplicació per habilitar-lo."
	613	text_reassign_time_entries: 'Torna a assignar les hores informades a aquest assumpte:'	686
	614	text_user_wrote: '%s va escriure:'	687	default_role_manager: Gestor
	615	text_enumeration_destroy_question: '%d objectes estan assignats a aquest valor.'	688	default_role_developper: Desenvolupador
	616	text_enumeration_category_reassign_to: 'Torna a assignar-los a aquest valor:'	689	default_role_reporter: Informador
	617	text_email_delivery_not_configured: "El lliurament per correu electrònic no està configurat i les notificacions estan inhabilitades.\nConfigureu el servidor SMTP a config/email.yml i reinicieu l'aplicació per habilitar-lo."	690	default_tracker_bug: Error
	618		691	default_tracker_feature: Característica
	619	default_role_manager: Gestor	692	default_tracker_support: Suport
	620	default_role_developper: Desenvolupador	693	default_issue_status_new: Nou
	621	default_role_reporter: Informador	694	default_issue_status_assigned: Assignat
	622	default_tracker_bug: Error	695	default_issue_status_resolved: Resolt
	623	default_tracker_feature: Característica	696	default_issue_status_feedback: Comentaris
	624	default_tracker_support: Suport	697	default_issue_status_closed: Tancat
	625	default_issue_status_~~new~~: ~~Nou~~	698	default_issue_status_rejected: Rebutjat
	626	default_issue_status_assigned: Assignat	699	default_doc_category_user: "Documentació d'usuari"
	627	default_issue_status_resolved: Resolt	700	default_doc_category_tech: Documentació tècnica
	628	default_issue_status_feedback: Comentaris	701	default_priority_low: Baixa
	629	default_issue_status_closed: Tancat	702	default_priority_normal: Normal
	630	default_issue_status_rejected: Rebutjat	703	default_priority_high: Alta
	631	default_doc_category_user: "Documentació d'usuari"	704	default_priority_urgent: Urgent
	632	default_doc_category_tech: Documentació tècnica	705	default_priority_immediate: Immediata
	633	default_priority_low: Baixa	706	default_activity_design: Disseny
	634	default_priority_normal: Normal	707	default_activity_development: Desenvolupament
	635	default_priority_high: Alta	708
	636	default_priority_urgent: Urgent	709	enumeration_issue_priorities: Prioritat dels assumptes
	637	default_priority_immediate: Immediata	710	enumeration_doc_categories: Categories del document
	638	default_activity_design: Disseny	711	enumeration_activities: Activitats (seguidor de temps)
	639	default_activity_development: Desenvolupament	712	setting_plain_text_mail: plain text only (no HTML)
	640		713	permission_view_files: View files
	641	enumeration_issue_priorities: Prioritat dels assumptes	714	permission_edit_issues: Edit issues
	642	enumeration_doc_categories: Categories del document	715	permission_edit_own_time_entries: Edit own time logs
	643	enumeration_activities: Activitats (seguidor de temps)	716	permission_manage_public_queries: Manage public queries
	644	setting_plain_text_mail: plain text only (no HTML)	717	permission_add_issues: Add issues
	645	permission_view_files: View files	718	permission_log_time: Log spent time
	646	permission_edit_issues: Edit issues	719	permission_view_changesets: View changesets
	647	permission_~~edit_own~~_time_entries: ~~Edit~~ ~~own~~ time ~~logs~~	720	permission_view_time_entries: View spent time
	648	permission_manage_~~public_querie~~s: Manage ~~public querie~~s	721	permission_manage_versions: Manage versions
	649	permission_add_issues: Add issues	722	permission_manage_wiki: Manage wiki
	650	permission_log_time: Log spent time	723	permission_manage_categories: Manage issue categories
	651	permission_view_changesets: View changesets	724	permission_protect_wiki_pages: Protect wiki pages
	652	permission_view_time_entries: View spent time	725	permission_comment_news: Comment news
	653	permission_manage_versions: Manage versions	726	permission_delete_messages: Delete messages
	654	permission_manage_wiki: Manage wiki	727	permission_select_project_modules: Select project modules
	655	permission_manage_~~categorie~~s: Manage ~~issue categorie~~s	728	permission_manage_documents: Manage documents
	656	permission_~~protec~~t_wiki_pages: ~~Protec~~t wiki pages	729	permission_edit_wiki_pages: Edit wiki pages
	657	permission_comment_news: Comment news	730	permission_add_issue_watchers: Add watchers
	658	permission_delete_messages: Delete messages	731	permission_view_gantt: View gantt chart
	659	permission_select_project_modules: Select project modules	732	permission_move_issues: Move issues
	660	permission_manage_~~document~~s: Manage ~~document~~s	733	permission_manage_issue_relations: Manage issue relations
	661	permission_~~edit~~_wiki_pages: ~~Edit~~ wiki pages	734	permission_delete_wiki_pages: Delete wiki pages
	662	permission_add_issue_watchers: Add watchers	735	permission_manage_boards: Manage boards
	663	permission_view_gantt: View gantt chart	736	permission_delete_wiki_pages_attachments: Delete attachments
	664	permission_move_issues: Move issues	737	permission_view_wiki_edits: View wiki history
	665	permission_manage_issue_relations: Manage issue relations	738	permission_add_messages: Post messages
	666	permission_delete_wiki_pages: Delete wiki pages	739	permission_view_messages: View messages
	667	permission_manage_~~board~~s: Manage ~~board~~s	740	permission_manage_files: Manage files
	668	permission_delete_wiki_pages_attachments: Delete attachments	741	permission_edit_issue_notes: Edit notes
	669	permission_view_wiki_edits: View wiki history	742	permission_manage_news: Manage news
	670	permission_add_messages: Post messages	743	permission_view_calendar: View calendrier
	671	permission_view_messages: View messages	744	permission_manage_members: Manage members
	672	permission_manage_files: Manage files	745	permission_edit_messages: Edit messages
	673	permission_edit_issu~~e_not~~es: ~~Edit~~ ~~not~~es	746	permission_delete_issues: Delete issues
	674	permission_manage_news: Manage news	747	permission_view_issue_watchers: View watchers list
	675	permission_view_calendar: View calendrier	748	permission_manage_repository: Manage repository
	676	permission_manage_members: Manage members	749	permission_commit_access: Commit access
	677	permission_edit_messages: Edit messages	750	permission_browse_repository: Browse repository
	678	permission_delete_issues: Delete issues	751	permission_view_documents: View documents
	679	permission_view_issue_watchers: View watchers list	752	permission_edit_project: Edit project
	680	permission_manage_repository: Manage repository	753	permission_add_issue_notes: Add notes
	681	permission_commit_access: Commit access	754	permission_save_queries: Save queries
	682	permission_browse_repository: Browse repository	755	permission_view_wiki_pages: View wiki
	683	permission_view_documents: View documents	756	permission_rename_wiki_pages: Rename wiki pages
	684	permission_edit_~~project~~: Edit ~~projec~~t	757	permission_edit_time_entries: Edit time logs
	685	permission_~~add~~_issue_notes: ~~Add~~ notes	758	permission_edit_own_issue_notes: Edit own notes
	686	permission_save_queries: Save queries	759	setting_gravatar_enabled: Use Gravatar user icons
	687	permission_view_wiki_pages: View wiki	760	label_example: Example
	688	permission_rename_wiki_pages: Rename wiki pages	761	text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
	689	permission_edit_~~time_entri~~es: Edit ~~time~~ ~~log~~s	762	permission_edit_own_messages: Edit own messages
	690	permission_~~edit_own_issue_not~~es: ~~Edit~~ own ~~not~~es	763	permission_delete_own_messages: Delete own messages
	691	setting_gravatar_enabled: Use Gravatar user icons	764	label_user_activity: "{{value}}'s activity"
	692	label_example: Example	765	label_updated_time_by: "Updated by {{author}} {{age}} ago"
	693	text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."	766	text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
	694	permission_edit_own_messages: Edit own messages	767	setting_diff_max_lines_displayed: Max number of diff lines displayed
	695	permission_delete_own_messages: Delete own messages	768	text_plugin_assets_writable: Plugin assets directory writable
	696	label_user_activity: "%s's activity"	769	warning_attachments_not_saved: "{{count}} file(s) could not be saved."
	697	label_updated_time_by: Updated by %s %s ago	770	button_create_and_continue: Create and continue
	698	text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'	771	text_custom_field_possible_values_info: 'One line for each value'
	699	setting_diff_max_lines_displayed: Max number of diff lines displayed	772	label_display: Display
	700	text_plugin_assets_writable: Plugin assets directory writable	773	field_editable: Editable
	701	warning_attachments_not_saved: "%d file(s) could not be saved."	774	setting_repository_log_display_limit: Maximum number of revisions displayed on file log
	702	button_create_and_continue: Create and continue
	703	text_custom_field_possible_values_info: 'One line for each value'
	704	label_display: Display
	705	field_editable: Editable
	706	setting_repository_log_display_limit: Maximum number of revisions displayed on file log
	707	field_identity_url: OpenID URL
	708	setting_openid: Allow OpenID login and registration
	709	label_login_with_open_id_option: or login with OpenID
	710	field_watcher: Watcher

config/locales/cs.yml ~~lang/cs.yml~~ renamed +776 -712

This diff has been collapsed as it changes many lines, (1488 lines changed) Show them Hide them
	@@ -1,714 +1,778
	1	# CZ translation by Maxim Krušina \| Massimo Filippi, s.r.o. \| maxim@mxm.cz	1	cs:
	2	# Based on original CZ translation by Jan Kadleček	2	date:
			3	formats:
			4	# Use the strftime parameters for formats.
			5	# When no format has been given, it uses default.
			6	# You can provide other formats here if you like!
			7	default: "%Y-%m-%d"
			8	short: "%b %d"
			9	long: "%B %d, %Y"
			10
			11	day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
			12	abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
			13
			14	# Don't forget the nil at the beginning; there's no such thing as a 0th month
			15	month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
			16	abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
			17	# Used in date_select and datime_select.
			18	order: [ :year, :month, :day ]
	3		19
	4	_gloc_rule_default: '\|n\| n==1 ? "" : "_plural" '	20	time:
			21	formats:
			22	default: "%a, %d %b %Y %H:%M:%S %z"
			23	short: "%d %b %H:%M"
			24	long: "%B %d, %Y %H:%M"
			25	am: "am"
			26	pm: "pm"
			27
			28	datetime:
			29	distance_in_words:
			30	half_a_minute: "half a minute"
			31	less_than_x_seconds:
			32	one: "less than 1 second"
			33	other: "less than {{count}} seconds"
			34	x_seconds:
			35	one: "1 second"
			36	other: "{{count}} seconds"
			37	less_than_x_minutes:
			38	one: "less than a minute"
			39	other: "less than {{count}} minutes"
			40	x_minutes:
			41	one: "1 minute"
			42	other: "{{count}} minutes"
			43	about_x_hours:
			44	one: "about 1 hour"
			45	other: "about {{count}} hours"
			46	x_days:
			47	one: "1 day"
			48	other: "{{count}} days"
			49	about_x_months:
			50	one: "about 1 month"
			51	other: "about {{count}} months"
			52	x_months:
			53	one: "1 month"
			54	other: "{{count}} months"
			55	about_x_years:
			56	one: "about 1 year"
			57	other: "about {{count}} years"
			58	over_x_years:
			59	one: "over 1 year"
			60	other: "over {{count}} years"
			61
			62	# Used in array.to_sentence.
			63	support:
			64	array:
			65	sentence_connector: "and"
			66	skip_last_comma: false
			67
			68	activerecord:
			69	errors:
			70	messages:
			71	inclusion: "není zahrnuto v seznamu"
			72	exclusion: "je rezervováno"
			73	invalid: "je neplatné"
			74	confirmation: "se neshoduje s potvrzením"
			75	accepted: "musí být akceptováno"
			76	empty: "nemůže být prázdný"
			77	blank: "nemůže být prázdný"
			78	too_long: "je příliš dlouhý"
			79	too_short: "je příliš krátký"
			80	wrong_length: "má chybnou délku"
			81	taken: "je již použito"
			82	not_a_number: "není číslo"
			83	not_a_date: "není platné datum"
			84	greater_than: "must be greater than {{count}}"
			85	greater_than_or_equal_to: "must be greater than or equal to {{count}}"
			86	equal_to: "must be equal to {{count}}"
			87	less_than: "must be less than {{count}}"
			88	less_than_or_equal_to: "must be less than or equal to {{count}}"
			89	odd: "must be odd"
			90	even: "must be even"
			91	greater_than_start_date: "musí být větší než počáteční datum"
			92	not_same_project: "nepatří stejnému projektu"
			93	circular_dependency: "Tento vztah by vytvořil cyklickou závislost"
	5		94
	6	actionview_datehelper_select_day_prefix:	95	# CZ translation by Maxim Krušina \| Massimo Filippi, s.r.o. \| maxim@mxm.cz
	7	actionview_datehelper_select_month_names: Leden,Únor,Březen,Duben,Květen,Červen,Červenec,Srpen,Září,Říjen,Listopad,Prosinec	96	# Based on original CZ translation by Jan Kadleček
	8	actionview_datehelper_select_month_names_abbr: Led,Úno,Bře,Dub,Kvě,Čer,Čvc,Srp,Zář,Říj,Lis,Pro	97
	9	actionview_datehelper_select_month_prefix:	98	actionview_instancetag_blank_option: Prosím vyberte
	10	actionview_datehelper_select_year_prefix:	99
	11	actionview_datehelper_time_in_words_day: 1 den	100	general_text_No: 'Ne'
	12	actionview_datehelper_time_in_words_day_plural: %d dny	101	general_text_Yes: 'Ano'
	13	actionview_datehelper_time_in_words_hour_about: asi hodinou	102	general_text_no: 'ne'
	14	actionview_datehelper_time_in_words_hour_about_plural: asi %d hodinami	103	general_text_yes: 'ano'
	15	actionview_datehelper_time_in_words_hour_about_single: asi hodinou	104	general_lang_name: 'Čeština'
	16	actionview_datehelper_time_in_words_minute: 1 minutou	105	general_csv_separator: ','
	17	actionview_datehelper_time_in_words_minute_half: půl minutou	106	general_csv_decimal_separator: '.'
	18	actionview_datehelper_time_in_words_minute_less_than: méně než minutou	107	general_csv_encoding: UTF-8
	19	actionview_datehelper_time_in_words_minute_plural: %d minutami	108	general_pdf_encoding: UTF-8
	20	actionview_datehelper_time_in_words_minute_single: 1 minutou	109	general_first_day_of_week: '1'
	21	actionview_datehelper_time_in_words_second_less_than: méně než sekundou	110
	22	actionview_datehelper_time_in_words_second_less_than_plural: méně než %d sekundami	111	notice_account_updated: Účet byl úspěšně změněn.
	23	actionview_instancetag_blank_option: Prosím vyberte	112	notice_account_invalid_creditentials: Chybné jméno nebo heslo
	24		113	notice_account_password_updated: Heslo bylo úspěšně změněno.
	25	activerecord_error_inclusion: není zahrnuto v seznamu	114	notice_account_wrong_password: Chybné heslo
	26	activerecord_error_exclusion: je rezervováno	115	notice_account_register_done: Účet byl úspěšně vytvořen. Pro aktivaci účtu klikněte na odkaz v emailu, který vám byl zaslán.
	27	activerecord_error_invalid: je neplatné	116	notice_account_unknown_email: Neznámý uživatel.
	28	activerecord_error_confirmation: se neshoduje s potvrzením	117	notice_can_t_change_password: Tento účet používá externí autentifikaci. Zde heslo změnit nemůžete.
	29	activerecord_error_accepted: musí být akceptováno	118	notice_account_lost_email_sent: Byl vám zaslán email s intrukcemi jak si nastavíte nové heslo.
	30	activerecord_error_empty: nemůže být prázdný	119	notice_account_activated: Váš účet byl aktivován. Nyní se můžete přihlásit.
	31	activerecord_error_blank: nemůže být prázdný	120	notice_successful_create: Úspěšně vytvořeno.
	32	activerecord_error_too_long: je příliš dlouhý	121	notice_successful_update: Úspěšně aktualizováno.
	33	activerecord_error_too_short: je příliš krátký	122	notice_successful_delete: Úspěšně odstraněno.
	34	activerecord_error_wrong_length: má chybnou délku	123	notice_successful_connection: Úspěšné připojení.
	35	activerecord_error_taken: je již použito	124	notice_file_not_found: Stránka na kterou se snažíte zobrazit neexistuje nebo byla smazána.
	36	activerecord_error_not_a_number: není číslo	125	notice_locking_conflict: Údaje byly změněny jiným uživatelem.
	37	activerecord_error_not_a_date: není platné datum	126	notice_scm_error: Entry and/or revision doesn't exist in the repository.
	38	activerecord_error_greater_than_start_date: musí být větší než počáteční datum	127	notice_not_authorized: Nemáte dostatečná práva pro zobrazení této stránky.
	39	activerecord_error_not_same_project: nepatří stejnému projektu	128	notice_email_sent: "Na adresu {{value}} byl odeslán email"
	40	activerecord_error_circular_dependency: Tento vztah by vytvořil cyklickou závislost	129	notice_email_error: "Při odesílání emailu nastala chyba ({{value}})"
	41		130	notice_feeds_access_key_reseted: Váš klíč pro přístup k RSS byl resetován.
	42	general_fmt_age: %d rok	131	notice_failed_to_save_issues: "Failed to save {{count}} issue(s) on {{total}} selected: {{ids}}."
	43	general_fmt_age_plural: %d roků	132	notice_no_issue_selected: "Nebyl zvolen žádný úkol. Prosím, zvolte úkoly, které chcete editovat"
	44	general_fmt_date: %%m/%%d/%%Y	133	notice_account_pending: "Váš účet byl vytvořen, nyní čeká na schválení administrátorem."
	45	general_fmt_datetime: %%m/%%d/%%Y %%I:%%M %%p	134	notice_default_data_loaded: Výchozí konfigurace úspěšně nahrána.
	46	general_fmt_datetime_short: %%b %%d, %%I:%%M %%p	135
	47	general_fmt_time: %%I:%%M %%p	136	error_can_t_load_default_data: "Výchozí konfigurace nebyla nahrána: {{value}}"
	48	general_text_No: 'Ne'	137	error_scm_not_found: "Položka a/nebo revize neexistují v repository."
	49	general_text_Yes: 'Ano'	138	error_scm_command_failed: "Při pokusu o přístup k repository došlo k chybě: {{value}}"
	50	general_text_no: 'ne'	139	error_issue_not_found_in_project: 'Úkol nebyl nalezen nebo nepatří k tomuto projektu'
	51	general_text_yes: 'ano'	140
	52	general_lang_name: 'Čeština'	141	mail_subject_lost_password: "Vaše heslo ({{value}})"
	53	general_csv_separator: ','	142	mail_body_lost_password: 'Pro změnu vašeho hesla klikněte na následující odkaz:'
	54	general_csv_decimal_separator: '.'	143	mail_subject_register: "Aktivace účtu ({{value}})"
	55	general_csv_encoding: UTF-8	144	mail_body_register: 'Pro aktivaci vašeho účtu klikněte na následující odkaz:'
	56	general_pdf_encoding: UTF-8	145	mail_body_account_information_external: "Pomocí vašeho účtu {{value}} se můžete přihlásit."
	57	general_day_names: Pondělí,Úterý,Středa,Čtvrtek,Pátek,Sobota,Neděle	146	mail_body_account_information: Informace o vašem účtu
	58	general_first_day_of_week: '1'	147	mail_subject_account_activation_request: "Aktivace {{value}} účtu"
	59		148	mail_body_account_activation_request: "Byl zaregistrován nový uživatel {{value}}. Aktivace jeho účtu závisí na vašem potvrzení."
	60	notice_account_updated: Účet byl úspěšně změněn.	149
	61	notice_account_invalid_creditentials: Chybné jméno nebo heslo	150	gui_validation_error: 1 chyba
	62	notice_account_password_updated: Heslo bylo úspěšně změněno.	151	gui_validation_error_plural: "{{count}} chyb(y)"
	63	notice_account_wrong_password: Chybné heslo	152
	64	notice_account_register_done: Účet byl úspěšně vytvořen. Pro aktivaci účtu klikněte na odkaz v emailu, který vám byl zaslán.	153	field_name: Název
	65	notice_account_unknown_email: Neznámý uživatel.	154	field_description: Popis
	66	notice_can_t_change_password: Tento účet používá externí autentifikaci. Zde heslo změnit nemůžete.	155	field_summary: Přehled
	67	notice_account_lost_email_sent: Byl vám zaslán email s intrukcemi jak si nastavíte nové heslo.	156	field_is_required: Povinné pole
	68	notice_account_activated: Váš účet byl aktivován. Nyní se můžete přihlásit.	157	field_firstname: Jméno
	69	notice_successful_create: Úspěšně vytvořeno.	158	field_lastname: Příjmení
	70	notice_successful_update: Úspěšně aktualizováno.	159	field_mail: Email
	71	notice_successful_delete: Úspěšně odstraněno.	160	field_filename: Soubor
	72	notice_successful_connection: Úspěšné připojení.	161	field_filesize: Velikost
	73	notice_file_not_found: Stránka na kterou se snažíte zobrazit neexistuje nebo byla smazána.	162	field_downloads: Staženo
	74	notice_locking_conflict: Údaje byly změněny jiným uživatelem.	163	field_author: Autor
	75	notice_scm_error: Entry and/or revision doesn't exist in the repository.	164	field_created_on: Vytvořeno
	76	notice_not_authorized: Nemáte dostatečná práva pro zobrazení této stránky.	165	field_updated_on: Aktualizováno
	77	notice_email_sent: Na adresu %s byl odeslán email	166	field_field_format: Formát
	78	notice_email_error: Při odesílání emailu nastala chyba (%s)	167	field_is_for_all: Pro všechny projekty
	79	notice_feeds_access_key_reseted: Váš klíč pro přístup k RSS byl resetován.	168	field_possible_values: Možné hodnoty
	80	notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."	169	field_regexp: Regulární výraz
	81	notice_no_issue_selected: "Nebyl zvolen žádný úkol. Prosím, zvolte úkoly, které chcete editovat"	170	field_min_length: Minimální délka
	82	notice_account_pending: "Váš účet byl vytvořen, nyní čeká na schválení administrátorem."	171	field_max_length: Maximální délka
	83	notice_default_data_loaded: Výchozí konfigurace úspěšně nahrána.	172	field_value: Hodnota
	84		173	field_category: Kategorie
	85	error_can_t_load_default_data: "Výchozí konfigurace nebyla nahrána: %s"	174	field_title: Název
	86	error_scm_not_found: "Položka a/nebo revize neexistují v repository."	175	field_project: Projekt
	87	error_scm_command_failed: "Při pokusu o přístup k repository došlo k chybě: %s"	176	field_issue: Úkol
	88	error_issue_not_found_in_project: 'Úkol nebyl nalezen nebo nepatří k tomuto projektu'	177	field_status: Stav
	89		178	field_notes: Poznámka
	90	mail_subject_lost_password: Vaše heslo (%s)	179	field_is_closed: Úkol uzavřen
	91	mail_body_lost_password: 'Pro změnu vašeho hesla klikněte na následující odkaz:'	180	field_is_default: Výchozí stav
	92	mail_subject_register: Aktivace účtu (%s)	181	field_tracker: Fronta
	93	mail_body_register: 'Pro aktivaci vašeho účtu klikněte na následující odkaz:'	182	field_subject: Předmět
	94	mail_body_account_information_external: Pomocí vašeho účtu "%s" se můžete přihlásit.	183	field_due_date: Uzavřít do
	95	mail_body_account_information: Informace o vašem účtu	184	field_assigned_to: Přiřazeno
	96	mail_subject_account_activation_request: Aktivace %s účtu	185	field_priority: Priorita
	97	mail_body_account_activation_request: Byl zaregistrován nový uživatel "%s". Aktivace jeho účtu závisí na vašem potvrzení.	186	field_fixed_version: Přiřazeno k verzi
	98		187	field_user: Uživatel
	99	gui_validation_error: 1 chyba	188	field_role: Role
	100	gui_validation_error_plural: %d chyb(y)	189	field_homepage: Homepage
	101		190	field_is_public: Veřejný
	102	field_name: Název	191	field_parent: Nadřazený projekt
	103	field_description: Popis	192	field_is_in_chlog: Úkoly zobrazené v změnovém logu
	104	field_summary: Přehled	193	field_is_in_roadmap: Úkoly zobrazené v plánu
	105	field_is_required: Povinné pole	194	field_login: Přihlášení
	106	field_firstname: Jméno	195	field_mail_notification: Emailová oznámení
	107	field_lastname: Příjmení	196	field_admin: Administrátor
	108	field_mail: Email	197	field_last_login_on: Poslední přihlášení
	109	field_filename: Soubor	198	field_language: Jazyk
	110	field_filesize: Velikost	199	field_effective_date: Datum
	111	field_downloads: Staženo	200	field_password: Heslo
	112	field_author: Autor	201	field_new_password: Nové heslo
	113	field_created_on: Vytvořeno	202	field_password_confirmation: Potvrzení
	114	field_updated_on: Aktualizováno	203	field_version: Verze
	115	field_field_format: Formát	204	field_type: Typ
	116	field_is_for_all: Pro všechny projekty	205	field_host: Host
	117	field_possible_values: Možné hodnoty	206	field_port: Port
	118	field_regexp: Regulární výraz	207	field_account: Účet
	119	field_min_length: Minimální délka	208	field_base_dn: Base DN
	120	field_max_length: Maximální délka	209	field_attr_login: Přihlášení (atribut)
	121	field_value: Hodnota	210	field_attr_firstname: Jméno (atribut)
	122	field_category: Kategorie	211	field_attr_lastname: Příjemní (atribut)
	123	field_title: Název	212	field_attr_mail: Email (atribut)
	124	field_project: Projekt	213	field_onthefly: Automatické vytváření uživatelů
	125	field_issue: Úkol	214	field_start_date: Začátek
	126	field_status: Stav	215	field_done_ratio: %% Hotovo
	127	field_notes: Poznámka	216	field_auth_source: Autentifikační mód
	128	field_is_closed: Úkol uzavřen	217	field_hide_mail: Nezobrazovat můj email
	129	field_is_default: Výchozí stav	218	field_comments: Komentář
	130	field_tracker: Fronta	219	field_url: URL
	131	field_subject: Předmět	220	field_start_page: Výchozí stránka
	132	field_due_date: Uzavřít do	221	field_subproject: Podprojekt
	133	field_assigned_to: Přiřazeno	222	field_hours: Hodiny
	134	field_~~prior~~ity: ~~Prior~~ita	223	field_activity: Aktivita
	135	field_fixed_version: Přiřazeno k verzi	224	field_spent_on: Datum
	136	field_user: Uživatel	225	field_identifier: Identifikátor
	137	field_role: Role	226	field_is_filter: Použít jako filtr
	138	field_homepage: Homepage	227	field_issue_to_id: Související úkol
	139	field_is_public: Veřejný	228	field_delay: Zpoždění
	140	field_parent: Nadřazený projekt	229	field_assignable: Úkoly mohou být přiřazeny této roli
	141	field_is_in_chlog: Úkoly zobrazené v změnovém logu	230	field_redirect_existing_links: Přesměrovat stvávající odkazy
	142	field_is_in_roadmap: Úkoly zobrazené v plánu	231	field_estimated_hours: Odhadovaná doba
	143	field_login: Přihlášení	232	field_column_names: Sloupce
	144	field_mail_notification: Emailová oznámení	233	field_time_zone: Časové pásmo
	145	field_admin: Administrátor	234	field_searchable: Umožnit vyhledávání
	146	field_last_login_on: Poslední přihlášení	235	field_default_value: Výchozí hodnota
	147	field_language: Jazyk	236	field_comments_sorting: Zobrazit komentáře
	148	field_effective_date: Datum	237
	149	field_password: Heslo	238	setting_app_title: Název aplikace
	150	field_new_password: Nové heslo	239	setting_app_subtitle: Podtitulek aplikace
	151	field_password_confirmation: Potvrzení	240	setting_welcome_text: Uvítací text
	152	field_version: Verze	241	setting_default_language: Výchozí jazyk
	153	field_type: Typ	242	setting_login_required: Auten. vyžadována
	154	field_host: Host	243	setting_self_registration: Povolena automatická registrace
	155	field_port: Port	244	setting_attachment_max_size: Maximální velikost přílohy
	156	field_account: Účet	245	setting_issues_export_limit: Limit pro export úkolů
	157	field_base_dn: Base DN	246	setting_mail_from: Odesílat emaily z adresy
	158	field_attr_login: Přihlášení (atribut)	247	setting_bcc_recipients: Příjemci skryté kopie (bcc)
	159	field_attr_firstname: Jméno (atribut)	248	setting_host_name: Host name
	160	field_attr_lastname: Příjemní (atribut)	249	setting_text_formatting: Formátování textu
	161	field_attr_mail: Email (atribut)	250	setting_wiki_compression: Komperese historie Wiki
	162	field_onthefly: Automatické vytváření uživatelů	251	setting_feeds_limit: Feed content limit
	163	field_start_date: Začátek	252	setting_default_projects_public: Nové projekty nastavovat jako veřejné
	164	field_done_ratio: %% Hotovo	253	setting_autofetch_changesets: Autofetch commits
	165	field_auth_source: Autentifikační mód	254	setting_sys_api_enabled: Povolit WS pro správu repozitory
	166	field_hide_mail: Nezobrazovat můj email	255	setting_commit_ref_keywords: Klíčová slova pro odkazy
	167	field_comments: Komentář	256	setting_commit_fix_keywords: Klíčová slova pro uzavření
	168	field_url: URL	257	setting_autologin: Automatické přihlašování
	169	field_start_page: Výchozí stránka	258	setting_date_format: Formát data
	170	field_subproject: Podprojekt	259	setting_time_format: Formát času
	171	field_hours: Hodiny	260	setting_cross_project_issue_relations: Povolit vazby úkolů napříč projekty
	172	field_activity: Aktivita	261	setting_issue_list_default_columns: Výchozí sloupce zobrazené v seznamu úkolů
	173	field_spent_on: Datum	262	setting_repositories_encodings: Kódování
	174	field_identifier: Identifikátor	263	setting_emails_footer: Patička emailů
	175	field_is_filter: Použít jako filtr	264	setting_protocol: Protokol
	176	field_issue_to_id: Související úkol	265	setting_per_page_options: Povolené počty řádků na stránce
	177	field_delay: Zpoždění	266	setting_user_format: Formát zobrazení uživatele
	178	field_assignable: Úkoly mohou být přiřazeny této roli	267	setting_activity_days_default: Days displayed on project activity
	179	field_redirect_existing_links: Přesměrovat stvávající odkazy	268	setting_display_subprojects_issues: Display subprojects issues on main projects by default
	180	field_estimated_hours: Odhadovaná doba	269
	181	field_column_names: Sloupce	270	project_module_issue_tracking: Sledování úkolů
	182	field_time_zone: Časové pásmo	271	project_module_time_tracking: Sledování času
	183	field_searchable: Umožnit vyhledávání	272	project_module_news: Novinky
	184	field_default_value: Výchozí hodnota	273	project_module_documents: Dokumenty
	185	field_comments_sorting: Zobrazit komentáře	274	project_module_files: Soubory
	186		275	project_module_wiki: Wiki
	187	setting_app_title: Název aplikace	276	project_module_repository: Repository
	188	setting_app_subtitle: Podtitulek aplikace	277	project_module_boards: Diskuse
	189	setting_welcome_text: Uvítací text	278
	190	setting_default_language: Výchozí jazyk	279	label_user: Uživatel
	191	setting_login_required: Auten. vyžadována	280	label_user_plural: Uživatelé
	192	setting_self_registration: Povolena automatická registrace	281	label_user_new: Nový uživatel
	193	setting_attachment_max_size: Maximální velikost přílohy	282	label_project: Projekt
	194	setting_issues_export_limit: Limit pro export úkolů	283	label_project_new: Nový projekt
	195	setting_mail_from: Odesílat emaily z adresy	284	label_project_plural: Projekty
	196	setting_bcc_recipients: Příjemci skryté kopie (bcc)	285	label_x_projects:
	197	setting_host_name: Host name	286	zero: no projects
	198	setting_text_formatting: Formátování textu	287	one: 1 project
	199	setting_wiki_compression: Komperese historie Wiki	288	other: "{{count}} projects"
	200	setting_feeds_limit: Feed content limit	289	label_project_all: Všechny projekty
	201	setting_default_projects_public: Nové projekty nastavovat jako veřejné	290	label_project_latest: Poslední projekty
	202	setting_autofetch_changesets: Autofetch commits	291	label_issue: Úkol
	203	setting_sys_api_enabled: Povolit WS pro správu repozitory	292	label_issue_new: Nový úkol
	204	setting_commit_ref_keywords: Klíčová slova pro odkazy	293	label_issue_plural: Úkoly
	205	setting_commit_fix_keywords: Klíčová slova pro uzavření	294	label_issue_view_all: Všechny úkoly
	206	setting_autologin: Automatické přihlašování	295	label_issues_by: "Úkoly od uživatele {{value}}"
	207	setting_date_format: Formát data	296	label_issue_added: Úkol přidán
	208	setting_time_format: Formát času	297	label_issue_updated: Úkol aktualizován
	209	setting_cross_project_issue_relations: Povolit vazby úkolů napříč projekty	298	label_document: Dokument
	210	setting_issue_list_default_columns: Výchozí sloupce zobrazené v seznamu úkolů	299	label_document_new: Nový dokument
	211	setting_repositories_encodings: Kódování	300	label_document_plural: Dokumenty
	212	setting_emails_footer: Patička emailů	301	label_document_added: Dokument přidán
	213	setting_protocol: Protokol	302	label_role: Role
	214	setting_per_page_options: Povolené počty řádků na stránce	303	label_role_plural: Role
	215	setting_user_format: Formát zobrazení uživatele	304	label_role_new: Nová role
	216	setting_activity_days_default: Days displayed on project activity	305	label_role_and_permissions: Role a práva
	217	setting_display_subprojects_issues: Display subprojects issues on main projects by default	306	label_member: Člen
	218		307	label_member_new: Nový člen
	219	project_module_issue_tracking: Sledování úkolů	308	label_member_plural: Členové
	220	project_module_time_tracking: Sledování času	309	label_tracker: Fronta
	221	project_module_news: Novinky	310	label_tracker_plural: Fronty
	222	project_module_documents: Dokumenty	311	label_tracker_new: Nová fronta
	223	project_module_files: Soubory	312	label_workflow: Workflow
	224	project_module_wiki: Wiki	313	label_issue_status: Stav úkolu
	225	project_module_repository: Repository	314	label_issue_status_plural: Stavy úkolů
	226	project_module_boards: Diskuse	315	label_issue_status_new: Nový stav
	227		316	label_issue_category: Kategorie úkolu
	228	label_user: Uživatel	317	label_issue_category_plural: Kategorie úkolů
	229	label_user_plural: Uživatelé	318	label_issue_category_new: Nová kategorie
	230	label_user_new: Nový uživatel	319	label_custom_field: Uživatelské pole
	231	label_project: Projekt	320	label_custom_field_plural: Uživatelská pole
	232	label_project_new: Nový projekt	321	label_custom_field_new: Nové uživatelské pole
	233	label_project_plural: Projekty	322	label_enumerations: Seznamy
	234	label_project_all: Všechny projekty	323	label_enumeration_new: Nová hodnota
	235	label_project_latest: Poslední projekty	324	label_information: Informace
	236	label_issue: Úkol	325	label_information_plural: Informace
	237	label_issue_new: Nový úkol	326	label_please_login: Prosím přihlašte se
	238	label_issue_plural: Úkoly	327	label_register: Registrovat
	239	label_issue_view_all: Všechny úkoly	328	label_password_lost: Zapomenuté heslo
	240	label_issues_by: Úkoly od uživatele %s	329	label_home: Úvodní
	241	label_issue_added: Úkol přidán	330	label_my_page: Moje stránka
	242	label_issue_updated: Úkol aktualizován	331	label_my_account: Můj účet
	243	label_document: Dokument	332	label_my_projects: Moje projekty
	244	label_document_new: Nový dokument	333	label_administration: Administrace
	245	label_document_plural: Dokumenty	334	label_login: Přihlášení
	246	label_document_added: Dokument přidán	335	label_logout: Odhlášení
	247	label_role: Role	336	label_help: Nápověda
	248	label_role_plural: Role	337	label_reported_issues: Nahlášené úkoly
	249	label_role_new: Nová role	338	label_assigned_to_me_issues: Mé úkoly
	250	label_role_and_permissions: Role a práva	339	label_last_login: Poslední přihlášení
	251	label_member: Člen	340	label_registered_on: Registrován
	252	label_member_new: Nový člen	341	label_activity: Aktivita
	253	label_member_plural: Členové	342	label_overall_activity: Celková aktivita
	254	label_tracker: Fronta	343	label_new: Nový
	255	label_tracker_plural: Fronty	344	label_logged_as: Přihlášen jako
	256	label_tracker_new: Nová fronta	345	label_environment: Prostředí
	257	label_workflow: Workflow	346	label_authentication: Autentifikace
	258	label_issue_status: Stav úkolu	347	label_auth_source: Mód autentifikace
	259	label_issue_status_plural: Stavy úkolů	348	label_auth_source_new: Nový mód autentifikace
	260	label_issue_status_new: Nový stav	349	label_auth_source_plural: Módy autentifikace
	261	label_issue_category: Kategorie úkolu	350	label_subproject_plural: Podprojekty
	262	label_issue_category_plural: Kategorie úkolů	351	label_min_max_length: Min - Max délka
	263	label_issue_category_new: Nová kategorie	352	label_list: Seznam
	264	label_custom_field: Uživatelské pole	353	label_date: Datum
	265	label_custom_field_plural: Uživatelská pole	354	label_integer: Celé číslo
	266	label_custom_field_new: Nové uživatelské pole	355	label_float: Desetiné číslo
	267	label_enumerations: Seznamy	356	label_boolean: Ano/Ne
	268	label_enumeration_new: Nová hodnota	357	label_string: Text
	269	label_information: Informace	358	label_text: Dlouhý text
	270	label_information_plural: Informace	359	label_attribute: Atribut
	271	label_please_login: Prosím přihlašte se	360	label_attribute_plural: Atributy
	272	label_register: Registrovat	361	label_download: "{{count}} Download"
	273	label_password_lost: Zapomenuté heslo	362	label_download_plural: "{{count}} Downloads"
	274	label_home: Úvodní	363	label_no_data: Žádné položky
	275	label_my_page: Moje stránka	364	label_change_status: Změnit stav
	276	label_my_account: Můj účet	365	label_history: Historie
	277	label_my_projects: Moje projekty	366	label_attachment: Soubor
	278	label_administration: Administrace	367	label_attachment_new: Nový soubor
	279	label_login: Přihlášení	368	label_attachment_delete: Odstranit soubor
	280	label_logout: Odhlášení	369	label_attachment_plural: Soubory
	281	label_help: Nápověda	370	label_file_added: Soubor přidán
	282	label_reported_issues: Nahlášené úkoly	371	label_report: Přeheled
	283	label_assigned_to_me_issues: Mé úkoly	372	label_report_plural: Přehledy
	284	label_last_login: Poslední přihlášení	373	label_news: Novinky
	285	label_last_updates: Poslední změna	374	label_news_new: Přidat novinku
	286	label_last_updates_plural: %d poslední změny	375	label_news_plural: Novinky
	287	label_registered_on: Registrován	376	label_news_latest: Poslední novinky
	288	label_activity: Aktivita	377	label_news_view_all: Zobrazit všechny novinky
	289	label_overall_activity: Celková aktivita	378	label_news_added: Novinka přidána
	290	label_new: Nový	379	label_change_log: Protokol změn
	291	label_logged_as: Přihlášen jako	380	label_settings: Nastavení
	292	label_~~environment~~: P~~rost~~ředí	381	label_overview: Přehled
	293	label_authentication: Autentifikace	382	label_version: Verze
	294	label_auth_source: Mód autentifikace	383	label_version_new: Nová verze
	295	label_auth_source_new: Nový mód autentifikace	384	label_version_plural: Verze
	296	label_auth_source_plural: Módy autentifikace	385	label_confirmation: Potvrzení
	297	label_subproject_plural: Podprojekty	386	label_export_to: 'Také k dispozici:'
	298	label_min_max_length: Min - Max délka	387	label_read: Načítá se...
	299	label_list: Seznam	388	label_public_projects: Veřejné projekty
	300	label_date: Datum	389	label_open_issues: otevřený
	301	label_integer: Celé číslo	390	label_open_issues_plural: otevřené
	302	label_float: Desetiné číslo	391	label_closed_issues: uzavřený
	303	label_boolean: Ano/Ne	392	label_closed_issues_plural: uzavřené
	304	label_string: Text	393	label_x_open_issues_abbr_on_total:
	305	label_text: Dlouhý text	394	zero: 0 open / {{total}}
	306	label_attribute: Atribut	395	one: 1 open / {{total}}
	307	label_attribute_plural: Atributy	396	other: "{{count}} open / {{total}}"
	308	label_download: %d Download	397	label_x_open_issues_abbr:
	309	label_download_plural: %d Downloads	398	zero: 0 open
	310	label_no_data: Žádné položky	399	one: 1 open
	311	label_change_status: Změnit stav	400	other: "{{count}} open"
	312	label_history: Historie	401	label_x_closed_issues_abbr:
	313	label_attachment: Soubor	402	zero: 0 closed
	314	label_attachment_new: Nový soubor	403	one: 1 closed
	315	label_attachment_delete: Odstranit soubor	404	other: "{{count}} closed"
	316	label_attachment_plural: Soubory	405	label_total: Celkem
	317	label_file_added: Soubor přidán	406	label_permissions: Práva
	318	label_report: Přeheled	407	label_current_status: Aktuální stav
	319	label_report_plural: Přehledy	408	label_new_statuses_allowed: Nové povolené stavy
	320	label_news: Novinky	409	label_all: vše
	321	label_news_new: Přidat novinku	410	label_none: nic
	322	label_news_plural: Novinky	411	label_nobody: nikdo
	323	label_news_latest: Poslední novinky	412	label_next: Další
	324	label_news_view_all: Zobrazit všechny novinky	413	label_previous: Předchozí
	325	label_news_added: Novinka přidána	414	label_used_by: Použito
	326	label_change_log: Protokol změn	415	label_details: Detaily
	327	label_settings: Nastavení	416	label_add_note: Přidat poznámku
	328	label_overview: Přehled	417	label_per_page: Na stránku
	329	label_version: Verze	418	label_calendar: Kalendář
	330	label_version_new: Nová verze	419	label_months_from: měsíců od
	331	label_version_plural: Verze	420	label_gantt: Ganttův graf
	332	label_confirmation: Potvrzení	421	label_internal: Interní
	333	label_export_to: 'Také k dispozici:'	422	label_last_changes: "posledních {{count}} změn"
	334	label_read: Načítá se...	423	label_change_view_all: Zobrazit všechny změny
	335	label_public_projects: Veřejné projekty	424	label_personalize_page: Přizpůsobit tuto stránku
	336	label_open_issues: otevřený	425	label_comment: Komentář
	337	label_~~open_issues~~_plural: ~~otevřené~~	426	label_comment_plural: Komentáře
	338	label_closed_issues: uzavřený	427	label_x_comments:
	339	label_closed_issues_plural: uzavřené	428	zero: no comments
	340	label_total: Celkem	429	one: 1 comment
	341	label_permissions: Práva	430	other: "{{count}} comments"
	342	label_current_status: Aktuální stav	431	label_comment_add: Přidat komentáře
	343	label_new_statuses_allowed: Nové povolené stavy	432	label_comment_added: Komentář přidán
	344	label_all: vše	433	label_comment_delete: Odstranit komentář
	345	label_none: nic	434	label_query: Uživatelský dotaz
	346	label_nobody: nikdo	435	label_query_plural: Uživatelské dotazy
	347	label_next: Další	436	label_query_new: Nový dotaz
	348	label_previous: Předchozí	437	label_filter_add: Přidat filtr
	349	label_used_by: Použito	438	label_filter_plural: Filtry
	350	label_~~detai~~ls: ~~Detaily~~	439	label_equals: je
	351	label_add_note: Přidat poznámku	440	label_not_equals: není
	352	label_per_page: Na stránku	441	label_in_less_than: je měší než
	353	label_calendar: Kalendář	442	label_in_more_than: je větší než
	354	label_months_from: měsíců od	443	label_in: v
	355	label_gantt: Ganttův graf	444	label_today: dnes
	356	label_internal: Interní	445	label_all_time: vše
	357	label_last_changes: posledních %d změn	446	label_yesterday: včera
	358	label_change_view_all: Zobrazit všechny změny	447	label_this_week: tento týden
	359	label_personalize_page: Přizpůsobit tuto stránku	448	label_last_week: minulý týden
	360	label_comment: Komentář	449	label_last_n_days: "posledních {{count}} dnů"
	361	label_comment_plural: Komentáře	450	label_this_month: tento měsíc
	362	label_comment_add: Přidat komentáře	451	label_last_month: minulý měsíc
	363	label_comment_added: Komentář přidán	452	label_this_year: tento rok
	364	label_comment_delete: Odstranit komentář	453	label_date_range: Časový rozsah
	365	label_query: Uživatelský dotaz	454	label_less_than_ago: před méně jak (dny)
	366	label_query_plural: Uživatelské dotazy	455	label_more_than_ago: před více jak (dny)
	367	label_query_new: Nový dotaz	456	label_ago: před (dny)
	368	label_filter_add: Přidat filtr	457	label_contains: obsahuje
	369	label_filter_plural: Filtry	458	label_not_contains: neobsahuje
	370	label_equals: je	459	label_day_plural: dny
	371	label_not_equals: není	460	label_repository: Repository
	372	label_in_less_than: je měší než	461	label_repository_plural: Repository
	373	label_in_more_than: je větší než	462	label_browse: Procházet
	374	label_in: v	463	label_modification: "{{count}} změna"
	375	label_today: dnes	464	label_modification_plural: "{{count}} změn"
	376	label_all_time: vše	465	label_revision: Revize
	377	label_yesterday: včera	466	label_revision_plural: Revizí
	378	label_this_week: tento týden	467	label_associated_revisions: Související verze
	379	label_last_week: minulý týden	468	label_added: přidáno
	380	label_last_n_days: posledních %d dnů	469	label_modified: změněno
	381	label_this_month: tento měsíc	470	label_deleted: odstraněno
	382	label_last_month: minulý měsíc	471	label_latest_revision: Poslední revize
	383	label_this_year: tento rok	472	label_latest_revision_plural: Poslední revize
	384	label_date_range: Časový rozsah	473	label_view_revisions: Zobrazit revize
	385	label_less_than_ago: před méně jak (dny)	474	label_max_size: Maximální velikost
	386	label_more_than_ago: před více jak (dny)	475	label_sort_highest: Přesunout na začátek
	387	label_ago: před (dny)	476	label_sort_higher: Přesunout nahoru
	388	label_contains: obsahuje	477	label_sort_lower: Přesunout dolů
	389	label_not_contains: neobsahuje	478	label_sort_lowest: Přesunout na konec
	390	label_day_plural: dny	479	label_roadmap: Plán
	391	label_repository: Repository	480	label_roadmap_due_in: "Zbývá {{value}}"
	392	label_repository_plural: Repository	481	label_roadmap_overdue: "{{value}} pozdě"
	393	label_browse: Procházet	482	label_roadmap_no_issues: Pro tuto verzi nejsou žádné úkoly
	394	label_modification: %d změna	483	label_search: Hledat
	395	label_modification_plural: %d změn	484	label_result_plural: Výsledky
	396	label_revision: Revize	485	label_all_words: Všechna slova
	397	label_revision_plural: Revizí	486	label_wiki: Wiki
	398	label_associated_revisions: Související verze	487	label_wiki_edit: Wiki úprava
	399	label_added: přidáno	488	label_wiki_edit_plural: Wiki úpravy
	400	label_modified: změněno	489	label_wiki_page: Wiki stránka
	401	label_deleted: odstraněno	490	label_wiki_page_plural: Wiki stránky
	402	label_latest_revision: Poslední revize	491	label_index_by_title: Index dle názvu
	403	label_latest_revision_plural: Poslední revize	492	label_index_by_date: Index dle data
	404	label_view_revisions: Zobrazit revize	493	label_current_version: Aktuální verze
	405	label_max_size: Maximální velikost	494	label_preview: Náhled
	406	label_on: 'zapnuto'	495	label_feed_plural: Příspěvky
	407	label_sort_highest: Přesunout na začátek	496	label_changes_details: Detail všech změn
	408	label_sort_higher: Přesunout nahoru	497	label_issue_tracking: Sledování úkolů
	409	label_sort_lower: Přesunout dolů	498	label_spent_time: Strávený čas
	410	label_sort_lowest: Přesunout na konec	499	label_f_hour: "{{value}} hodina"
	411	label_roadmap: Plán	500	label_f_hour_plural: "{{value}} hodin"
	412	label_roadmap_due_in: Zbývá %s	501	label_time_tracking: Sledování času
	413	label_roadmap_overdue: %s pozdě	502	label_change_plural: Změny
	414	label_roadmap_no_issues: Pro tuto verzi nejsou žádné úkoly	503	label_statistics: Statistiky
	415	label_search: Hledat	504	label_commits_per_month: Commitů za měsíc
	416	label_result_plural: Výsledky	505	label_commits_per_author: Commitů za autora
	417	label_all_words: Všechna slova	506	label_view_diff: Zobrazit rozdíly
	418	label_wiki: Wiki	507	label_diff_inline: uvnitř
	419	label_wiki_edit: Wiki úprava	508	label_diff_side_by_side: vedle sebe
	420	label_wiki_edit_plural: Wiki úpravy	509	label_options: Nastavení
	421	label_wiki_page: Wiki stránka	510	label_copy_workflow_from: Kopírovat workflow z
	422	label_wiki_page_plural: Wiki stránky	511	label_permissions_report: Přehled práv
	423	label_index_by_title: Index dle názvu	512	label_watched_issues: Sledované úkoly
	424	label_index_by_date: Index dle data	513	label_related_issues: Související úkoly
	425	label_current_version: Aktuální verze	514	label_applied_status: Použitý stav
	426	label_preview: Náhled	515	label_loading: Nahrávám...
	427	label_feed_plural: Příspěvky	516	label_relation_new: Nová souvislost
	428	label_changes_details: Detail všech změn	517	label_relation_delete: Odstranit souvislost
	429	label_issue_tracking: Sledování úkolů	518	label_relates_to: související s
	430	label_spent_time: Strávený čas	519	label_duplicates: duplicity
	431	label_f_hour: %.2f hodina	520	label_blocks: bloků
	432	label_f_hour_plural: %.2f hodin	521	label_blocked_by: zablokován
	433	label_time_tracking: Sledování času	522	label_precedes: předchází
	434	label_change_plural: Změny	523	label_follows: následuje
	435	label_statistics: Statistiky	524	label_end_to_start: od konce do začátku
	436	label_commits_per_month: Commitů za měsíc	525	label_end_to_end: od konce do konce
	437	label_commits_per_author: Commitů za autora	526	label_start_to_start: od začátku do začátku
	438	label_view_diff: Zobrazit rozdíly	527	label_start_to_end: od začátku do konce
	439	label_diff_inline: uvnitř	528	label_stay_logged_in: Zůstat přihlášený
	440	label_diff_side_by_side: vedle sebe	529	label_disabled: zakázán
	441	label_options: Nastavení	530	label_show_completed_versions: Ukázat dokončené verze
	442	label_copy_workflow_from: Kopírovat workflow z	531	label_me: mě
	443	label_permissions_report: Přehled práv	532	label_board: Fórum
	444	label_watched_issues: Sledované úkoly	533	label_board_new: Nové fórum
	445	label_related_issues: Související úkoly	534	label_board_plural: Fóra
	446	label_applied_status: Použitý stav	535	label_topic_plural: Témata
	447	label_loading: Nahrávám...	536	label_message_plural: Zprávy
	448	label_relation_new: Nová souvislost	537	label_message_last: Poslední zpráva
	449	label_relation_delete: Odstranit souvislost	538	label_message_new: Nová zpráva
	450	label_relates_to: související s	539	label_message_posted: Zpráva přidána
	451	label_duplicates: duplicity	540	label_reply_plural: Odpovědi
	452	label_blocks: bloků	541	label_send_information: Zaslat informace o účtu uživateli
	453	label_blocked_by: zablokován	542	label_year: Rok
	454	label_precedes: předchází	543	label_month: Měsíc
	455	label_follows: následuje	544	label_week: Týden
	456	label_end_to_start: od konce do začátku	545	label_date_from: Od
	457	label_end_to_end: od konce do konce	546	label_date_to: Do
	458	label_start_to_start: od začátku do začátku	547	label_language_based: Podle výchozího jazyku
	459	label_start_to_end: od začátku do konce	548	label_sort_by: "Seřadit podle {{value}}"
	460	label_stay_logged_in: Zůstat přihlášený	549	label_send_test_email: Poslat testovací email
	461	label_disabled: zakázán	550	label_feeds_access_key_created_on: "Přístupový klíč pro RSS byl vytvořen před {{value}}"
	462	label_show_completed_versions: Ukázat dokončené verze	551	label_module_plural: Moduly
	463	label_me: mě	552	label_added_time_by: "'Přidáno uživatelem {{author}} před {{age}}'"
	464	label_board: Fórum	553	label_updated_time: "Aktualizováno před {{value}}'"
	465	label_board_new: Nové fórum	554	label_jump_to_a_project: Zvolit projekt...
	466	label_~~board~~_plural: ~~Fóra~~	555	label_file_plural: Soubory
	467	label_topic_plural: Témata	556	label_changeset_plural: Changesety
	468	label_message_plural: Zprávy	557	label_default_columns: Výchozí sloupce
	469	label_message_last: Poslední zpráva	558	label_no_change_option: (beze změny)
	470	label_message_new: Nová zpráva	559	label_bulk_edit_selected_issues: Bulk edit selected issues
	471	label_message_posted: Zpráva přidána	560	label_theme: Téma
	472	label_reply_plural: Odpovědi	561	label_default: Výchozí
	473	label_send_information: Zaslat informace o účtu uživateli	562	label_search_titles_only: Vyhledávat pouze v názvech
	474	label_year: Rok	563	label_user_mail_option_all: "Pro všechny události všech mých projektů"
	475	label_month: Měsíc	564	label_user_mail_option_selected: "Pro všechny události vybraných projektů..."
	476	label_week: Týden	565	label_user_mail_option_none: "Pouze pro události které sleduji nebo které se mne týkají"
	477	label_date_from: Od	566	label_user_mail_no_self_notified: "Nezasílat informace o mnou vytvořených změnách"
	478	label_date_to: Do	567	label_registration_activation_by_email: aktivace účtu emailem
	479	label_language_based: Podle výchozího jazyku	568	label_registration_manual_activation: manuální aktivace účtu
	480	label_sort_by: Seřadit podle %s	569	label_registration_automatic_activation: automatická aktivace účtu
	481	label_send_test_email: Poslat testovací email	570	label_display_per_page: "{{value}} na stránku'"
	482	label_feeds_access_key_created_on: Přístupový klíč pro RSS byl vytvořen před %s	571	label_age: Věk
	483	label_module_plural: Moduly	572	label_change_properties: Změnit vlastnosti
	484	label_added_time_by: 'Přidáno uživatelem %s před %s'	573	label_general: Obecné
	485	label_updated_time: 'Aktualizováno před %s'	574	label_more: Více
	486	label_jump_to_a_project: Zvolit projekt...	575	label_scm: SCM
	487	label_file_plural: Soubory	576	label_plugins: Doplňky
	488	label_changeset_plural: Changesety	577	label_ldap_authentication: Autentifikace LDAP
	489	label_default_columns: Výchozí sloupce	578	label_downloads_abbr: D/L
	490	label_no_change_option: (beze změny)	579	label_optional_description: Volitelný popis
	491	label_bulk_edit_selected_issues: Bulk edit selected issues	580	label_add_another_file: Přidat další soubor
	492	label_theme: Téma	581	label_preferences: Nastavení
	493	label_default: Výchozí	582	label_chronological_order: V chronologickém pořadí
	494	label_search_titles_only: Vyhledávat pouze v názvech	583	label_reverse_chronological_order: V obrácaném chronologickém pořadí
	495	label_user_mail_option_all: "Pro všechny události všech mých projektů"	584
	496	label_user_mail_option_selected: "Pro všechny události vybraných projektů..."	585	button_login: Přihlásit
	497	label_user_mail_option_none: "Pouze pro události které sleduji nebo které se mne týkají"	586	button_submit: Potvrdit
	498	label_user_mail_no_self_notified: "Nezasílat informace o mnou vytvořených změnách"	587	button_save: Uložit
	499	label_registration_activation_by_email: aktivace účtu emailem	588	button_check_all: Zašrtnout vše
	500	label_registration_manual_activation: manuální aktivace účtu	589	button_uncheck_all: Odšrtnout vše
	501	label_registration_automatic_activation: automatická aktivace účtu	590	button_delete: Odstranit
	502	label_display_per_page: '%s na stránku'	591	button_create: Vytvořit
	503	label_age: Věk	592	button_test: Test
	504	label_change_properties: Změnit vlastnosti	593	button_edit: Upravit
	505	label_general: Obecné	594	button_add: Přidat
	506	label_more: Více	595	button_change: Změnit
	507	label_scm: SCM	596	button_apply: Použít
	508	label_plugins: Doplňky	597	button_clear: Smazat
	509	label_ldap_authentication: Autentifikace LDAP	598	button_lock: Zamknout
	510	label_downloads_abbr: D/L	599	button_unlock: Odemknout
	511	label_optional_description: Volitelný popis	600	button_download: Stáhnout
	512	label_add_another_file: Přidat další soubor	601	button_list: Vypsat
	513	label_preferences: Nastavení	602	button_view: Zobrazit
	514	label_chronological_order: V chronologickém pořadí	603	button_move: Přesunout
	515	label_reverse_chronological_order: V obrácaném chronologickém pořadí	604	button_back: Zpět
	516		605	button_cancel: Storno
	517	button_login: Přihlásit	606	button_activate: Aktivovat
	518	button_s~~ubmi~~t: ~~Potvr~~dit	607	button_sort: Seřadit
	519	button_save: Uložit	608	button_log_time: Přidat čas
	520	button_check_all: Zašrtnout vše	609	button_rollback: Zpět k této verzi
	521	button_uncheck_all: Odšrtnout vše	610	button_watch: Sledovat
	522	button_delete: Odstranit	611	button_unwatch: Nesledovat
	523	button_create: Vytvořit	612	button_reply: Odpovědět
	524	button_test: Test	613	button_archive: Archivovat
	525	button_edit: Upravit	614	button_unarchive: Odarchivovat
	526	button_add: Přidat	615	button_reset: Reset
	527	button_change: Změnit	616	button_rename: Přejmenovat
	528	button_apply: Použít	617	button_change_password: Změnit heslo
	529	button_clear: Smazat	618	button_copy: Kopírovat
	530	button_lock: Zamknout	619	button_annotate: Komentovat
	531	button_unlock: Odemknout	620	button_update: Aktualizovat
	532	button_download: Stáhnout	621	button_configure: Konfigurovat
	533	button_list: Vypsat	622
	534	button_view: Zobrazit	623	status_active: aktivní
	535	button_move: Přesunout	624	status_registered: registrovaný
	536	button_back: Zpět	625	status_locked: uzamčený
	537	button_cancel: Storno	626
	538	button_activate: Aktivovat	627	text_select_mail_notifications: Vyberte akci při které bude zasláno upozornění emailem.
	539	button_sort: Seřadit	628	text_regexp_info: např. ^[A-Z0-9]+$
	540	button_log_time: Přidat čas	629	text_min_max_length_info: 0 znamená bez limitu
	541	button_rollback: Zpět k této verzi	630	text_project_destroy_confirmation: Jste si jisti, že chcete odstranit tento projekt a všechna související data ?
	542	button_watch: Sledovat	631	text_workflow_edit: Vyberte roli a frontu k editaci workflow
	543	button_unwatch: Nesledovat	632	text_are_you_sure: Jste si jisti?
	544	button_reply: Odpovědět	633	text_journal_changed: "změněno z {{old}} na {{new}}"
	545	button_archive: Archivovat	634	text_journal_set_to: "nastaveno na {{value}}"
	546	button_unarchive: Odarchivovat	635	text_journal_deleted: odstraněno
	547	button_reset: Reset	636	text_tip_task_begin_day: úkol začíná v tento den
	548	button_rename: Přejmenovat	637	text_tip_task_end_day: úkol končí v tento den
	549	button_change_password: Změnit heslo	638	text_tip_task_begin_end_day: úkol začíná a končí v tento den
	550	button_copy: Kopírovat	639	text_project_identifier_info: 'Jsou povolena malá písmena (a-z), čísla a pomlčky.<br />Po uložení již není možné identifikátor změnit.'
	551	button_annotate: Komentovat	640	text_caracters_maximum: "{{count}} znaků maximálně."
	552	button_update: Aktualizovat	641	text_caracters_minimum: "Musí být alespoň {{count}} znaků dlouhé."
	553	button_configure: Konfigurovat	642	text_length_between: "Délka mezi {{min}} a {{max}} znaky."
	554		643	text_tracker_no_workflow: Pro tuto frontu není definován žádný workflow
	555	status_active: aktivní	644	text_unallowed_characters: Nepovolené znaky
	556	status_registered: registrovaný	645	text_comma_separated: Povoleno více hodnot (oddělěné čárkou).
	557	status_locked: uzamčený	646	text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
	558		647	text_issue_added: "Úkol {{id}} byl vytvořen uživatelem {{author}}."
	559	text_select_mail_notifications: Vyberte akci při které bude zasláno upozornění emailem.	648	text_issue_updated: "Úkol {{id}} byl aktualizován uživatelem {{author}}."
	560	text_regexp_info: např. ^[A-Z0-9]+$	649	text_wiki_destroy_confirmation: Opravdu si přejete odstranit tuto WIKI a celý její obsah?
	561	text_min_max_length_info: 0 znamená bez limitu	650	text_issue_category_destroy_question: "Některé úkoly ({{count}}) jsou přiřazeny k této kategorii. Co s nimi chtete udělat?"
	562	text_project_destroy_confirmation: Jste si jisti, že chcete odstranit tento projekt a všechna související data ?	651	text_issue_category_destroy_assignments: Zrušit přiřazení ke kategorii
	563	text_workflow_edit: Vyberte roli a frontu k editaci workflow	652	text_issue_category_reassign_to: Přiřadit úkoly do této kategorie
	564	text_are_you_sure: Jste si jisti?	653	text_user_mail_option: "U projektů, které nebyly vybrány, budete dostávat oznámení pouze o vašich či o sledovaných položkách (např. o položkách jejichž jste autor nebo ke kterým jste přiřazen(a))."
	565	text_journal_changed: změněno z %s na %s	654	text_no_configuration_data: "Role, fronty, stavy úkolů ani workflow nebyly zatím nakonfigurovány.\nVelice doporučujeme nahrát výchozí konfiguraci.Po té si můžete vše upravit"
	566	text_journal_set_to: nastaveno na %s	655	text_load_default_configuration: Nahrát výchozí konfiguraci
	567	text_journal_deleted: odstraněno	656	text_status_changed_by_changeset: "Použito v changesetu {{value}}."
	568	text_tip_task_begin_day: úkol začíná v tento den	657	text_issues_destroy_confirmation: 'Opravdu si přejete odstranit všechny zvolené úkoly?'
	569	text_tip_task_end_day: úkol končí v tento den	658	text_select_project_modules: 'Aktivní moduly v tomto projektu:'
	570	text_tip_task_begin_end_day: úkol začíná a končí v tento den	659	text_default_administrator_account_changed: Výchozí nastavení administrátorského účtu změněno
	571	text_project_identifier_info: 'Jsou povolena malá písmena (a-z), čísla a pomlčky.<br />Po uložení již není možné identifikátor změnit.'	660	text_file_repository_writable: Povolen zápis do repository
	572	text_caracters_maximum: %d znaků maximálně.	661	text_rmagick_available: RMagick k dispozici (volitelné)
	573	text_caracters_minimum: Musí být alespoň %d znaků dlouhé.	662	text_destroy_time_entries_question: U úkolů, které chcete odstranit je evidováno %.02f práce. Co chete udělat?
	574	text_length_between: Délka mezi %d a %d znaky.	663	text_destroy_time_entries: Odstranit evidované hodiny.
	575	text_tracker_no_workflow: Pro tuto frontu není definován žádný workflow	664	text_assign_time_entries_to_project: Přiřadit evidované hodiny projektu
	576	text_unallowed_characters: Nepovolené znaky	665	text_reassign_time_entries: 'Přeřadit evidované hodiny k tomuto úkolu:'
	577	text_comma_separated: Povoleno více hodnot (oddělěné čárkou).	666
	578	text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages	667	default_role_manager: Manažer
	579	text_issue_added: Úkol %s byl vytvořen uživatelem %s.	668	default_role_developper: Vývojář
	580	text_issue_updated: Úkol %s byl aktualizován uživatelem %s.	669	default_role_reporter: Reportér
	581	text_wiki_destroy_confirmation: Opravdu si přejete odstranit tuto WIKI a celý její obsah?	670	default_tracker_bug: Chyba
	582	text_issue_category_destroy_question: Některé úkoly (%d) jsou přiřazeny k této kategorii. Co s nimi chtete udělat?	671	default_tracker_feature: Požadavek
	583	text_issue_category_destroy_assignments: Zrušit přiřazení ke kategorii	672	default_tracker_support: Podpora
	584	text_issue_category_reassign_to: Přiřadit úkoly do této kategorie	673	default_issue_status_new: Nový
	585	text_user_mail_option: "U projektů, které nebyly vybrány, budete dostávat oznámení pouze o vašich či o sledovaných položkách (např. o položkách jejichž jste autor nebo ke kterým jste přiřazen(a))."	674	default_issue_status_assigned: Přiřazený
	586	text_no_configuration_data: "Role, fronty, stavy úkolů ani workflow nebyly zatím nakonfigurovány.\nVelice doporučujeme nahrát výchozí konfiguraci.Po té si můžete vše upravit"	675	default_issue_status_resolved: Vyřešený
	587	text_load_default_configuration: Nahrát výchozí konfiguraci	676	default_issue_status_feedback: Čeká se
	588	text_status_changed_by_changeset: Použito v changesetu %s.	677	default_issue_status_closed: Uzavřený
	589	text_issues_destroy_confirmation: 'Opravdu si přejete odstranit všechny zvolené úkoly?'	678	default_issue_status_rejected: Odmítnutý
	590	text_select_project_modules: 'Aktivní moduly v tomto projektu:'	679	default_doc_category_user: Uživatelská dokumentace
	591	text_default_administrator_account_changed: Výchozí nastavení administrátorského účtu změněno	680	default_doc_category_tech: Technická dokumentace
	592	text_file_repository_writable: Povolen zápis do repository	681	default_priority_low: Nízká
	593	text_rmagick_available: RMagick k dispozici (volitelné)	682	default_priority_normal: Normální
	594	text_destroy_time_entries_question: U úkolů, které chcete odstranit je evidováno %.02f práce. Co chete udělat?	683	default_priority_high: Vysoká
	595	text_destroy_time_entries: Odstranit evidované hodiny.	684	default_priority_urgent: Urgentní
	596	text_assign_time_entries_to_project: Přiřadit evidované hodiny projektu	685	default_priority_immediate: Okamžitá
	597	text_reassign_time_entries: 'Přeřadit evidované hodiny k tomuto úkolu:'	686	default_activity_design: Design
	598		687	default_activity_development: Vývoj
	599	default_role_manager: Manažer	688
	600	default_role_developper: Vývojář	689	enumeration_issue_priorities: Priority úkolů
	601	default_role_reporter: Reportér	690	enumeration_doc_categories: Kategorie dokumentů
	602	default_tracker_bug: Chyba	691	enumeration_activities: Aktivity (sledování času)
	603	default_tracker_feature: Požadavek	692	error_scm_annotate: "Položka neexistuje nebo nemůže být komentována."
	604	default_tracker_support: Podpora	693	label_planning: Plánování
	605	default_issue_status_new: Nový	694	text_subprojects_destroy_warning: "Its subproject(s): {{value}} will be also deleted.'"
	606	default_issue_status_assigned: Přiřazený	695	label_and_its_subprojects: "{{value}} and its subprojects"
	607	default_issue_status_resolved: Vyřešený	696	mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:"
	608	default_issue_status_feedback: Čeká se	697	mail_subject_reminder: "{{count}} issue(s) due in the next days"
	609	default_issue_status_closed: Uzavřený	698	text_user_wrote: "{{value}} wrote:'"
	610	default_issue_status_rejected: Odmítnutý	699	label_duplicated_by: duplicated by
	611	default_doc_category_user: Uživatelská dokumentace	700	setting_enabled_scm: Enabled SCM
	612	default_doc_category_tech: Technická dokumentace	701	text_enumeration_category_reassign_to: 'Reassign them to this value:'
	613	default_priority_low: Nízká	702	text_enumeration_destroy_question: "{{count}} objects are assigned to this value.'"
	614	default_priority_normal: Normální	703	label_incoming_emails: Incoming emails
	615	default_priority_high: Vysoká	704	label_generate_key: Generate a key
	616	default_priority_urgent: Urgentní	705	setting_mail_handler_api_enabled: Enable WS for incoming emails
	617	default_priority_immediate: Okamžitá	706	setting_mail_handler_api_key: API key
	618	default_activity_design: Design	707	text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
	619	default_activity_development: Vývoj	708	field_parent_title: Parent page
	620		709	label_issue_watchers: Watchers
	621	enumeration_issue_priorities: Priority úkolů	710	setting_commit_logs_encoding: Commit messages encoding
	622	enumeration_doc_categories: Kategorie dokumentů	711	button_quote: Quote
	623	enumeration_activities: Aktivity (sledování času)	712	setting_sequential_project_identifiers: Generate sequential project identifiers
	624	error_scm_annotate: "Položka neexistuje nebo nemůže být komentována."	713	notice_unable_delete_version: Unable to delete version
	625	label_planning: Plánování	714	label_renamed: renamed
	626	text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'	715	label_copied: copied
	627	label_and_its_subprojects: %s and its subprojects	716	setting_plain_text_mail: plain text only (no HTML)
	628	mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"	717	permission_view_files: View files
	629	mail_subject_reminder: "%d issue(s) due in the next days"	718	permission_edit_issues: Edit issues
	630	text_user_wrote: '%s wrote:'	719	permission_edit_own_time_entries: Edit own time logs
	631	label_duplicated_by: duplicated by	720	permission_manage_public_queries: Manage public queries
	632	setting_enabled_scm: Enabled SCM	721	permission_add_issues: Add issues
	633	text_enumeration_category_reassign_to: 'Reassign them to this value:'	722	permission_log_time: Log spent time
	634	text_enumeration_destroy_question: '%d objects are assigned to this value.'	723	permission_view_changesets: View changesets
	635	label_incoming_emails: Incoming emails	724	permission_view_time_entries: View spent time
	636	label_generate_key: Generate a key	725	permission_manage_versions: Manage versions
	637	setting_mail_handler_api_enabled: Enable WS for incoming emails	726	permission_manage_wiki: Manage wiki
	638	setting_mail_handler_api_key: API key	727	permission_manage_categories: Manage issue categories
	639	text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."	728	permission_protect_wiki_pages: Protect wiki pages
	640	field_parent_title: Parent page	729	permission_comment_news: Comment news
	641	label_issue_watchers: Watchers	730	permission_delete_messages: Delete messages
	642	setting_commit_logs_encoding: Commit messages encoding	731	permission_select_project_modules: Select project modules
	643	button_quote: Quote	732	permission_manage_documents: Manage documents
	644	setting_sequential_project_identifiers: Generate sequential project identifiers	733	permission_edit_wiki_pages: Edit wiki pages
	645	notice_unable_delete_version: Unable to delete version	734	permission_add_issue_watchers: Add watchers
	646	label_renamed: renamed	735	permission_view_gantt: View gantt chart
	647	label_copied: copied	736	permission_move_issues: Move issues
	648	setting_plain_text_mail: plain text only (no HTML)	737	permission_manage_issue_relations: Manage issue relations
	649	permission_view_files: View files	738	permission_delete_wiki_pages: Delete wiki pages
	650	permission_edit_issues: Edit issues	739	permission_manage_boards: Manage boards
	651	permission_edit_own_time_entries: Edit own time logs	740	permission_delete_wiki_pages_attachments: Delete attachments
	652	permission_manage_public_queries: Manage public queries	741	permission_view_wiki_edits: View wiki history
	653	permission_add_~~issu~~es: ~~Add~~ ~~issu~~es	742	permission_add_messages: Post messages
	654	permission_log_time: Log spent time	743	permission_view_messages: View messages
	655	permission_view_changesets: View changesets	744	permission_manage_files: Manage files
	656	permission_~~view_time_entri~~es: ~~View~~ ~~spe~~nt ~~tim~~e	745	permission_edit_issue_notes: Edit notes
	657	permission_manage_~~versio~~ns: Manage ~~versio~~ns	746	permission_manage_news: Manage news
	658	permission_manage_wiki: Manage wiki	747	permission_view_calendar: View calendrier
	659	permission_manage_~~categorie~~s: Manage ~~issue categorie~~s	748	permission_manage_members: Manage members
	660	permission_protect_wiki_pages: Protect wiki pages	749	permission_edit_messages: Edit messages
	661	permission_comment_news: Comment news	750	permission_delete_issues: Delete issues
	662	permission_delete_messages: Delete messages	751	permission_view_issue_watchers: View watchers list
	663	permission_select_project_modules: Select project modules	752	permission_manage_repository: Manage repository
	664	permission_manage_documents: Manage documents	753	permission_commit_access: Commit access
	665	permission_edit_wiki_pages: Edit wiki pages	754	permission_browse_repository: Browse repository
	666	permission_add_issue_watchers: Add watchers	755	permission_view_documents: View documents
	667	permission_view_gantt: View gantt chart	756	permission_edit_project: Edit project
	668	permission_~~move_issu~~es: ~~Move~~ ~~issu~~es	757	permission_add_issue_notes: Add notes
	669	permission_~~manage_issue_relation~~s: ~~Manag~~e ~~issue relation~~s	758	permission_save_queries: Save queries
	670	permission_~~delete~~_wiki_pages: ~~Delete~~ wiki ~~pages~~	759	permission_view_wiki_pages: View wiki
	671	permission_manage_boards: Manage boards	760	permission_rename_wiki_pages: Rename wiki pages
	672	permission_delete_wiki_pages_attachments: Delete attachments	761	permission_edit_time_entries: Edit time logs
	673	permission_view_wiki_edits: View wiki history	762	permission_edit_own_issue_notes: Edit own notes
	674	permission_add_messages: Post messages	763	setting_gravatar_enabled: Use Gravatar user icons
	675	permission_view_messages: View messages	764	label_example: Example
	676	permission_manage_files: Manage files	765	text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
	677	permission_edit_~~issue_not~~es: Edit ~~not~~es	766	permission_edit_own_messages: Edit own messages
	678	permission_manage_news: Manage news	767	permission_delete_own_messages: Delete own messages
	679	permission_view_calendar: View calendrier	768	label_user_activity: "{{value}}'s activity"
	680	permission_manage_members: Manage members	769	label_updated_time_by: "Updated by {{author}} {{age}} ago"
	681	permission_edit_messages: Edit messages	770	text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
	682	permission_delete_issues: Delete issues	771	setting_diff_max_lines_displayed: Max number of diff lines displayed
	683	permission_view_issue_watchers: View watchers list	772	text_plugin_assets_writable: Plugin assets directory writable
	684	permission_manage_repository: Manage repository	773	warning_attachments_not_saved: "{{count}} file(s) could not be saved."
	685	permission_commit_access: Commit access	774	button_create_and_continue: Create and continue
	686	permission_browse_repository: Browse repository	775	text_custom_field_possible_values_info: 'One line for each value'
	687	permission_view_documents: View documents	776	label_display: Display
	688	permission_edit_project: Edit project	777	field_editable: Editable
	689	permission_add_issue_notes: Add notes	778	setting_repository_log_display_limit: Maximum number of revisions displayed on file log
	690	permission_save_queries: Save queries
	691	permission_view_wiki_pages: View wiki
	692	permission_rename_wiki_pages: Rename wiki pages
	693	permission_edit_time_entries: Edit time logs
	694	permission_edit_own_issue_notes: Edit own notes
	695	setting_gravatar_enabled: Use Gravatar user icons
	696	label_example: Example
	697	text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
	698	permission_edit_own_messages: Edit own messages
	699	permission_delete_own_messages: Delete own messages
	700	label_user_activity: "%s's activity"
	701	label_updated_time_by: Updated by %s %s ago
	702	text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
	703	setting_diff_max_lines_displayed: Max number of diff lines displayed
	704	text_plugin_assets_writable: Plugin assets directory writable
	705	warning_attachments_not_saved: "%d file(s) could not be saved."
	706	button_create_and_continue: Create and continue
	707	text_custom_field_possible_values_info: 'One line for each value'
	708	label_display: Display
	709	field_editable: Editable
	710	setting_repository_log_display_limit: Maximum number of revisions displayed on file log
	711	field_identity_url: OpenID URL
	712	setting_openid: Allow OpenID login and registration
	713	label_login_with_open_id_option: or login with OpenID
	714	field_watcher: Watcher

config/locales/da.yml ~~lang/da.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/da.yml to config/locales/da.yml			NO CONTENT: file renamed from lang/da.yml to config/locales/da.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/de.yml ~~lang/de.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/de.yml to config/locales/de.yml			NO CONTENT: file renamed from lang/de.yml to config/locales/de.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/en.yml ~~lang/en.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/en.yml to config/locales/en.yml			NO CONTENT: file renamed from lang/en.yml to config/locales/en.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/fi.yml ~~lang/fi.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/fi.yml to config/locales/fi.yml			NO CONTENT: file renamed from lang/fi.yml to config/locales/fi.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/fr.yml ~~lang/fr.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/fr.yml to config/locales/fr.yml			NO CONTENT: file renamed from lang/fr.yml to config/locales/fr.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/he.yml ~~lang/he.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/he.yml to config/locales/he.yml			NO CONTENT: file renamed from lang/he.yml to config/locales/he.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/hu.yml ~~lang/hu.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/hu.yml to config/locales/hu.yml			NO CONTENT: file renamed from lang/hu.yml to config/locales/hu.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/it.yml ~~lang/it.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/it.yml to config/locales/it.yml			NO CONTENT: file renamed from lang/it.yml to config/locales/it.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/ja.yml ~~lang/ja.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/ja.yml to config/locales/ja.yml			NO CONTENT: file renamed from lang/ja.yml to config/locales/ja.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/lt.yml ~~lang/lt.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/lt.yml to config/locales/lt.yml			NO CONTENT: file renamed from lang/lt.yml to config/locales/lt.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/nl.yml ~~lang/nl.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/nl.yml to config/locales/nl.yml			NO CONTENT: file renamed from lang/nl.yml to config/locales/nl.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/no.yml ~~lang/no.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/no.yml to config/locales/no.yml			NO CONTENT: file renamed from lang/no.yml to config/locales/no.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/pl.yml ~~lang/pl.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/pl.yml to config/locales/pl.yml			NO CONTENT: file renamed from lang/pl.yml to config/locales/pl.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/pt-BR.yml ~~lang/pt-br.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/pt-br.yml to config/locales/pt-BR.yml			NO CONTENT: file renamed from lang/pt-br.yml to config/locales/pt-BR.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/pt.yml ~~lang/pt.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/pt.yml to config/locales/pt.yml			NO CONTENT: file renamed from lang/pt.yml to config/locales/pt.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/ro.yml ~~lang/ro.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/ro.yml to config/locales/ro.yml			NO CONTENT: file renamed from lang/ro.yml to config/locales/ro.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/ru.yml ~~lang/ru.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/ru.yml to config/locales/ru.yml			NO CONTENT: file renamed from lang/ru.yml to config/locales/ru.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/sk.yml ~~lang/sk.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/sk.yml to config/locales/sk.yml			NO CONTENT: file renamed from lang/sk.yml to config/locales/sk.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/sl.yml ~~lang/sl.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/sl.yml to config/locales/sl.yml			NO CONTENT: file renamed from lang/sl.yml to config/locales/sl.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/sr.yml ~~lang/sr.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/sr.yml to config/locales/sr.yml			NO CONTENT: file renamed from lang/sr.yml to config/locales/sr.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/th.yml ~~lang/th.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/th.yml to config/locales/th.yml			NO CONTENT: file renamed from lang/th.yml to config/locales/th.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/tr.yml ~~lang/tr.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/tr.yml to config/locales/tr.yml			NO CONTENT: file renamed from lang/tr.yml to config/locales/tr.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/zh-TW.yml ~~lang/zh-tw.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/zh-tw.yml to config/locales/zh-TW.yml			NO CONTENT: file renamed from lang/zh-tw.yml to config/locales/zh-TW.yml
The requested commit or file is too big and content was truncated. Show full diff

config/locales/zh.yml ~~lang/zh.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from lang/zh.yml to config/locales/zh.yml			NO CONTENT: file renamed from lang/zh.yml to config/locales/zh.yml
The requested commit or file is too big and content was truncated. Show full diff

extra/sample_plugin/app/controllers/example_controller.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

extra/sample_plugin/config/locales/en.yml ~~extra/sample_plugin/lang/en.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from extra/sample_plugin/lang/en.yml to extra/sample_plugin/config/locales/en.yml			NO CONTENT: file renamed from extra/sample_plugin/lang/en.yml to extra/sample_plugin/config/locales/en.yml
The requested commit or file is too big and content was truncated. Show full diff

extra/sample_plugin/config/locales/fr.yml ~~extra/sample_plugin/lang/fr.yml~~ renamed 0 0

	1	NO CONTENT: file renamed from extra/sample_plugin/lang/fr.yml to extra/sample_plugin/config/locales/fr.yml			NO CONTENT: file renamed from extra/sample_plugin/lang/fr.yml to extra/sample_plugin/config/locales/fr.yml
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/default_data/loader.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/export/pdf.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/helpers/calendar.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/hook.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/menu_manager.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/redmine/plugin.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/tabular_form_builder.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lib/tasks/load_default_data.rake 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

public/javascripts/calendar/lang/calendar-vi.js ~~public/javascripts/calendar/lang/calendar-vn.js~~ renamed 0 0

NO CONTENT: file renamed from public/javascripts/calendar/lang/calendar-vn.js to public/javascripts/calendar/lang/calendar-vi.js

public/javascripts/controls.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

public/javascripts/dragdrop.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

public/javascripts/effects.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

public/javascripts/jstoolbar/lang/jstoolbar-vi.js ~~public/javascripts/jstoolbar/lang/jstoolbar-vn.js~~ renamed 0 0

NO CONTENT: file renamed from public/javascripts/jstoolbar/lang/jstoolbar-vn.js to public/javascripts/jstoolbar/lang/jstoolbar-vi.js

public/javascripts/prototype.js 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

public/stylesheets/application.css 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/application_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/attachments_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/custom_fields_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/issues_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/messages_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/news_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/projects_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/repositories_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/search_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/timelog_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/welcome_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/wikis_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/integration/account_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/integration/admin_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/integration/application_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/integration/issues_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/test_helper.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/default_data_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/helpers/application_helper_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/issue_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/mailer_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/project_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/repository_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/user_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/version_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/wiki_page_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/CHANGELOG 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/Rakefile 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/boot.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/generators/plugin_migration/plugin_migration_generator.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/assets.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/plugin.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/plugin/migrator.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/rails_extensions/action_mailer.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/rails_extensions/dependencies.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/rails_extensions/migrations.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/rails_extensions/routing.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/lib/engines/testing.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/engines/tasks/engines.rake 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

lang/es.yml removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

lang/gl.yml removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

lang/ko.yml removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

lang/mk.yml removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

lang/sv.yml removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

lang/uk.yml removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

lang/vn.yml removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/CHANGELOG removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/MIT-LICENSE removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/README removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/Rakefile removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/classes/ActionController/Filters/ClassMethods.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/classes/ActionMailer/Base.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/classes/ActionView/Base.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/classes/ActionView/Helpers/DateHelper.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/classes/ActionView/Helpers/InstanceTag.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/classes/ActiveRecord/Errors.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/classes/ActiveRecord/Validations/ClassMethods.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/classes/GLoc.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/classes/GLoc/ClassMethods.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/classes/GLoc/Helpers.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/classes/GLoc/InstanceMethods.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/created.rid removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/files/CHANGELOG.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/files/README.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/files/lib/gloc-helpers_rb.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/files/lib/gloc-internal_rb.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/files/lib/gloc-rails-text_rb.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/files/lib/gloc-rails_rb.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/files/lib/gloc-ruby_rb.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/files/lib/gloc-version_rb.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/files/lib/gloc_rb.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/fr_class_index.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/fr_file_index.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/fr_method_index.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/index.html removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/doc/rdoc-style.css removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/init.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/lib/gloc-config.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/lib/gloc-dev.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/lib/gloc-helpers.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/lib/gloc-internal.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/lib/gloc-rails-text.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/lib/gloc-rails.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/lib/gloc-ruby.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/lib/gloc-version.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/lib/gloc.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/tasks/gloc.rake removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/test/gloc_rails_test.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/test/gloc_test.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/test/lang/en.yaml removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/test/lang/en_AU.yaml removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/test/lang/ja.yml removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/test/lang2/en.yml removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/test/lang2/ja.yaml removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/test/lib/rails-string_ext.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

vendor/plugins/gloc-1.1.0/test/lib/rails-time_ext.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages