diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index abe76c797..b66851eef 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -95,6 +95,10 @@ module ApplicationHelper l(:label_added_time_by, author || 'Anonymous', time_tag) end + def l_or_humanize(s) + l_has_string?("label_#{s}".to_sym) ? l("label_#{s}".to_sym) : s.to_s.humanize + end + def day_name(day) l(:general_day_names).split(',')[day-1] end diff --git a/app/views/projects/settings/_modules.rhtml b/app/views/projects/settings/_modules.rhtml index 2ecdaf7e8..d600f2090 100644 --- a/app/views/projects/settings/_modules.rhtml +++ b/app/views/projects/settings/_modules.rhtml @@ -3,7 +3,7 @@ :html => {:id => 'modules-form'} do |f| %>
-Select modules to enable for this project: +<%= l(:text_select_project_modules) %>
<% Redmine::AccessControl.available_project_modules.each do |m| %>

diff --git a/app/views/projects/settings/_repository.rhtml b/app/views/projects/settings/_repository.rhtml index 10530a296..95830ab98 100644 --- a/app/views/projects/settings/_repository.rhtml +++ b/app/views/projects/settings/_repository.rhtml @@ -1,11 +1,12 @@ <% remote_form_for :repository, @repository, :url => { :controller => 'repositories', :action => 'edit', :id => @project }, - :builder => TabularFormBuilder do |f| %> + :builder => TabularFormBuilder, + :lang => current_language do |f| %> <%= error_messages_for 'repository' %>
-

<%= scm_select_tag(@repository) %>

+

<%= scm_select_tag(@repository) %>

<%= repository_field_tags(f, @repository) if @repository %>
diff --git a/app/views/projects/settings/_wiki.rhtml b/app/views/projects/settings/_wiki.rhtml index 267c077e1..00da93039 100644 --- a/app/views/projects/settings/_wiki.rhtml +++ b/app/views/projects/settings/_wiki.rhtml @@ -1,6 +1,7 @@ <% remote_form_for :wiki, @wiki, :url => { :controller => 'wikis', :action => 'edit', :id => @project }, - :builder => TabularFormBuilder do |f| %> + :builder => TabularFormBuilder, + :lang => current_language do |f| %> <%= error_messages_for 'wiki' %> diff --git a/app/views/settings/_notifications.rhtml b/app/views/settings/_notifications.rhtml index ca04352f4..ac3213853 100644 --- a/app/views/settings/_notifications.rhtml +++ b/app/views/settings/_notifications.rhtml @@ -12,7 +12,7 @@
<%=l(:text_select_mail_notifications)%> <% @notifiables.each do |notifiable| %>
+ <%= l_or_humanize(notifiable) %>
<% end %> <%= hidden_field_tag 'settings[notified_events][]', '' %>

<%= check_all_links('mail-options-form') %>

diff --git a/lang/bg.yml b/lang/bg.yml index 164d67671..88ac9c889 100644 --- a/lang/bg.yml +++ b/lang/bg.yml @@ -569,3 +569,11 @@ setting_user_format: Потребителски формат text_status_changed_by_changeset: Applied in changeset %s. label_more: More text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added diff --git a/lang/cs.yml b/lang/cs.yml index 86a111cc7..fd4ee5223 100644 --- a/lang/cs.yml +++ b/lang/cs.yml @@ -569,3 +569,11 @@ setting_user_format: Users display format text_status_changed_by_changeset: Applied in changeset %s. label_more: More text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added diff --git a/lang/de.yml b/lang/de.yml index c5a6cdf95..ba6589b24 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -569,3 +569,11 @@ enumeration_activities: Aktivitäten (Zeiterfassung) text_status_changed_by_changeset: Applied in changeset %s. label_more: More text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added diff --git a/lang/en.yml b/lang/en.yml index a37be93c7..c0b986238 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -219,9 +219,12 @@ label_issue_new: New issue label_issue_plural: Issues label_issue_view_all: View all issues label_issues_by: Issues by %s +label_issue_added: Issue added +label_issue_updated: Issue updated label_document: Document label_document_new: New document label_document_plural: Documents +label_document_added: Document added label_role: Role label_role_plural: Roles label_role_new: New role @@ -291,6 +294,7 @@ label_attachment: File label_attachment_new: New file label_attachment_delete: Delete file label_attachment_plural: Files +label_file_added: File added label_report: Report label_report_plural: Reports label_news: News @@ -298,6 +302,7 @@ label_news_new: Add news label_news_plural: News label_news_latest: Latest news label_news_view_all: View all news +label_news_added: News added label_change_log: Change log label_settings: Settings label_overview: Overview @@ -435,6 +440,7 @@ label_topic_plural: Topics label_message_plural: Messages label_message_last: Last message label_message_new: New message +label_message_posted: Message added label_reply_plural: Replies label_send_information: Send account information to the user label_year: Year @@ -470,6 +476,7 @@ label_age: Age label_change_properties: Change properties label_general: General label_more: More +label_scm: SCM button_login: Login button_submit: Submit @@ -543,6 +550,7 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n text_load_default_configuration: Load the default configuration text_status_changed_by_changeset: Applied in changeset %s. text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +text_select_project_modules: 'Select modules to enable for this project:' default_role_manager: Manager default_role_developper: Developer diff --git a/lang/es.yml b/lang/es.yml index 1bc7d00fb..d76e7c8a6 100644 --- a/lang/es.yml +++ b/lang/es.yml @@ -572,3 +572,11 @@ setting_user_format: Users display format text_status_changed_by_changeset: Applied in changeset %s. label_more: More text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added diff --git a/lang/fi.yml b/lang/fi.yml index dda26242b..f9bb3620d 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -573,3 +573,11 @@ setting_user_format: Käyttäjien esitysmuoto text_status_changed_by_changeset: Applied in changeset %s. text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' label_more: More +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added diff --git a/lang/fr.yml b/lang/fr.yml index 8c569fc5a..2f2c3cab1 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -68,7 +68,6 @@ notice_successful_delete: Suppression effectuée avec succès. notice_successful_connection: Connection réussie. notice_file_not_found: "La page à laquelle vous souhaitez accéder n'existe pas ou a été supprimée." notice_locking_conflict: Les données ont été mises à jour par un autre utilisateur. Mise à jour impossible. -notice_scm_error: "L'entrée et/ou la révision demandée n'existe pas dans le dépôt." notice_not_authorized: "Vous n'êtes pas autorisés à accéder à cette page." notice_email_sent: "Un email a été envoyé à %s" notice_email_error: "Erreur lors de l'envoi de l'email (%s)" @@ -219,10 +218,13 @@ label_issue: Demande label_issue_new: Nouvelle demande label_issue_plural: Demandes label_issue_view_all: Voir toutes les demandes +label_issue_added: Demande ajoutée +label_issue_updated: Demande mise à jour label_issues_by: Demandes par %s label_document: Document label_document_new: Nouveau document label_document_plural: Documents +label_document_added: Document ajouté label_role: Rôle label_role_plural: Rôles label_role_new: Nouveau rôle @@ -292,6 +294,7 @@ label_attachment: Fichier label_attachment_new: Nouveau fichier label_attachment_delete: Supprimer le fichier label_attachment_plural: Fichiers +label_file_added: Fichier ajouté label_report: Rapport label_report_plural: Rapports label_news: Annonce @@ -299,6 +302,7 @@ label_news_new: Nouvelle annonce label_news_plural: Annonces label_news_latest: Dernières annonces label_news_view_all: Voir toutes les annonces +label_news_added: Annonce ajoutée label_change_log: Historique label_settings: Configuration label_overview: Aperçu @@ -436,6 +440,7 @@ label_topic_plural: Discussions label_message_plural: Messages label_message_last: Dernier message label_message_new: Nouveau message +label_message_posted: Message ajouté label_reply_plural: Réponses label_send_information: Envoyer les informations à l'utilisateur label_year: Année @@ -471,6 +476,7 @@ label_age: Age label_change_properties: Changer les propriétés label_general: Général label_more: Plus +label_scm: SCM button_login: Connexion button_submit: Soumettre @@ -513,7 +519,7 @@ status_active: actif status_registered: enregistré status_locked: vérouillé -text_select_mail_notifications: Sélectionner les actions pour lesquelles la notification par mail doit être activée. +text_select_mail_notifications: Actions pour lesquelles une notification par e-mail est envoyée text_regexp_info: ex. ^[A-Z0-9]+$ text_min_max_length_info: 0 pour aucune restriction text_project_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce projet et tout ce qui lui est rattaché ? @@ -544,6 +550,7 @@ text_no_configuration_data: "Les rôles, trackers, statuts et le workflow ne son text_load_default_configuration: Charger le paramétrage par défaut text_status_changed_by_changeset: Appliqué par commit %s. text_issues_destroy_confirmation: 'Etes-vous sûr de vouloir supprimer le(s) demandes(s) selectionnée(s) ?' +text_select_project_modules: 'Selectionner les modules à activer pour ce project:' default_role_manager: Manager default_role_developper: Développeur diff --git a/lang/he.yml b/lang/he.yml index 6631a457f..9cd91d387 100644 --- a/lang/he.yml +++ b/lang/he.yml @@ -569,3 +569,11 @@ setting_user_format: Users display format text_status_changed_by_changeset: Applied in changeset %s. label_more: More text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added diff --git a/lang/it.yml b/lang/it.yml index 3c77c97a6..78bfbb9c3 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -569,3 +569,11 @@ setting_user_format: Users display format text_status_changed_by_changeset: Applied in changeset %s. label_more: More text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added diff --git a/lang/ja.yml b/lang/ja.yml index 50d23e80f..0ef22d50b 100644 --- a/lang/ja.yml +++ b/lang/ja.yml @@ -570,3 +570,11 @@ setting_user_format: Users display format text_status_changed_by_changeset: Applied in changeset %s. label_more: More text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added diff --git a/lang/ko.yml b/lang/ko.yml index 62ec95ef3..606cf7e11 100644 --- a/lang/ko.yml +++ b/lang/ko.yml @@ -569,3 +569,11 @@ setting_user_format: Users display format text_status_changed_by_changeset: Applied in changeset %s. label_more: More text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added diff --git a/lang/lt.yml b/lang/lt.yml index a7b12736a..383654300 100644 --- a/lang/lt.yml +++ b/lang/lt.yml @@ -570,3 +570,11 @@ setting_user_format: Vartotojo atvaizdavimo formatas text_status_changed_by_changeset: Applied in changeset %s. label_more: More text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added diff --git a/lang/nl.yml b/lang/nl.yml index 7b5f6bf3a..30ea9dd5d 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -570,3 +570,11 @@ setting_user_format: Users display format text_status_changed_by_changeset: Applied in changeset %s. label_more: More text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added diff --git a/lang/pl.yml b/lang/pl.yml index 5c12c658f..fce25d09b 100644 --- a/lang/pl.yml +++ b/lang/pl.yml @@ -569,3 +569,11 @@ setting_user_format: Users display format text_status_changed_by_changeset: Applied in changeset %s. label_more: More text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added diff --git a/lang/pt-br.yml b/lang/pt-br.yml index 4616e83a7..4df1c9c1e 100644 --- a/lang/pt-br.yml +++ b/lang/pt-br.yml @@ -569,3 +569,11 @@ setting_user_format: Users display format text_status_changed_by_changeset: Applied in changeset %s. label_more: More text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added diff --git a/lang/pt.yml b/lang/pt.yml index 31df179f2..9aa017ee9 100644 --- a/lang/pt.yml +++ b/lang/pt.yml @@ -569,3 +569,11 @@ setting_user_format: Users display format text_status_changed_by_changeset: Applied in changeset %s. label_more: More text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added diff --git a/lang/ro.yml b/lang/ro.yml index 52e856683..16f055413 100644 --- a/lang/ro.yml +++ b/lang/ro.yml @@ -569,3 +569,11 @@ setting_user_format: Users display format text_status_changed_by_changeset: Applied in changeset %s. label_more: More text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added diff --git a/lang/ru.yml b/lang/ru.yml index f4cbb9976..795bb7706 100644 --- a/lang/ru.yml +++ b/lang/ru.yml @@ -570,3 +570,11 @@ enumeration_activities: Действия (учет времени) text_status_changed_by_changeset: Реализовано в %s редакции. label_more: Больше text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added diff --git a/lang/sr.yml b/lang/sr.yml index c32394dc3..55f668790 100644 --- a/lang/sr.yml +++ b/lang/sr.yml @@ -570,3 +570,11 @@ setting_user_format: Users display format text_status_changed_by_changeset: Applied in changeset %s. label_more: More text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added diff --git a/lang/sv.yml b/lang/sv.yml index 40a1ce8f6..b2d637dca 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -570,3 +570,11 @@ setting_user_format: Users display format text_status_changed_by_changeset: Applied in changeset %s. label_more: More text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml index 601f5c2ec..ad4cff73b 100644 --- a/lang/zh-tw.yml +++ b/lang/zh-tw.yml @@ -569,3 +569,11 @@ enumeration_activities: 活動 (time tracking) text_status_changed_by_changeset: Applied in changeset %s. label_more: More text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added diff --git a/lang/zh.yml b/lang/zh.yml index fd513a96a..0edd41c52 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -572,3 +572,11 @@ setting_user_format: 用户显示格式 text_status_changed_by_changeset: Applied in changeset %s. label_more: More text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?' +label_scm: SCM +text_select_project_modules: 'Select modules to enable for this project:' +label_issue_added: Issue added +label_issue_updated: Issue updated +label_document_added: Document added +label_message_posted: Message added +label_file_added: File added +label_news_added: News added