Updates for 2.2.4 release.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11659 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r11648, r11649, r11650 from trunk to 2.2-stable.
2013-03-19 19:34:01 +00:00 · 2013-03-19 08:40:52 +00:00 · 2013-03-16 08:02:20 +00:00 · 2013-03-11 18:30:20 +00:00 · 2013-03-11 18:28:49 +00:00 · 2013-03-11 18:27:46 +00:00
36 changed files with 3464 additions and 3436 deletions
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
-gem 'rails', '3.2.11'
+gem "rails", "3.2.13"
 gem "jquery-rails", "~> 2.0.2"
 gem "i18n", "~> 0.6.0"
 gem "coderay", "~> 1.0.6"
@@ -79,7 +79,7 @@ group :test do
  platforms = [:mri_19]
  platforms << :jruby if defined?(JRUBY_VERSION) && JRUBY_VERSION >= "1.7"
  gem "test-unit", :platforms => platforms
-  gem "mocha", "0.12.3"
+  gem "mocha", "~> 0.13.3"
 end
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
@@ -39,14 +39,18 @@ class BoardsController < ApplicationController
        sort_init 'updated_on', 'desc'
        sort_update	'created_on' => "#{Message.table_name}.created_on",
                    'replies' => "#{Message.table_name}.replies_count",
-                    'updated_on' => "#{Message.table_name}.updated_on"
+                    'updated_on' => "COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on)"
        @topic_count = @board.topics.count
        @topic_pages = Paginator.new self, @topic_count, per_page_option, params['page']
-        @topics =  @board.topics.reorder("#{Message.table_name}.sticky DESC").order(sort_clause).all(
+        @topics =  @board.topics.
-                                      :include => [:author, {:last_reply => :author}],
+          reorder("#{Message.table_name}.sticky DESC").
-                                      :limit  =>  @topic_pages.items_per_page,
+          includes(:last_reply).
-                                      :offset =>  @topic_pages.current.offset)
+          limit(@topic_pages.items_per_page).
          offset(@topic_pages.current.offset).
          order(sort_clause).
          preload(:author, {:last_reply => :author}).
          all
        @message = Message.new(:board => @board)
        render :action => 'show', :layout => !request.xhr?
      }
@@ -123,7 +123,7 @@ class MessagesController < ApplicationController
 private
  def find_message
-    find_board
+    return unless find_board
    @message = @board.messages.find(params[:id], :include => :parent)
    @topic = @message.root
  rescue ActiveRecord::RecordNotFound
@@ -135,5 +135,6 @@ private
    @project = @board.project
  rescue ActiveRecord::RecordNotFound
    render_404
    nil
  end
 end
@@ -704,10 +704,11 @@ module ApplicationHelper
  #     identifier:document:"Some document"
  #     identifier:version:1.0.0
  #     identifier:source:some/file
-  def parse_redmine_links(text, project, obj, attr, only_path, options)
+  def parse_redmine_links(text, default_project, obj, attr, only_path, options)
-    text.gsub!(%r{([\s\(,\-\[\>]|^)(!)?(([a-z0-9\-_]+):)?(attachment|document|version|forum|news|message|project|commit|source|export)?(((#)|((([a-z0-9\-]+)\|)?(r)))((\d+)((#note)?-(\d+))?)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]][^A-Za-z0-9_/])|,|\s|\]|<|$)}) do |m|
+    text.gsub!(%r{([\s\(,\-\[\>]|^)(!)?(([a-z0-9\-_]+):)?(attachment|document|version|forum|news|message|project|commit|source|export)?(((#)|((([a-z0-9\-_]+)\|)?(r)))((\d+)((#note)?-(\d+))?)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]][^A-Za-z0-9_/])|,|\s|\]|<|$)}) do |m|
      leading, esc, project_prefix, project_identifier, prefix, repo_prefix, repo_identifier, sep, identifier, comment_suffix, comment_id = $1, $2, $3, $4, $5, $10, $11, $8 || $12 || $18, $14 || $19, $15, $17
      link = nil
      project = default_project
      if project_identifier
        project = Project.visible.find_by_identifier(project_identifier)
      end
@@ -793,7 +794,7 @@ module ApplicationHelper
          when 'commit', 'source', 'export'
            if project
              repository = nil
-              if name =~ %r{^(([a-z0-9\-]+)\|)(.+)$}
+              if name =~ %r{^(([a-z0-9\-_]+)\|)(.+)$}
                repo_prefix, repo_identifier, name = $1, $2, $3
                repository = project.repositories.detect {|repo| repo.identifier == repo_identifier}
              else
@@ -350,7 +350,10 @@ module IssuesHelper
    association = Issue.reflect_on_association(field.to_sym)
    if association
      record = association.class_name.constantize.find_by_id(id)
-      return record.name if record
+      if record
        record.name.force_encoding('UTF-8') if record.name.respond_to?(:force_encoding)
        return record.name
      end
    end
  end
@@ -87,14 +87,14 @@ module QueriesHelper
      format_time(value)
    when 'Date'
      format_date(value)
-    when 'Fixnum', 'Float'
+    when 'Fixnum'
      if column.name == :done_ratio
        progress_bar(value, :width => '80px')
      elsif  column.name == :spent_hours
        sprintf "%.2f", value
      else
-        h(value.to_s)
+        value.to_s
      end
    when 'Float'
      sprintf "%.2f", value
    when 'User'
      link_to_user value
    when 'Project'
@@ -249,26 +249,9 @@ class MailHandler < ActionMailer::Base
  def add_attachments(obj)
    if email.attachments && email.attachments.any?
      email.attachments.each do |attachment|
        filename = attachment.filename
        unless filename.respond_to?(:encoding)
          # try to reencode to utf8 manually with ruby1.8
          h = attachment.header['Content-Disposition']
          unless h.nil?
            begin
              if m = h.value.match(/filename\*[0-9\*]*=([^=']+)'/)
                filename = Redmine::CodesetUtil.to_utf8(filename, m[1])
              elsif m = h.value.match(/filename=.*=\?([^\?]+)\?[BbQq]\?/)
                # http://tools.ietf.org/html/rfc2047#section-4
                filename = Redmine::CodesetUtil.to_utf8(filename, m[1])
              end
            rescue
              # nop
            end
          end
        end
        obj.attachments << Attachment.create(:container => obj,
                          :file => attachment.decoded,
-                          :filename => filename,
+                          :filename => attachment.filename,
                          :author => user,
                          :content_type => attachment.mime_type)
      end
@@ -391,19 +374,6 @@ class MailHandler < ActionMailer::Base
  def cleaned_up_subject
    subject = email.subject.to_s
    unless subject.respond_to?(:encoding)
      # try to reencode to utf8 manually with ruby1.8
      begin
        if h = email.header[:subject]
          # http://tools.ietf.org/html/rfc2047#section-4
          if m = h.value.match(/=\?([^\?]+)\?[BbQq]\?/)
            subject = Redmine::CodesetUtil.to_utf8(subject, m[1])
          end
        end
      rescue
        # nop
      end
    end
    subject.strip[0,255]
  end
@@ -731,7 +731,7 @@ class Project < ActiveRecord::Base
  def copy_wiki(project)
    # Check that the source project has a wiki first
    unless project.wiki.nil?
-      self.wiki ||= Wiki.new
+      wiki = self.wiki || Wiki.new
      wiki.attributes = project.wiki.attributes.dup.except("id", "project_id")
      wiki_pages_map = {}
      project.wiki.pages.each do |page|
@@ -743,6 +743,8 @@ class Project < ActiveRecord::Base
        wiki.pages << new_wiki_page
        wiki_pages_map[page.id] = new_wiki_page
      end
      self.wiki = wiki
      wiki.save
      # Reproduce page hierarchy
      project.wiki.pages.each do |page|
@@ -111,7 +111,7 @@
        <li><%= bulk_update_custom_field_context_menu_link(field, text, value || text) %></li>
      <% end %>
      <% unless field.is_required? %>
-        <li><%= bulk_update_custom_field_context_menu_link(field, l(:label_none), '') %></li>
+        <li><%= bulk_update_custom_field_context_menu_link(field, l(:label_none), '__none__') %></li>
      <% end %>
      </ul>
    </li>
@@ -833,7 +833,7 @@ bg:
  label_generate_key: Генериране на ключ
  label_issue_watchers: Наблюдатели
  label_example: Пример
-  label_display: Display
+  label_display: Показване
  label_sort: Сортиране
  label_ascending: Нарастващ
  label_descending: Намаляващ
@@ -1,3 +1,4 @@
 # Update to 2.2 by Karel Picman <karel.picman@kontron.com>
 # Update to 1.1 by Michal Gebauer <mishak@mishak.net>
 # Updated by Josef Liška <jl@chl.cz>
 # CZ translation by Maxim Krušina | Massimo Filippi, s.r.o. | maxim@mxm.cz
@@ -941,146 +942,146 @@ cs:
  enumeration_activities: Aktivity (sledování času)
  enumeration_system_activity: Systémová aktivita
-  field_warn_on_leaving_unsaved: Warn me when leaving a page with unsaved text
+  field_warn_on_leaving_unsaved: Varuj mě před opuštěním stránky s neuloženým textem
-  text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
+  text_warn_on_leaving_unsaved: Aktuální stránka obsahuje neuložený text, který bude ztracen, když opustíte stránku.
-  label_my_queries: My custom queries
+  label_my_queries: Moje vlastní dotazy
-  text_journal_changed_no_detail: "%{label} updated"
+  text_journal_changed_no_detail: "%{label} aktualizován"
-  label_news_comment_added: Comment added to a news
+  label_news_comment_added: K novince byl přidán komentář
-  button_expand_all: Expand all
+  button_expand_all: Rozbal vše
-  button_collapse_all: Collapse all
+  button_collapse_all: Sbal vše
-  label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
+  label_additional_workflow_transitions_for_assignee: Další změna stavu povolena, jestliže je uživatel přiřazen
-  label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
+  label_additional_workflow_transitions_for_author: Další změna stavu povolena, jestliže je uživatel autorem
-  label_bulk_edit_selected_time_entries: Bulk edit selected time entries
+  label_bulk_edit_selected_time_entries: Hromadná změna záznamů času
-  text_time_entries_destroy_confirmation: Are you sure you want to delete the selected time entr(y/ies)?
+  text_time_entries_destroy_confirmation: Jste si jistí, že chcete smazat vybraný záznam(y) času?
-  label_role_anonymous: Anonymous
+  label_role_anonymous: Anonymní
-  label_role_non_member: Non member
+  label_role_non_member: Není členem
-  label_issue_note_added: Note added
+  label_issue_note_added: Přidána poznámka
-  label_issue_status_updated: Status updated
+  label_issue_status_updated: Aktualizován stav
-  label_issue_priority_updated: Priority updated
+  label_issue_priority_updated: Aktualizována priorita
-  label_issues_visibility_own: Issues created by or assigned to the user
+  label_issues_visibility_own: Úkol vytvořen nebo přiřazen uživatel(i/em)
-  field_issues_visibility: Issues visibility
+  field_issues_visibility: Viditelnost úkolů
-  label_issues_visibility_all: All issues
+  label_issues_visibility_all: Všechny úkoly
-  permission_set_own_issues_private: Set own issues public or private
+  permission_set_own_issues_private: Nastavit vlastní úkoly jako veřejné nebo soukromé
-  field_is_private: Private
+  field_is_private: Soukromý
-  permission_set_issues_private: Set issues public or private
+  permission_set_issues_private: Nastavit úkoly jako veřejné nebo soukromé
-  label_issues_visibility_public: All non private issues
+  label_issues_visibility_public: Všechny úkoly, které nejsou soukromé
-  text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
+  text_issues_destroy_descendants_confirmation: "%{count} podúkol(ů) bude rovněž smazán(o)."
  field_commit_logs_encoding: Kódování zpráv při commitu
-  field_scm_path_encoding: Path encoding
+  field_scm_path_encoding: Kódování cesty SCM
-  text_scm_path_encoding_note: "Default: UTF-8"
+  text_scm_path_encoding_note: "Výchozí: UTF-8"
-  field_path_to_repository: Path to repository
+  field_path_to_repository: Cesta k repositáři
-  field_root_directory: Root directory
+  field_root_directory: Kořenový adresář
-  field_cvs_module: Module
+  field_cvs_module: Modul
  field_cvsroot: CVSROOT
-  text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
+  text_mercurial_repository_note: Lokální repositář (např. /hgrepo, c:\hgrepo)
-  text_scm_command: Command
+  text_scm_command: Příkaz
-  text_scm_command_version: Version
+  text_scm_command_version: Verze
-  label_git_report_last_commit: Report last commit for files and directories
+  label_git_report_last_commit: Reportovat poslední commit pro soubory a adresáře
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_config: Můžete si nastavit vaše SCM příkazy v config/configuration.yml. Restartujte, prosím, aplikaci po jejich úpravě.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
+  text_scm_command_not_available: SCM příkaz není k dispozici. Zkontrolujte, prosím, nastavení v panelu Administrace.
-  notice_issue_successful_create: Issue %{id} created.
+  notice_issue_successful_create: Úkol %{id} vytvořen.
-  label_between: between
+  label_between: mezi
-  setting_issue_group_assignment: Allow issue assignment to groups
+  setting_issue_group_assignment: Povolit přiřazení úkolu skupině
-  label_diff: diff
+  label_diff: rozdíl
-  text_git_repository_note: Repository is bare and local (e.g. /gitrepo, c:\gitrepo)
+  text_git_repository_note: Repositář je "bare and local" (např. /gitrepo, c:\gitrepo)
-  description_query_sort_criteria_direction: Sort direction
+  description_query_sort_criteria_direction: Směr třídění
-  description_project_scope: Search scope
+  description_project_scope: Rozsah vyhledávání
-  description_filter: Filter
+  description_filter: Filtr
-  description_user_mail_notification: Mail notification settings
+  description_user_mail_notification: Nastavení emailových notifikací
-  description_date_from: Enter start date
+  description_date_from: Zadejte počáteční datum
-  description_message_content: Message content
+  description_message_content: Obsah zprávy
-  description_available_columns: Available Columns
+  description_available_columns: Dostupné sloupce
-  description_date_range_interval: Choose range by selecting start and end date
+  description_date_range_interval: Zvolte rozsah výběrem počátečního a koncového data
-  description_issue_category_reassign: Choose issue category
+  description_issue_category_reassign: Zvolte kategorii úkolu
-  description_search: Searchfield
+  description_search: Vyhledávací pole
-  description_notes: Notes
+  description_notes: Poznámky
-  description_date_range_list: Choose range from list
+  description_date_range_list: Zvolte rozsah ze seznamu
-  description_choose_project: Projects
+  description_choose_project: Projekty
-  description_date_to: Enter end date
+  description_date_to: Zadejte datum
-  description_query_sort_criteria_attribute: Sort attribute
+  description_query_sort_criteria_attribute: Třídící atribut
-  description_wiki_subpages_reassign: Choose new parent page
+  description_wiki_subpages_reassign: Zvolte novou rodičovskou stránku
-  description_selected_columns: Selected Columns
+  description_selected_columns: Vybraný sloupec
-  label_parent_revision: Parent
+  label_parent_revision: Rodič
-  label_child_revision: Child
+  label_child_revision: Potomek
-  error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
+  error_scm_annotate_big_text_file: Vstup nemůže být anotován, protože překračuje povolenou velikost textového souboru
-  setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+  setting_default_issue_start_date_to_creation_date: Použij aktuální datum jako počáteční datum pro nové úkoly
-  button_edit_section: Edit this section
+  button_edit_section: Uprav tuto sekci
-  setting_repositories_encodings: Attachments and repositories encodings
+  setting_repositories_encodings: Kódování příloh a repositářů
-  description_all_columns: All Columns
+  description_all_columns: Všechny sloupce
  button_export: Export
-  label_export_options: "%{export_format} export options"
+  label_export_options: "nastavení exportu %{export_format}"
-  error_attachment_too_big: This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})
+  error_attachment_too_big: Soubor nemůže být nahrán, protože jeho velikost je větší než maximum (%{max_size})
-  notice_failed_to_save_time_entries: "Failed to save %{count} time entrie(s) on %{total} selected: %{ids}."
+  notice_failed_to_save_time_entries: "Chyba při ukládání %{count} časov(ých/ého) záznam(ů) z %{total} vybraného: %{ids}."
  label_x_issues:
    zero:  0 Úkol
    one:   1 Úkol
    other: "%{count} Úkoly"
-  label_repository_new: New repository
+  label_repository_new: Nový repositář
-  field_repository_is_default: Main repository
+  field_repository_is_default: Hlavní repositář
-  label_copy_attachments: Copy attachments
+  label_copy_attachments: Kopírovat přílohy
  label_item_position: "%{position}/%{count}"
-  label_completed_versions: Completed versions
+  label_completed_versions: Dokončené verze
-  text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
+  text_project_identifier_info: Jsou povolena pouze malá písmena (a-z), číslice, pomlčky a podtržítka.<br />Po uložení již nelze identifikátor měnit.
-  field_multiple: Multiple values
+  field_multiple: Více hodnot
-  setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed
+  setting_commit_cross_project_ref: Povolit reference a opravy úklů ze všech ostatních projektů
-  text_issue_conflict_resolution_add_notes: Add my notes and discard my other changes
+  text_issue_conflict_resolution_add_notes: Přidat moje poznámky a zahodit ostatní změny
-  text_issue_conflict_resolution_overwrite: Apply my changes anyway (previous notes will be kept but some changes may be overwritten)
+  text_issue_conflict_resolution_overwrite: Přesto přijmout moje úpravy (předchozí poznámky budou zachovány, ale některé změny mohou být přepsány)
-  notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
+  notice_issue_update_conflict: Během vašich úprav byl úkol aktualizován jiným uživatelem.
-  text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
+  text_issue_conflict_resolution_cancel: Zahoď všechny moje změny a znovu zobraz %{link}
-  permission_manage_related_issues: Manage related issues
+  permission_manage_related_issues: Spravuj související úkoly
-  field_auth_source_ldap_filter: LDAP filter
+  field_auth_source_ldap_filter: LDAP filtr
-  label_search_for_watchers: Search for watchers to add
+  label_search_for_watchers: Hledej sledující pro přidání
-  notice_account_deleted: Your account has been permanently deleted.
+  notice_account_deleted: Váš účet byl trvale smazán.
-  setting_unsubscribe: Allow users to delete their own account
+  setting_unsubscribe: Povolit uživatelům smazání jejich vlastního účtu
-  button_delete_my_account: Delete my account
+  button_delete_my_account: Smazat můj účet
  text_account_destroy_confirmation: |-
-    Are you sure you want to proceed?
+    Skutečně chcete pokračovat?
-    Your account will be permanently deleted, with no way to reactivate it.
+    Váš účet bude nenávratně smazán.
-  error_session_expired: Your session has expired. Please login again.
+  error_session_expired: Vaše sezení vypršelo. Znovu se přihlaste, prosím.
-  text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
+  text_session_expiration_settings: "Varování: změnou tohoto nastavení mohou vypršet aktuální sezení včetně toho vašeho."
-  setting_session_lifetime: Session maximum lifetime
+  setting_session_lifetime: Maximální čas sezení
-  setting_session_timeout: Session inactivity timeout
+  setting_session_timeout: Vypršení sezení bez aktivity
-  label_session_expiration: Session expiration
+  label_session_expiration: Vypršení sezení
-  permission_close_project: Close / reopen the project
+  permission_close_project: Zavřít / Otevřít projekt
-  label_show_closed_projects: View closed projects
+  label_show_closed_projects: Zobrazit zavřené projekty
-  button_close: Close
+  button_close: Zavřít
-  button_reopen: Reopen
+  button_reopen: Znovu otevřít
-  project_status_active: active
+  project_status_active: aktivní
-  project_status_closed: closed
+  project_status_closed: zavřený
-  project_status_archived: archived
+  project_status_archived: archivovaný
-  text_project_closed: This project is closed and read-only.
+  text_project_closed: Tento projekt je uzevřený a je pouze pro čtení.
-  notice_user_successful_create: User %{id} created.
+  notice_user_successful_create: Uživatel %{id} vytvořen.
-  field_core_fields: Standard fields
+  field_core_fields: Standardní pole
-  field_timeout: Timeout (in seconds)
+  field_timeout: Vypršení (v sekundách)
-  setting_thumbnails_enabled: Display attachment thumbnails
+  setting_thumbnails_enabled: Zobrazit náhled přílohy
-  setting_thumbnails_size: Thumbnails size (in pixels)
+  setting_thumbnails_size: Velikost náhledu (v pixelech)
-  label_status_transitions: Status transitions
+  label_status_transitions: Změna stavu
-  label_fields_permissions: Fields permissions
+  label_fields_permissions: Práva k polím
-  label_readonly: Read-only
+  label_readonly: Pouze pro čtení
-  label_required: Required
+  label_required: Vyžadováno
-  text_repository_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
+  text_repository_identifier_info: Jou povoleny pouze malá písmena (a-z), číslice, pomlčky a podtržítka.<br />Po uložení již nelze identifikátor změnit.
-  field_board_parent: Parent forum
+  field_board_parent: Rodičovské fórum
-  label_attribute_of_project: Project's %{name}
+  label_attribute_of_project: Projektové %{name}
-  label_attribute_of_author: Author's %{name}
+  label_attribute_of_author: Autorovo %{name}
-  label_attribute_of_assigned_to: Assignee's %{name}
+  label_attribute_of_assigned_to: "%{name} přiřazené(ho)"
-  label_attribute_of_fixed_version: Target version's %{name}
+  label_attribute_of_fixed_version: Cílová verze %{name}
-  label_copy_subtasks: Copy subtasks
+  label_copy_subtasks: Kopírovat podúkoly
-  label_copied_to: copied to
+  label_copied_to: zkopírováno do
-  label_copied_from: copied from
+  label_copied_from: zkopírováno z
-  label_any_issues_in_project: any issues in project
+  label_any_issues_in_project: jakékoli úkoly v projektu
-  label_any_issues_not_in_project: any issues not in project
+  label_any_issues_not_in_project: jakékoli úkoly mimo projektu
-  field_private_notes: Private notes
+  field_private_notes: Soukromé poznámky
-  permission_view_private_notes: View private notes
+  permission_view_private_notes: Zobrazit soukromé poznámky
-  permission_set_notes_private: Set notes as private
+  permission_set_notes_private: Nastavit poznámky jako soukromé
-  label_no_issues_in_project: no issues in project
+  label_no_issues_in_project: žádné úkoly v projektu
  label_any: vše
-  label_last_n_weeks: last %{count} weeks
+  label_last_n_weeks: poslední %{count} týdny
-  setting_cross_project_subtasks: Allow cross-project subtasks
+  setting_cross_project_subtasks: Povolit podúkoly napříč projekty
  label_cross_project_descendants: S podprojekty
  label_cross_project_tree: Se stromem projektu
  label_cross_project_hierarchy: S hierarchií projektu
  label_cross_project_system: Se všemi projekty
-  button_hide: Hide
+  button_hide: Skrýt
-  setting_non_working_week_days: Non-working days
+  setting_non_working_week_days: Dny pracovního volna/klidu
-  label_in_the_next_days: in the next
+  label_in_the_next_days: v přístích
-  label_in_the_past_days: in the past
+  label_in_the_past_days: v minulých
@@ -1037,84 +1037,84 @@ es:
  description_selected_columns: Columnas seleccionadas
  label_parent_revision: Padre
  label_child_revision: Hijo
-  setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+  setting_default_issue_start_date_to_creation_date: Utilizar la fecha actual como fecha de inicio para nuevas peticiones
-  button_edit_section: Edit this section
+  button_edit_section: Editar esta sección
-  setting_repositories_encodings: Attachments and repositories encodings
+  setting_repositories_encodings: Codificación de adjuntos y repositorios
  description_all_columns: Todas las columnas
  button_export: Exportar
  label_export_options: "%{export_format} opciones de exportación"
  error_attachment_too_big: Este fichero no se puede adjuntar porque excede el tamaño máximo de fichero (%{max_size})
-  notice_failed_to_save_time_entries: "Error al guarda %{count} entradas de tiempo de las %{total} seleccionadas: %{ids}."
+  notice_failed_to_save_time_entries: "Error al guardar %{count} entradas de tiempo de las %{total} seleccionadas: %{ids}."
  label_x_issues:
    zero:  0 petición
    one:   1 petición
    other: "%{count} peticiones"
-  label_repository_new: New repository
+  label_repository_new: Nuevo repositorio
-  field_repository_is_default: Main repository
+  field_repository_is_default: Repositorio principal
-  label_copy_attachments: Copy attachments
+  label_copy_attachments: Copiar adjuntos
  label_item_position: "%{position}/%{count}"
-  label_completed_versions: Completed versions
+  label_completed_versions: Versiones completadas
-  text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
+  text_project_identifier_info: Solo se permiten letras en minúscula (a-z), números, guiones y barras bajas.<br />Una vez guardado, el identificador no se puede cambiar.
-  field_multiple: Multiple values
+  field_multiple: Valores múltiples
-  setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed
+  setting_commit_cross_project_ref: Permitir referenciar y resolver peticiones de todos los demás proyectos
-  text_issue_conflict_resolution_add_notes: Add my notes and discard my other changes
+  text_issue_conflict_resolution_add_notes: Añadir mis notas y descartar mis otros cambios
-  text_issue_conflict_resolution_overwrite: Apply my changes anyway (previous notes will be kept but some changes may be overwritten)
+  text_issue_conflict_resolution_overwrite: Aplicar mis campos de todas formas (las notas anteriores se mantendrán pero algunos cambios podrían ser sobreescritos)
-  notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
+  notice_issue_update_conflict: La petición ha sido actualizada por otro usuario mientras la editaba.
-  text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
+  text_issue_conflict_resolution_cancel: Descartar todos mis cambios y mostrar de nuevo %{link}
-  permission_manage_related_issues: Manage related issues
+  permission_manage_related_issues: Gestionar peticiones relacionadas
-  field_auth_source_ldap_filter: LDAP filter
+  field_auth_source_ldap_filter: Filtro LDAP
-  label_search_for_watchers: Search for watchers to add
+  label_search_for_watchers: Buscar seguidores para añadirlos
-  notice_account_deleted: Your account has been permanently deleted.
+  notice_account_deleted: Su cuenta ha sido eliminada
-  setting_unsubscribe: Allow users to delete their own account
+  setting_unsubscribe: Permitir a los usuarios borrar sus propias cuentas
-  button_delete_my_account: Delete my account
+  button_delete_my_account: Borrar mi cuenta
  text_account_destroy_confirmation: |-
-    Are you sure you want to proceed?
+    ¿Está seguro de querer proceder?
-    Your account will be permanently deleted, with no way to reactivate it.
+    Su cuenta quedará borrada permanentemente, sin la posibilidad de reactivarla.
-  error_session_expired: Your session has expired. Please login again.
+  error_session_expired: Su sesión ha expirado. Por favor, vuelva a identificarse.
-  text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
+  text_session_expiration_settings: "Advertencia: el cambio de estas opciones podría hacer expirar las sesiones activas, incluyendo la suya."
-  setting_session_lifetime: Session maximum lifetime
+  setting_session_lifetime: Tiempo de vida máximo de las sesiones
-  setting_session_timeout: Session inactivity timeout
+  setting_session_timeout: Tiempo máximo de inactividad de las sesiones
-  label_session_expiration: Session expiration
+  label_session_expiration: Expiración de sesiones
-  permission_close_project: Close / reopen the project
+  permission_close_project: Cerrar / reabrir el proyecto
-  label_show_closed_projects: View closed projects
+  label_show_closed_projects: Ver proyectos cerrados
-  button_close: Close
+  button_close: Cerrar
-  button_reopen: Reopen
+  button_reopen: Reabrir
-  project_status_active: active
+  project_status_active: activo
-  project_status_closed: closed
+  project_status_closed: cerrado
-  project_status_archived: archived
+  project_status_archived: archivado
-  text_project_closed: This project is closed and read-only.
+  text_project_closed: Este proyecto está cerrado y es de sólo lectura
-  notice_user_successful_create: User %{id} created.
+  notice_user_successful_create: Usuario %{id} creado.
-  field_core_fields: Standard fields
+  field_core_fields: Campos básicos
-  field_timeout: Timeout (in seconds)
+  field_timeout: Tiempo de inactividad (en segundos)
-  setting_thumbnails_enabled: Display attachment thumbnails
+  setting_thumbnails_enabled: Mostrar miniaturas de los adjuntos
-  setting_thumbnails_size: Thumbnails size (in pixels)
+  setting_thumbnails_size: Tamaño de las miniaturas (en píxeles)
-  label_status_transitions: Status transitions
+  label_status_transitions: Transiciones de estado
-  label_fields_permissions: Fields permissions
+  label_fields_permissions: Permisos sobre los campos
-  label_readonly: Read-only
+  label_readonly: Sólo lectura
-  label_required: Required
+  label_required: Requerido
-  text_repository_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
+  text_repository_identifier_info: Solo se permiten letras en minúscula (a-z), números, guiones y barras bajas.<br />Una vez guardado, el identificador no se puede cambiar.
-  field_board_parent: Parent forum
+  field_board_parent: Foro padre
-  label_attribute_of_project: Project's %{name}
+  label_attribute_of_project: "%{name} del proyecto"
-  label_attribute_of_author: Author's %{name}
+  label_attribute_of_author: "%{name} del autor"
-  label_attribute_of_assigned_to: Assignee's %{name}
+  label_attribute_of_assigned_to: "%{name} de la persona asignada"
-  label_attribute_of_fixed_version: Target version's %{name}
+  label_attribute_of_fixed_version: "%{name} de la versión indicada"
-  label_copy_subtasks: Copy subtasks
+  label_copy_subtasks: Copiar subtareas
-  label_copied_to: copied to
+  label_copied_to: copiada a
-  label_copied_from: copied from
+  label_copied_from: copiada desde
-  label_any_issues_in_project: any issues in project
+  label_any_issues_in_project: cualquier petición del proyecto
-  label_any_issues_not_in_project: any issues not in project
+  label_any_issues_not_in_project: cualquier petición que no sea del proyecto
-  field_private_notes: Private notes
+  field_private_notes: Notas privadas
-  permission_view_private_notes: View private notes
+  permission_view_private_notes: Ver notas privadas
-  permission_set_notes_private: Set notes as private
+  permission_set_notes_private: Poner notas como privadas
-  label_no_issues_in_project: no issues in project
+  label_no_issues_in_project: no hay peticiones en el proyecto
  label_any: todos
-  label_last_n_weeks: last %{count} weeks
+  label_last_n_weeks: en las últimas %{count} semanas
-  setting_cross_project_subtasks: Allow cross-project subtasks
+  setting_cross_project_subtasks: Permitir subtareas cruzadas entre proyectos
  label_cross_project_descendants: Con proyectos hijo
  label_cross_project_tree: Con el árbol del proyecto
  label_cross_project_hierarchy: Con la jerarquía del proyecto
  label_cross_project_system: Con todos los proyectos
-  button_hide: Hide
+  button_hide: Ocultar
-  setting_non_working_week_days: Non-working days
+  setting_non_working_week_days: Días no laborables
-  label_in_the_next_days: in the next
+  label_in_the_next_days: en los próximos
-  label_in_the_past_days: in the past
+  label_in_the_past_days: en los anteriores
@@ -53,8 +53,8 @@ pt-BR:
        one: 'aproximadamente 1 hora'
        other: 'aproximadamente %{count} horas'
      x_hours:
-        one:   "1 hour"
+        one:   "1 hora"
-        other: "%{count} hours"
+        other: "%{count} horas"
      x_days:
        one: '1 dia'
@@ -76,8 +76,8 @@ pt-BR:
        one: 'mais de 1 ano'
        other: 'mais de %{count} anos'
      almost_x_years:
-        one:   "almost 1 year"
+        one:   "quase 1 ano"
-        other: "almost %{count} years"
+        other: "quase %{count} anos"
  # numeros
  number:
@@ -888,7 +888,7 @@ pt-BR:
  setting_issue_done_ratio_issue_status: Usar a situação da tarefa
  error_issue_done_ratios_not_updated: O pecentual de conclusão das tarefas não foi atualizado.
  error_workflow_copy_target: Por favor, selecione os tipos de tarefa e os papéis alvo
-  setting_issue_done_ratio_issue_field: Use the issue field
+  setting_issue_done_ratio_issue_field: Use o campo da tarefa
  label_copy_same_as_target: Mesmo alvo
  label_copy_target: Alvo
  notice_issue_done_ratios_updated: Percentual de conslusão atualizados.
@@ -994,13 +994,13 @@ pt-BR:
  label_git_report_last_commit: Relatar última alteração para arquivos e diretórios
  text_scm_config: Você pode configurar seus comandos de versionamento em config/configurations.yml. Por favor reinicie a aplicação após alterá-lo.
  text_scm_command_not_available: Comando de versionamento não disponível. Por favor verifique as configurações no painel de administração.
-  notice_issue_successful_create: Issue %{id} created.
+  notice_issue_successful_create: Tarefa %{id} criada.
-  label_between: between
+  label_between: entre
-  setting_issue_group_assignment: Allow issue assignment to groups
+  setting_issue_group_assignment: Permitir atribuições de tarefas a grupos
  label_diff: diff
-  text_git_repository_note: Repository is bare and local (e.g. /gitrepo, c:\gitrepo)
+  text_git_repository_note: "Repositório esta vazio e é local (ex: /gitrepo, c:\\gitrepo)"
-  description_query_sort_criteria_direction: Sort direction
+  description_query_sort_criteria_direction: Direção da ordenação
  description_project_scope: Escopo da pesquisa
  description_filter: Filtro
  description_user_mail_notification: Configuração de notificações por e-mail
@@ -1014,91 +1014,91 @@ pt-BR:
  description_date_range_list: Escolha um período a partira da lista
  description_choose_project: Projetos
  description_date_to: Digite a data final
-  description_query_sort_criteria_attribute: Sort attribute
+  description_query_sort_criteria_attribute: Atributo de ordenação
  description_wiki_subpages_reassign: Escolha uma nova página pai
  description_selected_columns: Colunas selecionadas
-  label_parent_revision: Parent
+  label_parent_revision: Pais
-  label_child_revision: Child
+  label_child_revision: Filhos
-  error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
+  error_scm_annotate_big_text_file: A entrada não pode ser anotada, pois excede o tamanho máximo do arquivo de texto.
  setting_default_issue_start_date_to_creation_date: Usar data corrente como data inicial para novas tarefas
-  button_edit_section: Edit this section
+  button_edit_section: Editar esta seção
-  setting_repositories_encodings: Attachments and repositories encodings
+  setting_repositories_encodings: Encoding dos repositórios e anexos
-  description_all_columns: All Columns
+  description_all_columns: Todas as colunas
-  button_export: Export
+  button_export: Exportar
-  label_export_options: "%{export_format} export options"
+  label_export_options: "Opções de exportação %{export_format}"
-  error_attachment_too_big: This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})
+  error_attachment_too_big: Este arquivo não pode ser enviado porque excede o tamanho máximo permitido (%{max_size})
-  notice_failed_to_save_time_entries: "Failed to save %{count} time entrie(s) on %{total} selected: %{ids}."
+  notice_failed_to_save_time_entries: "Falha ao salvar %{count} de %{total} horas trabalhadas: %{ids}."
  label_x_issues:
    zero:  0 tarefa
    one:   1 tarefa
    other: "%{count} tarefas"
-  label_repository_new: New repository
+  label_repository_new: Novo repositório
-  field_repository_is_default: Main repository
+  field_repository_is_default: Repositório principal
-  label_copy_attachments: Copy attachments
+  label_copy_attachments: Copiar anexos
  label_item_position: "%{position}/%{count}"
-  label_completed_versions: Completed versions
+  label_completed_versions: Versões completadas
-  text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
+  text_project_identifier_info: Somente letras minúsculas (az), números, traços e sublinhados são permitidos. <br /> Uma vez salvo, o identificador não pode ser alterado.
-  field_multiple: Multiple values
+  field_multiple: Multiplos valores
-  setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed
+  setting_commit_cross_project_ref: Permitir que tarefas de todos os outros projetos sejam refenciadas e resolvidas
-  text_issue_conflict_resolution_add_notes: Add my notes and discard my other changes
+  text_issue_conflict_resolution_add_notes: Adicione minhas anotações e descartar minhas outras mudanças
-  text_issue_conflict_resolution_overwrite: Apply my changes anyway (previous notes will be kept but some changes may be overwritten)
+  text_issue_conflict_resolution_overwrite: Aplicar as minhas alterações de qualquer maneira (notas anteriores serão mantidos, mas algumas mudanças podem ser substituídos)
-  notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
+  notice_issue_update_conflict: A tarefa foi atualizada por um outro usuário, enquanto você estava editando.
-  text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
+  text_issue_conflict_resolution_cancel: Descartar todas as minhas mudanças e re-exibir %{link}
-  permission_manage_related_issues: Manage related issues
+  permission_manage_related_issues: Gerenciar tarefas relacionadas
-  field_auth_source_ldap_filter: LDAP filter
+  field_auth_source_ldap_filter: Filtro LDAP
-  label_search_for_watchers: Search for watchers to add
+  label_search_for_watchers: Procurar por outros observadores para adiconar
-  notice_account_deleted: Your account has been permanently deleted.
+  notice_account_deleted: Sua conta foi excluída permanentemente.
-  setting_unsubscribe: Allow users to delete their own account
+  setting_unsubscribe: Permitir aos usuários excluir sua conta própria
-  button_delete_my_account: Delete my account
+  button_delete_my_account: Excluir minha conta
  text_account_destroy_confirmation: |-
-    Are you sure you want to proceed?
+    Tem certeza de que quer continuar?
-    Your account will be permanently deleted, with no way to reactivate it.
+    Sua conta será excluída permanentemente, sem qualquer forma de reativá-lo.
-  error_session_expired: Your session has expired. Please login again.
+  error_session_expired: A sua sessão expirou. Por favor, faça login novamente.
-  text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
+  text_session_expiration_settings: "Aviso: a alteração dessas configurações pode expirar as sessões atuais, incluindo a sua."
-  setting_session_lifetime: Session maximum lifetime
+  setting_session_lifetime: duração máxima da sessão
-  setting_session_timeout: Session inactivity timeout
+  setting_session_timeout: tempo limite de inatividade da sessão
-  label_session_expiration: Session expiration
+  label_session_expiration: "Expiração da sessão"
-  permission_close_project: Close / reopen the project
+  permission_close_project: Fechar / reabrir o projeto
-  label_show_closed_projects: View closed projects
+  label_show_closed_projects: Visualização de projetos fechados
-  button_close: Close
+  button_close: Fechar
-  button_reopen: Reopen
+  button_reopen: Reabrir
-  project_status_active: active
+  project_status_active: ativo
-  project_status_closed: closed
+  project_status_closed: fechado
-  project_status_archived: archived
+  project_status_archived: arquivado
-  text_project_closed: This project is closed and read-only.
+  text_project_closed: Este projeto é fechado e somente leitura.
-  notice_user_successful_create: User %{id} created.
+  notice_user_successful_create: Usuário %{id} criado.
-  field_core_fields: Standard fields
+  field_core_fields: campos padrão
-  field_timeout: Timeout (in seconds)
+  field_timeout: Tempo de espera (em segundos)
-  setting_thumbnails_enabled: Display attachment thumbnails
+  setting_thumbnails_enabled: exibir miniaturas de anexos
-  setting_thumbnails_size: Thumbnails size (in pixels)
+  setting_thumbnails_size: Tamanho das miniaturas (em pixels)
-  label_status_transitions: Status transitions
+  label_status_transitions: Estados das transições
-  label_fields_permissions: Fields permissions
+  label_fields_permissions: Permissões de campos
-  label_readonly: Read-only
+  label_readonly: somente leitura
-  label_required: Required
+  label_required: Obrigatório
-  text_repository_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
+  text_repository_identifier_info: Somente letras minúsculas (az), números, traços e sublinhados são permitidos <br/> Uma vez salvo, o identificador não pode ser alterado.
-  field_board_parent: Parent forum
+  field_board_parent: Fórum Pai
-  label_attribute_of_project: Project's %{name}
+  label_attribute_of_project: "Projeto %{name}"
-  label_attribute_of_author: Author's %{name}
+  label_attribute_of_author: "autor %{name}"
-  label_attribute_of_assigned_to: Assignee's %{name}
+  label_attribute_of_assigned_to: "atribuído %{name}"
-  label_attribute_of_fixed_version: Target version's %{name}
+  label_attribute_of_fixed_version: "versão alvo %{name}"
-  label_copy_subtasks: Copy subtasks
+  label_copy_subtasks: Copiar sub-tarefas
-  label_copied_to: copied to
+  label_copied_to: copiada
-  label_copied_from: copied from
+  label_copied_from: copiado
-  label_any_issues_in_project: any issues in project
+  label_any_issues_in_project: quaisquer problemas em projeto
-  label_any_issues_not_in_project: any issues not in project
+  label_any_issues_not_in_project: todas as questões que não estão em projeto
-  field_private_notes: Private notes
+  field_private_notes: notas privadas
-  permission_view_private_notes: View private notes
+  permission_view_private_notes: Ver notas privadas
-  permission_set_notes_private: Set notes as private
+  permission_set_notes_private: Defina notas como privada
-  label_no_issues_in_project: no issues in project
+  label_no_issues_in_project: sem problemas em projeto
  label_any: todos
-  label_last_n_weeks: last %{count} weeks
+  label_last_n_weeks: "últimas %{count} semanas"
-  setting_cross_project_subtasks: Allow cross-project subtasks
+  setting_cross_project_subtasks: Permitir cruzamento de sub-tarefas entre projetos 
  label_cross_project_descendants: Com sub-projetos
  label_cross_project_tree: Com a árvore do projeto
  label_cross_project_hierarchy: Com a hierarquia do projeto
  label_cross_project_system: Com todos os projetos
-  button_hide: Hide
+  button_hide: Esconder
-  setting_non_working_week_days: Non-working days
+  setting_non_working_week_days: dias não úteis
-  label_in_the_next_days: in the next
+  label_in_the_next_days: na próxima
-  label_in_the_past_days: in the past
+  label_in_the_past_days: no passado
@@ -1,6 +1,7 @@
 # Portuguese localization for Ruby on Rails
 # by Ricardo Otero <oterosantos@gmail.com>
 # by Alberto Ferreira <toraxic@gmail.com>
 # by Rui Rebelo <rmrebelo@ua.pt>
 pt:
  support:
    array:
@@ -51,8 +52,8 @@ pt:
        one: "aproximadamente 1 hora"
        other: "aproximadamente %{count} horas"
      x_hours:
-        one:   "1 hour"
+        one:   "1 hora"
-        other: "%{count} hours"
+        other: "%{count} horas"
      x_days:
        one: "1 dia"
        other: "%{count} dias"
@@ -69,8 +70,8 @@ pt:
        one: "mais de 1 ano"
        other: "mais de %{count} anos"
      almost_x_years:
-        one:   "almost 1 year"
+        one:   "quase 1 ano"
-        other: "almost %{count} years"
+        other: "quase %{count} anos"
  number:
    format:
@@ -440,17 +441,17 @@ pt:
  label_closed_issues: fechado
  label_closed_issues_plural: fechados
  label_x_open_issues_abbr_on_total:
-    zero:  0 open / %{total}
+    zero:  0 abertas / %{total}
-    one:   1 open / %{total}
+    one:   1 aberta / %{total}
-    other: "%{count} open / %{total}"
+    other: "%{count} abertas / %{total}"
  label_x_open_issues_abbr:
-    zero:  0 open
+    zero:  0 abertas
-    one:   1 open
+    one:   1 aberta
-    other: "%{count} open"
+    other: "%{count} abertas"
  label_x_closed_issues_abbr:
-    zero:  0 closed
+    zero:  0 fechadas
-    one:   1 closed
+    one:   1 fechada
-    other: "%{count} closed"
+    other: "%{count} fechadas"
  label_total: Total
  label_permissions: Permissões
  label_current_status: Estado actual
@@ -474,9 +475,9 @@ pt:
  label_comment: Comentário
  label_comment_plural: Comentários
  label_x_comments:
-    zero: no comments
+    zero: sem comentários
-    one: 1 comment
+    one: 1 comentário
-    other: "%{count} comments"
+    other: "%{count} comentários"
  label_comment_add: Adicionar comentário
  label_comment_added: Comentário adicionado
  label_comment_delete: Apagar comentários
@@ -943,146 +944,146 @@ pt:
  setting_commit_logtime_enabled: Activar registo de tempo
  notice_gantt_chart_truncated: O gráfico foi truncado porque excede o número máximo de itens visível (%{máx.})
  setting_gantt_items_limit: Número máximo de itens exibidos no gráfico Gantt
-  field_warn_on_leaving_unsaved: Warn me when leaving a page with unsaved text
+  field_warn_on_leaving_unsaved: Avisar-me quando deixar uma página com texto por salvar
-  text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
+  text_warn_on_leaving_unsaved: A página actual contém texto por salvar que será perdido caso saia desta página.
-  label_my_queries: My custom queries
+  label_my_queries: As minhas consultas
-  text_journal_changed_no_detail: "%{label} updated"
+  text_journal_changed_no_detail: "%{label} actualizada"
-  label_news_comment_added: Comment added to a news
+  label_news_comment_added: Comentário adicionado a uma notícia
-  button_expand_all: Expand all
+  button_expand_all: Expandir todos
-  button_collapse_all: Collapse all
+  button_collapse_all: Minimizar todos
-  label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
+  label_additional_workflow_transitions_for_assignee: Transições adicionais permitidas quando a tarefa está atribuida ao utilizador
-  label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
+  label_additional_workflow_transitions_for_author: Transições adicionais permitidas quando o utilizador é o autor da tarefa
-  label_bulk_edit_selected_time_entries: Bulk edit selected time entries
+  label_bulk_edit_selected_time_entries: Edição em massa de registos de tempo
-  text_time_entries_destroy_confirmation: Are you sure you want to delete the selected time entr(y/ies)?
+  text_time_entries_destroy_confirmation: Têm a certeza que pretende apagar o(s) registo(s) de tempo selecionado(s)?
-  label_role_anonymous: Anonymous
+  label_role_anonymous: Anónimo
-  label_role_non_member: Non member
+  label_role_non_member: Não membro
-  label_issue_note_added: Note added
+  label_issue_note_added: Nota adicionada
-  label_issue_status_updated: Status updated
+  label_issue_status_updated: Estado actualizado
-  label_issue_priority_updated: Priority updated
+  label_issue_priority_updated: Prioridade adicionada
-  label_issues_visibility_own: Issues created by or assigned to the user
+  label_issues_visibility_own: Tarefas criadas ou atribuídas ao utilizador
-  field_issues_visibility: Issues visibility
+  field_issues_visibility: Visibilidade das tarefas
-  label_issues_visibility_all: All issues
+  label_issues_visibility_all: Todas as tarefas
-  permission_set_own_issues_private: Set own issues public or private
+  permission_set_own_issues_private: Configurar as suas tarefas como públicas ou privadas
-  field_is_private: Private
+  field_is_private: Privado
-  permission_set_issues_private: Set issues public or private
+  permission_set_issues_private: Configurar tarefas como públicas ou privadas
-  label_issues_visibility_public: All non private issues
+  label_issues_visibility_public: Todas as tarefas públicas
-  text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
+  text_issues_destroy_descendants_confirmation: Irá apagar também %{count} subtarefa(s).
-  field_commit_logs_encoding: Encoding das mensagens de commit
+  field_commit_logs_encoding: Codificação das mensagens de commit
-  field_scm_path_encoding: Path encoding
+  field_scm_path_encoding: Codificação do caminho
-  text_scm_path_encoding_note: "Default: UTF-8"
+  text_scm_path_encoding_note: "Por omissão: UTF-8"
-  field_path_to_repository: Path to repository
+  field_path_to_repository: Caminho para o repositório
-  field_root_directory: Root directory
+  field_root_directory: Raíz do directório
-  field_cvs_module: Module
+  field_cvs_module: Módulo
  field_cvsroot: CVSROOT
-  text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
+  text_mercurial_repository_note: "Repositório local (ex: /hgrepo, c:\\hgrepo)"
-  text_scm_command: Command
+  text_scm_command: Comando
-  text_scm_command_version: Version
+  text_scm_command_version: Versão
-  label_git_report_last_commit: Report last commit for files and directories
+  label_git_report_last_commit: Analisar último commit por ficheiros e pastas
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_config: Pode configurar os comando SCM em config/configuration.yml. Por favor reinicie a aplicação depois de alterar o ficheiro.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
+  text_scm_command_not_available: O comando SCM não está disponível. Por favor verifique as configurações no painel de administração.
-  notice_issue_successful_create: Issue %{id} created.
+  notice_issue_successful_create: Tarefa %{id} criada.
-  label_between: between
+  label_between: entre
-  setting_issue_group_assignment: Allow issue assignment to groups
+  setting_issue_group_assignment: Permitir atribuir tarefas a grupos
-  label_diff: diff
+  label_diff: diferença
-  text_git_repository_note: Repository is bare and local (e.g. /gitrepo, c:\gitrepo)
+  text_git_repository_note: O repositório é local (e.g. /gitrepo, c:\gitrepo)
-  description_query_sort_criteria_direction: Sort direction
+  description_query_sort_criteria_direction: Direcção da ordenação
-  description_project_scope: Search scope
+  description_project_scope: Âmbito da pesquisa
-  description_filter: Filter
+  description_filter: Filtro
-  description_user_mail_notification: Mail notification settings
+  description_user_mail_notification: Configurações das notificações por email
-  description_date_from: Enter start date
+  description_date_from: Introduza data de início
-  description_message_content: Message content
+  description_message_content: Conteúdo da mensagem
-  description_available_columns: Available Columns
+  description_available_columns: Colunas disponíveis
-  description_date_range_interval: Choose range by selecting start and end date
+  description_date_range_interval: Escolha o intervalo seleccionando a data de início e de fim
-  description_issue_category_reassign: Choose issue category
+  description_issue_category_reassign: Escolha a categoria da tarefa
-  description_search: Searchfield
+  description_search: Campo de pesquisa
-  description_notes: Notes
+  description_notes: Notas
-  description_date_range_list: Choose range from list
+  description_date_range_list: Escolha o intervalo da lista
-  description_choose_project: Projects
+  description_choose_project: Projecto
-  description_date_to: Enter end date
+  description_date_to: Introduza data de fim
-  description_query_sort_criteria_attribute: Sort attribute
+  description_query_sort_criteria_attribute: Ordenar atributos
-  description_wiki_subpages_reassign: Choose new parent page
+  description_wiki_subpages_reassign: Escolha nova página pai
-  description_selected_columns: Selected Columns
+  description_selected_columns: Colunas seleccionadas
-  label_parent_revision: Parent
+  label_parent_revision: Pai
-  label_child_revision: Child
+  label_child_revision: Filha
-  error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
+  error_scm_annotate_big_text_file: Esta entrada não pode ser anotada, excede o tamanha máximo.
-  setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+  setting_default_issue_start_date_to_creation_date: Utilizar a data actual como data de início para novas tarefas
-  button_edit_section: Edit this section
+  button_edit_section: Editar esta secção
-  setting_repositories_encodings: Attachments and repositories encodings
+  setting_repositories_encodings: Codificação dos anexos e repositórios
-  description_all_columns: All Columns
+  description_all_columns: Todas as colunas
-  button_export: Export
+  button_export: Exportar
-  label_export_options: "%{export_format} export options"
+  label_export_options: "%{export_format} opções de exportação"
-  error_attachment_too_big: This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})
+  error_attachment_too_big: Este ficheiro não pode ser carregado pois excede o tamanho máximo permitido por ficheiro (%{max_size})
-  notice_failed_to_save_time_entries: "Failed to save %{count} time entrie(s) on %{total} selected: %{ids}."
+  notice_failed_to_save_time_entries: "Falha ao guardar %{count} registo(s) de tempo dos %{total} seleccionados: %{ids}."
  label_x_issues:
    zero:  0 tarefa
    one:   1 tarefa
    other: "%{count} tarefas"
-  label_repository_new: New repository
+  label_repository_new: Novo repositório
-  field_repository_is_default: Main repository
+  field_repository_is_default: Repositório principal
-  label_copy_attachments: Copy attachments
+  label_copy_attachments: Copiar anexos
  label_item_position: "%{position}/%{count}"
-  label_completed_versions: Completed versions
+  label_completed_versions: Versões completas
-  text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
+  text_project_identifier_info: Apenas letras minúsculas (a-z), números, traços e sublinhados são permitidos.<br />Depois de guardar não é possível alterar.
-  field_multiple: Multiple values
+  field_multiple: Múltiplos valores
-  setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed
+  setting_commit_cross_project_ref: Permitir que tarefas dos restantes projectos sejam referenciadas e resolvidas
-  text_issue_conflict_resolution_add_notes: Add my notes and discard my other changes
+  text_issue_conflict_resolution_add_notes: Adicionar as minhas notas e descartar as minhas restantes alterações
-  text_issue_conflict_resolution_overwrite: Apply my changes anyway (previous notes will be kept but some changes may be overwritten)
+  text_issue_conflict_resolution_overwrite: Aplicar as minhas alterações (notas antigas serão mantidas mas algumas alterações podem se perder)
-  notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
+  notice_issue_update_conflict: Esta tarefa foi actualizada por outro utilizador enquanto estava a edita-la.
-  text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
+  text_issue_conflict_resolution_cancel: Descartar todas as minhas alterações e actualizar %{link}
-  permission_manage_related_issues: Manage related issues
+  permission_manage_related_issues: Gerir tarefas relacionadas
-  field_auth_source_ldap_filter: LDAP filter
+  field_auth_source_ldap_filter: Filtro LDAP
-  label_search_for_watchers: Search for watchers to add
+  label_search_for_watchers: Pesquisar por observadores para adicionar
-  notice_account_deleted: Your account has been permanently deleted.
+  notice_account_deleted: A sua conta foi apagada permanentemente.
-  setting_unsubscribe: Allow users to delete their own account
+  setting_unsubscribe: Permitir aos utilizadores apagarem a sua própria conta
-  button_delete_my_account: Delete my account
+  button_delete_my_account: Apagar a minha conta
  text_account_destroy_confirmation: |-
-    Are you sure you want to proceed?
+    Têm a certeza que pretende avançar?
-    Your account will be permanently deleted, with no way to reactivate it.
+    A sua conta vai ser permanentemente apagada, não será possível recupera-la.
-  error_session_expired: Your session has expired. Please login again.
+  error_session_expired: A sua sessão expirou. Por-favor autentique-se novamente.
-  text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
+  text_session_expiration_settings: "Atenção: alterar estas configurações pode fazer expirar as sessões em curso, incluíndo a sua."
-  setting_session_lifetime: Session maximum lifetime
+  setting_session_lifetime: Duração máxima da sessão
-  setting_session_timeout: Session inactivity timeout
+  setting_session_timeout: Tempo limite de inactividade da sessão
-  label_session_expiration: Session expiration
+  label_session_expiration: Expiração da sessão
-  permission_close_project: Close / reopen the project
+  permission_close_project: Fechar / re-abrir o projecto
-  label_show_closed_projects: View closed projects
+  label_show_closed_projects: Ver os projectos fechados
-  button_close: Close
+  button_close: Fechar
-  button_reopen: Reopen
+  button_reopen: Re-abrir
-  project_status_active: active
+  project_status_active: activo
-  project_status_closed: closed
+  project_status_closed: fechado
-  project_status_archived: archived
+  project_status_archived: arquivado
-  text_project_closed: This project is closed and read-only.
+  text_project_closed: Este projecto está fechado e é apenas de leitura.
-  notice_user_successful_create: User %{id} created.
+  notice_user_successful_create: Utilizador %{id} criado.
-  field_core_fields: Standard fields
+  field_core_fields: Campos padrão
-  field_timeout: Timeout (in seconds)
+  field_timeout: Tempo limite (em segundos)
-  setting_thumbnails_enabled: Display attachment thumbnails
+  setting_thumbnails_enabled: Apresentar miniaturas dos anexos
-  setting_thumbnails_size: Thumbnails size (in pixels)
+  setting_thumbnails_size: Tamanho das miniaturas (em pixeis)
-  label_status_transitions: Status transitions
+  label_status_transitions: Estado das transições
-  label_fields_permissions: Fields permissions
+  label_fields_permissions: Permissões do campo
-  label_readonly: Read-only
+  label_readonly: Apenas de leitura
-  label_required: Required
+  label_required: Obrigatório
-  text_repository_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
+  text_repository_identifier_info: Apenas letras minúsculas (a-z), números, traços e sublinhados são permitidos.<br />Depois de guardar não é possível alterar.
-  field_board_parent: Parent forum
+  field_board_parent: Fórum pai
-  label_attribute_of_project: Project's %{name}
+  label_attribute_of_project: "%{name} do Projecto"
-  label_attribute_of_author: Author's %{name}
+  label_attribute_of_author: "%{name} do Autor"
-  label_attribute_of_assigned_to: Assignee's %{name}
+  label_attribute_of_assigned_to: "%{name} do atribuído"
-  label_attribute_of_fixed_version: Target version's %{name}
+  label_attribute_of_fixed_version: "%{name} da Versão"
-  label_copy_subtasks: Copy subtasks
+  label_copy_subtasks: Copiar sub-tarefas
-  label_copied_to: copied to
+  label_copied_to: copiado para
-  label_copied_from: copied from
+  label_copied_from: copiado de
-  label_any_issues_in_project: any issues in project
+  label_any_issues_in_project: tarefas do projecto
-  label_any_issues_not_in_project: any issues not in project
+  label_any_issues_not_in_project: tarefas sem projecto
-  field_private_notes: Private notes
+  field_private_notes: Notas privadas
-  permission_view_private_notes: View private notes
+  permission_view_private_notes: Ver notas privadas
-  permission_set_notes_private: Set notes as private
+  permission_set_notes_private: Configurar notas como privadas
-  label_no_issues_in_project: no issues in project
+  label_no_issues_in_project: sem tarefas no projecto
  label_any: todos
-  label_last_n_weeks: last %{count} weeks
+  label_last_n_weeks: últimas %{count} semanas
-  setting_cross_project_subtasks: Allow cross-project subtasks
+  setting_cross_project_subtasks: Permitir sub-tarefas entre projectos
  label_cross_project_descendants: Com os sub-projectos
  label_cross_project_tree: Com árvore do projecto
  label_cross_project_hierarchy: Com hierarquia do projecto
  label_cross_project_system: Com todos os projectos
-  button_hide: Hide
+  button_hide: Esconder
-  setting_non_working_week_days: Non-working days
+  setting_non_working_week_days: Dias não úteis
-  label_in_the_next_days: in the next
+  label_in_the_next_days: no futuro
-  label_in_the_past_days: in the past
+  label_in_the_past_days: no passado
@@ -1147,7 +1147,7 @@ ru:
  button_delete_my_account: "Удалить мою учетную запись" 
  text_account_destroy_confirmation: "Ваша учетная запись будет полностью удалена без возможности восстановления.\nВы уверены, что хотите продолжить?" 
  error_session_expired: Срок вашей сессии истек. Пожалуйста войдите еще раз
-  text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
+  text_session_expiration_settings: "Внимание! Изменение этих настроек может привести к завершению текущих сессий, включая вашу."
  setting_session_lifetime: Максимальная продолжительность сессии
  setting_session_timeout: Таймут сессии 
  label_session_expiration: Срок истечения сессии
@@ -2,6 +2,7 @@
 # by
 #   Do Hai Bac (dohaibac@gmail.com)
 #   Dao Thanh Ngoc (ngocdaothanh@gmail.com, http://github.com/ngocdaothanh/rails-i18n/tree/master)
 #   Nguyen Minh Thien (thiencdcn@gmail.com, http://www.eDesignLab.org)
 vi:
  number:
@@ -80,8 +81,8 @@ vi:
        one:   "khoảng 1 giờ"
        other: "khoảng %{count} giờ"
      x_hours:
-        one:   "1 hour"
+        one:   "1 giờ"
-        other: "%{count} hours"
+        other: "%{count} giờ"
      x_days:
        one:   "1 ngày"
        other: "%{count} ngày"
@@ -98,8 +99,8 @@ vi:
        one:   "hơn 1 năm"
        other: "hơn %{count} năm"
      almost_x_years:
-        one:   "almost 1 year"
+        one:   "gần 1 năm"
-        other: "almost %{count} years"
+        other: "gần %{count} năm"
    prompts:
      year:   "Năm"
      month:  "Tháng"
@@ -142,7 +143,7 @@ vi:
        greater_than_start_date: "phải đi sau ngày bắt đầu"
        not_same_project: "không thuộc cùng dự án"
        circular_dependency: "quan hệ có thể gây ra lặp vô tận"
-        cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
+        cant_link_an_issue_with_a_descendant: "Một vấn đề không thể liên kết tới một trong số những tác vụ con của nó"
  direction: ltr
  date:
@@ -214,16 +215,16 @@ vi:
  notice_email_sent: "Email đã được gửi tới %{value}"
  notice_email_error: "Lỗi xảy ra khi gửi email (%{value})"
  notice_feeds_access_key_reseted: Mã số chứng thực RSS đã được tạo lại.
-  notice_failed_to_save_issues: "Failed to save %{count} issue(s) on %{total} selected: %{ids}."
+  notice_failed_to_save_issues: "Thất bại khi lưu %{count} vấn đề trong %{total} lựa chọn: %{ids}."
-  notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
+  notice_no_issue_selected: "Không có vấn đề được chọn! Vui lòng kiểm tra các vấn đề bạn cần chỉnh sửa."
  notice_account_pending: "Thông tin tài khoản đã được tạo ra và đang chờ chứng thực từ ban quản trị."
  notice_default_data_loaded: Đã nạp cấu hình mặc định.
  notice_unable_delete_version: Không thể xóa phiên bản.
  error_can_t_load_default_data: "Không thể nạp cấu hình mặc định: %{value}"
-  error_scm_not_found: "The entry or revision was not found in the repository."
+  error_scm_not_found: "Không tìm thấy dữ liệu trong kho chứa."
  error_scm_command_failed: "Lỗi xảy ra khi truy cập vào kho lưu trữ: %{value}"
-  error_scm_annotate: "The entry does not exist or can not be annotated."
+  error_scm_annotate: "Đầu vào không tồn tại hoặc không thể chú thích."
  error_issue_not_found_in_project: 'Vấn đề không tồn tại hoặc không thuộc dự án'
  mail_subject_lost_password: "%{value}: mật mã của bạn"
@@ -292,17 +293,17 @@ vi:
  field_version: Phiên bản
  field_type: Kiểu
  field_host: Host
-  field_port: Port
+  field_port: Cổng
  field_account: Tài khoản
  field_base_dn: Base DN
-  field_attr_login: Login attribute
+  field_attr_login: Thuộc tính đăng nhập
-  field_attr_firstname: Firstname attribute
+  field_attr_firstname: Thuộc tính tên đệm và Tên
-  field_attr_lastname: Lastname attribute
+  field_attr_lastname: Thuộc tính Họ
-  field_attr_mail: Email attribute
+  field_attr_mail: Thuộc tính Email
-  field_onthefly: On-the-fly user creation
+  field_onthefly: Tạo người dùng tức thì
  field_start_date: Bắt đầu
  field_done_ratio: Tiến độ
-  field_auth_source: Authentication mode
+  field_auth_source: Chế độ xác thực
  field_hide_mail: Không làm lộ email của bạn
  field_comments: Bình luận
  field_url: URL
@@ -332,31 +333,31 @@ vi:
  setting_login_required: Cần đăng nhập
  setting_self_registration: Tự chứng thực
  setting_attachment_max_size: Cỡ tối đa của tập tin đính kèm
-  setting_issues_export_limit: Issues export limit
+  setting_issues_export_limit: Giới hạn Export vấn đề
-  setting_mail_from: Emission email address
+  setting_mail_from: Địa chỉ email gửi thông báo
  setting_bcc_recipients: Tạo bản CC bí mật (bcc)
  setting_host_name: Tên miền và đường dẫn
  setting_text_formatting: Định dạng bài viết
-  setting_wiki_compression: Wiki history compression
+  setting_wiki_compression: Nén lịch sử Wiki
  setting_feeds_limit: Giới hạn nội dung của feed
  setting_default_projects_public: Dự án mặc định là công cộng
-  setting_autofetch_changesets: Autofetch commits
+  setting_autofetch_changesets: Tự động tìm nạp commits
-  setting_sys_api_enabled: Enable WS for repository management
+  setting_sys_api_enabled: Cho phép WS quản lý kho chứa
  setting_commit_ref_keywords: Từ khóa tham khảo
  setting_commit_fix_keywords: Từ khóa chỉ vấn đề đã giải quyết
  setting_autologin: Tự động đăng nhập
  setting_date_format: Định dạng ngày
  setting_time_format: Định dạng giờ
  setting_cross_project_issue_relations: Cho phép quan hệ chéo giữa các dự án
-  setting_issue_list_default_columns: Default columns displayed on the issue list
+  setting_issue_list_default_columns: Các cột mặc định hiển thị trong danh sách vấn đề
  setting_emails_footer: Chữ ký cuối thư
  setting_protocol: Giao thức
-  setting_per_page_options: Objects per page options
+  setting_per_page_options: Tùy chọn đối tượng mỗi trang
  setting_user_format: Định dạng hiển thị người dùng
-  setting_activity_days_default: Days displayed on project activity
+  setting_activity_days_default: Ngày hiển thị hoạt động của dự án
-  setting_display_subprojects_issues: Display subprojects issues on main projects by default
+  setting_display_subprojects_issues: Hiển thị mặc định vấn đề của dự án con ở dự án chính
-  setting_enabled_scm: Enabled SCM
+  setting_enabled_scm: Cho phép SCM
-  setting_mail_handler_api_enabled: Enable WS for incoming emails
+  setting_mail_handler_api_enabled: Cho phép WS cho các email tới
  setting_mail_handler_api_key: Mã số API
  setting_sequential_project_identifiers: Tự sinh chuỗi ID dự án
@@ -376,9 +377,9 @@ vi:
  label_project_new: Dự án mới
  label_project_plural: Dự án
  label_x_projects:
-    zero:  no projects
+    zero:  không có dự án
-    one:   1 project
+    one:   một dự án
-    other: "%{count} projects"
+    other: "%{count} dự án"
  label_project_all: Mọi dự án
  label_project_latest: Dự án mới nhất
  label_issue: Vấn đề
@@ -402,18 +403,18 @@ vi:
  label_tracker: Dòng vấn đề
  label_tracker_plural: Dòng vấn đề
  label_tracker_new: Tạo dòng vấn đề mới
-  label_workflow: Workflow
+  label_workflow: Quy trình làm việc
-  label_issue_status: Issue status
+  label_issue_status: Trạng thái vấn đề
-  label_issue_status_plural: Issue statuses
+  label_issue_status_plural: Trạng thái vấn đề
-  label_issue_status_new: New status
+  label_issue_status_new: Thêm trạng thái
  label_issue_category: Chủ đề
  label_issue_category_plural: Chủ đề
  label_issue_category_new: Chủ đề mới
-  label_custom_field: Custom field
+  label_custom_field: Trường tùy biến
-  label_custom_field_plural: Custom fields
+  label_custom_field_plural: Trường tùy biến
-  label_custom_field_new: New custom field
+  label_custom_field_new: Thêm Trường tùy biến
-  label_enumerations: Enumerations
+  label_enumerations: Liệt kê
-  label_enumeration_new: New value
+  label_enumeration_new: Thêm giá trị
  label_information: Thông tin
  label_information_plural: Thông tin
  label_please_login: Vui lòng đăng nhập
@@ -435,23 +436,23 @@ vi:
  label_overall_activity: Tất cả hoạt động
  label_new: Mới
  label_logged_as: Tài khoản &raquo;
-  label_environment: Environment
+  label_environment: Môi trường
-  label_authentication: Authentication
+  label_authentication: Xác thực
-  label_auth_source: Authentication mode
+  label_auth_source: Chế độ xác thực
-  label_auth_source_new: New authentication mode
+  label_auth_source_new: Chế độ xác thực mới
-  label_auth_source_plural: Authentication modes
+  label_auth_source_plural: Chế độ xác thực
  label_subproject_plural: Dự án con
  label_and_its_subprojects: "%{value} và dự án con"
-  label_min_max_length: Min - Max length
+  label_min_max_length: Độ dài nhỏ nhất - lớn nhất
-  label_list: List
+  label_list: Danh sách
  label_date: Ngày
-  label_integer: Integer
+  label_integer: Số nguyên
-  label_float: Float
+  label_float: Số thực
  label_boolean: Boolean
-  label_string: Text
+  label_string: Văn bản
-  label_text: Long text
+  label_text: Văn bản dài
-  label_attribute: Attribute
+  label_attribute: Thuộc tính
-  label_attribute_plural: Attributes
+  label_attribute_plural: Các thuộc tính
  label_download: "%{count} lần tải"
  label_download_plural: "%{count} lần tải"
  label_no_data: Chưa có thông tin gì
@@ -477,24 +478,24 @@ vi:
  label_version_plural: Phiên bản
  label_confirmation: Khẳng định
  label_export_to: 'Định dạng khác của trang này:'
-  label_read: Read...
+  label_read: Đọc...
  label_public_projects: Các dự án công cộng
  label_open_issues: mở
  label_open_issues_plural: mở
  label_closed_issues: đóng
  label_closed_issues_plural: đóng
  label_x_open_issues_abbr_on_total:
-    zero:  0 open / %{total}
+    zero:  "0 mở / %{total}"
-    one:   1 open / %{total}
+    one:   "1 mở / %{total}"
-    other: "%{count} open / %{total}"
+    other: "%{count} mở / %{total}"
  label_x_open_issues_abbr:
-    zero:  0 open
+    zero:  0 mở
-    one:   1 open
+    one:   1 mở
-    other: "%{count} open"
+    other: "%{count} mở"
  label_x_closed_issues_abbr:
-    zero:  0 closed
+    zero:  0 đóng
-    one:   1 closed
+    one:   1 đóng
-    other: "%{count} closed"
+    other: "%{count} đóng"
  label_total: Tổng cộng
  label_permissions: Quyền
  label_current_status: Trạng thái hiện tại
@@ -504,7 +505,7 @@ vi:
  label_nobody: Chẳng ai
  label_next: Sau
  label_previous: Trước
-  label_used_by: Used by
+  label_used_by: Được dùng bởi
  label_details: Chi tiết
  label_add_note: Thêm ghi chú
  label_per_page: Mỗi trang
@@ -518,9 +519,9 @@ vi:
  label_comment: Bình luận
  label_comment_plural: Bình luận
  label_x_comments:
-    zero: no comments
+    zero: không có bình luận
-    one: 1 comment
+    one: 1 bình luận
-    other: "%{count} comments"
+    other: "%{count} bình luận"
  label_comment_add: Thêm bình luận
  label_comment_added: Đã thêm bình luận
  label_comment_delete: Xóa bình luận
@@ -557,7 +558,7 @@ vi:
  label_modification_plural: "%{count} thay đổi"
  label_revision: Bản điều chỉnh
  label_revision_plural: Bản điều chỉnh
-  label_associated_revisions: Associated revisions
+  label_associated_revisions: Các bản điều chỉnh được ghép
  label_added: thêm
  label_modified: đổi
  label_copied: chép
@@ -579,7 +580,7 @@ vi:
  label_result_plural: Kết quả
  label_all_words: Mọi từ
  label_wiki: Wiki
-  label_wiki_edit: Wiki edit
+  label_wiki_edit: Sửa Wiki
  label_wiki_edit_plural: Thay đổi wiki
  label_wiki_page: Trang wiki
  label_wiki_page_plural: Trang wiki
@@ -587,7 +588,7 @@ vi:
  label_index_by_date: Danh sách theo ngày
  label_current_version: Bản hiện tại
  label_preview: Xem trước
-  label_feed_plural: Feeds
+  label_feed_plural: Nguồn cấp tin
  label_changes_details: Chi tiết của mọi thay đổi
  label_issue_tracking: Vấn đề
  label_spent_time: Thời gian
@@ -596,13 +597,13 @@ vi:
  label_time_tracking: Theo dõi thời gian
  label_change_plural: Thay đổi
  label_statistics: Thống kê
-  label_commits_per_month: Commits per month
+  label_commits_per_month: Commits mỗi tháng
-  label_commits_per_author: Commits per author
+  label_commits_per_author: Commits mỗi tác giả
  label_view_diff: So sánh
  label_diff_inline: inline
-  label_diff_side_by_side: side by side
+  label_diff_side_by_side: bên cạnh nhau
  label_options: Tùy chọn
-  label_copy_workflow_from: Copy workflow from
+  label_copy_workflow_from: Sao chép quy trình từ
  label_permissions_report: Thống kê các quyền
  label_watched_issues: Chủ đề đang theo dõi
  label_related_issues: Liên quan
@@ -642,7 +643,7 @@ vi:
  label_date_to: Đến
  label_language_based: Theo ngôn ngữ người dùng
  label_sort_by: "Sắp xếp theo %{value}"
-  label_send_test_email: Send a test email
+  label_send_test_email: Gửi một email kiểm tra
  label_feeds_access_key_created_on: "Mã chứng thực RSS được tạo ra cách đây %{value}"
  label_module_plural: Mô-đun
  label_added_time_by: "thêm bởi %{author} cách đây %{age}"
@@ -659,11 +660,11 @@ vi:
  label_user_mail_option_all: "Mọi sự kiện trên mọi dự án của bạn"
  label_user_mail_option_selected: "Mọi sự kiện trên các dự án được chọn..."
  label_user_mail_no_self_notified: "Đừng gửi email về các thay đổi do chính bạn thực hiện"
-  label_registration_activation_by_email: account activation by email
+  label_registration_activation_by_email: kích hoạt tài khoản qua email
-  label_registration_manual_activation: manual account activation
+  label_registration_manual_activation: kích hoạt tài khoản thủ công
-  label_registration_automatic_activation: automatic account activation
+  label_registration_automatic_activation: kích hoạt tài khoản tự động
  label_display_per_page: "mỗi trang: %{value}"
-  label_age: Age
+  label_age: Thời gian
  label_change_properties: Thay đổi thuộc tính
  label_general: Tổng quan
  label_more: Chi tiết
@@ -727,43 +728,43 @@ vi:
  text_select_mail_notifications: Chọn hành động đối với mỗi email thông báo sẽ gửi.
  text_regexp_info: eg. ^[A-Z0-9]+$
  text_min_max_length_info: 0 để chỉ không hạn chế
-  text_project_destroy_confirmation: Are you sure you want to delete this project and related data ?
+  text_project_destroy_confirmation: Bạn có chắc chắn muốn xóa dự án này và các dữ liệu liên quan ?
-  text_subprojects_destroy_warning: "Its subproject(s): %{value} will be also deleted."
+  text_subprojects_destroy_warning: "Dự án con của : %{value} cũng sẽ bị xóa."
-  text_workflow_edit: Select a role and a tracker to edit the workflow
+  text_workflow_edit: Chọn một vai trò và một vấn đề để sửa quy trình
  text_are_you_sure: Bạn chắc chứ?
  text_tip_issue_begin_day: ngày bắt đầu
  text_tip_issue_end_day: ngày kết thúc
  text_tip_issue_begin_end_day: bắt đầu và kết thúc cùng ngày
  text_caracters_maximum: "Tối đa %{count} ký tự."
  text_caracters_minimum: "Phải gồm ít nhất %{count} ký tự."
-  text_length_between: "Length between %{min} and %{max} characters."
+  text_length_between: "Chiều dài giữa %{min} và %{max} ký tự."
-  text_tracker_no_workflow: No workflow defined for this tracker
+  text_tracker_no_workflow: Không có quy trình được định nghĩa cho theo dõi này
  text_unallowed_characters: Ký tự không hợp lệ
-  text_comma_separated: Multiple values allowed (comma separated).
+  text_comma_separated: Nhiều giá trị được phép (cách nhau bởi dấu phẩy).
-  text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
+  text_issues_ref_in_commit_messages: Vấn đề tham khảo và cố định trong ghi chú commit
-  text_issue_added: "Issue %{id} has been reported by %{author}."
+  text_issue_added: "Vấn đề %{id} đã được báo cáo bởi %{author}."
-  text_issue_updated: "Issue %{id} has been updated by %{author}."
+  text_issue_updated: "Vấn đề %{id} đã được cập nhật bởi %{author}."
-  text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
+  text_wiki_destroy_confirmation: Bạn có chắc chắn muốn xóa trang wiki này và tất cả nội dung của nó ?
-  text_issue_category_destroy_question: "Some issues (%{count}) are assigned to this category. What do you want to do ?"
+  text_issue_category_destroy_question: "Một số vấn đề (%{count}) được gán cho danh mục này. Bạn muốn làm gì ?"
-  text_issue_category_destroy_assignments: Remove category assignments
+  text_issue_category_destroy_assignments: Gỡ bỏ danh mục được phân công
-  text_issue_category_reassign_to: Reassign issues to this category
+  text_issue_category_reassign_to: Gán lại vấn đề cho danh mục này
  text_user_mail_option: "Với các dự án không được chọn, bạn chỉ có thể nhận được thông báo về các vấn đề bạn đăng ký theo dõi hoặc có liên quan đến bạn (chẳng hạn, vấn đề được gán cho bạn)."
-  text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+  text_no_configuration_data: "Quyền, theo dõi, tình trạng vấn đề và quy trình chưa được cấu hình.\nBắt buộc phải nạp cấu hình mặc định. Bạn sẽ thay đổi nó được sau khi đã nạp."
-  text_load_default_configuration: Load the default configuration
+  text_load_default_configuration: Nạp lại cấu hình mặc định
-  text_status_changed_by_changeset: "Applied in changeset %{value}."
+  text_status_changed_by_changeset: "Áp dụng trong changeset : %{value}."
-  text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+  text_issues_destroy_confirmation: 'Bạn có chắc chắn muốn xóa các vấn đề đã chọn ?'
  text_select_project_modules: 'Chọn các mô-đun cho dự án:'
-  text_default_administrator_account_changed: Default administrator account changed
+  text_default_administrator_account_changed: Thay đổi tài khoản quản trị mặc định
-  text_file_repository_writable: File repository writable
+  text_file_repository_writable: Cho phép ghi thư mục đính kèm
-  text_rmagick_available: RMagick available (optional)
+  text_rmagick_available: Trạng thái RMagick
-  text_destroy_time_entries_question: "%{hours} hours were reported on the issues you are about to delete. What do you want to do ?"
+  text_destroy_time_entries_question: "Thời gian %{hours} giờ đã báo cáo trong vấn đề bạn định xóa. Bạn muốn làm gì tiếp ?"
-  text_destroy_time_entries: Delete reported hours
+  text_destroy_time_entries: Xóa thời gian báo cáo
-  text_assign_time_entries_to_project: Assign reported hours to the project
+  text_assign_time_entries_to_project: Gán thời gian báo cáo cho dự án
-  text_reassign_time_entries: 'Reassign reported hours to this issue:'
+  text_reassign_time_entries: 'Gán lại thời gian báo cáo cho Vấn đề này:'
-  text_user_wrote: "%{value} wrote:"
+  text_user_wrote: "%{value} đã viết:"
-  text_enumeration_destroy_question: "%{count} objects are assigned to this value."
+  text_enumeration_destroy_question: "%{count} đối tượng được gán giá trị này."
-  text_enumeration_category_reassign_to: 'Reassign them to this value:'
+  text_enumeration_category_reassign_to: 'Gán lại giá trị này:'
-  text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/configuration.yml and restart the application to enable them."
+  text_email_delivery_not_configured: "Cấu hình gửi Email chưa được đặt, và chức năng thông báo bị loại bỏ.\nCấu hình máy chủ SMTP của bạn ở file config/configuration.yml và khởi động lại để kích hoạt chúng."
  default_role_manager: Điều hành
  default_role_developer: Phát triển
@@ -772,7 +773,7 @@ vi:
  default_tracker_feature: Tính năng
  default_tracker_support: Hỗ trợ
  default_issue_status_new: Mới
-  default_issue_status_in_progress: In Progress
+  default_issue_status_in_progress: Đang tiến hành
  default_issue_status_resolved: Quyết tâm
  default_issue_status_feedback: Phản hồi
  default_issue_status_closed: Đóng
@@ -843,292 +844,295 @@ vi:
  permission_delete_own_messages: Xóa bài viết cá nhân
  label_example: Ví dụ
  text_repository_usernames_mapping: "Chọn hoặc cập nhật ánh xạ người dùng hệ thống với người dùng trong kho lưu trữ.\nNhững trường hợp trùng hợp về tên và email sẽ được tự động ánh xạ."
-  permission_delete_own_messages: Delete own messages
+  permission_delete_own_messages: Xóa thông điệp
-  label_user_activity: "%{value}'s activity"
+  label_user_activity: "%{value} hoạt động"
-  label_updated_time_by: "Updated by %{author} %{age} ago"
+  label_updated_time_by: "Cập nhật bởi %{author} cách đây %{age}"
-  text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
+  text_diff_truncated: '... Thay đổi này đã được cắt bớt do nó vượt qua giới hạn kích thước có thể hiển thị.'
-  setting_diff_max_lines_displayed: Max number of diff lines displayed
+  setting_diff_max_lines_displayed: Số dòng thay đổi tối đa được hiển thị
-  text_plugin_assets_writable: Plugin assets directory writable
+  text_plugin_assets_writable: Cho phép ghi thư mục Plugin
-  warning_attachments_not_saved: "%{count} file(s) could not be saved."
+  warning_attachments_not_saved: "%{count} file không được lưu."
-  button_create_and_continue: Create and continue
+  button_create_and_continue: Tạo và tiếp tục
-  text_custom_field_possible_values_info: 'One line for each value'
+  text_custom_field_possible_values_info: 'Một dòng cho mỗi giá trị'
-  label_display: Display
+  label_display: Hiển thị
-  field_editable: Editable
+  field_editable: Có thể sửa được
-  setting_repository_log_display_limit: Maximum number of revisions displayed on file log
+  setting_repository_log_display_limit: Số lượng tối đa các bản điều chỉnh hiển thị trong file log
-  setting_file_max_size_displayed: Max size of text files displayed inline
+  setting_file_max_size_displayed: Kích thước tối đa của tệp tin văn bản
-  field_watcher: Watcher
+  field_watcher: Người quan sát
-  setting_openid: Allow OpenID login and registration
+  setting_openid: Cho phép đăng nhập và đăng ký dùng OpenID
  field_identity_url: OpenID URL
-  label_login_with_open_id_option: or login with OpenID
+  label_login_with_open_id_option: hoặc đăng nhập với OpenID
-  field_content: Content
+  field_content: Nội dung
-  label_descending: Descending
+  label_descending: Giảm dần
-  label_sort: Sort
+  label_sort: Sắp xếp
-  label_ascending: Ascending
+  label_ascending: Tăng dần
-  label_date_from_to: From %{start} to %{end}
+  label_date_from_to: "Từ %{start} tới %{end}"
  label_greater_or_equal: ">="
-  label_less_or_equal: <=
+  label_less_or_equal: "<="
-  text_wiki_page_destroy_question: This page has %{descendants} child page(s) and descendant(s). What do you want to do?
+  text_wiki_page_destroy_question: "Trang này có %{descendants} trang con và trang cháu. Bạn muốn làm gì tiếp?"
-  text_wiki_page_reassign_children: Reassign child pages to this parent page
+  text_wiki_page_reassign_children: Gán lại trang con vào trang mẹ này
-  text_wiki_page_nullify_children: Keep child pages as root pages
+  text_wiki_page_nullify_children: Giữ trang con như trang gốc
-  text_wiki_page_destroy_children: Delete child pages and all their descendants
+  text_wiki_page_destroy_children: Xóa trang con và tất cả trang con cháu của nó
-  setting_password_min_length: Minimum password length
+  setting_password_min_length: Chiều dài tối thiểu của mật khẩu
-  field_group_by: Group results by
+  field_group_by: Nhóm kết quả bởi
-  mail_subject_wiki_content_updated: "'%{id}' wiki page has been updated"
+  mail_subject_wiki_content_updated: "%{id} trang wiki đã được cập nhật"
-  label_wiki_content_added: Wiki page added
+  label_wiki_content_added: Đã thêm trang Wiki
-  mail_subject_wiki_content_added: "'%{id}' wiki page has been added"
+  mail_subject_wiki_content_added: "%{id} trang wiki đã được thêm vào"
-  mail_body_wiki_content_added: The '%{id}' wiki page has been added by %{author}.
+  mail_body_wiki_content_added: "Có %{id} trang wiki đã được thêm vào bởi %{author}."
-  label_wiki_content_updated: Wiki page updated
+  label_wiki_content_updated: Trang Wiki đã được cập nhật
-  mail_body_wiki_content_updated: The '%{id}' wiki page has been updated by %{author}.
+  mail_body_wiki_content_updated: "Có %{id} trang wiki đã được cập nhật bởi %{author}."
-  permission_add_project: Create project
+  permission_add_project: Tạo dự án
-  setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  setting_new_project_user_role_id: Quyền được gán cho người dùng không phải quản trị viên khi tạo dự án mới
-  label_view_all_revisions: View all revisions
+  label_view_all_revisions: Xem tất cả bản điều chỉnh
-  label_tag: Tag
+  label_tag: Thẻ
-  label_branch: Branch
+  label_branch: Nhánh
-  error_no_tracker_in_project: No tracker is associated to this project. Please check the Project settings.
+  error_no_tracker_in_project: Không có ai theo dõi dự án này. Hãy kiểm tra lại phần thiết lập cho dự án.
-  error_no_default_issue_status: No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").
+  error_no_default_issue_status: Không có vấn đề mặc định được định nghĩa. Vui lòng kiểm tra cấu hình của bạn (Vào "Quản trị -> Trạng thái vấn đề").
-  text_journal_changed: "%{label} changed from %{old} to %{new}"
+  text_journal_changed: "%{label} thay đổi từ %{old} tới %{new}"
-  text_journal_set_to: "%{label} set to %{value}"
+  text_journal_set_to: "%{label} gán cho %{value}"
-  text_journal_deleted: "%{label} deleted (%{old})"
+  text_journal_deleted: "%{label} xóa (%{old})"
-  label_group_plural: Groups
+  label_group_plural: Các nhóm
-  label_group: Group
+  label_group: Nhóm
-  label_group_new: New group
+  label_group_new: Thêm nhóm
-  label_time_entry_plural: Spent time
+  label_time_entry_plural: Thời gian đã sử dụng
-  text_journal_added: "%{label} %{value} added"
+  text_journal_added: "%{label} %{value} được thêm"
-  field_active: Active
+  field_active: Tích cực
-  enumeration_system_activity: System Activity
+  enumeration_system_activity: Hoạt động hệ thống
-  permission_delete_issue_watchers: Delete watchers
+  permission_delete_issue_watchers: Xóa người quan sát
-  version_status_closed: closed
+  version_status_closed: đóng
-  version_status_locked: locked
+  version_status_locked: khóa
-  version_status_open: open
+  version_status_open: mở
-  error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened
+  error_can_not_reopen_issue_on_closed_version: Một vấn đề được gán cho phiên bản đã đóng không thể mở lại được
-  label_user_anonymous: Anonymous
+  label_user_anonymous: Ẩn danh
-  button_move_and_follow: Move and follow
+  button_move_and_follow: Di chuyển và theo
-  setting_default_projects_modules: Default enabled modules for new projects
+  setting_default_projects_modules: Các Module được kích hoạt mặc định cho dự án mới
-  setting_gravatar_default: Default Gravatar image
+  setting_gravatar_default: Ảnh Gravatar mặc định
-  field_sharing: Sharing
+  field_sharing: Chia sẻ
-  label_version_sharing_hierarchy: With project hierarchy
+  label_version_sharing_hierarchy: Với thứ bậc dự án
-  label_version_sharing_system: With all projects
+  label_version_sharing_system: Với tất cả dự án
-  label_version_sharing_descendants: With subprojects
+  label_version_sharing_descendants: Với dự án con
-  label_version_sharing_tree: With project tree
+  label_version_sharing_tree: Với cây dự án
-  label_version_sharing_none: Not shared
+  label_version_sharing_none: Không chia sẻ
-  error_can_not_archive_project: This project can not be archived
+  error_can_not_archive_project: Dựa án này không thể lưu trữ được
-  button_duplicate: Duplicate
+  button_duplicate: Nhân đôi
-  button_copy_and_follow: Copy and follow
+  button_copy_and_follow: Sao chép và theo
-  label_copy_source: Source
+  label_copy_source: Nguồn
-  setting_issue_done_ratio: Calculate the issue done ratio with
+  setting_issue_done_ratio: Tính toán tỷ lệ hoàn thành vấn đề với
-  setting_issue_done_ratio_issue_status: Use the issue status
+  setting_issue_done_ratio_issue_status: Sử dụng trạng thái của vấn đề
-  error_issue_done_ratios_not_updated: Issue done ratios not updated.
+  error_issue_done_ratios_not_updated: Tỷ lệ hoàn thành vấn đề không được cập nhật.
-  error_workflow_copy_target: Please select target tracker(s) and role(s)
+  error_workflow_copy_target: Vui lòng lựa chọn đích của theo dấu và quyền
-  setting_issue_done_ratio_issue_field: Use the issue field
+  setting_issue_done_ratio_issue_field: Dùng trường vấn đề
-  label_copy_same_as_target: Same as target
+  label_copy_same_as_target: Tương tự như đích
-  label_copy_target: Target
+  label_copy_target: Đích
-  notice_issue_done_ratios_updated: Issue done ratios updated.
+  notice_issue_done_ratios_updated: Tỷ lệ hoàn thành vấn đề được cập nhật.
-  error_workflow_copy_source: Please select a source tracker or role
+  error_workflow_copy_source: Vui lòng lựa chọn nguồn của theo dấu hoặc quyền
-  label_update_issue_done_ratios: Update issue done ratios
+  label_update_issue_done_ratios: Cập nhật tỷ lệ hoàn thành vấn đề
-  setting_start_of_week: Start calendars on
+  setting_start_of_week: Định dạng lịch
-  permission_view_issues: View Issues
+  permission_view_issues: Xem Vấn đề
-  label_display_used_statuses_only: Only display statuses that are used by this tracker
+  label_display_used_statuses_only: Chỉ hiển thị trạng thái đã được dùng bởi theo dõi này
-  label_revision_id: Revision %{value}
+  label_revision_id: "Bản điều chỉnh %{value}"
-  label_api_access_key: API access key
+  label_api_access_key: Khoá truy cập API
-  label_api_access_key_created_on: API access key created %{value} ago
+  label_api_access_key_created_on: "Khoá truy cập API đựơc tạo cách đây %{value}. Khóa này được dùng cho eDesignLab Client."
-  label_feeds_access_key: RSS access key
+  label_feeds_access_key: Khoá truy cập RSS
-  notice_api_access_key_reseted: Your API access key was reset.
+  notice_api_access_key_reseted: Khoá truy cập API của bạn đã được đặt lại.
-  setting_rest_api_enabled: Enable REST web service
+  setting_rest_api_enabled: Cho phép dịch vụ web REST
-  label_missing_api_access_key: Missing an API access key
+  label_missing_api_access_key: Mất Khoá truy cập API
-  label_missing_feeds_access_key: Missing a RSS access key
+  label_missing_feeds_access_key: Mất Khoá truy cập RSS
-  button_show: Show
+  button_show: Hiện
-  text_line_separated: Multiple values allowed (one line for each value).
+  text_line_separated: Nhiều giá trị được phép(mỗi dòng một giá trị).
-  setting_mail_handler_body_delimiters: Truncate emails after one of these lines
+  setting_mail_handler_body_delimiters: "Cắt bớt email sau những dòng :"
-  permission_add_subprojects: Create subprojects
+  permission_add_subprojects: Tạo Dự án con
-  label_subproject_new: New subproject
+  label_subproject_new: Thêm dự án con
  text_own_membership_delete_confirmation: |-
-    You are about to remove some or all of your permissions and may no longer be able to edit this project after that.
+    Bạn đang cố gỡ bỏ một số hoặc tất cả quyền của bạn với dự án này và có thể sẽ mất quyền thay đổi nó sau đó.
-    Are you sure you want to continue?
+    Bạn có muốn tiếp tục?
-  label_close_versions: Close completed versions
+  label_close_versions: Đóng phiên bản đã hoàn thành
-  label_board_sticky: Sticky
+  label_board_sticky: Chú ý
-  label_board_locked: Locked
+  label_board_locked: Đã khóa
-  permission_export_wiki_pages: Export wiki pages
+  permission_export_wiki_pages: Xuất trang wiki
-  setting_cache_formatted_text: Cache formatted text
+  setting_cache_formatted_text: Cache định dạng các ký tự
-  permission_manage_project_activities: Manage project activities
+  permission_manage_project_activities: Quản lý hoạt động của dự án
-  error_unable_delete_issue_status: Unable to delete issue status
+  error_unable_delete_issue_status: Không thể xóa trạng thái vấn đề
-  label_profile: Profile
+  label_profile: Hồ sơ
-  permission_manage_subtasks: Manage subtasks
+  permission_manage_subtasks: Quản lý tác vụ con
-  field_parent_issue: Parent task
+  field_parent_issue: Tác vụ cha
-  label_subtask_plural: Subtasks
+  label_subtask_plural: Tác vụ con
-  label_project_copy_notifications: Send email notifications during the project copy
+  label_project_copy_notifications: Gửi email thông báo trong khi dự án được sao chép
-  error_can_not_delete_custom_field: Unable to delete custom field
+  error_can_not_delete_custom_field: Không thể xóa trường tùy biến
-  error_unable_to_connect: Unable to connect (%{value})
+  error_unable_to_connect: "Không thể kết nối (%{value})"
-  error_can_not_remove_role: This role is in use and can not be deleted.
+  error_can_not_remove_role: Quyền này đang được dùng và không thể xóa được.
-  error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
+  error_can_not_delete_tracker: Theo dõi này chứa vấn đề và không thể xóa được.
-  field_principal: Principal
+  field_principal: Chủ yếu
-  label_my_page_block: My page block
+  label_my_page_block: Block trang của tôi
-  notice_failed_to_save_members: "Failed to save member(s): %{errors}."
+  notice_failed_to_save_members: "Thất bại khi lưu thành viên : %{errors}."
-  text_zoom_out: Zoom out
+  text_zoom_out: Thu nhỏ
-  text_zoom_in: Zoom in
+  text_zoom_in: Phóng to
-  notice_unable_delete_time_entry: Unable to delete time log entry.
+  notice_unable_delete_time_entry: Không thể xóa mục time log.
-  label_overall_spent_time: Overall spent time
+  label_overall_spent_time: Tổng thời gian sử dụng
  field_time_entries: Log time
-  project_module_gantt: Gantt
+  project_module_gantt: Biểu đồ Gantt
-  project_module_calendar: Calendar
+  project_module_calendar: Lịch
-  button_edit_associated_wikipage: "Edit associated Wiki page: %{page_title}"
+  button_edit_associated_wikipage: "Chỉnh sửa trang Wiki liên quan: %{page_title}"
-  field_text: Text field
+  text_are_you_sure_with_children: Xóa vấn đề và tất cả vấn đề con?  
-  label_user_mail_option_only_owner: Only for things I am the owner of
+  field_text: Trường văn bản
-  setting_default_notification_option: Default notification option
+  label_user_mail_option_only_owner: Chỉ những thứ tôi sở hữu
-  label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
+  setting_default_notification_option: Tuỳ chọn thông báo mặc định
-  label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_only_my_events: Chỉ những thứ tôi theo dõi hoặc liên quan
-  label_user_mail_option_none: No events
+  label_user_mail_option_only_assigned: Chỉ những thứ tôi được phân công
-  field_member_of_group: Assignee's group
+  label_user_mail_option_none: Không có sự kiện
-  field_assigned_to_role: Assignee's role
+  field_member_of_group: Nhóm thụ hưởng
-  notice_not_authorized_archived_project: The project you're trying to access has been archived.
+  field_assigned_to_role: Quyền thụ hưởng
-  label_principal_search: "Search for user or group:"
+  notice_not_authorized_archived_project: Dự án bạn đang có truy cập đã được lưu trữ.
-  label_user_search: "Search for user:"
+  label_principal_search: "Tìm kiếm người dùng hoặc nhóm:"
-  field_visible: Visible
+  label_user_search: "Tìm kiếm người dùng:"
-  setting_emails_header: Emails header
+  field_visible: Nhìn thấy
-  setting_commit_logtime_activity_id: Activity for logged time
+  setting_emails_header: Tiêu đề Email
-  text_time_logged_by_changeset: Applied in changeset %{value}.
+  setting_commit_logtime_activity_id: Cho phép ghi lại thời gian
-  setting_commit_logtime_enabled: Enable time logging
+  text_time_logged_by_changeset: "Áp dụng trong changeset : %{value}."
-  notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
+  setting_commit_logtime_enabled: Cho phép time logging
-  setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
+  notice_gantt_chart_truncated: "Đồ thị đã được cắt bớt bởi vì nó đã vượt qua lượng thông tin tối đa có thể hiển thị :(%{max})"
-  field_warn_on_leaving_unsaved: Warn me when leaving a page with unsaved text
+  setting_gantt_items_limit: Lượng thông tin tối đa trên đồ thị gantt
-  text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
+  description_selected_columns: Các cột được lựa chọn
-  label_my_queries: My custom queries
+  field_warn_on_leaving_unsaved: Cảnh báo tôi khi rời một trang có các nội dung chưa lưu
-  text_journal_changed_no_detail: "%{label} updated"
+  text_warn_on_leaving_unsaved: Trang hiện tại chứa nội dung chưa lưu và sẽ bị mất nếu bạn rời trang này.
-  label_news_comment_added: Comment added to a news
+  label_my_queries: Các truy vấn tùy biến
-  button_expand_all: Expand all
+  text_journal_changed_no_detail: "%{label} cập nhật"
-  button_collapse_all: Collapse all
+  label_news_comment_added: Bình luận đã được thêm cho một tin tức
-  label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
+  button_expand_all: Mở rộng tất cả
-  label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
+  button_collapse_all: Thu gọn tất cả
-  label_bulk_edit_selected_time_entries: Bulk edit selected time entries
+  label_additional_workflow_transitions_for_assignee: Chuyển đổi bổ sung cho phép khi người sử dụng là người nhận chuyển nhượng
-  text_time_entries_destroy_confirmation: Are you sure you want to delete the selected time entr(y/ies)?
+  label_additional_workflow_transitions_for_author: Các chuyển đổi bổ xung được phép khi người dùng là tác giả
-  label_role_anonymous: Anonymous
+  label_bulk_edit_selected_time_entries: Sửa nhiều mục đã chọn
-  label_role_non_member: Non member
+  text_time_entries_destroy_confirmation: Bạn có chắc chắn muốn xóa bỏ các mục đã chọn?
-  label_issue_note_added: Note added
+  label_role_anonymous: Ẩn danh
-  label_issue_status_updated: Status updated
+  label_role_non_member: Không là thành viên
-  label_issue_priority_updated: Priority updated
+  label_issue_note_added: Ghi chú được thêm
-  label_issues_visibility_own: Issues created by or assigned to the user
+  label_issue_status_updated: Trạng thái cập nhật
-  field_issues_visibility: Issues visibility
+  label_issue_priority_updated: Cập nhật ưu tiên
-  label_issues_visibility_all: All issues
+  label_issues_visibility_own: Vấn đề tạo bởi hoặc gán cho người dùng
-  permission_set_own_issues_private: Set own issues public or private
+  field_issues_visibility: Vấn đề được nhìn thấy
-  field_is_private: Private
+  label_issues_visibility_all: Tất cả vấn đề
-  permission_set_issues_private: Set issues public or private
+  permission_set_own_issues_private: Đặt vấn đề sở hữu là riêng tư hoặc công cộng
-  label_issues_visibility_public: All non private issues
+  field_is_private: Riêng tư
-  text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
+  permission_set_issues_private: Gán vấn đề là riêng tư hoặc công cộng
-  field_commit_logs_encoding: Commit messages encoding
+  label_issues_visibility_public: Tất cả vấn đề không riêng tư
-  field_scm_path_encoding: Path encoding
+  text_issues_destroy_descendants_confirmation: "Hành động này sẽ xóa %{count} tác vụ con."
-  text_scm_path_encoding_note: "Default: UTF-8"
+  field_commit_logs_encoding: Mã hóa ghi chú Commit
-  field_path_to_repository: Path to repository
+  field_scm_path_encoding: Mã hóa đường dẫn
-  field_root_directory: Root directory
+  text_scm_path_encoding_note: "Mặc định: UTF-8"
  field_path_to_repository: Đường dẫn tới kho chứa
  field_root_directory: Thư mục gốc
  field_cvs_module: Module
  field_cvsroot: CVSROOT
-  text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
+  text_mercurial_repository_note: Kho chứa cục bộ (vd. /hgrepo, c:\hgrepo)
-  text_scm_command: Command
+  text_scm_command: Lệnh
-  text_scm_command_version: Version
+  text_scm_command_version: Phiên bản  
-  label_git_report_last_commit: Report last commit for files and directories
+  label_git_report_last_commit: Báo cáo lần Commit cuối cùng cho file và thư mục  
-  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_config: Bạn có thể cấu hình lệnh Scm trong file config/configuration.yml. Vui lòng khởi động lại ứng dụng sau khi chỉnh sửa nó.
-  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
+  text_scm_command_not_available: Lệnh Scm không có sẵn. Vui lòng kiểm tra lại thiết đặt trong phần Quản trị.  
-  notice_issue_successful_create: Issue %{id} created.
+  notice_issue_successful_create: "Vấn đề %{id} đã được tạo."  
-  label_between: between
+  label_between: Ở giữa
-  setting_issue_group_assignment: Allow issue assignment to groups
+  setting_issue_group_assignment: Cho phép gán vấn đề đến các nhóm
-  label_diff: diff
+  label_diff: Sự khác nhau
-  text_git_repository_note: Repository is bare and local (e.g. /gitrepo, c:\gitrepo)
+  text_git_repository_note: Kho chứa cục bộ và công cộng (vd. /gitrepo, c:\gitrepo)
-  description_query_sort_criteria_direction: Sort direction
+  description_query_sort_criteria_direction: Chiều sắp xếp
-  description_project_scope: Search scope
+  description_project_scope: Phạm vi tìm kiếm
-  description_filter: Filter
+  description_filter: Lọc
-  description_user_mail_notification: Mail notification settings
+  description_user_mail_notification: Thiết lập email thông báo
-  description_date_from: Enter start date
+  description_date_from: Nhập ngày bắt đầu
-  description_message_content: Message content
+  description_message_content: Nội dung thông điệp
-  description_available_columns: Available Columns
+  description_available_columns: Các cột có sẵn
-  description_date_range_interval: Choose range by selecting start and end date
+  description_date_range_interval: Chọn khoảng thời gian giữa ngày bắt đầu và kết thúc
-  description_issue_category_reassign: Choose issue category
+  description_issue_category_reassign: Chọn danh mục vấn đề
-  description_search: Searchfield
+  description_search: Trường tìm kiếm
-  description_notes: Notes
+  description_notes: Các chú ý
-  description_date_range_list: Choose range from list
+  description_date_range_list: Chọn khoảng từ danh sách
-  description_choose_project: Projects
+  description_choose_project: Các dự án
-  description_date_to: Enter end date
+  description_date_to: Nhập ngày kết thúc
-  description_query_sort_criteria_attribute: Sort attribute
+  description_query_sort_criteria_attribute: Sắp xếp thuộc tính
-  description_wiki_subpages_reassign: Choose new parent page
+  description_wiki_subpages_reassign: Chọn một trang cấp trên
-  description_selected_columns: Selected Columns
+  label_parent_revision: Cha
-  label_parent_revision: Parent
+  label_child_revision: Con
-  label_child_revision: Child
+  error_scm_annotate_big_text_file: Các mục không được chú thích, vì nó vượt quá kích thước tập tin văn bản tối đa.
-  error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
+  setting_default_issue_start_date_to_creation_date: Sử dụng thời gian hiện tại khi tạo vấn đề mới
-  setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+  button_edit_section: Soạn thảo sự lựa chọn này
-  button_edit_section: Edit this section
+  setting_repositories_encodings: Mã hóa kho chứa
-  setting_repositories_encodings: Attachments and repositories encodings
+  description_all_columns: Các cột
  description_all_columns: All Columns
  button_export: Export
-  label_export_options: "%{export_format} export options"
+  label_export_options: "%{export_format} tùy chọn Export"
-  error_attachment_too_big: This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})
+  error_attachment_too_big: "File này không thể tải lên vì nó vượt quá kích thước cho phép : (%{max_size})"
-  notice_failed_to_save_time_entries: "Failed to save %{count} time entrie(s) on %{total} selected: %{ids}."
+  notice_failed_to_save_time_entries: "Lỗi khi lưu %{count} lần trên %{total} sự lựa chọn : %{ids}."
  label_x_issues:
    zero:  0 vấn đề
    one:   1 vấn đề
    other: "%{count} vấn đề"
-  label_repository_new: New repository
+  label_repository_new: Kho lưu trữ mới
-  field_repository_is_default: Main repository
+  field_repository_is_default: Kho lưu trữ chính
-  label_copy_attachments: Copy attachments
+  label_copy_attachments: Copy các file đính kèm
  label_item_position: "%{position}/%{count}"
-  label_completed_versions: Completed versions
+  label_completed_versions: Các phiên bản hoàn thành
-  text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
+  text_project_identifier_info: Chỉ cho phép chữ cái thường (a-z), con số và dấu gạch ngang.<br />Sau khi lưu, chỉ số ID không thể thay đổi.
-  field_multiple: Multiple values
+  field_multiple: Nhiều giá trị
-  setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed
+  setting_commit_cross_project_ref: Sử dụng thời gian hiện tại khi tạo vấn đề mới
-  text_issue_conflict_resolution_add_notes: Add my notes and discard my other changes
+  text_issue_conflict_resolution_add_notes: Thêm ghi chú của tôi và loại bỏ các thay đổi khác 
-  text_issue_conflict_resolution_overwrite: Apply my changes anyway (previous notes will be kept but some changes may be overwritten)
+  text_issue_conflict_resolution_overwrite: Áp dụng thay đổi bằng bất cứ giá nào, ghi chú trước đó có thể bị ghi đè
-  notice_issue_update_conflict: The issue has been updated by an other user while you were editing it.
+  notice_issue_update_conflict: Vấn đề này đã được cập nhật bởi một người dùng khác trong khi bạn đang chỉnh sửa nó.
-  text_issue_conflict_resolution_cancel: Discard all my changes and redisplay %{link}
+  text_issue_conflict_resolution_cancel: "Loại bỏ tất cả các thay đổi và hiển thị lại %{link}"
-  permission_manage_related_issues: Manage related issues
+  permission_manage_related_issues: Quản lý các vấn đề liên quan
-  field_auth_source_ldap_filter: LDAP filter
+  field_auth_source_ldap_filter: Bộ lọc LDAP
-  label_search_for_watchers: Search for watchers to add
+  label_search_for_watchers: Tìm kiếm người theo dõi để thêm
-  notice_account_deleted: Your account has been permanently deleted.
+  notice_account_deleted: Tài khoản của bạn đã được xóa vĩnh viễn.
-  setting_unsubscribe: Allow users to delete their own account
+  button_delete_my_account: Xóa tài khoản của tôi
-  button_delete_my_account: Delete my account
+  setting_unsubscribe: Cho phép người dùng xóa Account
  text_account_destroy_confirmation: |-
-    Are you sure you want to proceed?
+    Bạn đồng ý không ?
-    Your account will be permanently deleted, with no way to reactivate it.
+    Tài khoản của bạn sẽ bị xóa vĩnh viễn, không thể khôi phục lại!
-  error_session_expired: Your session has expired. Please login again.
+  error_session_expired: Phiên làm việc của bạn bị quá hạn, hãy đăng nhập lại 
-  text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
+  text_session_expiration_settings: "Chú ý : Thay đổi các thiết lập này có thể gây vô hiệu hóa Session hiện tại"
-  setting_session_lifetime: Session maximum lifetime
+  setting_session_lifetime: Thời gian tồn tại lớn nhất của Session
-  setting_session_timeout: Session inactivity timeout
+  setting_session_timeout: Thời gian vô hiệu hóa Session
-  label_session_expiration: Session expiration
+  label_session_expiration: Phiên làm việc bị quá hạn
-  permission_close_project: Close / reopen the project
+  permission_close_project: Đóng / Mở lại dự án
-  label_show_closed_projects: View closed projects
+  label_show_closed_projects: Xem các dự án đã đóng
-  button_close: Close
+  button_close: Đóng
-  button_reopen: Reopen
+  button_reopen: Mở lại
-  project_status_active: active
+  project_status_active: Kích hoạt
-  project_status_closed: closed
+  project_status_closed: Đã đóng
-  project_status_archived: archived
+  project_status_archived: Lưu trữ
-  text_project_closed: This project is closed and read-only.
+  text_project_closed: Dự án này đã đóng và chỉ đọc
-  notice_user_successful_create: User %{id} created.
+  notice_user_successful_create: "Người dùng %{id} đã được tạo."
-  field_core_fields: Standard fields
+  field_core_fields: Các trường tiêu chuẩn
-  field_timeout: Timeout (in seconds)
+  field_timeout: Quá hạn
-  setting_thumbnails_enabled: Display attachment thumbnails
+  setting_thumbnails_enabled: Hiển thị các thumbnail đính kèm
-  setting_thumbnails_size: Thumbnails size (in pixels)
+  setting_thumbnails_size: Kích thước Thumbnails(pixel)
-  label_status_transitions: Status transitions
+  setting_session_lifetime: Thời gian tồn tại lớn nhất của Session
-  label_fields_permissions: Fields permissions
+  setting_session_timeout: Thời gian vô hiệu hóa Session
-  label_readonly: Read-only
+  label_status_transitions: Trạng thái chuyển tiếp
-  label_required: Required
+  label_fields_permissions: Cho phép các trường
-  text_repository_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
+  label_readonly: Chỉ đọc
-  field_board_parent: Parent forum
+  label_required: Yêu cầu
-  label_attribute_of_project: Project's %{name}
+  text_repository_identifier_info: Chỉ có các chữ thường (a-z), các số (0-9), dấu gạch ngang và gạch dưới là hợp lệ.<br />Khi đã lưu, tên định danh sẽ không thể thay đổi.
-  label_attribute_of_author: Author's %{name}
+  field_board_parent: Diễn đàn cha
-  label_attribute_of_assigned_to: Assignee's %{name}
+  label_attribute_of_project: "Của dự án : %{name}"
-  label_attribute_of_fixed_version: Target version's %{name}
+  label_attribute_of_author: "Của tác giả : %{name}"
-  label_copy_subtasks: Copy subtasks
+  label_attribute_of_assigned_to: "Được phân công bởi %{name}"
-  label_copied_to: copied to
+  label_attribute_of_fixed_version: "Phiên bản mục tiêu của %{name}"
-  label_copied_from: copied from
+  label_copy_subtasks: Sao chép các nhiệm vụ con
-  label_any_issues_in_project: any issues in project
+  label_copied_to: Sao chép đến
-  label_any_issues_not_in_project: any issues not in project
+  label_copied_from: Sao chép từ
-  field_private_notes: Private notes
+  label_any_issues_in_project: Bất kỳ vấn đề nào trong dự án
-  permission_view_private_notes: View private notes
+  label_any_issues_not_in_project: Bất kỳ vấn đề nào không thuộc dự án
-  permission_set_notes_private: Set notes as private
+  field_private_notes: Ghi chú riêng tư
-  label_no_issues_in_project: no issues in project
+  permission_view_private_notes: Xem ghi chú riêng tư
  permission_set_notes_private: Đặt ghi chú thành riêng tư
  label_no_issues_in_project: Không có vấn đề nào trong dự án
  label_any: tất cả
-  label_last_n_weeks: last %{count} weeks
+  label_last_n_weeks: "%{count} tuần qua"
-  setting_cross_project_subtasks: Allow cross-project subtasks
+  setting_cross_project_subtasks: Cho phép các nhiệm vụ con liên dự án
-  label_cross_project_descendants: With subprojects
+  label_cross_project_descendants: Trong các dự án con
-  label_cross_project_tree: With project tree
+  label_cross_project_tree: Trong cùng cây dự án
-  label_cross_project_hierarchy: With project hierarchy
+  label_cross_project_hierarchy: Trong dự án cùng cấp bậc
-  label_cross_project_system: With all projects
+  label_cross_project_system: Trong tất cả các dự án
-  button_hide: Hide
+  button_hide: Ẩn
-  setting_non_working_week_days: Non-working days
+  setting_non_working_week_days: Các ngày không làm việc
-  label_in_the_next_days: in the next
+  label_in_the_next_days: Trong tương lai
-  label_in_the_past_days: in the past
+  label_in_the_past_days: Trong quá khứ
@@ -4,6 +4,34 @@ Redmine - project management software
 Copyright (C) 2006-2012  Jean-Philippe Lang
 http://www.redmine.org/
 == 2013-03-19 v2.2.4
 * Upgrade to Rails 3.2.13
 * Defect #12243: Ordering forum replies by last reply date is broken
 * Defect #13127: h1 multiple lined titles breaks into main menu
 * Defect #13138: Generating PDF of issue causes UndefinedConversionError with htmlentities gem
 * Defect #13165: rdm-mailhandler.rb: initialize_http_header override basic auth
 * Defect #13232: Link to topic in nonexistent forum causes error 500
 * Patch #13181: Bulgarian translation of jstoolbar-bg.js
 * Patch #13207: Portuguese translation for 2.2-stable
 * Patch #13310: pt-BR label_last_n_weeks translation
 * Patch #13325: pt-BR translation for 2.2-stable
 * Patch #13343: Vietnamese translation for 2.2-stable
 * Patch #13398: Czech translation for 2.2-stable
 == 2013-02-12 v2.2.3
 * Upgrade to Rails 3.2.12
 * Defect #11987: pdf: Broken new line in table
 * Defect #12930: 404 Error when referencing different project source files in the wiki syntax
 * Defect #12979: Wiki link syntax commit:repo_a:abcd doesn't work
 * Defect #13075: Can't clear custom field value through context menu in the issue list
 * Defect #13097: Project copy fails when wiki module is disabled
 * Defect #13126: Issue view: estimated time vs. spent time
 * Patch #12922: Update Spanish translation
 * Patch #12928: Bulgarian translation for 2.2-stable
 * Patch #12987: Russian translation for 2.2-stable
 == 2013-01-20 v2.2.2
 * Defect #7510: Link to attachment should return latest attachment
@@ -10,8 +10,8 @@ module Net
    def self.post_form(url, params, headers, options={})
      request = Post.new(url.path)
      request.form_data = params
      request.basic_auth url.user, url.password if url.user
      request.initialize_http_header(headers)
      request.basic_auth url.user, url.password if url.user
      http = new(url.host, url.port)
      http.use_ssl = (url.scheme == 'https')
      if options[:no_check_certificate]
@@ -23,7 +23,7 @@ module Net
 end
 class RedmineMailHandler
-  VERSION = '0.2'
+  VERSION = '0.2.1'
  attr_accessor :verbose, :issue_attributes, :allow_override, :unknown_user, :no_permission_check, :url, :key, :no_check_certificate
@@ -10,10 +10,6 @@ A template plugin allowing the inclusion of ERB-enabled RFPDF template files.
 ==
 ==
 If you are using HTML, it is recommended you install:
 gem install -r htmlentities
 TCPDF Documentation located at:
 http://phpdocs.moodle.org/com-tecnick-tcpdf/TCPDF.html
@@ -1,8 +1,3 @@
 begin
  require('htmlentities') 
 rescue LoadError
  # This gem is not required - just nice to have.
 end
 require('cgi')
 require 'rfpdf'
@@ -94,8 +94,6 @@ class TCPDF
  cattr_accessor :k_path_url_cache
  @@k_path_url_cache = Rails.root.join('tmp')
  cattr_accessor :decoder
 	attr_accessor :barcode
 	attr_accessor :buffer
@@ -223,12 +221,6 @@ class TCPDF
 		#Some checks
 		dochecks();
 		begin	  
 		  @@decoder = HTMLEntities.new 
 		rescue
 		  @@decoder = nil
 		end
 		#Initialization of properties
  	@barcode ||= false
 		@buffer ||= ''
@@ -4002,6 +3994,10 @@ class TCPDF
 				@quote_page[@quote_count] = @page;
 				@quote_count += 1
 			when 'br'
 				if @tdbegin
 					@tdtext << "\n"
 					return
 				end
 				Ln();
 				if (@li_spacer.length > 0)
@@ -4340,11 +4336,7 @@ class TCPDF
 	# @return string converted
 	#
 	def unhtmlentities(string)
 	  if @@decoder.nil?
      CGI.unescapeHTML(string)
    else
  	  @@decoder.decode(string)
    end
  end
 end # END OF CLASS
@@ -4,7 +4,7 @@ module Redmine
  module VERSION #:nodoc:
    MAJOR = 2
    MINOR = 2
-    TINY  = 2
+    TINY  = 4
    # Branch values:
    # * official release: nil
@@ -13,6 +13,7 @@ namespace :ci do
  desc "Setup Redmine for a new build."
  task :setup do
    Rake::Task["ci:dump_environment"].invoke
    Rake::Task["tmp:clear"].invoke
    Rake::Task["db:create"].invoke
    Rake::Task["db:migrate"].invoke
    Rake::Task["db:schema:dump"].invoke
@@ -11,6 +11,6 @@ jsToolBar.strings['Unordered list'] = 'Неподреден списък';
 jsToolBar.strings['Ordered list'] = 'Подреден списък';
 jsToolBar.strings['Quote'] = 'Цитат';
 jsToolBar.strings['Unquote'] = 'Премахване на цитат';
-jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Preformatted text'] = 'Форматиран текст';
 jsToolBar.strings['Wiki link'] = 'Връзка до Wiki страница';
 jsToolBar.strings['Image'] = 'Изображение';
@@ -25,7 +25,7 @@ h4 {border-bottom: 1px dotted #bbb;}
 #account {float:right;}
-#header {height:5.3em;margin:0;background-color:#628DB6;color:#f8f8f8; padding: 4px 8px 0px 6px; position:relative;}
+#header {min-height:5.3em;margin:0;background-color:#628DB6;color:#f8f8f8; padding: 4px 8px 20px 6px; position:relative;}
 #header a {color:#f8f8f8;}
 #header h1 a.ancestor { font-size: 80%; }
 #quick-search {float:right;}
@@ -69,6 +69,21 @@ class BoardsControllerTest < ActionController::TestCase
    assert topics.first.updated_on < topics.second.updated_on
  end
  def test_show_should_display_message_with_last_reply_first
    Message.update_all(:sticky => 0)
    # Reply to an old topic
    old_topic = Message.where(:board_id => 1, :parent_id => nil).order('created_on ASC').first
    reply = Message.new(:board_id => 1, :subject => 'New reply', :content => 'New reply', :author_id => 2)
    old_topic.children << reply
    get :show, :project_id => 1, :id => 1
    assert_response :success
    topics = assigns(:topics)
    assert_not_nil topics
    assert_equal old_topic, topics.first
  end
  def test_show_with_permission_should_display_the_new_message_form
    @request.session[:user_id] = 2
    get :show, :project_id => 1, :id => 1
@@ -132,7 +132,7 @@ class ContextMenusControllerTest < ActionController::TestCase
      :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=Foo"}
    assert_tag 'a',
      :content => 'none',
-      :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D="}
+      :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=__none__"}
  end
  def test_context_menu_should_not_include_null_value_for_required_custom_fields
@@ -81,6 +81,11 @@ class MessagesControllerTest < ActionController::TestCase
    assert_response 404
  end
  def test_show_message_from_invalid_board_should_respond_with_404
    get :show, :board_id => 999, :id => 1
    assert_response 404
  end
  def test_get_new
    @request.session[:user_id] = 2
    get :new, :board_id => 1
@@ -347,6 +347,15 @@ RAW
    to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text), "#{text} failed" }
  end
  def test_redmine_links_with_a_different_project_before_current_project
    vp1 = Version.generate!(:project_id => 1, :name => '1.4.4')
    vp3 = Version.generate!(:project_id => 3, :name => '1.4.4')
    @project = Project.find(3)
    assert_equal %(<p><a href="/versions/#{vp1.id}" class="version">1.4.4</a> <a href="/versions/#{vp3.id}" class="version">1.4.4</a></p>),
      textilizable("ecookbook:version:1.4.4 version:1.4.4")
  end
  def test_escaped_redmine_links_should_not_be_parsed
    to_test = [
      '#3.',
@@ -394,14 +403,14 @@ RAW
  end
  def test_multiple_repositories_redmine_links
-    svn = Repository::Subversion.create!(:project_id => 1, :identifier => 'svn1', :url => 'file:///foo/hg')
+    svn = Repository::Subversion.create!(:project_id => 1, :identifier => 'svn_repo-1', :url => 'file:///foo/hg')
    Changeset.create!(:repository => svn, :committed_on => Time.now, :revision => '123')
    hg = Repository::Mercurial.create!(:project_id => 1, :identifier => 'hg1', :url => '/foo/hg')
    Changeset.create!(:repository => hg, :committed_on => Time.now, :revision => '123', :scmid => 'abcd')
    changeset_link = link_to('r2', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 2},
                                    :class => 'changeset', :title => 'This commit fixes #1, #2 and references #1 & #3')
-    svn_changeset_link = link_to('svn1|r123', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :repository_id => 'svn1', :rev => 123},
+    svn_changeset_link = link_to('svn_repo-1|r123', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :repository_id => 'svn_repo-1', :rev => 123},
                                    :class => 'changeset', :title => '')
    hg_changeset_link = link_to('hg1|abcd', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :repository_id => 'hg1', :rev => 'abcd'},
                                    :class => 'changeset', :title => '')
@@ -411,7 +420,7 @@ RAW
    to_test = {
      'r2'                          => changeset_link,
-      'svn1|r123'                   => svn_changeset_link,
+      'svn_repo-1|r123'             => svn_changeset_link,
      'invalid|r123'                => 'invalid|r123',
      'commit:hg1|abcd'             => hg_changeset_link,
      'commit:invalid|abcd'         => 'commit:invalid|abcd',
Author	SHA1	Message	Date
Jean-Philippe Lang	c4164a0a7f	Updates for 2.2.4 release. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11659 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-03-19 19:34:01 +00:00
Toshi MARUYAMA	504a767028	Merged r11648, r11649, r11650 from trunk to 2.2-stable. upgrade Rails 3.2.13. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11653 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-03-19 08:40:52 +00:00
Toshi MARUYAMA	0eaba11e20	Merged r11637 from trunk to 2.2-stable (#13354 ) PDF: fix incompatible character encodings: UTF-8 and ASCII-8BIT. Contributed by Jun NAITOH. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11638 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-03-16 08:02:20 +00:00
Jean-Philippe Lang	c2eb28b901	Merged r11446 from trunk (#13232 ). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11596 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-03-11 18:30:20 +00:00
Jean-Philippe Lang	f09ea7b65a	Merged r11351 from trunk (#13127 ). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11595 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-03-11 18:28:49 +00:00
Jean-Philippe Lang	878e85848f	Backported r11424 from trunk (#12243 ). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11594 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-03-11 18:27:46 +00:00
Jean-Philippe Lang	4b010fb653	Merged r11371 from trunk (#13165 ). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11593 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-03-11 18:22:03 +00:00
Toshi MARUYAMA	5f96e64cd7	Merged r11553 from trunk to 2.2-stable (#13398 , #13391 ) Czech translation for 2.2-stable updated by Karel Pičman. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11557 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-03-08 01:02:47 +00:00
Toshi MARUYAMA	ec1cb4632c	Merged r11529 from trunk to 2.2-stable (#13343 , #13339 ) r11529 has some 2.2-stable translation. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11532 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-03-03 12:00:40 +00:00
Toshi MARUYAMA	e4a1b1324a	Merged r11528 from trunk to 2.2-stable (#13343 , #13339 ) Vietnamese translation for 2.2-stable updated by Minh Thien Nguyen. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11531 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-03-03 12:00:29 +00:00
Toshi MARUYAMA	6991874911	Merged r11498 from trunk to 2.2-stable (#13325 , #13324 ) pt-BR translation for 2.2-stable updated. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11500 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-03-01 01:52:02 +00:00
Toshi MARUYAMA	17bd53ae43	Merged r11491 from trunk to 2.2-stable (#13310 ) pt-BR "label_last_n_weeks" translation updated. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11492 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-02-28 08:33:38 +00:00
Toshi MARUYAMA	559dc4f523	Merged r11432 from trunk to 2.2-stable (#13207 , #13206 ) Portuguese translation for 2.2-stable updated by Rui Rebelo. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11436 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-02-18 14:19:38 +00:00
Toshi MARUYAMA	6dcd50047d	Merged r11389 from trunk to 2.2-stable. add "tmp:clear" to "ci:setup" rake task for translation. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11435 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-02-18 13:22:25 +00:00
Toshi MARUYAMA	252df8dfc0	Merged r11399 from trunk to 2.2-stable (#13138 ) not use htmlentities gem in rfpdf plugin. Contributed by Jun NAITOH. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11400 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-02-15 14:32:45 +00:00
Toshi MARUYAMA	cbd3b057e0	Merged r11390 from trunk to 2.2-stable. Bulgarian translation of jstoolbar-bg.js updated by Ivan Cenov (#13181) git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11391 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-02-15 06:23:34 +00:00
Jean-Philippe Lang	d094dea0ec	Merged r11366 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11367 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-02-12 18:08:38 +00:00
Jean-Philippe Lang	3a98a14250	Merged r11350 from trunk (#13126 ). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11365 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-02-12 18:04:49 +00:00
Jean-Philippe Lang	ecef96a6b9	Merged r11332 from trunk (#13097 ). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11364 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-02-12 18:03:16 +00:00
Jean-Philippe Lang	0951522247	Merged r11331 and r11333 from trunk (#13075 ). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11363 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-02-12 18:01:15 +00:00
Jean-Philippe Lang	42cc2d322a	Merged r11281 from trunk (#12979 ). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11362 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-02-12 17:57:46 +00:00
Jean-Philippe Lang	0367c323de	Merged r11258 from trunk (#12930 ). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11361 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-02-12 17:56:39 +00:00
Toshi MARUYAMA	80be82ae50	Merged r11353 from trunk to 2.2-stable upgrade Rails to 3.2.12. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11358 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-02-12 06:28:11 +00:00
Toshi MARUYAMA	ebed927de5	2.2-stable: svn propset svn:eol-style native SVG source files (#12971 ) git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11357 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-02-12 03:52:41 +00:00
Toshi MARUYAMA	cbd069118a	2.2-stable: backout r11355 (back to Rails 3.2.11) jruby-1.6.7 tests fail on CI server. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11356 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-02-12 02:49:25 +00:00
Toshi MARUYAMA	a211d1be7d	Merged r11353 from trunk to 2.2-stable upgrade Rails to 3.2.12. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11355 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-02-12 01:46:21 +00:00
Toshi MARUYAMA	0a8e0a3bed	Merged r11306 from trunk to 2.2-stable (#11987 ) pdf: fix broken new line in table. Contributed by Jun NAITOH. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11308 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-02-03 06:53:18 +00:00
Toshi MARUYAMA	58cf34dea5	Merged r11263 from trunk to 2.2-stable (#12987 ) Russian translation for 2.2-stable updated. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11266 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-01-26 00:40:21 +00:00
Toshi MARUYAMA	594a7bde95	Merged r11246 from trunk to 2.2-stable (#12926 , #12928 ) Bulgarian translation for 2.2-stable updated by Ivan Cenov. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11251 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-01-21 13:54:49 +00:00
Toshi MARUYAMA	c5e257d82b	Merged r11243 from trunk to 2.2-stable (#12922 ) Spanish translation for 2.2-stable updated by Jorge López. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11245 e93f8b46-1217-0410-a6f0-8f06a7374b81	2013-01-21 11:50:27 +00:00