diff --git a/redmine/lang/en.yml b/redmine/lang/en.yml
index f0f551953..14c78e79c 100644
--- a/redmine/lang/en.yml
+++ b/redmine/lang/en.yml
@@ -57,6 +57,7 @@ notice_successful_create: Successful creation.
 notice_successful_update: Successful update.
 notice_successful_delete: Successful deletion.
 notice_successful_connection: Successful connection.
+notice_file_not_found: Requested file doesn't exist or has been deleted.
 
 gui_validation_error: 1 error
 gui_validation_error_plural: %d errors
@@ -124,7 +125,7 @@ field_attr_lastname: Lastname attribute
 field_attr_mail: Email attribute
 field_onthefly: On-the-fly user creation
 
-label_user: Uuser
+label_user: User
 label_user_plural: Users
 label_user_new: New user
 label_project: Project
diff --git a/redmine/lang/en_US.rb b/redmine/lang/en_US.rb
deleted file mode 100644
index 7f5d6d163..000000000
--- a/redmine/lang/en_US.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-Localization.define('en', 'English') do |l| 
-  l.store '(date)', lambda { |t| t.strftime('%m/%d/%Y') }
-  l.store '(time)', lambda { |t| t.strftime('%m/%d/%Y %I:%M%p') }
-  
-  l.store '%d errors', ['1 error', '%d errors']
-end 
\ No newline at end of file
diff --git a/redmine/lang/es.yml b/redmine/lang/es.yml
new file mode 100644
index 000000000..3281efc4f
--- /dev/null
+++ b/redmine/lang/es.yml
@@ -0,0 +1,289 @@
+_gloc_rule_default: '|n| n==1 ? "" : "_plural" '
+
+actionview_datehelper_select_day_prefix:
+actionview_datehelper_select_month_names: Enero,Febrero,Marzo,Abril,Mayo,Junio,Julio,Agosto,Septiembre,Octubre,Noviembre,Diciembre
+actionview_datehelper_select_month_names_abbr: Ene,Feb,Mar,Abr,Mayo,Jun,Jul,Ago,Sep,Oct,Nov,Dic
+actionview_datehelper_select_month_prefix:
+actionview_datehelper_select_year_prefix:
+actionview_datehelper_time_in_words_day: 1 day
+actionview_datehelper_time_in_words_day_plural: %d days
+actionview_datehelper_time_in_words_hour_about: about an hour
+actionview_datehelper_time_in_words_hour_about_plural: about %d hours
+actionview_datehelper_time_in_words_hour_about_single: about an hour
+actionview_datehelper_time_in_words_minute: 1 minute
+actionview_datehelper_time_in_words_minute_half: half a minute
+actionview_datehelper_time_in_words_minute_less_than: less than a minute
+actionview_datehelper_time_in_words_minute_plural: %d minutes
+actionview_datehelper_time_in_words_minute_single: 1 minute
+actionview_datehelper_time_in_words_second_less_than: less than a second
+actionview_datehelper_time_in_words_second_less_than_plural: less than %d seconds
+actionview_instancetag_blank_option: Please select
+
+activerecord_error_inclusion: is not included in the list
+activerecord_error_exclusion: is reserved
+activerecord_error_invalid: is invalid
+activerecord_error_confirmation: doesn't match confirmation
+activerecord_error_accepted: must be accepted
+activerecord_error_empty: can't be empty
+activerecord_error_blank: can't be blank
+activerecord_error_too_long: is too long
+activerecord_error_too_short: is too short
+activerecord_error_wrong_length: is the wrong length
+activerecord_error_taken: has already been taken
+activerecord_error_not_a_number: is not a number
+
+general_fmt_age: %d yr
+general_fmt_age_plural: %d yrs
+general_fmt_date: %%b %%d, %%Y (%%a)
+general_fmt_datetime: %%b %%d, %%Y (%%a), %%I:%%M %%p
+general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
+general_fmt_time: %%I:%%M %%p
+general_text_No: 'No'
+general_text_Yes: 'Yes'
+general_text_no: 'no'
+general_text_yes: 'yes'
+general_lang_es: 'Español'
+
+notice_account_updated: Account was successfully updated.
+notice_account_invalid_creditentials: Invalid user or password
+notice_account_password_updated: Password was successfully updated.
+notice_account_wrong_password: Wrong password
+notice_account_register_done: Account was successfully created.
+notice_account_unknown_email: Unknown user.
+notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
+notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
+notice_account_activated: Your account has been activated. You can now log in.
+notice_successful_create: Successful creation.
+notice_successful_update: Successful update.
+notice_successful_delete: Successful deletion.
+notice_successful_connection: Successful connection.
+notice_file_not_found: Requested file doesn't exist or has been deleted.
+
+gui_validation_error: 1 error
+gui_validation_error_plural: %d errors
+
+field_name: Nombre
+field_description: Descripción
+field_summary: Resumen
+field_is_required: Obligatorio
+field_firstname: Nombre
+field_lastname: Apellido
+field_mail: Email
+field_filename: Fichero
+#field_filesize: Size
+field_downloads: Telecargas
+field_author: Autor
+field_created_on: Creado
+field_updated_on: Actualizado
+#field_field_format: Format
+field_is_for_all: Para todos los proyectos
+field_possible_values: Valores posibles
+field_regexp: Expresión regular
+#field_min_length: Minimum length
+#field_max_length: Maximum length
+field_value: Valor
+field_category: Categoría
+field_title: Título
+field_project: Proyecto
+field_issue: Petición
+field_status: Estatuto
+#field_notes: Notes
+field_is_closed: Petición resuelta
+field_is_default: Estatuto por defecto
+field_html_color: Color
+field_tracker: Tracker
+field_subject: Tema
+#field_due_date: Due date
+field_assigned_to: Asignado a
+field_priority: Prioridad
+field_fixed_version: Versión corregida
+field_user: Usuario
+field_role: Papel
+field_homepage: Sitio web
+field_is_public: Público
+#field_parent: Subproject de
+field_is_in_chlog: Consultar las peticiones en el histórico
+field_login: Identificador
+field_mail_notification: Notificación por mail
+field_admin: Administrador
+field_locked: Cerrado
+field_last_login_on: Última conexión
+field_language: Lengua
+field_effective_date: Fecha
+field_password: Contraseña
+field_new_password: Nueva contraseña
+field_password_confirmation: Confirmación
+field_version: Versión
+field_type: Tipo
+#field_host: Host
+#field_port: Port
+#field_account: Account
+#field_base_dn: Base DN
+#field_attr_login: Login attribute
+#field_attr_firstname: Firstname attribute
+#field_attr_lastname: Lastname attribute
+#field_attr_mail: Email attribute
+#field_onthefly: On-the-fly user creation
+
+label_user: Usuario
+label_user_plural: Usuarios
+label_user_new: Nuevo usuario
+label_project: Proyecto
+label_project_new: Nuevo proyecto
+label_project_plural: Proyectos
+#label_project_latest: Latest projects
+label_issue: Petición
+label_issue_new: Nueva petición
+label_issue_plural: Peticiones
+label_issue_view_all: Ver todas las peticiones
+label_document: Documento
+label_document_new: Nuevo documento
+label_document_plural: Documentos
+label_role: Papel
+label_role_plural: Papeles
+label_role_new: Nuevo papel
+label_role_and_permissions: Papeles y permisos
+label_member: Miembro
+label_member_new: Nuevo miembro
+label_member_plural: Miembros
+label_tracker: Tracker
+label_tracker_plural: Trackers
+label_tracker_new: Nuevo tracker
+label_workflow: Workflow
+label_issue_status: Estatuto de petición
+label_issue_status_plural: Estatutos de las peticiones
+label_issue_status_new: Nuevo estatuto
+label_issue_category: Categoría de las peticiones
+label_issue_category_plural: Categorías de las peticiones
+label_issue_category_new: Nueva categoría
+label_custom_field: Campo personalizado
+label_custom_field_plural: Campos personalizados
+label_custom_field_new: Nuevo campo personalizado
+label_enumerations: Listas de valores
+label_enumeration_new: Nuevo valor
+label_information: Informacion
+label_information_plural: Informaciones
+label_please_login: Conexión
+#label_register: Register
+#label_password_lost: Lost password
+label_home: Acogida
+label_my_page: Mi página
+label_my_account: Mi cuenta
+label_my_projects: Mis proyectos
+label_administration: Administración
+label_login: Conexión
+label_logout: Desconexión
+label_help: Ayuda
+label_reported_issues: Peticiones registradas
+label_assigned_to_me_issues: Peticiones que me están asignadas
+label_last_login: Última conexión
+label_last_updates: Actualizado
+label_last_updates_plural: %d Actualizados
+label_registered_on: Inscrito el
+label_activity: Actividad
+label_new: Nuevo
+label_logged_as: Conectado como
+#label_environment: Environment
+#label_authentication: Authentication
+#label_auth_source: Authentification mode
+#label_auth_source_new: New authentication mode
+#label_auth_source_plural: Authentification modes
+#label_subproject: Subproject
+#label_subproject_plural: Subprojects
+#label_min_max_length: Min - Max length
+#label_list: List
+label_date: Fecha
+#label_integer: Integer
+#label_boolean: Boolean
+#label_string: String
+#label_text: Text
+#label_attribute: Attribute
+#label_attribute_plural: Attributes
+label_download: %d Telecarga
+label_download_plural: %d Telecargas
+#label_no_data: No data to display
+label_change_status: Cambiar el estatuto
+label_history: Histórico
+label_attachment: Fichero
+label_attachment_new: Nuevo fichero
+#label_attachment_delete: Delete file
+label_attachment_plural: Ficheros
+#label_report: Report
+#label_report_plural: Reports
+label_news: Noticia
+label_news_new: Nueva noticia
+label_news_plural: Noticias
+label_news_latest: Últimas noticias
+label_news_view_all: Ver todas las noticias
+label_change_log: Cambios
+label_settings: Configuración
+label_overview: Vistazo
+label_version: Versión
+label_version_new: Nueva versión
+label_version_plural: Versiónes
+label_confirmation: Confirmación
+#label_export_csv: Export to CSV
+label_read: Leer...
+label_public_projects: Proyectos publicos
+label_open_issues: Abierta
+label_open_issues_plural: Abiertas
+label_closed_issues: Cerrada
+label_closed_issues_plural: Cerradas
+label_total: Total
+label_permissions: Permisos
+#label_current_status: Current status
+label_new_statuses_allowed: Nuevos estatutos autorizados
+label_all: Todos
+label_none: Ninguno
+label_next: Próximo
+label_previous: Precedente
+label_used_by: Utilizado por
+
+button_login: Conexión
+button_submit: Someter
+button_save: Validar
+button_check_all: Seleccionar todo
+button_uncheck_all: No seleccionar nada
+button_delete: Suprimir
+button_create: Crear
+button_test: Testar
+button_edit: Modificar
+button_add: Añadir
+button_change: Cambiar
+button_apply: Aplicar
+button_clear: Anular
+button_lock: Bloquear
+button_unlock: Desbloquear
+button_download: Telecargar
+button_list: Listar
+button_view: Ver
+
+text_select_mail_notifications: Seleccionar las actividades que necesitan la activación de la notificación por mail.
+text_regexp_info: eg. ^[A-Z0-9]+$
+text_min_max_length_info: 0 para ninguna restricción
+#text_possible_values_info: values separated with |
+text_project_destroy_confirmation: ¿ Estás seguro de querer eliminar el proyecto ?
+text_workflow_edit: Seleccionar un workflow para actualizar
+
+#default_role_manager: Manager
+#default_role_developper: Developer
+#default_role_reporter: Reporter
+default_tracker_bug: Anomalía
+default_tracker_feature: Evolución
+default_tracker_support: Asistencia
+default_issue_status_new: Nuevo
+default_issue_status_assigned: Asignada
+default_issue_status_resolved: Resuelta
+default_issue_status_feedback: Comentario
+default_issue_status_closed: Cerrada
+default_issue_status_rejected: Rechazada
+default_doc_category_user: Documentación del usuario
+default_doc_category_tech: Documentación tecnica
+default_priority_low: Bajo
+default_priority_normal: Normal
+default_priority_high: Alto
+default_priority_urgent: Urgente
+default_priority_immediate: Ahora
+
+enumeration_issue_priorities: Prioridad de las peticiones
+enumeration_doc_categories: Categorías del documento
diff --git a/redmine/lang/es_ES.rb b/redmine/lang/es_ES.rb
deleted file mode 100644
index ef15f9c53..000000000
--- a/redmine/lang/es_ES.rb
+++ /dev/null
@@ -1,315 +0,0 @@
-Localization.define('es', 'Español') do |l| 
-
-  # trackers
-  l.store 'Bug', 'Anomalía'
-  l.store 'Feature request', 'Evolución'
-  l.store 'Support request', 'Asistencia'
-  # issue statuses
-  l.store 'New', 'Nuevo'
-  l.store 'Assigned', 'Asignada'
-  l.store 'Resolved', 'Resuelta'
-  l.store 'Closed', 'Cerrada'
-  l.store 'Rejected', 'Rechazada'
-  l.store 'Feedback', 'Comentario'  
-
-  # issue priorities
-  l.store 'Issue priorities', 'Prioridad de las peticiones'
-  l.store 'Low', 'Bajo'
-  l.store 'Normal', 'Normal'
-  l.store 'High', 'Alto'
-  l.store 'Urgent', 'Urgente'
-  l.store 'Immediate', 'Ahora'
-  # document categories
-  l.store 'Document categories', 'Categorías del documento'
-  l.store 'Uncategorized', 'Sin categorías '
-  l.store 'User documentation', 'Documentación del usuario'
-  l.store 'Technical documentation', 'Documentación tecnica'  
-  # dates  
-  l.store '(date)', lambda { |t| t.strftime('%d/%m/%Y') }  
-  l.store '(time)', lambda { |t| t.strftime('%d/%m/%Y %H:%M') }  
-   
-  # ./script/../config/../app/views/account/login.rhtml
-
-  # ./script/../config/../app/views/account/my_account.rhtml
-  l.store 'My account', 'Mi cuenta'
-  l.store 'Login', 'Identificador'
-  l.store 'Created on', 'Creado el'
-  l.store 'Last update', 'Actualizado'
-  l.store 'Information', 'Informaciones'
-  l.store 'Firstname', 'Nombre'
-  l.store 'Lastname', 'Apellido'
-  l.store 'Mail', 'Mail'
-  l.store 'Language', 'Lengua'
-  l.store 'Mail notifications', 'Notificación por mail'
-  l.store 'Save', 'Validar'
-  l.store 'Password', 'Contraseña'
-  l.store 'New password', 'Nueva contraseña'
-  l.store 'Confirmation', 'Confirmación'
-
-  # ./script/../config/../app/views/account/my_page.rhtml
-  l.store 'My page', 'Mi página'
-  l.store 'Welcome', 'Bienvenido'
-  l.store 'Last login', 'Última conexión'
-  l.store 'Reported issues', 'Peticiones registradas'
-  l.store 'Assigned to me', 'Peticiones que me están asignadas'
-
-  # ./script/../config/../app/views/account/show.rhtml
-  l.store 'Registered on', 'Inscrito el'
-  l.store 'Projects', 'Proyectos'
-  l.store 'Activity', 'Actividad'
-
-  # ./script/../config/../app/views/admin/index.rhtml
-  l.store 'Administration', 'Administración'
-  l.store 'Users', 'Usuarios'
-  l.store 'Roles and permissions', 'Papeles y permisos'
-  l.store 'Trackers', 'Trackers'
-  l.store 'Custom fields', 'Campos personalizados'
-  l.store 'Issue Statuses', 'Estatutos de las peticiones'
-  l.store 'Workflow', 'Workflow'
-  l.store 'Enumerations', 'Listas de valores'
-
-  # ./script/../config/../app/views/admin/info.rhtml
-  l.store 'Version', 'Versión'
-  l.store 'Database', 'Base de datos'
-
-  # ./script/../config/../app/views/admin/mail_options.rhtml
-  l.store 'Select actions for which mail notification should be enabled.', 'Seleccionar las actividades que necesitan la activación de la notificación por mail.'
-  l.store 'Check all', 'Seleccionar todo'
-  l.store 'Uncheck all', 'No seleccionar nada'
-
-  # ./script/../config/../app/views/admin/projects.rhtml
-  l.store 'Project', 'Proyecto'
-  l.store 'Description', 'Descripción'
-  l.store 'Public', 'Público'
-  l.store 'Delete', 'Suprimir'
-  l.store 'Previous', 'Precedente'
-  l.store 'Next', 'Próximo'
-
-  # ./script/../config/../app/views/custom_fields/edit.rhtml
-  l.store 'Custom field', 'Campo personalizado'
-
-  # ./script/../config/../app/views/custom_fields/list.rhtml
-  l.store 'Name', 'Nombre'
-  l.store 'Type', 'Tipo'
-  l.store 'Required', 'Obligatorio'
-  l.store 'For all projects', 'Para todos los proyectos'
-  l.store 'Used by', 'Utilizado por'
-
-  # ./script/../config/../app/views/custom_fields/new.rhtml
-  l.store 'New custom field', 'Nuevo campo personalizado'
-  l.store 'Create', 'Crear'
-
-  # ./script/../config/../app/views/custom_fields/_form.rhtml
-  l.store '0 means no restriction', '0 para ninguna restricción'
-  l.store 'Regular expression pattern', 'Expresión regular'
-  l.store 'Possible values', 'Valores posibles'
-
-  # ./script/../config/../app/views/documents/edit.rhtml
-  l.store 'Document', 'Documento'
-
-  # ./script/../config/../app/views/documents/show.rhtml
-  l.store 'Category', 'Categoría'
-  l.store 'Edit', 'Modificar'
-  l.store 'download', 'Telecarga'
-  l.store 'Add file', 'Añadir el fichero'
-  l.store 'Add', 'Añadir'
-
-  # ./script/../config/../app/views/documents/_form.rhtml
-  l.store 'Title', 'Título'
-
-  # ./script/../config/../app/views/enumerations/edit.rhtml
-
-  # ./script/../config/../app/views/enumerations/list.rhtml
-
-  # ./script/../config/../app/views/enumerations/new.rhtml
-  l.store 'New enumeration', 'Nuevo valor'
-
-  # ./script/../config/../app/views/enumerations/_form.rhtml
-
-  # ./script/../config/../app/views/issues/change_status.rhtml
-  l.store 'Issue', 'Petición'
-  l.store 'New status', 'Nuevo estatuto'
-  l.store 'Assigned to', 'Asignado a'
-  l.store 'Fixed in version', 'Versión corregida'
-  l.store 'Notes', 'Anotación'
-
-  # ./script/../config/../app/views/issues/edit.rhtml
-  l.store 'Status', 'Estatuto'
-  l.store 'Tracker', 'Tracker'
-  l.store 'Priority', 'Prioridad'
-  l.store 'Subject', 'Tema'
-
-  # ./script/../config/../app/views/issues/show.rhtml
-  l.store 'Author', 'Autor'
-  l.store 'Change status', 'Cambiar el estatuto'
-  l.store 'History', 'Histórico'
-  l.store 'Attachments', 'Ficheros'
-  l.store 'Update...', 'Actualizar...'
-
-  # ./script/../config/../app/views/issues/_list_simple.rhtml
-  l.store 'No issue', 'Ninguna petición'
-
-  # ./script/../config/../app/views/issue_categories/edit.rhtml
-
-  # ./script/../config/../app/views/issue_categories/_form.rhtml
-
-  # ./script/../config/../app/views/issue_statuses/edit.rhtml
-  l.store 'Issue status', 'Estatuto de petición'
-
-  # ./script/../config/../app/views/issue_statuses/list.rhtml
-  l.store 'Issue statuses', 'Estatutos de la petición'
-  l.store 'Default status', 'Estatuto por defecto'
-  l.store 'Issue closed', 'Petición resuelta'
-  l.store 'Color', 'Color'
-
-  # ./script/../config/../app/views/issue_statuses/new.rhtml
-  l.store 'New issue status', 'Nuevo estatuto'
-
-  # ./script/../config/../app/views/issue_statuses/_form.rhtml
-
-  # ./script/../config/../app/views/layouts/base.rhtml
-  l.store 'Home', 'Acogida'
-  l.store 'Help', 'Ayuda'
-  l.store 'Log in', 'Conexión'
-  l.store 'Logout', 'Desconexión'
-  l.store 'Overview', 'Vistazo'
-  l.store 'Issues', 'Peticiones'
-  l.store 'Reports', 'Rapports'
-  l.store 'News', 'Noticias'
-  l.store 'Change log', 'Cambios'
-  l.store 'Documents', 'Documentos'
-  l.store 'Members', 'Miembros'
-  l.store 'Files', 'Ficheros'
-  l.store 'Settings', 'Configuración'
-  l.store 'My projects', 'Mis proyectos'
-  l.store 'Logged as', 'Conectado como'
-
-  # ./script/../config/../app/views/mailer/issue_add.rhtml
-
-  # ./script/../config/../app/views/mailer/issue_change_status.rhtml
-
-  # ./script/../config/../app/views/mailer/_issue.rhtml
-
-  # ./script/../config/../app/views/news/edit.rhtml
-
-  # ./script/../config/../app/views/news/show.rhtml
-  l.store 'Summary', 'Resumen'
-  l.store 'By', 'Por'
-  l.store 'Date', 'Fecha'
-
-  # ./script/../config/../app/views/news/_form.rhtml
-
-  # ./script/../config/../app/views/projects/add.rhtml
-  l.store 'New project', 'Nuevo proyecto'
-
-  # ./script/../config/../app/views/projects/add_document.rhtml
-  l.store 'New document', 'Nuevo documento'
-  l.store 'File', 'Fichero'
-
-  # ./script/../config/../app/views/projects/add_issue.rhtml
-  l.store 'New issue', 'Nueva petición'
-  l.store 'Attachment', 'Fichero'
-
-  # ./script/../config/../app/views/projects/add_news.rhtml
-
-  # ./script/../config/../app/views/projects/add_version.rhtml
-  l.store 'New version', 'Nueva versión'
-
-  # ./script/../config/../app/views/projects/changelog.rhtml
-
-  # ./script/../config/../app/views/projects/destroy.rhtml
-  l.store 'Are you sure you want to delete project', '¿ Estás seguro de querer eliminar el proyecto ?'
-
-  # ./script/../config/../app/views/projects/list.rhtml
-  l.store 'Public projects', 'Proyectos publicos'
-
-  # ./script/../config/../app/views/projects/list_documents.rhtml
-  l.store 'Desciption', 'Descripción'
-
-  # ./script/../config/../app/views/projects/list_files.rhtml
-  l.store 'New file', 'Nuevo fichero'
-  
-  # ./script/../config/../app/views/projects/list_issues.rhtml
-  l.store 'Apply filter', 'Aplicar'
-  l.store 'Reset', 'Anular'
-  l.store 'Report an issue', 'Nueva petición'
-
-  # ./script/../config/../app/views/projects/list_members.rhtml
-  l.store 'Project members', 'Miembros del proyecto'
-
-  # ./script/../config/../app/views/projects/list_news.rhtml
-  l.store 'Read...', 'Leer...'
-
-  # ./script/../config/../app/views/projects/settings.rhtml
-  l.store 'New member', 'Nuevo miembro'
-  l.store 'Versions', 'Versiónes'
-  l.store 'New version...', 'Nueva versión...'
-  l.store 'Issue categories', 'Categorías de las peticiones'
-  l.store 'New category', 'Nueva categoría'
-
-  # ./script/../config/../app/views/projects/show.rhtml
-  l.store 'Homepage', 'Sitio web'
-  l.store 'open', 'abierta(s)'
-  l.store 'View all issues', 'Ver todas las peticiones'
-  l.store 'View all news', 'Ver todas las noticias'
-  l.store 'Latest news', 'Últimas noticias'
-
-  # ./script/../config/../app/views/projects/_form.rhtml
-
-  # ./script/../config/../app/views/reports/issue_report.rhtml
-  l.store 'Issues by tracker', 'Peticiones por tracker'
-  l.store 'Issues by priority', 'Peticiones por prioridad'
-  l.store 'Issues by category', 'Peticiones por categoría'
-
-  # ./script/../config/../app/views/reports/_simple.rhtml
-  l.store 'Open', 'Abierta'
-  l.store 'Total', 'Total'
-
-  # ./script/../config/../app/views/roles/edit.rhtml
-  l.store 'Role', 'Papel'
-
-  # ./script/../config/../app/views/roles/list.rhtml
-  l.store 'Roles', 'Papeles'
-
-  # ./script/../config/../app/views/roles/new.rhtml
-  l.store 'New role', 'Nuevo papel'
-
-  # ./script/../config/../app/views/roles/workflow.rhtml
-  l.store 'Workflow setup', 'Configuración del workflow'
-  l.store 'Select a workflow to edit', 'Seleccionar un workflow para actualizar'
-  l.store 'New statuses allowed', 'Nuevos estatutos autorizados'
-
-  # ./script/../config/../app/views/roles/_form.rhtml
-  l.store 'Permissions', 'Permisos'
-
-  # ./script/../config/../app/views/trackers/edit.rhtml
-
-  # ./script/../config/../app/views/trackers/list.rhtml
-  l.store 'View issues in change log', 'Consultar las peticiones en el histórico'
-  l.store 'New tracker', 'Nuevo tracker'
-  
-  # ./script/../config/../app/views/trackers/new.rhtml
-
-  # ./script/../config/../app/views/trackers/_form.rhtml
-
-  # ./script/../config/../app/views/users/add.rhtml
-  l.store 'New user', 'Nuevo usuario'
-
-  # ./script/../config/../app/views/users/edit.rhtml
-  l.store 'User', 'Usuario'
-
-  # ./script/../config/../app/views/users/list.rhtml
-  l.store 'Admin', 'Admin'
-  l.store 'Locked', 'Cerrado'
-
-  # ./script/../config/../app/views/users/_form.rhtml
-  l.store 'Administrator', 'Administrador'
-
-  # ./script/../config/../app/views/versions/edit.rhtml
-
-  # ./script/../config/../app/views/versions/_form.rhtml
-
-  # ./script/../config/../app/views/welcome/index.rhtml
-  
-
-end 
diff --git a/redmine/lang/fr.yml b/redmine/lang/fr.yml
index c573a5789..5a515d869 100644
--- a/redmine/lang/fr.yml
+++ b/redmine/lang/fr.yml
@@ -57,6 +57,7 @@ notice_successful_create: Création effectuée avec succès.
 notice_successful_update: Mise à jour effectuée avec succès.
 notice_successful_delete: Suppression effectuée avec succès.
 notice_successful_connection: Connection réussie.
+notice_file_not_found: Le fichier demandé n'existe pas ou a été supprimé.
 
 gui_validation_error: 1 erreur
 gui_validation_error_plural: %d erreurs
diff --git a/redmine/lang/fr_FR.rb b/redmine/lang/fr_FR.rb
deleted file mode 100644
index 68f214b69..000000000
--- a/redmine/lang/fr_FR.rb
+++ /dev/null
@@ -1,352 +0,0 @@
-Localization.define('fr', 'Français') do |l| 
-
-  # trackers
-  l.store 'Bug', 'Anomalie'
-  l.store 'Feature request', 'Evolution'
-  l.store 'Support request', 'Assistance'
-  # issue statuses
-  l.store 'New', 'Nouveau'
-  l.store 'Assigned', 'Assignée'
-  l.store 'Resolved', 'Résolue'
-  l.store 'Closed', 'Fermée'
-  l.store 'Rejected', 'Rejetée'
-  l.store 'Feedback', 'Commentaire' 
-  # filters
-  l.store '[All]', '[Tous]'
-  l.store '[Open]', '[Ouvert]'
-  l.store '[None]', '[Aucun]'
-
-  # issue priorities
-  l.store 'Issue priorities', 'Priorités des demandes'
-  l.store 'Low', 'Bas'
-  l.store 'Normal', 'Normal'
-  l.store 'High', 'Haut'
-  l.store 'Urgent', 'Urgent'
-  l.store 'Immediate', 'Immédiat'
-  # document categories
-  l.store 'Document categories', 'Catégories de documents'
-  l.store 'Uncategorized', 'Sans catégorie'
-  l.store 'User documentation', 'Documentation utilisateur'
-  l.store 'Technical documentation', 'Documentation technique' 
-  # custom fields formats
-  l.store 'String', 'Chaîne'
-  l.store 'Integer', 'Entier'
-  l.store 'Date', 'Date'
-  l.store 'Boolean', 'Booléen'
-  l.store 'List', 'Liste'
-  # dates  
-  l.store '(date)', lambda { |t| t.strftime('%d/%m/%Y') }  
-  l.store '(time)', lambda { |t| t.strftime('%d/%m/%Y %H:%M') }  
- 
- 
-  # error messages
-  l.store '%d errors', ['1 erreur', '%d erreurs']
-  
-  l.store "is not included in the list", "n'est pas inclus dans la liste"
-  l.store "is reserved", "est réservé"
-  l.store "is invalid", "n'est pas valide"
-  l.store "doesn't match confirmation", "ne correspond pas à la confirmation"
-  l.store "must be accepted", "doit être accepté"
-  l.store "can't be empty", "ne doit pas être vide"
-  l.store "can't be blank", "doit être renseigné"
-  l.store "is too long", "est trop long"
-  l.store "is too short", "est trop court"
-  l.store "is the wrong length", "n'est pas de la bonne longueur"
-  l.store "has already been taken", "est déjà utilisé"
-  l.store "is not a number", "doit être un nombre"
-  
-  # notice messages
-  l.store 'Invalid user/password', 'Identifiant/Mot de passe invalide'
-
-  # ./script/../config/../app/views/account/my_account.rhtml
-  l.store 'My account', 'Mon compte'
-  l.store 'Login', 'Identifiant'
-  l.store 'Created on', 'Crée le'
-  l.store 'Last update', 'Mis à jour'
-  l.store 'Information', 'Informations'
-  l.store 'Firstname', 'Prénom'
-  l.store 'Lastname', 'Nom'
-  l.store 'Mail', 'Mail'
-  l.store 'Language', 'Langue'
-  l.store 'Mail notifications', 'Notifications par mail'
-  l.store 'Save', 'Valider'
-  l.store 'Password', 'Mot de passe'
-  l.store 'New password', 'Nouveau mot de passe'
-  l.store 'Confirmation', 'Confirmation'
-
-  # ./script/../config/../app/views/account/my_page.rhtml
-  l.store 'My page', 'Ma page'
-  l.store 'Welcome', 'Bienvenue'
-  l.store 'Last login', 'Dernière connexion'
-  l.store 'Reported issues', 'Demandes soumises'
-  l.store 'Assigned to me', 'Demandes qui me sont assignées'
-
-  # ./script/../config/../app/views/account/login.rhtml
-  l.store 'Please login', 'Identification'
-  l.store 'Register', "S'enregistrer"
-  l.store 'Password lost', 'Mot de passe perdu'
-  l.store 'Submit', 'Soumettre'
-
-  # ./script/../config/../app/views/account/show.rhtml
-  l.store 'Registered on', 'Inscrit le'
-  l.store 'Projects', 'Projets'
-  l.store 'Activity', 'Activité'
-
-  # ./script/../config/../app/views/admin/index.rhtml
-  l.store 'Administration', 'Administration'
-  l.store 'Users', 'Utilisateurs'
-  l.store 'Roles and permissions', 'Rôles et permissions'
-  l.store 'Trackers', 'Trackers'
-  l.store 'Custom fields', 'Champs personnalisés'
-  l.store 'Issue Statuses', 'Statuts des demandes'
-  l.store 'Workflow', 'Workflow'
-  l.store 'Enumerations', 'Listes de valeurs'
-
-  # ./script/../config/../app/views/admin/info.rhtml
-  l.store 'Version', 'Version'
-  l.store 'Database', 'Base de données'
-
-  # ./script/../config/../app/views/admin/mail_options.rhtml
-  l.store 'Select actions for which mail notification should be enabled.', 'Sélectionner les actions pour lesquelles la notification par mail doit être activée.'
-  l.store 'Check all', 'Cocher tout'
-  l.store 'Uncheck all', 'Décocher tout'
-
-  # ./script/../config/../app/views/admin/projects.rhtml
-  l.store 'Project', 'Projet'
-  l.store 'Description', 'Description'
-  l.store 'Public', 'Public'
-  l.store 'Delete', 'Supprimer'
-  l.store 'Previous', 'Précédent'
-  l.store 'Next', 'Suivant'
-
-  # ./script/../config/../app/views/custom_fields/edit.rhtml
-  l.store 'Custom field', 'Champ personnalisé'
-
-  # ./script/../config/../app/views/custom_fields/list.rhtml
-  l.store 'Name', 'Nom'
-  l.store 'For', 'Pour'
-  l.store 'Type', 'Type'
-  l.store 'Required', 'Obligatoire'
-  l.store 'For all projects', 'Pour tous les projets'
-  l.store 'Used by', 'Utilisé par'
-
-  # ./script/../config/../app/views/custom_fields/new.rhtml
-  l.store 'New custom field', 'Nouveau champ personnalisé'
-  l.store 'Create', 'Créer'
-
-  # ./script/../config/../app/views/custom_fields/_form.rhtml
-  l.store '0 means no restriction', '0 pour aucune restriction'
-  l.store 'Regular expression pattern', 'Expression régulière'
-  l.store 'Possible values', 'Valeurs possibles'
-
-  # ./script/../config/../app/views/documents/edit.rhtml
-  l.store 'Document', 'Document'
-
-  # ./script/../config/../app/views/documents/show.rhtml
-  l.store 'Category', 'Catégorie'
-  l.store 'Edit', 'Modifier'
-  l.store 'download', 'téléchargement'
-  l.store 'Add file', 'Ajouter le fichier'
-  l.store 'Add', 'Ajouter'
-
-  # ./script/../config/../app/views/documents/_form.rhtml
-  l.store 'Title', 'Titre'
-
-  # ./script/../config/../app/views/enumerations/edit.rhtml
-
-  # ./script/../config/../app/views/enumerations/list.rhtml
-
-  # ./script/../config/../app/views/enumerations/new.rhtml
-  l.store 'New enumeration', 'Nouvelle valeur'
-
-  # ./script/../config/../app/views/enumerations/_form.rhtml
-
-  # ./script/../config/../app/views/issues/change_status.rhtml
-  l.store 'Issue', 'Demande'
-  l.store 'New status', 'Nouveau statut'
-  l.store 'Assigned to', 'Assigné à'
-  l.store 'Fixed in version', 'Version corrigée'
-  l.store 'Notes', 'Remarques'
-
-  # ./script/../config/../app/views/issues/edit.rhtml
-  l.store 'Status', 'Statut'
-  l.store 'Tracker', 'Tracker'
-  l.store 'Priority', 'Priorité'
-  l.store 'Subject', 'Sujet'
-
-  # ./script/../config/../app/views/issues/show.rhtml
-  l.store 'Author', 'Auteur'
-  l.store 'Change status', 'Changer le statut'
-  l.store 'History', 'Historique'
-  l.store 'Attachments', 'Fichiers'
-  l.store 'Update...', 'Changer...'
-
-  # ./script/../config/../app/views/issues/_list_simple.rhtml
-  l.store 'No issue', 'Aucune demande'
-
-  # ./script/../config/../app/views/issue_categories/edit.rhtml
-
-  # ./script/../config/../app/views/issue_categories/_form.rhtml
-
-  # ./script/../config/../app/views/issue_statuses/edit.rhtml
-  l.store 'Issue status', 'Statut de demande'
-
-  # ./script/../config/../app/views/issue_statuses/list.rhtml
-  l.store 'Issue statuses', 'Statuts de demande'
-  l.store 'Default status', 'Statut par défaut'
-  l.store 'Issue closed', 'Demande fermée'
-  l.store 'Color', 'Couleur'
-
-  # ./script/../config/../app/views/issue_statuses/new.rhtml
-  l.store 'New issue status', 'Nouveau statut'
-
-  # ./script/../config/../app/views/issue_statuses/_form.rhtml
-
-  # ./script/../config/../app/views/layouts/base.rhtml
-  l.store 'Home', 'Accueil'
-  l.store 'Help', 'Aide'
-  l.store 'Log in', 'Connexion'
-  l.store 'Logout', 'Déconnexion'
-  l.store 'Overview', 'Aperçu'
-  l.store 'Issues', 'Demandes'
-  l.store 'Reports', 'Rapports'
-  l.store 'News', 'Annonces'
-  l.store 'Change log', 'Historique'
-  l.store 'Documents', 'Documents'
-  l.store 'Members', 'Membres'
-  l.store 'Files', 'Fichiers'
-  l.store 'Settings', 'Configuration'
-  l.store 'My projects', 'Mes projets'
-  l.store 'Logged as', 'Connecté en tant que'
-
-  # ./script/../config/../app/views/mailer/issue_add.rhtml
-
-  # ./script/../config/../app/views/mailer/issue_change_status.rhtml
-
-  # ./script/../config/../app/views/mailer/_issue.rhtml
-
-  # ./script/../config/../app/views/news/edit.rhtml
-
-  # ./script/../config/../app/views/news/show.rhtml
-  l.store 'Summary', 'Résumé'
-  l.store 'By', 'Par'
-  l.store 'Date', 'Date'
-
-  # ./script/../config/../app/views/news/_form.rhtml
-
-  # ./script/../config/../app/views/projects/add.rhtml
-  l.store 'New project', 'Nouveau projet'
-
-  # ./script/../config/../app/views/projects/add_document.rhtml
-  l.store 'New document', 'Nouveau document'
-  l.store 'File', 'Fichier'
-
-  # ./script/../config/../app/views/projects/add_issue.rhtml
-  l.store 'New issue', 'Nouvelle demande'
-  l.store 'Attachment', 'Fichier'
-
-  # ./script/../config/../app/views/projects/add_news.rhtml
-
-  # ./script/../config/../app/views/projects/add_version.rhtml
-  l.store 'New version', 'Nouvelle version'
-
-  # ./script/../config/../app/views/projects/changelog.rhtml
-
-  # ./script/../config/../app/views/projects/destroy.rhtml
-  l.store 'Are you sure you want to delete project', 'Êtes-vous sûr de vouloir supprimer le projet'
-
-  # ./script/../config/../app/views/projects/list.rhtml
-  l.store 'Public projects', 'Projets publics'
-
-  # ./script/../config/../app/views/projects/list_documents.rhtml
-  l.store 'Desciption', 'Description'
-
-  # ./script/../config/../app/views/projects/list_files.rhtml
-  l.store 'Files', 'Fichiers'
-  l.store 'New file', 'Nouveau fichier'
-  
-  # ./script/../config/../app/views/projects/list_issues.rhtml
-  l.store 'Subprojects', 'Sous-projets'
-  l.store 'Apply filter', 'Appliquer'
-  l.store 'Reset', 'Annuler'
-  l.store 'Report an issue', 'Nouvelle demande'
-
-  # ./script/../config/../app/views/projects/list_members.rhtml
-  l.store 'Project members', 'Membres du projet'
-
-  # ./script/../config/../app/views/projects/list_news.rhtml
-  l.store 'Read...', 'Lire...'
-
-  # ./script/../config/../app/views/projects/settings.rhtml
-  l.store 'New member', 'Nouveau membre'
-  l.store 'Versions', 'Versions'
-  l.store 'New version...', 'Nouvelle version...'
-  l.store 'Issue categories', 'Catégories des demandes'
-  l.store 'New category', 'Nouvelle catégorie'
-
-  # ./script/../config/../app/views/projects/show.rhtml
-  l.store 'Homepage', 'Site web'
-  l.store 'open', 'ouverte(s)'
-  l.store 'View all issues', 'Voir toutes les demandes'
-  l.store 'View all news', 'Voir toutes les annonces'
-  l.store 'Latest news', 'Dernières annonces'
-
-  # ./script/../config/../app/views/projects/_form.rhtml
-
-  # ./script/../config/../app/views/reports/issue_report.rhtml
-  l.store 'Issues by tracker', 'Demandes par tracker'
-  l.store 'Issues by priority', 'Demandes par priorité'
-  l.store 'Issues by category', 'Demandes par catégorie'
-
-  # ./script/../config/../app/views/reports/_simple.rhtml
-  l.store 'Open', 'Ouverte'
-  l.store 'Total', 'Total'
-
-  # ./script/../config/../app/views/roles/edit.rhtml
-  l.store 'Role', 'Rôle'
-
-  # ./script/../config/../app/views/roles/list.rhtml
-  l.store 'Roles', 'Rôles'
-
-  # ./script/../config/../app/views/roles/new.rhtml
-  l.store 'New role', 'Nouveau rôle'
-
-  # ./script/../config/../app/views/roles/workflow.rhtml
-  l.store 'Workflow setup', 'Configuration du workflow'
-  l.store 'Select a workflow to edit', 'Sélectionner un workflow à mettre à jour'
-  l.store 'New statuses allowed', 'Nouveaux statuts autorisés'
-
-  # ./script/../config/../app/views/roles/_form.rhtml
-  l.store 'Permissions', 'Permissions'
-
-  # ./script/../config/../app/views/trackers/edit.rhtml
-
-  # ./script/../config/../app/views/trackers/list.rhtml
-  l.store 'View issues in change log', 'Demandes affichées dans l\'historique'
-
-  # ./script/../config/../app/views/trackers/new.rhtml
-  l.store 'New tracker', 'Nouveau tracker'
-
-  # ./script/../config/../app/views/trackers/_form.rhtml
-
-  # ./script/../config/../app/views/users/add.rhtml
-  l.store 'New user', 'Nouvel utilisateur'
-
-  # ./script/../config/../app/views/users/edit.rhtml
-  l.store 'User', 'Utilisateur'
-
-  # ./script/../config/../app/views/users/list.rhtml
-  l.store 'Admin', 'Admin'
-  l.store 'Locked', 'Verrouillé'
-
-  # ./script/../config/../app/views/users/_form.rhtml
-  l.store 'Administrator', 'Administrateur'
-
-  # ./script/../config/../app/views/versions/edit.rhtml
-
-  # ./script/../config/../app/views/versions/_form.rhtml
-
-  # ./script/../config/../app/views/welcome/index.rhtml
-  l.store 'Latest projects', 'Derniers projets'
-
-end