From a59e6bfb020f51ec2ae586e2e0e238b9827b7e9a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 15 Mar 2008 09:40:16 +0000
Subject: [PATCH] Remove hardcoded "Redmine" strings in account related emails.
 And use application title instead.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1254 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/mailer.rb |  8 ++++----
 lang/bg.yml          | 10 +++++-----
 lang/cs.yml          | 10 +++++-----
 lang/da.yml          | 14 +++++++-------
 lang/de.yml          | 10 +++++-----
 lang/en.yml          | 14 +++++++-------
 lang/es.yml          | 14 +++++++-------
 lang/fi.yml          | 14 +++++++-------
 lang/fr.yml          | 14 +++++++-------
 lang/he.yml          | 10 +++++-----
 lang/it.yml          | 12 ++++++------
 lang/ja.yml          | 12 ++++++------
 lang/ko.yml          |  8 ++++----
 lang/lt.yml          | 14 +++++++-------
 lang/nl.yml          | 12 ++++++------
 lang/pl.yml          | 12 ++++++------
 lang/pt-br.yml       | 12 ++++++------
 lang/pt.yml          | 12 ++++++------
 lang/ro.yml          | 14 +++++++-------
 lang/ru.yml          | 14 +++++++-------
 lang/sr.yml          | 14 +++++++-------
 lang/sv.yml          | 12 ++++++------
 lang/uk.yml          | 14 +++++++-------
 lang/zh-tw.yml       | 14 +++++++-------
 lang/zh.yml          | 14 +++++++-------
 25 files changed, 154 insertions(+), 154 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index ad5a3647b..2f23c1c8f 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -86,7 +86,7 @@ class Mailer < ActionMailer::Base
   def account_information(user, password)
     set_language_if_valid user.language
     recipients user.mail
-    subject l(:mail_subject_register)
+    subject l(:mail_subject_register, Setting.app_title)
     body :user => user,
          :password => password,
          :login_url => url_for(:controller => 'account', :action => 'login')
@@ -95,7 +95,7 @@ class Mailer < ActionMailer::Base
   def account_activation_request(user)
     # Send the email to all active administrators
     recipients User.find_active(:all, :conditions => {:admin => true}).collect { |u| u.mail }.compact
-    subject l(:mail_subject_account_activation_request)
+    subject l(:mail_subject_account_activation_request, Setting.app_title)
     body :user => user,
          :url => url_for(:controller => 'users', :action => 'index', :status => User::STATUS_REGISTERED, :sort_key => 'created_on', :sort_order => 'desc')
   end
@@ -103,7 +103,7 @@ class Mailer < ActionMailer::Base
   def lost_password(token)
     set_language_if_valid(token.user.language)
     recipients token.user.mail
-    subject l(:mail_subject_lost_password)
+    subject l(:mail_subject_lost_password, Setting.app_title)
     body :token => token,
          :url => url_for(:controller => 'account', :action => 'lost_password', :token => token.value)
   end  
@@ -111,7 +111,7 @@ class Mailer < ActionMailer::Base
   def register(token)
     set_language_if_valid(token.user.language)
     recipients token.user.mail
-    subject l(:mail_subject_register)
+    subject l(:mail_subject_register, Setting.app_title)
     body :token => token,
          :url => url_for(:controller => 'account', :action => 'activate', :token => token.value)
   end
diff --git a/lang/bg.yml b/lang/bg.yml
index 362421fa6..7b4e15720 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -76,9 +76,9 @@ notice_feeds_access_key_reseted: Вашия ключ за RSS достъп бе
 error_scm_not_found: Несъществуващ обект в хранилището.
 error_scm_command_failed: "Грешка при опит за комуникация с хранилище: %s"
 
-mail_subject_lost_password: Вашата парола
+mail_subject_lost_password: Вашата парола (%s)
 mail_body_lost_password: 'За да смените паролата си, използвайте следния линк:'
-mail_subject_register: Активация на акаунт
+mail_subject_register: Активация на акаунт (%s)
 mail_body_register: 'За да активирате акаунта си използвайте следния линк:'
 
 gui_validation_error: 1 грешка
@@ -536,13 +536,13 @@ label_user_mail_option_none: "Само за наблюдавани или в к
 setting_emails_footer: Подтекст за e-mail
 label_float: Дробно
 button_copy: Копиране
-mail_body_account_information_external: Можете да използвате вашия "%s" акаунт за вход в Redmine.
-mail_body_account_information: Информацията за акаунта ви в Redmine
+mail_body_account_information_external: Можете да използвате вашия "%s" акаунт за вход.
+mail_body_account_information: Информацията за акаунта
 setting_protocol: Протокол
 label_user_mail_no_self_notified: "Не искам известия за извършени от мен промени"
 setting_time_format: Формат на часа
 label_registration_activation_by_email: активиране на акаунта по email
-mail_subject_account_activation_request: Заявка за активиране на акаунт в Redmine
+mail_subject_account_activation_request: Заявка за активиране на акаунт в %s
 mail_body_account_activation_request: 'Има новорегистриран потребител (%s), очакващ вашето одобрение:'
 label_registration_automatic_activation: автоматично активиране
 label_registration_manual_activation: ръчно активиране
diff --git a/lang/cs.yml b/lang/cs.yml
index 2b215bec0..52ee9e451 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -83,13 +83,13 @@ error_scm_not_found: "Položka a/nebo revize neexistují v repository."
 error_scm_command_failed: "Při pokusu o přístup k repository došlo k chybě: %s"
 error_issue_not_found_in_project: 'Úkol nebyl nalezen nebo nepatří k tomuto projektu'
 
-mail_subject_lost_password: Vaše heslo
+mail_subject_lost_password: Vaše heslo (%s)
 mail_body_lost_password: 'Pro změnu vašeho hesla klikněte na následující odkaz:'
-mail_subject_register: aktivace účtu
+mail_subject_register: Aktivace účtu (%s)
 mail_body_register: 'Pro aktivaci vašeho účtu klikněte na následující odkaz:'
-mail_body_account_information_external: Pomocí vašeho účtu "%s" se můžete přihlásit do Redmine.
-mail_body_account_information: Informace o vašem Redmine účtu
-mail_subject_account_activation_request: Aktivace Redmine účtu
+mail_body_account_information_external: Pomocí vašeho účtu "%s" se můžete přihlásit.
+mail_body_account_information: Informace o vašem účtu
+mail_subject_account_activation_request: Aktivace %s účtu
 mail_body_account_activation_request: Byl zaregistrován nový uživatel "%s". Aktivace jeho účtu závisí na vašem potvrzení.
 
 gui_validation_error: 1 chyba
diff --git a/lang/da.yml b/lang/da.yml
index 042666b43..d80124520 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -81,13 +81,13 @@ error_can_t_load_default_data: "Standard konfiguration kunne ikke indlæses: %s"
 error_scm_not_found: "Adgang og/eller revision blev ikke fundet i det valgte repository."
 error_scm_command_failed: "En fejl opstod under fobindelsen til det valgte repository: %s"
 
-mail_subject_lost_password: Dit Redmine kodeord
-mail_body_lost_password: 'For at ændre dit Redmine kodeord, klik på dette link:'
-mail_subject_register: Redmine konto aktivering
-mail_body_register: 'For at aktivere din Redmine konto, klik på dette link:'
-mail_body_account_information_external: Du kan bruge din "%s" konto til at logge ind på Redmine.
-mail_body_account_information: Din Redmine konto information
-mail_subject_account_activation_request: Redmine konto aktivering
+mail_subject_lost_password: Dit %s kodeord
+mail_body_lost_password: 'For at ændre dit kodeord, klik på dette link:'
+mail_subject_register: %s konto aktivering
+mail_body_register: 'For at aktivere din konto, klik på dette link:'
+mail_body_account_information_external: Du kan bruge din "%s" konto til at logge ind.
+mail_body_account_information: Din konto information
+mail_subject_account_activation_request: %s konto aktivering
 mail_body_account_activation_request: 'En ny bruger (%s) er registreret. Godkend venligst kontoen:'
 
 gui_validation_error: 1 fejl
diff --git a/lang/de.yml b/lang/de.yml
index 7ef41fe46..36ae228b5 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -82,13 +82,13 @@ error_scm_not_found: Eintrag und/oder Revision besteht nicht im Projektarchiv.
 error_scm_command_failed: "Beim Zugriff auf das Projektarchiv ist ein Fehler aufgetreten: %s"
 error_issue_not_found_in_project: 'Das Ticket wurde nicht gefunden oder gehört nicht zu diesem Projekt.'
 
-mail_subject_lost_password: Ihr Redmine-Kennwort
+mail_subject_lost_password: Ihr %s Kennwort
 mail_body_lost_password: 'Benutzen Sie den folgenden Link, um Ihr Kennwort zu ändern:'
-mail_subject_register: Redmine Kontoaktivierung
+mail_subject_register: %s Kontoaktivierung
 mail_body_register: 'Um Ihr Konto zu aktivieren, benutzen Sie folgenden Link:'
-mail_body_account_information_external: Sie können sich mit Ihrem Konto "%s" an Redmine anmelden.
-mail_body_account_information: Ihre Redmine Konto-Informationen
-mail_subject_account_activation_request: Antrag auf Redmine Kontoaktivierung
+mail_body_account_information_external: Sie können sich mit Ihrem Konto "%s" an anmelden.
+mail_body_account_information: Ihre Konto-Informationen
+mail_subject_account_activation_request: Antrag auf %s Kontoaktivierung
 mail_body_account_activation_request: 'Ein neuer Benutzer (%s) hat sich registriert. Sein Konto wartet auf Ihre Genehmigung:'
 
 gui_validation_error: 1 Fehler
diff --git a/lang/en.yml b/lang/en.yml
index 8a08507bb..2646e22a6 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -82,13 +82,13 @@ error_scm_not_found: "Entry and/or revision doesn't exist in the repository."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
 
-mail_subject_lost_password: Your Redmine password
-mail_body_lost_password: 'To change your Redmine password, click on the following link:'
-mail_subject_register: Redmine account activation
-mail_body_register: 'To activate your Redmine account, click on the following link:'
-mail_body_account_information_external: You can use your "%s" account to log into Redmine.
-mail_body_account_information: Your Redmine account information
-mail_subject_account_activation_request: Redmine account activation request
+mail_subject_lost_password: Your %s password
+mail_body_lost_password: 'To change your password, click on the following link:'
+mail_subject_register: Your %s account activation
+mail_body_register: 'To activate your account, click on the following link:'
+mail_body_account_information_external: You can use your "%s" account to log in.
+mail_body_account_information: Your account information
+mail_subject_account_activation_request: %s account activation request
 mail_body_account_activation_request: 'A new user (%s) has registered. His account is pending your approval:'
 
 gui_validation_error: 1 error
diff --git a/lang/es.yml b/lang/es.yml
index 1453534e8..4a5eff1c9 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -73,10 +73,10 @@ notice_not_authorized: No tiene autorización para acceder a esta página.
 error_scm_not_found: "La entrada y/o la revisión no existe en el repositorio."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: Tu contraseña del CIYAT - Gestor de Solicitudes
-mail_body_lost_password: 'Para cambiar su contraseña de Redmine, haga click en el siguiente enlace:'
-mail_subject_register: Activación de la cuenta del CIYAT - Gestor de Solicitudes
-mail_body_register: 'Para activar su cuenta Redmine, haga click en el siguiente enlace:'
+mail_subject_lost_password: Tu contraseña del %s
+mail_body_lost_password: 'Para cambiar su contraseña, haga click en el siguiente enlace:'
+mail_subject_register: Activación de la cuenta del %s
+mail_body_register: 'Para activar su cuenta, haga click en el siguiente enlace:'
 
 gui_validation_error: 1 error
 gui_validation_error_plural: %d errores
@@ -539,14 +539,14 @@ label_user_mail_option_none: "Sólo para elementos monitorizados o relacionados
 setting_emails_footer: Pie de mensajes
 label_float: Flotante
 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
+mail_body_account_information_external: Puede usar su cuenta "%s" para conectarse.
+mail_body_account_information: Información sobre su cuenta
 setting_protocol: Protocolo
 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_subject_account_activation_request: Petición de activación de cuenta %s
 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
diff --git a/lang/fi.yml b/lang/fi.yml
index fe16fd7e0..5ff496985 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -81,13 +81,13 @@ error_can_t_load_default_data: "Vakio asetuksia ei voitu ladata: %s"
 error_scm_not_found: "Syötettä ja/tai versiota ei löydy säiliöstä."
 error_scm_command_failed: "Säiliöön pääsyssä tapahtui virhe: %s"
 
-mail_subject_lost_password: Sinun Redmine salasanasi
-mail_body_lost_password: 'Vaihtaaksesi Redmine salasanasi, paina seuraavaa linkkiä:'
-mail_subject_register: Redmine tilin aktivointi
-mail_body_register: 'Aktivoidaksesi Redmine tilisi, paina seuraavaa linkkiä:'
-mail_body_account_information_external: Voit nyt käyttää "%s" tiliäsi kirjautuaksesi Redmine järjestelmään.
-mail_body_account_information: Sinun Redmine tilin tiedot
-mail_subject_account_activation_request: Redmine tilin aktivointi pyyntö
+mail_subject_lost_password: Sinun %s salasanasi
+mail_body_lost_password: 'Vaihtaaksesi salasanasi, paina seuraavaa linkkiä:'
+mail_subject_register: %s tilin aktivointi
+mail_body_register: 'Aktivoidaksesi tilisi, paina seuraavaa linkkiä:'
+mail_body_account_information_external: Voit nyt käyttää "%s" tiliäsi kirjautuaksesi järjestelmään.
+mail_body_account_information: Sinun tilin tiedot
+mail_subject_account_activation_request: %s tilin aktivointi pyyntö
 mail_body_account_activation_request: 'Uusi käyttäjä (%s) on rekisteröitynyt. Hänen tili odottaa hyväksyntääsi:'
 
 gui_validation_error: 1 virhe
diff --git a/lang/fr.yml b/lang/fr.yml
index c11db5cbf..136f3b0b8 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -82,13 +82,13 @@ error_scm_not_found: "L'entrée et/ou la révision demandée n'existe pas dans l
 error_scm_command_failed: "Une erreur s'est produite lors de l'accès au dépôt: %s"
 error_issue_not_found_in_project: "La demande n'existe pas ou n'appartient pas à ce projet"
 
-mail_subject_lost_password: Votre mot de passe redMine
-mail_body_lost_password: 'Pour changer votre mot de passe Redmine, cliquez sur le lien suivant:'
-mail_subject_register: Activation de votre compte redMine
-mail_body_register: 'Pour activer votre compte Redmine, cliquez sur le lien suivant:'
-mail_body_account_information_external: Vous pouvez utiliser votre compte "%s" pour vous connecter à Redmine.
-mail_body_account_information: Paramètres de connexion de votre compte Redmine
-mail_subject_account_activation_request: "Demande d'activation d'un compte Redmine"
+mail_subject_lost_password: Votre mot de passe %s
+mail_body_lost_password: 'Pour changer votre mot de passe, cliquez sur le lien suivant:'
+mail_subject_register: Activation de votre compte %s
+mail_body_register: 'Pour activer votre compte, cliquez sur le lien suivant:'
+mail_body_account_information_external: Vous pouvez utiliser votre compte "%s" pour vous connecter.
+mail_body_account_information: Paramètres de connexion de votre compte
+mail_subject_account_activation_request: "Demande d'activation d'un compte %s"
 mail_body_account_activation_request: "Un nouvel utilisateur (%s) s'est inscrit. Son compte nécessite votre approbation:"
 
 gui_validation_error: 1 erreur
diff --git a/lang/he.yml b/lang/he.yml
index 5828e6fb4..7450f04da 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -78,9 +78,9 @@ notice_no_issue_selected: "לא נבחר אף נושא! בחר בבקשה את 
 error_scm_not_found: כניסה ו\או גירסא אינם קיימים במאגר.
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: סיסמת ה-Redmine שלך
+mail_subject_lost_password: סיסמת ה-%s שלך
 mail_body_lost_password: 'לשינו סיסמת ה-Redmine שלך,לחץ על הקישור הבא:'
-mail_subject_register: הפעלת חשבון Redmine
+mail_subject_register: הפעלת חשבון %s
 mail_body_register: 'להפעלת חשבון ה-Redmine שלך, לחץ על הקישור הבא:'
 
 gui_validation_error: שגיאה 1
@@ -536,13 +536,13 @@ 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
+mail_body_account_information_external: You can use your "%s" account to log in.
+mail_body_account_information: Your 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_subject_account_activation_request: %s 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
diff --git a/lang/it.yml b/lang/it.yml
index f407cc764..2a35740ac 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -76,10 +76,10 @@ notice_feeds_access_key_reseted: Your RSS access key was reseted.
 error_scm_not_found: "La risorsa e/o la versione non esistono nel repository."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: Password redMine
+mail_subject_lost_password: Password %s
 mail_body_lost_password: 'Per cambiare la password, usate il seguente collegamento:'
-mail_subject_register: Attivazione utenza redMine
-mail_body_register: 'Per attivare la vostra utenza Redmine, usate il seguente collegamento:'
+mail_subject_register: Attivazione utenza %s
+mail_body_register: 'Per attivare la vostra utenza, usate il seguente collegamento:'
 
 gui_validation_error: 1 errore
 gui_validation_error_plural: %d errori
@@ -536,13 +536,13 @@ 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
+mail_body_account_information_external: You can use your "%s" account to log in.
+mail_body_account_information: Your 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_subject_account_activation_request: %s 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
diff --git a/lang/ja.yml b/lang/ja.yml
index 3e74c5582..1b5427be4 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -77,10 +77,10 @@ notice_feeds_access_key_reseted: RSSアクセスキーを初期化しました
 error_scm_not_found: リポジトリに、エントリ/リビジョンが存在しません。
 error_scm_command_failed: "リポジトリへアクセスしようとしてエラーになりました: %s"
 
-mail_subject_lost_password: Redmineパスワード
+mail_subject_lost_password: %sパスワード
 mail_body_lost_password: 'パスワードを変更するには、以下のリンクをたどってください:'
-mail_subject_register: Redmineアカウントが有効になりました
-mail_body_register: 'Redmineアカウントをアクティブにするには、以下のリンクをたどってください:'
+mail_subject_register: %sアカウントが有効になりました
+mail_body_register: 'アカウントをアクティブにするには、以下のリンクをたどってください:'
 
 gui_validation_error: 1件のエラー
 gui_validation_error_plural: %d件のエラー
@@ -537,13 +537,13 @@ label_user_mail_option_none: "ウォッチまたは関係しているチケッ
 setting_emails_footer: メールのフッタ
 label_float: 小数
 button_copy: コピー
-mail_body_account_information_external: 「%s」アカウントを使ってRedmineにログインできます。
-mail_body_account_information: Redmineアカウント情報
+mail_body_account_information_external: 「%s」アカウントを使ってにログインできます。
+mail_body_account_information: アカウント情報
 setting_protocol: プロトコル
 label_user_mail_no_self_notified: 自分自身による変更の通知は不要です
 setting_time_format: 時刻の形式
 label_registration_activation_by_email: メールでアカウントを有効化
-mail_subject_account_activation_request: Redminアカウントの有効化要求
+mail_subject_account_activation_request: %sアカウントの有効化要求
 mail_body_account_activation_request: 新しいユーザ(%s)が登録しています。このアカウントはあなたの承認待ちです：
 label_registration_automatic_activation: 自動でアカウントを有効化
 label_registration_manual_activation: 手動でアカウントを有効化
diff --git a/lang/ko.yml b/lang/ko.yml
index 73f7e3cc3..f53274ec6 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -78,9 +78,9 @@ notice_no_issue_selected: "이슈가 선택되지 않았습니다. 수정하기
 error_scm_not_found: 소스 저장소에 해당 내용이 존재하지 않습니다.
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: 당신의 비밀번호
+mail_subject_lost_password: 당신의 비밀번호 (%s)
 mail_body_lost_password: '비밀번호를 변경하기 위해서 링크를 이용하세요'
-mail_subject_register: 당신의 계정 활성화
+mail_subject_register: 당신의 계정 활성화 (%s)
 mail_body_register: '계정을 활성화 하기 위해서 링크를 이용하세요 :'
 
 gui_validation_error: 1 에러
@@ -538,11 +538,11 @@ mail_body_account_information_external: 레드마인에 로그인할 때 "%s" 
 button_change_password: 비밀번호 변경
 label_nobody: nobody
 setting_protocol: 프로토콜
-mail_body_account_information: Redmine 계정 정보
+mail_body_account_information: 계정 정보
 label_user_mail_no_self_notified: "내가 만든 변경사항들에 대해서는 알림메일을 받지 않습니다."
 setting_time_format: 시간 형식
 label_registration_activation_by_email: 메일로 계정을 활성화하기
-mail_subject_account_activation_request: 레드마인 계정 활성화 요청
+mail_subject_account_activation_request: 레드마인 계정 활성화 요청 (%s)
 mail_body_account_activation_request: '새 계정(%s)이 등록되었습니다. 관리자님의 승인을 기다리고 있습니다.:'
 label_registration_automatic_activation: 자동 계정 활성화
 label_registration_manual_activation: 수동 계정 활성화
diff --git a/lang/lt.yml b/lang/lt.yml
index fc242f6dd..957b8cc9c 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -80,13 +80,13 @@ notice_account_pending: "Jūsų paskyra buvo sukūrta ir dabar laukiama administ
 error_scm_not_found: "Duomenys ir/ar pakeitimai saugykloje(repozitorojoje) neegzistuoja."
 error_scm_command_failed: "Įvyko klaida jungiantis prie saugyklos: %s"
 
-mail_subject_lost_password: Jūsų Redmine slaptažodis
-mail_body_lost_password: 'Norėdami pakeisti Redmine slaptažodį, spauskite nuorodą:'
-mail_subject_register: 'Redmine paskyros aktyvavymas'
-mail_body_register: 'Norėdami aktyvuoti Redmine paskyrą, spauskite nuorodą:'
-mail_body_account_information_external: Jūs galite naudoti Jūsų "%s" paskyrą, norėdami prisijungti prie Redmine.
-mail_body_account_information: Informacija apie Jūsų Redmine paskyrą
-mail_subject_account_activation_request: Redmine paskyros aktyvavimo prašymas
+mail_subject_lost_password: Jūsų %s slaptažodis
+mail_body_lost_password: 'Norėdami pakeisti slaptažodį, spauskite nuorodą:'
+mail_subject_register: '%s paskyros aktyvavymas'
+mail_body_register: 'Norėdami aktyvuoti paskyrą, spauskite nuorodą:'
+mail_body_account_information_external: Jūs galite naudoti Jūsų "%s" paskyrą, norėdami prisijungti.
+mail_body_account_information: Informacija apie Jūsų paskyrą
+mail_subject_account_activation_request: %s paskyros aktyvavimo prašymas
 mail_body_account_activation_request: 'Užsiregistravo naujas vartotojas (%s). Jo paskyra laukia jūsų patvirtinimo:'
  
 gui_validation_error: 1 klaida
diff --git a/lang/nl.yml b/lang/nl.yml
index 25827e454..c197e05f9 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -76,10 +76,10 @@ notice_feeds_access_key_reseted: Your RSS access key was reseted.
 error_scm_not_found: "Deze ingang of revisie bestaat niet in de repository."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: Uw redMine wachtwoord
+mail_subject_lost_password: Uw %s wachtwoord
 mail_body_lost_password: 'Gebruik de volgende link om Uw wachtwoord te wijzigen:'
-mail_subject_register: redMine account activatie
-mail_body_register: 'Gebruik de volgende link om Uw Redmine account te activeren:'
+mail_subject_register: Uw %s account activatie
+mail_body_register: 'Gebruik de volgende link om Uw account te activeren:'
 
 gui_validation_error: 1 fout
 gui_validation_error_plural: %d fouten
@@ -537,13 +537,13 @@ 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
+mail_body_account_information_external: You can use your "%s" account to log in.
+mail_body_account_information: Your 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_subject_account_activation_request: %s 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
diff --git a/lang/pl.yml b/lang/pl.yml
index 0a25ba10e..0ba187ff3 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -73,10 +73,10 @@ notice_not_authorized: Nie jesteś autoryzowany by zobaczyć stronę.
 error_scm_not_found: "Wejście i/lub zmiana nie istnieje w repozytorium."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: Twoje hasło do redMine
+mail_subject_lost_password: Twoje hasło do %s
 mail_body_lost_password: 'W celu zmiany swojego hasła użyj poniższego odnośnika:'
-mail_subject_register: Aktywacja konta w redMine
-mail_body_register: 'W celu aktywacji Twojego konta w Redmine, użyj poniższego odnośnika:'
+mail_subject_register: Aktywacja konta w %s
+mail_body_register: 'W celu aktywacji Twojego konta, użyj poniższego odnośnika:'
 
 gui_validation_error: 1 błąd
 gui_validation_error_plural: %d błędów
@@ -536,13 +536,13 @@ label_user_mail_option_none: "Tylko to co obserwuje lub w czym biorę udział"
 setting_emails_footer: Stopka e-mail
 label_float: Liczba rzeczywista
 button_copy: Kopia
-mail_body_account_information_external: Możesz użyć twojego "%s" konta do zalogowania do Redmine.
-mail_body_account_information: Twoje konto w Redmine
+mail_body_account_information_external: Możesz użyć twojego "%s" konta do zalogowania.
+mail_body_account_information: Twoje konto
 setting_protocol: Protokoł
 label_user_mail_no_self_notified: "Nie chcę powiadomień o zmianach, które sam wprowadzam."
 setting_time_format: Format czasu
 label_registration_activation_by_email: aktywacja konta przez e-mail
-mail_subject_account_activation_request: Zapytanie aktywacyjne konta Redmine
+mail_subject_account_activation_request: Zapytanie aktywacyjne konta %s
 mail_body_account_activation_request: 'Zarejestrowano nowego użytkownika: (%s). Konto oczekuje na twoje zatwierdzenie:'
 label_registration_automatic_activation: automatyczna aktywacja kont
 label_registration_manual_activation: manualna aktywacja kont
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index e84a45de3..fbb82ea4a 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -76,10 +76,10 @@ notice_feeds_access_key_reseted: Your RSS access key was reseted.
 error_scm_not_found: "A entrada e/ou a revisao nao existem no repositorio."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: Sua senha do redMine.
+mail_subject_lost_password: Sua senha do %s.
 mail_body_lost_password: 'Para mudar sua senha, clique no link abaixo:'
-mail_subject_register: Ativacao de conta do redMine.
-mail_body_register: 'Para ativar sua conta do Redmine, clique no link abaixo:'
+mail_subject_register: Ativacao de conta do %s.
+mail_body_register: 'Para ativar sua conta, clique no link abaixo:'
 
 gui_validation_error: 1 erro
 gui_validation_error_plural: %d erros
@@ -536,13 +536,13 @@ 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
+mail_body_account_information_external: You can use your "%s" account to log in.
+mail_body_account_information: Your 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_subject_account_activation_request: %s 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
diff --git a/lang/pt.yml b/lang/pt.yml
index a8f5110eb..d177a0775 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -76,10 +76,10 @@ notice_feeds_access_key_reseted: Your RSS access key was reseted.
 error_scm_not_found: "A entrada e/ou a revisão não existem no repositório."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: Sua senha do redMine.
+mail_subject_lost_password: Sua senha do %s.
 mail_body_lost_password: 'Para mudar sua senha, clique no link abaixo:'
-mail_subject_register: Ativação de conta do redMine.
-mail_body_register: 'Para ativar sua conta do Redmine, clique no link abaixo:'
+mail_subject_register: Ativação de conta do %s.
+mail_body_register: 'Para ativar sua conta, clique no link abaixo:'
 
 gui_validation_error: 1 erro
 gui_validation_error_plural: %d erros
@@ -536,13 +536,13 @@ 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
+mail_body_account_information_external: You can use your "%s" account to log in.
+mail_body_account_information: Your 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_subject_account_activation_request: %s 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
diff --git a/lang/ro.yml b/lang/ro.yml
index f2f831eee..d99b53a53 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -76,10 +76,10 @@ notice_feeds_access_key_reseted: Parola de acces RSS a fost resetat.
 error_scm_not_found: "Articolul sau reviziunea nu exista in stoc (Repository)."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: Your Redmine password
-mail_body_lost_password: 'To change your Redmine password, click on the following link:'
-mail_subject_register: Redmine account activation
-mail_body_register: 'To activate your Redmine account, click on the following link:'
+mail_subject_lost_password: Your %s password
+mail_body_lost_password: 'To change your password, click on the following link:'
+mail_subject_register: Your %s account activation
+mail_body_register: 'To activate your account, click on the following link:'
 
 gui_validation_error: 1 eroare
 gui_validation_error_plural: %d erori
@@ -536,13 +536,13 @@ 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
+mail_body_account_information_external: You can use your "%s" account to log in.
+mail_body_account_information: Your 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_subject_account_activation_request: %s 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
diff --git a/lang/ru.yml b/lang/ru.yml
index ec5132a30..7b11b781f 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -81,13 +81,13 @@ error_scm_not_found: Хранилилище не содержит записи 
 error_scm_command_failed: "Ошибка доступа к хранилищу: %s"
 error_can_t_load_default_data: "Конфигурация по умолчанию не была загружена: %s"
 
-mail_subject_lost_password: Ваш Redmine пароль
-mail_body_lost_password: 'Для изменения Redmine пароля, зайдите по следующей ссылке:'
-mail_subject_register: Активация учетной записи Redmine
-mail_body_register: 'Для активации учетной записи Redmine, зайдите по следующей ссылке:'
-mail_body_account_information_external: Вы можете использовать вашу "%s" учетную запись для входа в Redmine.
-mail_body_account_information: Информация по Вашей учетной записи Redmine
-mail_subject_account_activation_request: Запрос на активацию пользователя в системе Redmine
+mail_subject_lost_password: Ваш %s пароль
+mail_body_lost_password: 'Для изменения пароля, зайдите по следующей ссылке:'
+mail_subject_register: Активация учетной записи %s
+mail_body_register: 'Для активации учетной записи, зайдите по следующей ссылке:'
+mail_body_account_information_external: Вы можете использовать вашу "%s" учетную запись для входа.
+mail_body_account_information: Информация по Вашей учетной записи
+mail_subject_account_activation_request: Запрос на активацию пользователя в системе %s
 mail_body_account_activation_request: 'Новый пользователь (%s) зарегистрирован. Учетная запись ожидает вашего утверждения:'
 
 
diff --git a/lang/sr.yml b/lang/sr.yml
index 79992f9d3..3584d823d 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -78,12 +78,12 @@ notice_no_issue_selected: "Nijedna kartica nije izabrana! Molim, izaberite karti
 error_scm_not_found: "Unos i/ili revizija ne postoji u spremištu."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: Vaša redMine lozinka
-mail_body_lost_password: 'Da biste izmenili vašu Redmine lozinku, kliknite na sledeći link:'
-mail_subject_register: aktivacija redMine naloga
-mail_body_register: 'Da biste aktivirali vaš Redmine nalog, kliknite na sledeći link:'
-mail_body_account_information_external: Mozete koristiti vas "%s" nalog da bi ste se prikljucili na Redmine.
-mail_body_account_information: Informacije o vasem Redmine nalogu
+mail_subject_lost_password: Vaša %s lozinka
+mail_body_lost_password: 'Da biste izmenili vašu lozinku, kliknite na sledeći link:'
+mail_subject_register: Aktivacija %s naloga
+mail_body_register: 'Da biste aktivirali vaš nalog, kliknite na sledeći link:'
+mail_body_account_information_external: Mozete koristiti vas "%s" nalog da bi ste se prikljucili.
+mail_body_account_information: Informacije o vasem nalogu
 
 gui_validation_error: 1 greška
 gui_validation_error_plural: %d grešaka
@@ -543,7 +543,7 @@ setting_protocol: Protocol
 label_user_mail_no_self_notified: "Ne želim da budem obaveštavan o izmenama koje sam pravim"
 setting_time_format: Format vremena
 label_registration_activation_by_email: aktivacija naloga putem email-a
-mail_subject_account_activation_request: Redmine zahtev za aktivacijom naloga
+mail_subject_account_activation_request: %s zahtev za aktivacijom naloga
 mail_body_account_activation_request: 'Novi korisnik (%s) se registrovao. Njegov nalog čeka vaše odobrenje:'
 label_registration_automatic_activation: automatska aktivacija naloga
 label_registration_manual_activation: ručna aktivacija naloga
diff --git a/lang/sv.yml b/lang/sv.yml
index 8594dc4d3..ab16af51d 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -76,10 +76,10 @@ notice_feeds_access_key_reseted: Your RSS access key was reseted.
 error_scm_not_found: "Inlägg och/eller revision finns inte i repositoriet."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: Ditt redMine lösenord
+mail_subject_lost_password: Ditt %s lösenord
 mail_body_lost_password: 'För att ändra lösenord, följ denna länk:'
-mail_subject_register: redMine kontoaktivering
-mail_body_register: 'För att aktivera ditt Redmine-konto, använd följande länk.'
+mail_subject_register: Ditt %s kontoaktivering
+mail_body_register: 'För att aktivera ditt konto, använd följande länk.'
 
 gui_validation_error: 1 fel
 gui_validation_error_plural: %d fel
@@ -537,13 +537,13 @@ 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
+mail_body_account_information_external: You can use your "%s" account to log in.
+mail_body_account_information: Your 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_subject_account_activation_request: %s 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
diff --git a/lang/uk.yml b/lang/uk.yml
index 7bd22acaf..7038640f2 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -77,13 +77,13 @@ notice_failed_to_save_issues: "Не вдалося зберегти %d пунк
 notice_no_issue_selected: "Не вибрано жодної задачі! Будь ласка, відзначте задачу, яку ви хочете відредагувати."
 notice_account_pending: "Ваш обліковий запис створено і він чекає на підтвердження адміністратором."
 
-mail_subject_lost_password: Ваш Redmine пароль
-mail_body_lost_password: 'Для зміни Redmine пароля, зайдіть за наступним посиланням:'
-mail_subject_register: Активація облікового запису Redmine
-mail_body_register: 'Для активації облікового запису Redmine, зайдіть за наступним посиланням:'
-mail_body_account_information_external: Ви можете використовувати ваш "%s" обліковий запис для входу в Redmine.
-mail_body_account_information: Інформація по Вашому обліковому запису Redmine
-mail_subject_account_activation_request: Запит на активацію облікового запису Redmine
+mail_subject_lost_password: Ваш %s пароль
+mail_body_lost_password: 'Для зміни пароля, зайдіть за наступним посиланням:'
+mail_subject_register: Активація облікового запису %s
+mail_body_register: 'Для активації облікового запису, зайдіть за наступним посиланням:'
+mail_body_account_information_external: Ви можете використовувати ваш "%s" обліковий запис для входу.
+mail_body_account_information: Інформація по Вашому обліковому запису
+mail_subject_account_activation_request: Запит на активацію облікового запису %s
 mail_body_account_activation_request: 'Новий користувач (%s) зареєструвався. Його обліковий запис чекає на ваше підтвердження:'
 
 gui_validation_error: 1 помилка
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index c14c26a34..32bcd8419 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -82,13 +82,13 @@ error_scm_not_found: SCM 儲存庫中找不到這個專案與(或)版本。
 error_scm_command_failed: "嘗試存取儲存庫時發生錯誤：: %s"
 error_issue_not_found_in_project: '該項目不存在或不屬於此專案'
 
-mail_subject_lost_password: 您的 Redmine 網站密碼
-mail_body_lost_password: '欲變更您的 Redmine 網站密碼, 請點選以下鏈結:'
-mail_subject_register: 啟用您的 Redmine 帳號
-mail_body_register: '欲啟用您的 Redmine 帳號, 請點選以下鏈結:'
-mail_body_account_information_external: 您可以使用 "%s" 帳號登入 Redmine 網站。
-mail_body_account_information: 您的 Redmine 帳號資訊
-mail_subject_account_activation_request: Redmine 帳號啟用需求通知
+mail_subject_lost_password: 您的 %s 網站密碼
+mail_body_lost_password: '欲變更您的 網站密碼, 請點選以下鏈結:'
+mail_subject_register: 啟用您的 %s 帳號
+mail_body_register: '欲啟用您的 帳號, 請點選以下鏈結:'
+mail_body_account_information_external: 您可以使用 "%s" 帳號登入 網站。
+mail_body_account_information: 您的 帳號資訊
+mail_subject_account_activation_request: %s 帳號啟用需求通知
 mail_body_account_activation_request: '有位新用戶 (%s) 已經完成註冊，正等候您的審核：'
 
 gui_validation_error: 1 個錯誤
diff --git a/lang/zh.yml b/lang/zh.yml
index 836241f90..e2d555fbf 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -82,13 +82,13 @@ error_scm_not_found: "版本库中不存在该条目和（或）其修订版本
 error_scm_command_failed: "访问版本库时发生错误：%s"
 error_issue_not_found_in_project: '问题不存在或不属于此项目'
 
-mail_subject_lost_password: 您的Redmine密码
-mail_body_lost_password: '请点击以下链接来修改您的Redmine密码：'
-mail_subject_register: Redmine帐号激活
-mail_body_register: '请点击以下链接来激活您的Redmine帐号：'
-mail_body_account_information_external: 您可以使用您的 "%s" 帐号来登录Redmine。
-mail_body_account_information: 您的Redmine帐号信息
-mail_subject_account_activation_request: Redmine帐号激活请求
+mail_subject_lost_password: 您的 %s 密码
+mail_body_lost_password: '请点击以下链接来修改您的密码：'
+mail_subject_register: %s帐号激活
+mail_body_register: '请点击以下链接来激活您的帐号：'
+mail_body_account_information_external: 您可以使用您的 "%s" 帐号来登录。
+mail_body_account_information: 您的帐号信息
+mail_subject_account_activation_request: %s帐号激活请求
 mail_body_account_activation_request: '新用户（%s）已完成注册，正在等候您的审核：'
 
 gui_validation_error: 1 个错误