diff --git a/app/views/feeds/news.rxml b/app/views/feeds/news.rxml
index 41fb0cade..67c358d8d 100644
--- a/app/views/feeds/news.rxml
+++ b/app/views/feeds/news.rxml
@@ -1,7 +1,7 @@
 xml.instruct!
 xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/" do
   xml.channel do
-    xml.title "#{Setting.header_title}: #{l(:label_news_latest)}"
+    xml.title "#{Setting.app_title}: #{l(:label_news_latest)}"
     xml.link url_for(:controller => '', :only_path => false)
     xml.pubDate CGI.rfc1123_date(@news.first.created_on)
     xml.description l(:label_news_latest)
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index e4c35b6bd..f4d45f029 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-<title><%= Setting.header_title + (@html_title ? ": #{@html_title}" : "") %></title>
+<title><%= Setting.app_title + (@html_title ? ": #{@html_title}" : "") %></title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <meta name="description" content="redMine" />
 <meta name="keywords" content="issue,bug,tracker" />
@@ -23,8 +23,8 @@
 
     <div id="header">
     <div style="float: left;">
-        <h1><%= Setting.header_title %></h1>
-        <h2><%= Setting.header_subtitle %></h2>
+        <h1><%= Setting.app_title %></h1>
+        <h2><%= Setting.app_subtitle %></h2>
     </div>
     <div style="float: right; padding-right: 1em; padding-top: 0.2em;">
       <% if loggedin? %><small><%=l(:label_logged_as)%> <b><%= @logged_in_user.login %></b></small><% end %>
diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml
index fcbb40f91..d1ec82200 100644
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -2,34 +2,34 @@
 
 <%= start_form_tag({:action => 'edit'}, :class => "tabular") %>
 <div class="box">
-<p><label>header_title</label>
-<%= text_field_tag 'settings[header_title]', Setting.header_title, :size => 30 %></p>
+<p><label><%= l(:setting_app_title) %></label>
+<%= text_field_tag 'settings[app_title]', Setting.app_title, :size => 30 %></p>
 
-<p><label>header_subtitle</label>
-<%= text_field_tag 'settings[header_subtitle]', Setting.header_subtitle, :size => 60 %></p>
+<p><label><%= l(:setting_app_subtitle) %></label>
+<%= text_field_tag 'settings[app_subtitle]', Setting.app_subtitle, :size => 60 %></p>
 
-<p><label>welcome_text</label>
+<p><label><%= l(:setting_welcome_text) %></label>
 <%= text_area_tag 'settings[welcome_text]', Setting.welcome_text, :cols => 60, :rows => 5 %></p>
 
-<p><label>default_language</label>
+<p><label><%= l(:setting_default_language) %></label>
 <%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p>
 
-<p><label>login_required</label>
+<p><label><%= l(:setting_login_required) %></label>
 <%= check_box_tag 'settings[login_required]', 1, Setting.login_required? %><%= hidden_field_tag 'settings[login_required]', 0 %></p>
 
-<p><label>self_registration</label>
+<p><label><%= l(:setting_self_registration) %></label>
 <%= check_box_tag 'settings[self_registration]', 1, Setting.self_registration? %><%= hidden_field_tag 'settings[self_registration]', 0 %></p>
 
-<p><label>attachment_max_size</label>
-<%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %></p>
+<p><label><%= l(:setting_attachment_max_size) %></label>
+<%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p>
 
-<p><label>mail_from</label>
+<p><label><%= l(:setting_mail_from) %></label>
 <%= text_field_tag 'settings[mail_from]', Setting.mail_from, :size => 60 %></p>
 
-<p><label>host_name</label>
+<p><label><%= l(:setting_host_name) %></label>
 <%= text_field_tag 'settings[host_name]', Setting.host_name, :size => 60 %></p>
 
-<p><label>text_formatting</label>
+<p><label><%= l(:setting_text_formatting) %></label>
 <%= select_tag 'settings[text_formatting]', options_for_select( [[l(:label_none), 0], ["textile", "textile"]], Setting.text_formatting) %></p>
 
 </div>
diff --git a/config/settings.yml b/config/settings.yml
index d6b3dfc25..371209926 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -19,9 +19,9 @@
 # DO NOT MODIFY THIS FILE !!!
 # Settings can be defined through the application in Admin -> Settings
 
-header_title:
+app_title:
   default: redMine
-header_subtitle:
+app_subtitle:
   default: Project management
 welcome_text:
   default:
diff --git a/lang/de.yml b/lang/de.yml
index 8f91c7f8a..f1cc3ba66 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -140,6 +140,17 @@ field_hide_mail: Mein email address verstecken
 field_comment: Anmerkung
 field_url: URL
 
+setting_app_title: Applikation Titel
+setting_app_subtitle: Applikation Untertitel
+setting_welcome_text: Willkommener Text
+setting_default_language: Rückstellung Sprache
+setting_login_required: Authent. erfordert
+setting_self_registration: Selbstausrichtung ermöglicht
+setting_attachment_max_size: Dateimaximumgröße
+setting_mail_from: Emission address
+setting_host_name: Host Name
+setting_text_formatting: Textformatierung
+
 label_user: Benutzer
 label_user_plural: Benutzer
 label_user_new: Neuer Benutzer
diff --git a/lang/en.yml b/lang/en.yml
index b21f28710..85df4e17c 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -140,6 +140,17 @@ field_hide_mail: Hide my email address
 field_comment: Comment
 field_url: URL
 
+setting_app_title: Application title
+setting_app_subtitle: Application subtitle
+setting_welcome_text: Welcome text
+setting_default_language: Default language
+setting_login_required: Authent. required
+setting_self_registration: Self-registration enabled
+setting_attachment_max_size: Attachment max. size
+setting_mail_from: Emission mail address
+setting_host_name: Host name
+setting_text_formatting: Text formatting
+
 label_user: User
 label_user_plural: Users
 label_user_new: New user
diff --git a/lang/es.yml b/lang/es.yml
index e4848f1d1..cff537b09 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -140,6 +140,17 @@ field_hide_mail: Ocultar mi email address
 field_comment: Comentario
 field_url: URL
 
+setting_app_title: Título del aplicación
+setting_app_subtitle: Subtítulo del aplicación
+setting_welcome_text: Texto acogida
+setting_default_language: Lengua del defecto
+setting_login_required: Autentif. requerida
+setting_self_registration: Registro permitido
+setting_attachment_max_size: Tamaño máximo del fichero
+setting_mail_from: Email de la emisión
+setting_host_name: Nombre de anfitrión
+setting_text_formatting: Formato de texto
+
 label_user: Usuario
 label_user_plural: Usuarios
 label_user_new: Nuevo usuario
diff --git a/lang/fr.yml b/lang/fr.yml
index 9154ee9c1..2c34755f2 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -140,6 +140,17 @@ field_hide_mail: Cacher mon adresse mail
 field_comment: Commentaire
 field_url: URL
 
+setting_app_title: Titre de l'application
+setting_app_subtitle: Sous-titre de l'application
+setting_welcome_text: Texte d'accueil
+setting_default_language: Langue par défaut
+setting_login_required: Authentif. obligatoire
+setting_self_registration: Enregistrement autorisé
+setting_attachment_max_size: Taille max des fichiers
+setting_mail_from: Adresse d'émission
+setting_host_name: Nom d'hôte
+setting_text_formatting: Formatage du texte
+
 label_user: Utilisateur
 label_user_plural: Utilisateurs
 label_user_new: Nouvel utilisateur
