From: Eric Davis Date: Thu, 19 Aug 2010 04:30:23 +0000 (+0000) Subject: Merged r3907 from trunk. X-Git-Tag: 1.0.1~61 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=acaa223cf887949a307a9156045cbf0ad4671351;p=redmine.git Merged r3907 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3957 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/models/mailer.rb b/app/models/mailer.rb index f39c53209..8f50b1b7b 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -80,7 +80,7 @@ class Mailer < ActionMailer::Base def reminder(user, issues, days) set_language_if_valid user.language recipients user.mail - subject l(:mail_subject_reminder, issues.size) + subject l(:mail_subject_reminder, :count => issues.size, :days => days) body :issues => issues, :days => days, :issues_url => url_for(:controller => 'issues', :action => 'index', :set_filter => 1, :assigned_to_id => user.id, :sort_key => 'due_date', :sort_order => 'asc') diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 051bbdaf2..8b2b23704 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -704,7 +704,7 @@ bg: text_subprojects_destroy_warning: "Its subproject(s): {{value}} will be also deleted." label_and_its_subprojects: "{{value}} and its subprojects" mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:" - mail_subject_reminder: "{{count}} issue(s) due in the next days" + mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days" text_user_wrote: "{{value}} wrote:" label_duplicated_by: duplicated by setting_enabled_scm: Enabled SCM diff --git a/config/locales/bs.yml b/config/locales/bs.yml index d3fe0a128..3d476ae13 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -184,7 +184,7 @@ bs: mail_body_account_information: Informacija o vašem korisničkom računu mail_subject_account_activation_request: "{{value}} zahtjev za aktivaciju korisničkog računa" mail_body_account_activation_request: "Novi korisnik ({{value}}) se registrovao. Korisnički račun čeka vaše odobrenje za aktivaciju:" - mail_subject_reminder: "{{count}} aktivnost(i) u kašnjenju u narednim danima" + mail_subject_reminder: "{{count}} aktivnost(i) u kašnjenju u narednim {{days}} danima" mail_body_reminder: "{{count}} aktivnost(i) koje su dodjeljenje vama u narednim {{days}} danima:" gui_validation_error: 1 greška diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 5f54930d1..1e47d3d66 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -166,7 +166,7 @@ ca: mail_body_account_information: Informació del compte mail_subject_account_activation_request: "Sol·licitud d'activació del compte de {{value}}" mail_body_account_activation_request: "S'ha registrat un usuari nou ({{value}}). El seu compte està pendent d'aprovació:" - mail_subject_reminder: "%d assumptes venceran els següents {{count}} dies" + mail_subject_reminder: "{{count}} assumptes venceran els següents {{days}} dies" mail_body_reminder: "{{count}} assumptes que teniu assignades venceran els següents {{days}} dies:" gui_validation_error: 1 error diff --git a/config/locales/cs.yml b/config/locales/cs.yml index b00527956..de4ad44c5 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -710,7 +710,7 @@ cs: text_subprojects_destroy_warning: "Jeho podprojek(y): {{value}} budou také smazány." label_and_its_subprojects: "{{value}} a jeho podprojekty" mail_body_reminder: "{{count}} úkol(ů), které máte přiřazeny má termín během několik dní ({{days}}):" - mail_subject_reminder: "{{count}} úkol(ů) má termín během několik dní" + mail_subject_reminder: "{{count}} úkol(ů) má termín během několik dní ({{days}})" text_user_wrote: "{{value}} napsal:" label_duplicated_by: duplicated by setting_enabled_scm: Povoleno SCM diff --git a/config/locales/da.yml b/config/locales/da.yml index 069674685..b241a52d8 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -791,7 +791,7 @@ da: permission_browse_repository: Gennemse repository permission_manage_repository: Administrér repository permission_manage_members: Administrér medlemmer - mail_subject_reminder: "{{count}} sag(er) har deadline i de kommende dage" + mail_subject_reminder: "{{count}} sag(er) har deadline i de kommende dage ({{days}})" permission_add_issue_notes: Tilføj noter permission_edit_messages: Redigér beskeder permission_view_issue_watchers: Se liste over overvågere diff --git a/config/locales/de.yml b/config/locales/de.yml index 05d5d9630..f7f9043c4 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -207,7 +207,7 @@ de: mail_body_account_information: Ihre Konto-Informationen mail_subject_account_activation_request: "Antrag auf {{value}} Kontoaktivierung" mail_body_account_activation_request: "Ein neuer Benutzer ({{value}}) hat sich registriert. Sein Konto wartet auf Ihre Genehmigung:" - mail_subject_reminder: "{{count}} Tickets müssen in den nächsten Tagen abgegeben werden" + mail_subject_reminder: "{{count}} Tickets müssen in den nächsten {{days}} Tagen abgegeben werden" mail_body_reminder: "{{count}} Tickets, die Ihnen zugewiesen sind, müssen in den nächsten {{days}} Tagen abgegeben werden:" mail_subject_wiki_content_added: "Wiki-Seite '{{page}}' hinzugefügt" mail_body_wiki_content_added: "Die Wiki-Seite '{{page}}' wurde von {{author}} hinzugefügt." diff --git a/config/locales/el.yml b/config/locales/el.yml index 6176a6c8e..a9146a611 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -171,7 +171,7 @@ el: mail_body_account_information: Πληροφορίες του λογαριασμού σας mail_subject_account_activation_request: "αίτημα ενεργοποίησης λογαριασμού {{value}}" mail_body_account_activation_request: "'Ένας νέος χρήστης ({{value}}) έχει εγγραφεί. Ο λογαριασμός είναι σε στάδιο αναμονής της έγκρισης σας:" - mail_subject_reminder: "{{count}} θέμα(τα) με προθεσμία στις επόμενες ημέρες" + mail_subject_reminder: "{{count}} θέμα(τα) με προθεσμία στις επόμενες {{days}} ημέρες" mail_body_reminder: "{{count}}θέμα(τα) που έχουν ανατεθεί σε σας, με προθεσμία στις επόμενες {{days}} ημέρες:" mail_subject_wiki_content_added: "'προστέθηκε η σελίδα wiki {{page}}' " mail_body_wiki_content_added: "Η σελίδα wiki '{{page}}' προστέθηκε από τον {{author}}." diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 2c19c4f49..118efbb4b 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -180,7 +180,7 @@ en-GB: mail_body_account_information: Your account information mail_subject_account_activation_request: "{{value}} account activation request" mail_body_account_activation_request: "A new user ({{value}}) has registered. The account is pending your approval:" - mail_subject_reminder: "{{count}} issue(s) due in the next days" + mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days" mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:" mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}." diff --git a/config/locales/en.yml b/config/locales/en.yml index 3ab257825..fb085695e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -183,7 +183,7 @@ en: mail_body_account_information: Your account information mail_subject_account_activation_request: "{{value}} account activation request" mail_body_account_activation_request: "A new user ({{value}}) has registered. The account is pending your approval:" - mail_subject_reminder: "{{count}} issue(s) due in the next days" + mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days" mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:" mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}." diff --git a/config/locales/es.yml b/config/locales/es.yml index 0a7a38a9c..bc345dcb5 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -662,7 +662,7 @@ es: mail_subject_account_activation_request: "Petición de activación de cuenta {{value}}" mail_subject_lost_password: "Tu contraseña del {{value}}" mail_subject_register: "Activación de la cuenta del {{value}}" - mail_subject_reminder: "{{count}} peticion(es) finalizan en los próximos días" + mail_subject_reminder: "{{count}} peticion(es) finalizan en los próximos {{days}} días" notice_account_activated: Su cuenta ha sido activada. Ya puede conectarse. notice_account_invalid_creditentials: Usuario o contraseña inválido. notice_account_lost_email_sent: Se le ha enviado un correo con instrucciones para elegir una nueva contraseña. diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 9f08652fc..741d3298f 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -180,7 +180,7 @@ eu: mail_body_account_information: Zure kontuaren informazioa mail_subject_account_activation_request: "{{value}} kontu gaitzeko eskaera" mail_body_account_activation_request: "Erabiltzaile berri bat ({{value}}) erregistratu da. Kontua zure onarpenaren zain dago:" - mail_subject_reminder: "{{count}} arazo hurrengo egunetan amaitzen d(ir)a" + mail_subject_reminder: "{{count}} arazo hurrengo {{days}} egunetan amaitzen d(ir)a" mail_body_reminder: "Zuri esleituta dauden {{count}} arazo hurrengo {{days}} egunetan amaitzen d(ir)a:" mail_subject_wiki_content_added: "'{{page}}' wiki orria gehitu da" mail_body_wiki_content_added: "{{author}}-(e)k '{{page}}' wiki orria gehitu du." diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 5556252cf..b6b48bac0 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -740,7 +740,7 @@ fi: text_subprojects_destroy_warning: "Tämän aliprojekti(t): {{value}} tullaan myös poistamaan." label_and_its_subprojects: "{{value}} ja aliprojektit" mail_body_reminder: "{{count}} sinulle nimettyä tapahtuma(a) erääntyy {{days}} päivä sisään:" - mail_subject_reminder: "{{count}} tapahtuma(a) erääntyy lähipäivinä" + mail_subject_reminder: "{{count}} tapahtuma(a) erääntyy {{days}} lähipäivinä" text_user_wrote: "{{value}} kirjoitti:" label_duplicated_by: kopioinut setting_enabled_scm: Versionhallinta käytettävissä diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 0efe114ea..1bc12685e 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -200,7 +200,7 @@ fr: mail_body_account_information: Paramètres de connexion de votre compte mail_subject_account_activation_request: "Demande d'activation d'un compte {{value}}" mail_body_account_activation_request: "Un nouvel utilisateur ({{value}}) s'est inscrit. Son compte nécessite votre approbation :" - mail_subject_reminder: "{{count}} demande(s) arrivent à échéance" + mail_subject_reminder: "{{count}} demande(s) arrivent à échéance ({{days}})" mail_body_reminder: "{{count}} demande(s) qui vous sont assignées arrivent à échéance dans les {{days}} prochains jours :" mail_subject_wiki_content_added: "Page wiki '{{page}}' ajoutée" mail_body_wiki_content_added: "La page wiki '{{page}}' a été ajoutée par {{author}}." diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 0652ce9e4..2a1d97ed7 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -639,7 +639,7 @@ gl: mail_subject_account_activation_request: "Petición de activación de conta {{value}}" mail_subject_lost_password: "O teu contrasinal de {{value}}" mail_subject_register: "Activación da conta de {{value}}" - mail_subject_reminder: "{{count}} petición(s) rematarán nos próximos días" + mail_subject_reminder: "{{count}} petición(s) rematarán nos próximos {{days}} días" notice_account_activated: A súa conta foi activada. Xa pode conectarse. notice_account_invalid_creditentials: Usuario ou contrasinal inválido. notice_account_lost_email_sent: Enviouse un correo con instrucións para elixir un novo contrasinal. diff --git a/config/locales/he.yml b/config/locales/he.yml index f84fd01fe..532c60195 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -192,7 +192,7 @@ he: mail_body_account_information: פרטי החשבון שלך mail_subject_account_activation_request: "בקשת הפעלה לחשבון {{value}}" mail_body_account_activation_request: "משתמש חדש ({{value}}) נרשם. החשבון שלו מחכה לאישור שלך:" - mail_subject_reminder: "{{count}} נושאים מיעדים להגשה בימים הקרובים" + mail_subject_reminder: "{{count}} נושאים מיעדים להגשה בימים הקרובים ({{days}})" mail_body_reminder: "{{count}} נושאים שמיועדים אליך מיועדים להגשה בתוך {{days}} ימים:" mail_subject_wiki_content_added: "דף ה־wiki ‏'{{page}}' נוסף" mail_body_wiki_content_added: דף ה־wiki ‏'{{page}}' נוסף ע"י {{author}}. diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 424fc7dc5..728a6d8e9 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -176,7 +176,7 @@ hr: mail_body_account_information: Vaši korisnički podaci mail_subject_account_activation_request: "{{value}} predmet za aktivaciju korisničkog računa" mail_body_account_activation_request: "Novi korisnik ({{value}}) je registriran. Njegov korisnički račun čeka vaše odobrenje:" - mail_subject_reminder: "{{count}} predmet(a) dospijeva sljedećih dana" + mail_subject_reminder: "{{count}} predmet(a) dospijeva sljedećih {{days}} dana" mail_body_reminder: "{{count}} vama dodijeljen(ih) predmet(a) dospijeva u sljedećih {{days}} dana:" mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}." diff --git a/config/locales/hu.yml b/config/locales/hu.yml index a62d07327..088027f1a 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -737,7 +737,7 @@ enumeration_doc_categories: Dokumentum kategóriák enumeration_activities: Tevékenységek (idő rögzítés) mail_body_reminder: "{{count}} neked kiosztott feladat határidős az elkövetkező {{days}} napban:" - mail_subject_reminder: "{{count}} feladat határidős az elkövetkező napokban" + mail_subject_reminder: "{{count}} feladat határidős az elkövetkező {{days}} napokban" text_user_wrote: "{{value}} írta:" label_duplicated_by: duplikálta setting_enabled_scm: Forráskódkezelő (SCM) engedélyezése diff --git a/config/locales/id.yml b/config/locales/id.yml index 5a14cda55..ec6688e5d 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -177,7 +177,7 @@ id: mail_body_account_information: Informasi akun anda mail_subject_account_activation_request: "Permintaan aktivasi akun {{value}} " mail_body_account_activation_request: "Pengguna baru ({{value}}) sudan didaftarkan. Akun tersebut menunggu persetujuan anda:" - mail_subject_reminder: "{{count}} masalah harus selesai pada hari berikutnya" + mail_subject_reminder: "{{count}} masalah harus selesai pada hari berikutnya ({{days}})" mail_body_reminder: "{{count}} masalah yang ditugaskan pada anda harus selesai dalam {{days}} hari kedepan:" mail_subject_wiki_content_added: "'{{page}}' halaman wiki sudah ditambahkan" mail_body_wiki_content_added: "The '{{page}}' halaman wiki sudah ditambahkan oleh {{author}}." diff --git a/config/locales/it.yml b/config/locales/it.yml index 758928f2a..bab1c6a91 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -717,7 +717,7 @@ it: text_subprojects_destroy_warning: "Anche i suoi sottoprogetti: {{value}} verranno eliminati." label_and_its_subprojects: "{{value}} ed i suoi sottoprogetti" mail_body_reminder: "{{count}} segnalazioni che ti sono state assegnate scadranno nei prossimi {{days}} giorni:" - mail_subject_reminder: "{{count}} segnalazioni in scadenza nei prossimi giorni" + mail_subject_reminder: "{{count}} segnalazioni in scadenza nei prossimi {{days}} giorni" text_user_wrote: "{{value}} ha scritto:" label_duplicated_by: duplicato da setting_enabled_scm: SCM abilitato diff --git a/config/locales/ja.yml b/config/locales/ja.yml index dc69c9792..c82155b8e 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -214,7 +214,7 @@ ja: mail_body_account_information: アカウント情報 mail_subject_account_activation_request: "{{value}} アカウントの承認要求" mail_body_account_activation_request: "新しいユーザ {{value}} が登録されました。このアカウントはあなたの承認待ちです：" - mail_subject_reminder: "{{count}}件のチケットが期日間近です" + mail_subject_reminder: "{{count}}件のチケットが{{days}}期日間近です" mail_body_reminder: "{{count}}件の担当チケットの期日が{{days}}日以内に到来します:" mail_subject_wiki_content_added: "Wikiページ {{page}} が追加されました" mail_body_wiki_content_added: "{{author}} によってWikiページ {{page}} が追加されました。" diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 6ba93edc3..d79c86cb9 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -228,7 +228,7 @@ ko: mail_subject_account_activation_request: "{{value}} 계정 활성화 요청" mail_body_account_activation_request: "새 사용자({{value}})가 등록되었습니다. 관리자님의 승인을 기다리고 있습니다.:" mail_body_reminder: "당신이 맡고 있는 일감 {{count}}개의 완료 기한이 {{days}}일 후 입니다." - mail_subject_reminder: "내일이 만기인 일감 {{count}}개" + mail_subject_reminder: "내일이 만기인 일감 {{count}}개 ({{days}})" mail_subject_wiki_content_added: "위키페이지 '{{page}}'이(가) 추가되었습니다." mail_subject_wiki_content_updated: "'위키페이지 {{page}}'이(가) 수정되었습니다." mail_body_wiki_content_added: "{{author}}이(가) 위키페이지 '{{page}}'을(를) 추가하였습니다." diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 675c3a14b..9bcafc71b 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -237,7 +237,7 @@ lt: mail_body_account_information: Informacija apie Jūsų paskyrą mail_subject_account_activation_request: "{{value}} paskyros aktyvavimo prašymas" mail_body_account_activation_request: "Užsiregistravo naujas vartotojas ({{value}}). Jo paskyra laukia jūsų patvirtinimo:" - mail_subject_reminder: "{{count}} darbas(ai) po kelių dienų" + mail_subject_reminder: "{{count}} darbas(ai) po kelių {{days}} dienų" mail_body_reminder: "{{count}} darbas(ai), kurie yra jums priskirti, baigiasi po {{days}} dienų(os):" mail_subject_wiki_content_added: "'{{page}}' pridėtas wiki puslapis" mail_body_wiki_content_added: "The '{{page}}' wiki puslapi pridėjo {{author}}." diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 4d49bd120..351f8528e 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -172,7 +172,7 @@ lv: mail_body_account_information: Jūsu konta informācija mail_subject_account_activation_request: "{{value}} konta aktivizācijas pieprasījums" mail_body_account_activation_request: "Jauns lietotājs ({{value}}) ir reģistrēts. Lietotāja konts gaida Jūsu apstiprinājumu:" - mail_subject_reminder: "{{count}} uzdevums(i) sagaidāms(i) tuvākajās dienās" + mail_subject_reminder: "{{count}} uzdevums(i) sagaidāms(i) tuvākajās {{days}} dienās" mail_body_reminder: "{{count}} uzdevums(i), kurš(i) ir nozīmēts(i) Jums, sagaidāms(i) tuvākajās {{days}} dienās:" mail_subject_wiki_content_added: "'{{page}}' Wiki lapa pievienota" mail_body_wiki_content_added: "The '{{page}}' Wiki lapu pievienojis {{author}}." diff --git a/config/locales/mn.yml b/config/locales/mn.yml index 63e808024..568e1f341 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -176,7 +176,7 @@ mn: mail_body_account_information: Таны дансны тухай мэдээлэл mail_subject_account_activation_request: "{{value}} дансыг идэвхжүүлэх хүсэлт" mail_body_account_activation_request: "Шинэ хэрэглэгч ({{value}}) бүртгүүлсэн байна. Таны баталгаажуулахыг хүлээж байна:" - mail_subject_reminder: "Дараагийн өдрүүдэд {{count}} асуудлыг шийдэх хэрэгтэй" + mail_subject_reminder: "Дараагийн өдрүүдэд {{count}} асуудлыг шийдэх хэрэгтэй ({{days}})" mail_body_reminder: "Танд оноогдсон {{count}} асуудлуудыг дараагийн {{days}} өдрүүдэд шийдэх хэрэгтэй:" mail_subject_wiki_content_added: "'{{page}}' wiki page has been added" mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}." diff --git a/config/locales/nl.yml b/config/locales/nl.yml index e24d5cbb5..4472a19d7 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -601,7 +601,7 @@ nl: mail_subject_account_activation_request: "{{value}} accountactivatieverzoek" mail_subject_lost_password: "uw {{value}} wachtwoord" mail_subject_register: "uw {{value}} accountactivatie" - mail_subject_reminder: "{{count}} issue(s) die voldaan moeten zijn in de komende dagen." + mail_subject_reminder: "{{count}} issue(s) die voldaan moeten zijn in de komende {{days}} dagen." notice_account_activated: uw account is geactiveerd. u kunt nu inloggen. notice_account_invalid_creditentials: Incorrecte gebruikersnaam of wachtwoord notice_account_lost_email_sent: Er is een e-mail naar u verstuurd met instructies over het kiezen van een nieuw wachtwoord. diff --git a/config/locales/no.yml b/config/locales/no.yml index 53bac51be..7d49537df 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -163,7 +163,7 @@ mail_body_account_information: Informasjon om din konto mail_subject_account_activation_request: "{{value}} kontoaktivering" mail_body_account_activation_request: "En ny bruker ({{value}}) er registrert, og avventer din godkjenning:" - mail_subject_reminder: "{{count}} sak(er) har frist de kommende dagene" + mail_subject_reminder: "{{count}} sak(er) har frist de kommende {{days}} dagene" mail_body_reminder: "{{count}} sak(er) som er tildelt deg har frist de kommende {{days}} dager:" gui_validation_error: 1 feil diff --git a/config/locales/pl.yml b/config/locales/pl.yml index efa2415de..2dadc8478 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -640,7 +640,7 @@ pl: mail_subject_account_activation_request: "Zapytanie aktywacyjne konta {{value}}" mail_subject_lost_password: "Twoje hasło do {{value}}" mail_subject_register: "Aktywacja konta w {{value}}" - mail_subject_reminder: "Uwaga na terminy, masz zagadnienia do obsłużenia w ciągu następnych {{count}} dni!" + mail_subject_reminder: "Uwaga na terminy, masz zagadnienia do obsłużenia w ciągu następnych {{count}} dni! ({{days}})" notice_account_activated: Twoje konto zostało aktywowane. Możesz się zalogować. notice_account_invalid_creditentials: Zły użytkownik lub hasło notice_account_lost_email_sent: Email z instrukcjami zmiany hasła został wysłany do Ciebie. diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 9365505d0..a66f23718 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -196,7 +196,7 @@ pt-BR: mail_body_account_information: Informações sobre sua conta mail_subject_account_activation_request: "{{value}} - Requisição de ativação de conta" mail_body_account_activation_request: "Um novo usuário ({{value}}) se registrou. A conta está aguardando sua aprovação:" - mail_subject_reminder: "{{count}} tarefa(s) com data prevista para os próximos dias" + mail_subject_reminder: "{{count}} tarefa(s) com data prevista para os próximos {{days}} dias" mail_body_reminder: "{{count}} tarefa(s) para você com data prevista para os próximos {{days}} dias:" gui_validation_error: 1 erro diff --git a/config/locales/pt.yml b/config/locales/pt.yml index c8dafd847..615f31645 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -181,7 +181,7 @@ pt: mail_body_account_information: Informação da sua conta mail_subject_account_activation_request: "Pedido de activação da conta {{value}}" mail_body_account_activation_request: "Um novo utilizador ({{value}}) registou-se. A sua conta está à espera de aprovação:" - mail_subject_reminder: "{{count}} tarefa(s) para entregar nos próximos dias" + mail_subject_reminder: "{{count}} tarefa(s) para entregar nos próximos {{days}} dias" mail_body_reminder: "{{count}} tarefa(s) que estão atribuídas a si estão agendadas para estarem completas nos próximos {{days}} dias:" gui_validation_error: 1 erro diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 5733ddebb..45fdd1eaa 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -164,7 +164,7 @@ ro: mail_body_account_information: Informații despre contul dumneavoastră mail_subject_account_activation_request: "Cerere de activare a contului {{value}}" mail_body_account_activation_request: "S-a înregistrat un utilizator nou ({{value}}). Contul așteaptă aprobarea dumneavoastră:" - mail_subject_reminder: "{{count}} tichete trebuie rezolvate în următoarele zile" + mail_subject_reminder: "{{count}} tichete trebuie rezolvate în următoarele {{days}} zile" mail_body_reminder: "{{count}} tichete atribuite dumneavoastră trebuie rezolvate în următoarele {{days}} zile:" gui_validation_error: o eroare diff --git a/config/locales/ru.yml b/config/locales/ru.yml index cce123622..064cbc28b 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -755,7 +755,7 @@ ru: mail_subject_account_activation_request: "Запрос на активацию пользователя в системе {{value}}" mail_subject_lost_password: "Ваш {{value}} пароль" mail_subject_register: "Активация учетной записи {{value}}" - mail_subject_reminder: "{{count}} назначенных на Вас задач в ближайшие дни" + mail_subject_reminder: "{{count}} назначенных на Вас задач в ближайшие {{days}} дни" notice_account_activated: Ваша учетная запись активирована. Вы можете войти. notice_account_invalid_creditentials: Неправильное имя пользователя или пароль diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 22f5799f7..0b2351e6b 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -708,7 +708,7 @@ sk: text_subprojects_destroy_warning: "Jeho podprojekt(y): {{value}} budú takisto vymazané." label_and_its_subprojects: "{{value}} a jeho podprojekty" mail_body_reminder: "{{count}} úloha(y), ktorá(é) je(sú) vám priradený(é), ma(jú) byť hotova(é) za {{days}} dní:" - mail_subject_reminder: "{{count}} úloha(y) ma(jú) byť hotova(é) za pár dní" + mail_subject_reminder: "{{count}} úloha(y) ma(jú) byť hotova(é) za pár {{days}} dní" text_user_wrote: "{{value}} napísal:" label_duplicated_by: duplikovaný setting_enabled_scm: Zapnúť SCM diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 77a155757..aac2e4331 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -167,7 +167,7 @@ sl: mail_body_account_information: Informacije o vašem računu mail_subject_account_activation_request: "{{value}} zahtevek za aktivacijo računa" mail_body_account_activation_request: "Registriral se je nov uporabnik ({{value}}). Račun čaka na vašo odobritev:" - mail_subject_reminder: "{{count}} zahtevek(zahtevki) zapadejo v naslednjih dneh" + mail_subject_reminder: "{{count}} zahtevek(zahtevki) zapadejo v naslednjih {{days}} dneh" mail_body_reminder: "{{count}} zahtevek(zahtevki), ki so vam dodeljeni bodo zapadli v naslednjih {{days}} dneh:" gui_validation_error: 1 napaka diff --git a/config/locales/sr-CY.yml b/config/locales/sr-CY.yml index 11f558470..39cc5dcb8 100644 --- a/config/locales/sr-CY.yml +++ b/config/locales/sr-CY.yml @@ -178,7 +178,7 @@ sr-CY: mail_body_account_information: Информације о вашем налогу mail_subject_account_activation_request: "Захтев за активацију налога {{value}}" mail_body_account_activation_request: "Нови корисник ({{value}}) је регистрован. Налог чека на ваше одобрење:" - mail_subject_reminder: "{{count}} проблема доспева наредних дана" + mail_subject_reminder: "{{count}} проблема доспева наредних {{days}} дана" mail_body_reminder: "{{count}} проблема додељених вама доспева у наредних {{days}} дана:" mail_subject_wiki_content_added: "'{{page}}' wiki страна је додато" mail_body_wiki_content_added: "{{author}} је додао '{{page}}' wiki страна." diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 50140b7d8..f52d9e063 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -178,7 +178,7 @@ sr: mail_body_account_information: Informacije o vašem nalogu mail_subject_account_activation_request: "Zahtev za aktivaciju naloga {{value}}" mail_body_account_activation_request: "Novi korisnik ({{value}}) je registrovan. Nalog čeka na vaše odobrenje:" - mail_subject_reminder: "{{count}} problema dospeva narednih dana" + mail_subject_reminder: "{{count}} problema dospeva narednih {{days}} dana" mail_body_reminder: "{{count}} problema dodeljenih vama dospeva u narednih {{days}} dana:" mail_subject_wiki_content_added: "'{{page}}' wiki strana je dodato" mail_body_wiki_content_added: "{{author}} je dodao '{{page}}' wiki strana." diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 23450007a..35ebc1053 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -234,7 +234,7 @@ sv: mail_body_account_information: Din kontoinformation mail_subject_account_activation_request: "{{value}} begäran om kontoaktivering" mail_body_account_activation_request: "En ny användare ({{value}}) har registrerat sig och avvaktar ditt godkännande:" - mail_subject_reminder: "{{count}} ärende(n) har deadline under de kommande dagarna" + mail_subject_reminder: "{{count}} ärende(n) har deadline under de kommande {{days}} dagarna" mail_body_reminder: "{{count}} ärende(n) som är tilldelat dig har deadline under de {{days}} dagarna:" mail_subject_wiki_content_added: "'{{page}}' wikisida has lagts till" mail_body_wiki_content_added: The '{{page}}' wikisida has lagts till av {{author}}. diff --git a/config/locales/th.yml b/config/locales/th.yml index 5f68696eb..2c127f3de 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -707,7 +707,7 @@ th: enumeration_activities: กิจกรรม (ใช้ในการติดตามเวลา) label_and_its_subprojects: "{{value}} and its subprojects" mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:" - mail_subject_reminder: "{{count}} issue(s) due in the next days" + mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days" text_user_wrote: "{{value}} wrote:" label_duplicated_by: duplicated by setting_enabled_scm: Enabled SCM diff --git a/config/locales/tr.yml b/config/locales/tr.yml index bc7bcbf7e..db4330924 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -749,7 +749,7 @@ tr: text_user_wrote: "{{value}} wrote:" setting_mail_handler_api_enabled: Enable WS for incoming emails label_and_its_subprojects: "{{value}} and its subprojects" - mail_subject_reminder: "{{count}} issue(s) due in the next days" + mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days" setting_mail_handler_api_key: API key setting_commit_logs_encoding: Commit messages encoding general_csv_decimal_separator: '.' diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 5ab983325..1a590dc0b 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -706,7 +706,7 @@ uk: text_subprojects_destroy_warning: "Its subproject(s): {{value}} will be also deleted." label_and_its_subprojects: "{{value}} and its subprojects" mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:" - mail_subject_reminder: "{{count}} issue(s) due in the next days" + mail_subject_reminder: "{{count}} issue(s) due in the next {{days}} days" text_user_wrote: "{{value}} wrote:" label_duplicated_by: duplicated by setting_enabled_scm: Enabled SCM diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 9d2af5e86..f8ca507bf 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -226,7 +226,7 @@ vi: mail_body_account_information: Thông tin về tài khoản mail_subject_account_activation_request: "{{value}}: Yêu cầu chứng thực tài khoản" mail_body_account_activation_request: "Người dùng ({{value}}) mới đăng ký và cần bạn xác nhận:" - mail_subject_reminder: "{{count}} vấn đề hết hạn trong các ngày tới" + mail_subject_reminder: "{{count}} vấn đề hết hạn trong các {{days}} ngày tới" mail_body_reminder: "{{count}} vấn đề gán cho bạn sẽ hết hạn trong {{days}} ngày tới:" gui_validation_error: 1 lỗi diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index fc5f557d1..5a08041c2 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -273,7 +273,7 @@ mail_body_account_information: 您的 Redmine 帳號資訊 mail_subject_account_activation_request: Redmine 帳號啟用需求通知 mail_body_account_activation_request: "有位新用戶 ({{value}}) 已經完成註冊，正等候您的審核：" - mail_subject_reminder: "您有 {{count}} 個項目即將到期" + mail_subject_reminder: "您有 {{count}} 個項目即將到期 ({{days}})" mail_body_reminder: "{{count}} 個指派給您的項目，將於 {{days}} 天之內到期：" mail_subject_wiki_content_added: "'{{page}}' wiki 頁面已被新增" mail_body_wiki_content_added: "The '{{page}}' wiki 頁面已被 {{author}} 新增。" diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 3f05306b6..87d430684 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -200,7 +200,7 @@ zh: mail_body_account_information: 您的帐号信息 mail_subject_account_activation_request: "{{value}}帐号激活请求" mail_body_account_activation_request: "新用户（{{value}}）已完成注册，正在等候您的审核：" - mail_subject_reminder: "{{count}} 个问题需要尽快解决" + mail_subject_reminder: "{{count}} 个问题需要尽快解决 ({{days}})" mail_body_reminder: "指派给您的 {{count}} 个问题需要在 {{days}} 天内完成：" mail_subject_wiki_content_added: "'{{page}}' wiki页面已添加" mail_body_wiki_content_added: "'{{page}}' wiki页面已由 {{author}} 添加。" diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb index f1fc2502f..a5932d325 100644 --- a/test/unit/mailer_test.rb +++ b/test/unit/mailer_test.rb @@ -352,6 +352,7 @@ class MailerTest < ActiveSupport::TestCase mail = ActionMailer::Base.deliveries.last assert mail.bcc.include?('dlopper@somenet.foo') assert mail.body.include?('Bug #3: Error 281 when updating a recipe') + assert_equal '1 issue(s) due in the next 42 days', mail.subject end def last_email