diff options
| -rw-r--r-- | app/models/attachment.rb | 2 | ||||
| -rw-r--r-- | lang/de.yml | 100 | ||||
| -rw-r--r-- | lang/es.yml | 88 | ||||
| -rw-r--r-- | public/.htaccess | 93 |
4 files changed, 149 insertions, 134 deletions
diff --git a/app/models/attachment.rb b/app/models/attachment.rb index 7262498c4..927aa1735 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -84,7 +84,7 @@ class Attachment < ActiveRecord::Base end def project - container.is_a?(Project) ? container : container.project + container.project end def image? diff --git a/lang/de.yml b/lang/de.yml index ab3e47013..1fc6f6b69 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -6,16 +6,16 @@ actionview_datehelper_select_month_names_abbr: Jan,Feb,Mär,Apr,Mai,Jun,Jul,Aug, actionview_datehelper_select_month_prefix: actionview_datehelper_select_year_prefix: actionview_datehelper_time_in_words_day: 1 Tag -actionview_datehelper_time_in_words_day_plural: %d Tage -actionview_datehelper_time_in_words_hour_about: ungefähr eine Stunde +actionview_datehelper_time_in_words_day_plural: %d Tagen +actionview_datehelper_time_in_words_hour_about: ungefähr einer Stunde actionview_datehelper_time_in_words_hour_about_plural: ungefähr %d Stunden -actionview_datehelper_time_in_words_hour_about_single: ungefähr eine Stunde +actionview_datehelper_time_in_words_hour_about_single: ungefähr einer Stunde actionview_datehelper_time_in_words_minute: 1 Minute -actionview_datehelper_time_in_words_minute_half: halbe Minute -actionview_datehelper_time_in_words_minute_less_than: weniger als eine Minute +actionview_datehelper_time_in_words_minute_half: einer halben Minute +actionview_datehelper_time_in_words_minute_less_than: weniger als einer Minute actionview_datehelper_time_in_words_minute_plural: %d Minuten actionview_datehelper_time_in_words_minute_single: 1 Minute -actionview_datehelper_time_in_words_second_less_than: Weniger als eine Sekunde +actionview_datehelper_time_in_words_second_less_than: weniger als einer Sekunde actionview_datehelper_time_in_words_second_less_than_plural: weniger als %d Sekunden actionview_instancetag_blank_option: Bitte auswählen @@ -74,10 +74,10 @@ notice_email_sent: Eine E-Mail wurde an %s gesendet. notice_email_error: Beim Senden einer E-Mail ist ein Fehler aufgetreten (%s). notice_feeds_access_key_reseted: Ihr RSS-Zugriffsschlüssel wurde zurückgesetzt. -mail_subject_lost_password: Ihr Redmine Kennwort -mail_body_lost_password: 'Benutzen Sie folgenden Link, um das Password zu Ãndern:' +mail_subject_lost_password: Ihr Redmine-Kennwort +mail_body_lost_password: 'Benutzen Sie den folgenden Link, um Ihr Kennwort zu ändern:' mail_subject_register: Redmine Kontoaktivierung -mail_body_register: 'Um Ihren Account zu aktivieren, benutzen Sie folgenden Link:' +mail_body_register: 'Um Ihr Konto zu aktivieren, benutzen Sie folgenden Link:' gui_validation_error: 1 Fehler gui_validation_error_plural: %d Fehler @@ -88,7 +88,7 @@ field_summary: Zusammenfassung field_is_required: Erforderlich field_firstname: Vorname field_lastname: Nachname -field_mail: Email +field_mail: E-Mail field_filename: Datei field_filesize: Größe field_downloads: Downloads @@ -146,7 +146,7 @@ field_onthefly: On-the-fly-Benutzererstellung field_start_date: Beginn field_done_ratio: %% erledigt field_auth_source: Authentifizierungs-Modus -field_hide_mail: Email-Adresse nicht anzeigen +field_hide_mail: E-Mail-Adresse nicht anzeigen field_comments: Kommentar field_url: URL field_start_page: Hauptseite @@ -421,7 +421,7 @@ label_feeds_access_key_created_on: RSS-Zugriffsschlüssel vor %s erstellt label_module_plural: Module label_added_time_by: Von %s vor %s hinzugefügt label_updated_time: Vor %s aktualisiert -label_jump_to_a_project: Jump to a project... +label_jump_to_a_project: Zu einem Projekt springen... button_login: Anmelden button_submit: OK @@ -470,8 +470,8 @@ text_journal_changed: geändert von %s zu %s text_journal_set_to: gestellt zu %s text_journal_deleted: gelöscht text_tip_task_begin_day: Aufgabe, die an diesem Tag beginnt -text_tip_task_end_day: Aufgabe, die an diesem Tag beendet -text_tip_task_begin_end_day: Aufgabe, die an diesem Tag beginnt und beendet +text_tip_task_end_day: Aufgabe, die an diesem Tag endet +text_tip_task_begin_end_day: Aufgabe, die an diesem Tag beginnt und endet text_project_identifier_info: 'Kleinbuchstaben (a-z), Ziffern und Bindestriche erlaubt.<br />Einmal gespeichert, kann die Kennung nicht mehr geändert werden.' text_caracters_maximum: Max. %d Zeichen. text_length_between: Länge zwischen %d und %d Zeichen. @@ -482,9 +482,9 @@ text_issues_ref_in_commit_messages: Ticket-Beziehungen und -Status in Commit-Log text_issue_added: Ticket %s wurde erstellt. text_issue_updated: Ticket %s wurde aktualisiert. text_wiki_destroy_confirmation: Sind Sie sicher, dass Sie dieses Wiki mit sämtlichem Inhalt löschen möchten? -text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ? -text_issue_category_destroy_assignments: Remove category assignments -text_issue_category_reassign_to: Reassing issues to this category +text_issue_category_destroy_question: Einige Tickets (%d) sind dieser Kategorie zugeodnet. Was möchten Sie tun? +text_issue_category_destroy_assignments: Kategorie-Zuordnung entfernen +text_issue_category_reassign_to: Tickets dieser Kategorie zuordnen default_role_manager: Manager default_role_developper: Developer @@ -511,38 +511,38 @@ default_activity_development: Development enumeration_issue_priorities: Ticket-Prioritäten enumeration_doc_categories: Dokumentenkategorien enumeration_activities: Aktivitäten (Zeiterfassung) -label_file_plural: Files +label_file_plural: Dateien label_changeset_plural: Changesets -field_column_names: Columns -label_default_columns: Default columns -setting_issue_list_default_columns: Default columns displayed on the issue list -setting_repositories_encodings: Repositories encodings -notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit." -label_bulk_edit_selected_issues: Bulk edit selected issues -label_no_change_option: (No change) -notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s." -label_theme: Theme +field_column_names: Spalten +label_default_columns: Default-Spalten +setting_issue_list_default_columns: Default-Spalten in der Ticket-Auflistung +setting_repositories_encodings: Repository-Kodierung +notice_no_issue_selected: "Kein Ticket ausgewählt! Bitte wählen Sie die Tickets, die Sie bearbeiten möchten." +label_bulk_edit_selected_issues: Alle ausgewählten Tickets bearbeiten +label_no_change_option: (Keine Änderung) +notice_failed_to_save_issues: "%d von %d ausgewählten Tickets konnte(n) nicht gespeichert werden: %s." +label_theme: Stil label_default: Default -label_search_titles_only: Search titles only -label_nobody: nobody -button_change_password: Change password -text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)." -label_user_mail_option_selected: "For any event on the selected projects only..." -label_user_mail_option_all: "For any event on all my projects" -label_user_mail_option_none: "Only for things I watch or I'm involved in" -setting_emails_footer: Emails footer -label_float: Float -button_copy: Copy -mail_body_account_information_external: You can use your "%s" account to log into Redmine. -mail_body_account_information: Your Redmine account information -setting_protocol: Protocol -label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself" -setting_time_format: Time format -label_registration_activation_by_email: account activation by email -mail_subject_account_activation_request: Redmine account activation request -mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:' -label_registration_automatic_activation: automatic account activation -label_registration_manual_activation: manual account activation -notice_account_pending: "Your account was created and is now pending administrator approval." -field_time_zone: Time zone -text_caracters_minimum: Must be at least %d characters long. +label_search_titles_only: Nur Titel durchsuchen +label_nobody: Niemand +button_change_password: Kennwort ändern +text_user_mail_option: "Für nicht ausgewählte Projekte werden Sie nur Benachrichtigungen für Dinge erhalten, die Sie beobachten oder an denen Sie beteiligt sind (z.B. Tickets, deren Autor Sie sind oder die Ihnen zugewiesen sind)." +label_user_mail_option_selected: "Für alle Ereignisse in den ausgewählten Projekten..." +label_user_mail_option_all: "Für alle Ereignisse in all meinen Projekten" +label_user_mail_option_none: "Nur für Dinge, die ich beobachte oder an denen ich beteiligt bin" +setting_emails_footer: E-Mail-Fußzeile +label_float: Fließkommazahl +button_copy: Kopieren +mail_body_account_information_external: Sie können sich mit Ihrem Konto "%s" an Redmine anmelden. +mail_body_account_information: Ihre Redmine Konto-Informationen +setting_protocol: Protokoll +label_user_mail_no_self_notified: "Ich möchte nicht über Änderungen benachrichtigt werden, die ich selbst durchführe." +setting_time_format: Zeitformat +label_registration_activation_by_email: Kontoaktivierung durch E-Mail +mail_subject_account_activation_request: Antrag auf Redmine Kontoaktivierung +mail_body_account_activation_request: 'Ein neuer Benutzer (%s) hat sich registriert. Sein Konto wartet auf Ihre Genehmigung:' +label_registration_automatic_activation: Automatische Kontoaktivierung +label_registration_manual_activation: Manuelle Kontoaktivierung +notice_account_pending: "Ihr Konto wurde erstellt und wartet jetzt auf die Genehmigung des Administrators." +field_time_zone: Zeitzone +text_caracters_minimum: Muss mindestens %d Zeichen lang sein. diff --git a/lang/es.yml b/lang/es.yml index ab4309ca1..b10bbd929 100644 --- a/lang/es.yml +++ b/lang/es.yml @@ -29,7 +29,7 @@ activerecord_error_blank: no puede estar en blanco activerecord_error_too_long: es demasiado largo activerecord_error_too_short: es demasiado corto activerecord_error_wrong_length: la longitud es incorrecta -activerecord_error_taken: has already been taken +activerecord_error_taken: ya está siendo usado activerecord_error_not_a_number: no es un número activerecord_error_not_a_date: no es una fecha válida activerecord_error_greater_than_start_date: debe ser la fecha mayor que del comienzo @@ -60,7 +60,7 @@ notice_account_wrong_password: Contraseña incorrecta. notice_account_register_done: Cuenta creada correctamente. notice_account_unknown_email: Usuario desconocido. notice_can_t_change_password: Esta cuenta utiliza una fuente de autenticación externa. No es posible cambiar la contraseña. -notice_account_lost_email_sent: Un correo con instrucciones para elegir una nueva contraseña le ha sido enviado. +notice_account_lost_email_sent: Se le ha enviado un correo con instrucciones para elegir una nueva contraseña. notice_account_activated: Su cuenta ha sido activada. Ahora se encuentra conectado. notice_successful_create: Creación correcta. notice_successful_update: Modificación correcta. @@ -226,7 +226,7 @@ label_administration: Administración label_login: Conexión label_logout: Desconexión label_help: Ayuda -label_reported_issues: Peticiones registradas +label_reported_issues: Peticiones registradas por mí label_assigned_to_me_issues: Peticiones que me están asignadas label_last_login: Última conexión label_last_updates: Actualizado @@ -257,7 +257,7 @@ label_change_status: Cambiar el estado label_history: Histórico label_attachment: Fichero label_attachment_new: Nuevo fichero -label_attachment_delete: Suprimir el fichero +label_attachment_delete: Borrar el fichero label_attachment_plural: Ficheros label_report: Informe label_report_plural: Informes @@ -303,10 +303,10 @@ label_comment: Comentario label_comment_plural: Comentarios label_comment_add: Añadir un comentario label_comment_added: Comentario añadido -label_comment_delete: Suprimir comentarios -label_query: Pregunta personalizada -label_query_plural: Preguntas personalizadas -label_query_new: Nueva pregunta +label_comment_delete: Borrar comentarios +label_query: Consulta personalizada +label_query_plural: Consultas personalizadas +label_query_new: Nueva consulta label_filter_add: Añadir el filtro label_filter_plural: Filtros label_equals: igual @@ -334,7 +334,7 @@ label_latest_revision: La revisión más actual label_latest_revision_plural: Las revisiones más actuales label_view_revisions: Ver las revisiones label_max_size: Tamaño máximo -label_on: en +label_on: de label_sort_highest: Primero label_sort_higher: Subir label_sort_lower: Bajar @@ -344,7 +344,7 @@ label_roadmap_due_in: Realizado en label_roadmap_no_issues: No hay peticiones para esta versión label_search: Búsqueda label_result: %d resultado -label_result_plural: %d resultados +label_result_plural: Resultados label_all_words: Todas las palabras label_wiki: Wiki label_wiki_edit: Wiki edicción @@ -353,7 +353,7 @@ label_wiki_page: Wiki página label_wiki_page_plural: Wiki páginas label_page_index: Índice label_current_version: Versión actual -label_preview: Previo +label_preview: Previsualizar label_feed_plural: Feeds label_changes_details: Detalles de todos los cambios label_issue_tracking: Peticiones @@ -391,10 +391,10 @@ label_stay_logged_in: Recordar conexión label_disabled: deshabilitado label_show_completed_versions: Muestra las versiones completas label_me: me -label_board: Forum -label_board_new: Nuevo forum -label_board_plural: Forums -label_topic_plural: Topics +label_board: Foro +label_board_new: Nuevo foro +label_board_plural: Foros +label_topic_plural: Temas label_message_plural: Mensajes label_message_last: Último mensaje label_message_new: Nuevo mensaje @@ -409,10 +409,10 @@ label_language_based: Badado en el idioma button_login: Conexión button_submit: Aceptar -button_save: Validar +button_save: Guardar button_check_all: Seleccionar todo button_uncheck_all: No seleccionar nada -button_delete: Suprimir +button_delete: Borrar button_create: Crear button_test: Testar button_edit: Modificar @@ -455,30 +455,30 @@ text_tip_task_begin_day: tarea que comienza este día text_tip_task_end_day: tarea que termina este día text_tip_task_begin_end_day: tarea que comienza y termina este día text_project_identifier_info: 'Letras minúsculas (a-z), números y signos de puntuación permitidos.<br />Una vez guardado, el identificador no puede modificarse.' -text_caracters_maximum: %d caracteres máximo. -text_length_between: Longitud entre %d y %d caracteres. +text_caracters_maximum: %d carácteres como máximo. +text_length_between: Longitud entre %d y %d carácteres. text_tracker_no_workflow: No hay ningún workflow definido para este tracker -text_unallowed_characters: Caracteres no permitidos +text_unallowed_characters: Carácteres no permitidos text_comma_separated: Múltiples valores permitidos (separados por coma). text_issues_ref_in_commit_messages: Referencia y petición de corrección en los mensajes -default_role_manager: Manager +default_role_manager: Jefe de proyecto default_role_developper: Desarrollador default_role_reporter: Informador -default_tracker_bug: Anomalía -default_tracker_feature: Evolución -default_tracker_support: Asistencia -default_issue_status_new: Nuevo +default_tracker_bug: Errores +default_tracker_feature: Tareas +default_tracker_support: Soporte +default_issue_status_new: Nueva default_issue_status_assigned: Asignada default_issue_status_resolved: Resuelta -default_issue_status_feedback: Comentario +default_issue_status_feedback: Comentarios default_issue_status_closed: Cerrada default_issue_status_rejected: Rechazada -default_doc_category_user: Documentación del usuario +default_doc_category_user: Documentación de usuario default_doc_category_tech: Documentación tecnica -default_priority_low: Bajo +default_priority_low: Baja default_priority_normal: Normal -default_priority_high: Alto +default_priority_high: Alta default_priority_urgent: Urgente default_priority_immediate: Inmediata default_activity_design: Diseño @@ -494,13 +494,13 @@ text_issue_category_destroy_question: Algunas peticiones (%d) están asignadas a label_feeds_access_key_created_on: Clave de acceso por RSS creada hace %s label_default_columns: Columnas por defecto setting_cross_project_issue_relations: Permitir relacionar peticiones de distintos proyectos -label_roadmap_overdue: %s late +label_roadmap_overdue: %s tarde label_module_plural: Módulos -label_this_week: this week -label_index_by_title: Index by title +label_this_week: esta semana +label_index_by_title: Índice por título label_jump_to_a_project: Ir al proyecto... field_assignable: Se pueden asignar peticiones a este perfil -label_sort_by: Sort by %s +label_sort_by: Ordenar por %s setting_issue_list_default_columns: Columnas por defecto para la lista de peticiones text_issue_updated: La petición %s ha sido actualizada. notice_feeds_access_key_reseted: Su clave de acceso para RSS ha sido reiniciada @@ -518,7 +518,7 @@ label_send_test_email: Enviar un correo de prueba button_reset: Reset label_added_time_by: Añadido por %s hace %s field_estimated_hours: Tiempo estimado -label_changeset_plural: Changesets +label_changeset_plural: Cambios setting_repositories_encodings: Codificaciones del repositorio notice_no_issue_selected: "Ninguna petición seleccionada. Por favor, compruebe la petición que quiere modificar" label_bulk_edit_selected_issues: Bulk edit selected issues @@ -539,13 +539,13 @@ button_copy: Copiar mail_body_account_information_external: Puede usar su cuenta "%s" para conectarse a Redmine. mail_body_account_information: Información sobre su cuenta de Redmine setting_protocol: Protocolo -text_caracters_minimum: Must be at least %d characters long. -field_time_zone: Time zone -label_registration_activation_by_email: account activation by email -label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself" -mail_subject_account_activation_request: Redmine account activation request -mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:' -label_registration_automatic_activation: automatic account activation -label_registration_manual_activation: manual account activation -notice_account_pending: "Your account was created and is now pending administrator approval." -setting_time_format: Time format +text_caracters_minimum: %d carácteres como mínimo +field_time_zone: Zona horaria +label_registration_activation_by_email: activación de cuenta por correo +label_user_mail_no_self_notified: "No quiero ser avisado de cambios hechos por mí" +mail_subject_account_activation_request: Petición de activación de cuenta Redmine +mail_body_account_activation_request: "Un nuevo usuario (%s) ha sido registrado. Esta cuenta está pendiende de aprobación" +label_registration_automatic_activation: activación automática de cuenta +label_registration_manual_activation: activación manual de cuenta +notice_account_pending: "Su cuenta ha sido creada y está pendiende de la aprobación por parte de administrador" +setting_time_format: Formato de hora diff --git a/public/.htaccess b/public/.htaccess index d3c998345..3d3fb88bc 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -1,40 +1,55 @@ -# General Apache options -AddHandler fastcgi-script .fcgi -AddHandler cgi-script .cgi -Options +FollowSymLinks +ExecCGI - -# If you don't want Rails to look in certain directories, -# use the following rewrite rules so that Apache won't rewrite certain requests -# -# Example: -# RewriteCond %{REQUEST_URI} ^/notrails.* -# RewriteRule .* - [L] - -# Redirect all requests not available on the filesystem to Rails -# By default the cgi dispatcher is used which is very slow -# -# For better performance replace the dispatcher with the fastcgi one -# -# Example: -# RewriteRule ^(.*)$ dispatch.fcgi [QSA,L] -RewriteEngine On - -# If your Rails application is accessed via an Alias directive, -# then you MUST also set the RewriteBase in this htaccess file. -# -# Example: -# Alias /myrailsapp /path/to/myrailsapp/public -# RewriteBase /myrailsapp - -RewriteRule ^$ index.html [QSA] -RewriteRule ^([^.]+)$ $1.html [QSA] -RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule ^(.*)$ dispatch.cgi [QSA,L] - -# In case Rails experiences terminal errors -# Instead of displaying this message you can supply a file here which will be rendered instead -# -# Example: -# ErrorDocument 500 /500.html - +# General Apache options
+<IfModule mod_fastcgi.c>
+ AddHandler fastcgi-script .fcgi
+</IfModule>
+<IfModule mod_fcgid.c>
+ AddHandler fcgid-script .fcgi
+</IfModule>
+<IfModule mod_cgi.c>
+ AddHandler cgi-script .cgi
+</IfModule>
+Options +FollowSymLinks +ExecCGI
+
+# If you don't want Rails to look in certain directories,
+# use the following rewrite rules so that Apache won't rewrite certain requests
+#
+# Example:
+# RewriteCond %{REQUEST_URI} ^/notrails.*
+# RewriteRule .* - [L]
+
+# Redirect all requests not available on the filesystem to Rails
+# By default the cgi dispatcher is used which is very slow
+#
+# For better performance replace the dispatcher with the fastcgi one
+#
+# Example:
+# RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
+RewriteEngine On
+
+# If your Rails application is accessed via an Alias directive,
+# then you MUST also set the RewriteBase in this htaccess file.
+#
+# Example:
+# Alias /myrailsapp /path/to/myrailsapp/public
+# RewriteBase /myrailsapp
+
+RewriteRule ^$ index.html [QSA]
+RewriteRule ^([^.]+)$ $1.html [QSA]
+RewriteCond %{REQUEST_FILENAME} !-f
+<IfModule mod_fastcgi.c>
+ RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
+</IfModule>
+<IfModule mod_fcgid.c>
+ RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
+</IfModule>
+<IfModule mod_cgi.c>
+ RewriteRule ^(.*)$ dispatch.cgi [QSA,L]
+</IfModule>
+
+# In case Rails experiences terminal errors
+# Instead of displaying this message you can supply a file here which will be rendered instead
+#
+# Example:
+# ErrorDocument 500 /500.html
+
ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"
\ No newline at end of file |