jro_apps/redmine Commit - r12:b862c447f16e

Localization plugin removed (replaced with GLoc)...

Jean-Philippe Lang -

r12:b862c447f16e

parent child

Context file:

r12:b862c447f16e

Expand all files

redmine/doc/docbook/fr/images/issues_list.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

redmine/doc/docbook/fr/images/users_list.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

redmine/doc/docbook/fr/images/workflow.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

redmine/doc/docbook/fr/redmine-userdoc-fr.xml created 644 +400 0

@@ -0,0 +1,400
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
	3	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
	4	<book>
	5	<title>Documentation redMine</title>
	6
	7	<chapter>
	8	<title>Administration</title>
	9
	10	<section>
	11	<title>Utilisateurs</title>
	12
	13	<para>Ces écrans vous permettent de gérer les utilisateurs de
	14	l'application.</para>
	15
	16	<section>
	17	<title>Liste des utilisateurs</title>
	18
	19	<para></para>
	20
	21	<screenshot>
	22	<screeninfo>Liste des utilisateurs</screeninfo>
	23
	24	<mediaobject>
	25	<imageobject>
	26	<imagedata fileref="images/users_list.png" />
	27	</imageobject>
	28	</mediaobject>
	29	</screenshot>
	30
	31	<para>Les boutons Lock/Unlock vous permettent de
	32	vérouiller/dévérouiller les comptes utilisateurs.</para>
	33
	34	<para>Un utilisateur dont le compte est vérouillé ne peut plus
	35	s'identifier pour accéder à l'application.</para>
	36	</section>
	37
	38	<section>
	39	<title>Création ou modification d'un utilisateur</title>
	40
	41	<para>En mode modification, laissez le champ Password vide pour
	42	laisser le mot de passe de l'utilisateur inchangé.</para>
	43
	44	<para>Un utilisateur déclaré comme administrateur dispose de toutes
	45	les permissions sur l'application et sur tous les projets.</para>
	46
	47	<itemizedlist>
	48	<listitem>
	49	<para><guilabel>Administrateur</guilabel>: déclare l'utilisateur
	50	comme administrateur de l'application.</para>
	51	</listitem>
	52
	53	<listitem>
	54	<para><guilabel>Notifications par mail</guilabel>: permet
	55	d'activer ou non l'envoi automatique de notifications par mail
	56	pour cet utilisateur</para>
	57	</listitem>
	58
	59	<listitem>
	60	<para><guilabel>Vérouillé</guilabel>: désactive le compte de
	61	l'utilisateur</para>
	62	</listitem>
	63	</itemizedlist>
	64	</section>
	65	</section>
	66
	67	<section>
	68	<title>Rôles et permissions</title>
	69
	70	<para>Les rôles permettent de définir les permissions des différents
	71	membres d'un projet. Chaque membre d'un projet dispose d'un rôle unique
	72	au sein d'un projet. Un utilisateur peut avoir différents rôles au sein
	73	de différents projets.</para>
	74
	75	<para>Sur l'écran d'édition du rôle, cochez les actions que vous
	76	souhaitez autoriser pour le rôle.</para>
	77	</section>
	78
	79	<section>
	80	<title>Trackers</title>
	81
	82	<para>Les trackers permettent de typer les demandes et de définir des
	83	workflows spécifiques pour chacun de ces types.</para>
	84	</section>
	85
	86	<section>
	87	<title>Champs personnalisés</title>
	88
	89	<para>Les champs personnalisés vous permettent d'ajouter des
	90	informations supplémentaires sur les demandes. Un champ personnalisé
	91	peut être de l'un des types suivants:</para>
	92
	93	<itemizedlist>
	94	<listitem>
	95	<para><guilabel>Integer</guilabel>: entier positif ou négatif</para>
	96	</listitem>
	97
	98	<listitem>
	99	<para><guilabel>String</guilabel>: chaîne de caractère</para>
	100	</listitem>
	101
	102	<listitem>
	103	<para><guilabel>Date</guilabel>: date</para>
	104	</listitem>
	105
	106	<listitem>
	107	<para><guilabel>Boolean</guilabel>: booléen (case à cocher)</para>
	108	</listitem>
	109
	110	<listitem>
	111	<para><guilabel>List</guilabel>: valeur à sélectionnée parmi une
	112	liste prédéfinie (liste déroulante)</para>
	113	</listitem>
	114	</itemizedlist>
	115
	116	<para>Des éléments de validation peuvent être définis:</para>
	117
	118	<itemizedlist>
	119	<listitem>
	120	<para><guilabel>Obligatoire</guilabel>: champ dont la saisie est
	121	obligatoire sur les demandes</para>
	122	</listitem>
	123
	124	<listitem>
	125	<para><guilabel>Pour tous les projects</guilabel>: champ
	126	automatiquement associé à l'ensemble des projets</para>
	127	</listitem>
	128
	129	<listitem>
	130	<para><guilabel>Min - max length</guilabel>: longueurs minimales et
	131	maximales pour les champs en saisie libre (0 signifie qu'il n'y a
	132	pas de restriction)</para>
	133	</listitem>
	134
	135	<listitem>
	136	<para><guilabel>Expression régulière</guilabel>: expression
	137	régulière permettant de valider la valeur saisie</para>
	138	</listitem>
	139
	140	<listitem>
	141	<para><guilabel>Valeurs possibles</guilabel>: valeurs possibles pour
	142	les champs de type "Liste". Les valeurs sont séparées par le
	143	caractère \|</para>
	144	</listitem>
	145	</itemizedlist>
	146
	147	<para>Si l'option <guilabel>Pour tous les projets</guilabel> n'est pas
	148	activée, chaque projet pourra choisir d'utiliser ou non le champ pour
	149	ses demandes.</para>
	150	</section>
	151
	152	<section>
	153	<title>Statut des demandes</title>
	154
	155	<para>Ces écrans vous permettent de définir les différents statuts
	156	possibles des demandes.</para>
	157
	158	<itemizedlist>
	159	<listitem>
	160	<para><guilabel>Demande fermée</guilabel>: indique que le statut
	161	correspond à une demande considérée comme fermée</para>
	162	</listitem>
	163
	164	<listitem>
	165	<para><guilabel>Statut par défaut</guilabel>: statut appliqué par
	166	défaut aux nouvelles demandes (seul un statut peut être déclaré
	167	comme statut par défaut)</para>
	168	</listitem>
	169
	170	<listitem>
	171	<para><guilabel>Couleur</guilabel>: code couleur HTML (6 caractères)
	172	représentant le statut à l'affichage</para>
	173	</listitem>
	174	</itemizedlist>
	175
	176	<para></para>
	177	</section>
	178
	179	<section>
	180	<title>Workflow</title>
	181
	182	<para>Le workflow permet de définir les changements que les différents
	183	membres d'un projet sont autorisés à effectuer sur les demandes, en
	184	fonction de leur type.</para>
	185
	186	<para>Sélectionnez le rôle et le tracker pour lesquels vous souhaitez
	187	modifier le workflow, puis cliquez sur Edit. L'écran vous permet alors
	188	de modifier, pour le rôle et le tracker choisi, les changements
	189	autorisés. Les lignes représentent les statuts initiaux des demandes.
	190	Les colonnes représentent les statuts autorisés à être appliqués.</para>
	191
	192	<para>Remarque: pour qu'un rôle puisse changer le statut des demandes,
	193	la permission doit lui être explicitement donnée indépendemment de la
	194	configuration du workflow.</para>
	195
	196	<para></para>
	197
	198	<screenshot>
	199	<screeninfo>Exemple de configuration d'un workflow</screeninfo>
	200
	201	<mediaobject>
	202	<imageobject>
	203	<imagedata fileref="images/workflow.png" />
	204	</imageobject>
	205	</mediaobject>
	206	</screenshot>
	207
	208	<para>Dans l'exemple ci-dessus, les demandes de type Bug au statut
	209	Nouveau pourront être passées au statut Assignée ou Résolue par le rôle
	210	Développeur. Celles au statut Assignée pourront être passées au statut
	211	Résolue. Le statut de toutes les autres demandes de type Bug ne pourra
	212	pas être modifié par le Développeur.</para>
	213	</section>
	214
	215	<section>
	216	<title>Listes de valeurs</title>
	217
	218	<para>Les listes de valeurs utilisées par l'application (exemple: les
	219	priorités des demandes) peuvent être personnalisées. Cet écran vous
	220	permet de définir les valeurs possibles pour chacune des listes
	221	suivantes:</para>
	222
	223	<itemizedlist>
	224	<listitem>
	225	<para>Priorités des demandes</para>
	226	</listitem>
	227
	228	<listitem>
	229	<para>Catégories de documents</para>
	230	</listitem>
	231	</itemizedlist>
	232
	233	<para></para>
	234	</section>
	235
	236	<section>
	237	<title>Notifications par mail</title>
	238
	239	<para>Cet écran vous permet de sélectionner les actions qui donneront
	240	lieu à une notification par mail aux membres du projet.</para>
	241
	242	<para>Remarque: l'envoi de mails doit être activé dans la configuration
	243	de l'application si souhaitez effectuer des notifications.</para>
	244	</section>
	245
	246	<section>
	247	<title>Informations</title>
	248
	249	<para>Affiche des informations relatives à l'application et à son
	250	environnement.</para>
	251	</section>
	252	</chapter>
	253
	254	<chapter>
	255	<title>Projets</title>
	256
	257	<para></para>
	258
	259	<section>
	260	<title>Aperçu du projet</title>
	261
	262	<para>L'aperçu vous présente les informations générales relatives au
	263	projet, les principaux membres, les dernières annonces, ainsi qu'une
	264	synthèse du nombre de demandes ouvertes par tracker.</para>
	265
	266	<para></para>
	267	</section>
	268
	269	<section>
	270	<title>Gestion des demandes</title>
	271
	272	<para></para>
	273
	274	<section>
	275	<title>Liste des demandes</title>
	276
	277	<para>Par défaut, l'ensemble des demandes ouvertes du projet sont
	278	affichées. Différents filtres vous permettent de sélectionner les
	279	demandes à afficher. Si le projet comporte des sous-projets, vous avez
	280	la possibilité d'afficher également les demandes relatives aux
	281	sous-projets (non affichées par défaut).</para>
	282
	283	<para>Une fois appliqué, un filtre reste valable durant toute votre
	284	session. Vous pouvez le redéfinir, ou le supprimer en cliquant sur
	285	Annuler.</para>
	286
	287	<para></para>
	288
	289	<screenshot>
	290	<screeninfo>Liste des demandes</screeninfo>
	291
	292	<mediaobject>
	293	<imageobject>
	294	<imagedata fileref="images/issues_list.png" />
	295	</imageobject>
	296	</mediaobject>
	297	</screenshot>
	298
	299	<para></para>
	300	</section>
	301	</section>
	302
	303	<section>
	304	<title>Rapports</title>
	305
	306	<para>Cet écran présente la synthèse du nombre de demandes par statut et
	307	selon différents critères (tracker, priorité, catégorie). Des liens
	308	directs permettent d'accéder à la liste détaillée des demandes pour
	309	chaque critère.</para>
	310	</section>
	311
	312	<section>
	313	<title>Historique</title>
	314
	315	<para>Cette page présente l'ensemble des demandes résolues dans chacune
	316	des versions du projet. Certains types de demande peuvent être exclus de
	317	cet affichage.</para>
	318	</section>
	319
	320	<section>
	321	<title>Annonces</title>
	322
	323	<para>Les nouvelles vous permettent d'informer les utilisateurs sur
	324	l'activité du projet.</para>
	325	</section>
	326
	327	<section>
	328	<title>Documents</title>
	329
	330	<para>Les documents sont groupés par catégories (voir Listes de
	331	valeurs). Un document peut contenir plusieurs fichiers (exemple:
	332	révisions ou versions successives).</para>
	333	</section>
	334
	335	<section>
	336	<title>Fichiers</title>
	337
	338	<para>Ce module vous permet de publier les différents fichiers (sources,
	339	binaires, ...) pour chaque version de l'application.</para>
	340	</section>
	341
	342	<section>
	343	<title>Configuration du projet</title>
	344
	345	<para></para>
	346
	347	<section>
	348	<title>Propriétés du projet</title>
	349
	350	<para></para>
	351
	352	<itemizedlist>
	353	<listitem>
	354	<para><guilabel>Public</guilabel>: si le projet est public, il
	355	sera visible (consultation des demandes, des documents, ...) pour
	356	l'ensemble des utilisateurs, y compris ceux qui ne sont pas
	357	membres du projet. Si le projet n'est pas public, seuls les
	358	membres du projet y ont accès, en fonction de leur rôle.</para>
	359	</listitem>
	360
	361	<listitem>
	362	<para><guilabel>Champs personnalisés</guilabel>: sélectionner les
	363	champs personnalisés que vous souhaitez utiliser au sein du
	364	projet. Seul l'administrateur peut ajouter de nouveaux champs
	365	personnalisés.</para>
	366	</listitem>
	367	</itemizedlist>
	368
	369	<para></para>
	370	</section>
	371
	372	<section>
	373	<title>Membres</title>
	374
	375	<para>Cet écran vous permet de définir les membres du projet ainsi que
	376	leurs rôles respectifs. Un utilisateur ne peut avoir qu'un rôle au
	377	sein d'un projet donné. Le rôle d'un membre détermine les permissions
	378	dont il bénéficie sur le projet.</para>
	379	</section>
	380
	381	<section>
	382	<title>Versions</title>
	383
	384	<para>Les versions vous permettent de suivre les changements survenus
	385	tout au long du projet. A la fermeture d'une demande, vous pouvez par
	386	exemple indiquer quelle version la prend en compte. Vous pouvez par
	387	ailleurs publier les différentes versions de l'application (voir
	388	Fichiers).</para>
	389	</section>
	390
	391	<section>
	392	<title>Catégories des demandes</title>
	393
	394	<para>Les catégories de demande vous permettent de typer les demandes.
	395	Les catégories peuvent par exemple correspondre aux différents modules
	396	du projet.</para>
	397	</section>
	398	</section>
	399	</chapter>
	400	</book> No newline at end of file

redmine/lib/tasks/load_default_data.rake created 644 +43 0

@@ -0,0 +1,43
	1	desc 'Load default configuration data (using default language)'
	2
	3	task :load_default_data => :environment do
	4	include GLoc
	5	set_language_if_valid($RDM_DEFAULT_LANG)
	6
	7	# roles
	8	r = Role.create :name => l(:default_role_manager)
	9	r.permissions = Permission.find(:all, :conditions => ["is_public=?", false])
	10	r = Role.create :name => l(:default_role_developper)
	11	r.permissions = Permission.find(:all, :conditions => ["is_public=?", false])
	12	r = Role.create :name => l(:default_role_reporter)
	13	r.permissions = Permission.find(:all, :conditions => ["is_public=?", false])
	14	# trackers
	15	Tracker.create(:name => l(:default_tracker_bug), :is_in_chlog => true)
	16	Tracker.create(:name => l(:default_tracker_feature), :is_in_chlog => true)
	17	Tracker.create(:name => l(:default_tracker_support), :is_in_chlog => false)
	18	# issue statuses
	19	IssueStatus.create(:name => l(:default_issue_status_new), :is_closed => false, :is_default => true, :html_color => 'F98787')
	20	IssueStatus.create(:name => l(:default_issue_status_assigned), :is_closed => false, :is_default => false, :html_color => 'C0C0FF')
	21	IssueStatus.create(:name => l(:default_issue_status_resolved), :is_closed => false, :is_default => false, :html_color => '88E0B3')
	22	IssueStatus.create(:name => l(:default_issue_status_feedback), :is_closed => false, :is_default => false, :html_color => 'F3A4F4')
	23	IssueStatus.create(:name => l(:default_issue_status_closed), :is_closed => true, :is_default => false, :html_color => 'DBDBDB')
	24	IssueStatus.create(:name => l(:default_issue_status_rejected), :is_closed => true, :is_default => false, :html_color => 'F5C28B')
	25	# workflow
	26	Tracker.find(:all).each { \|t\|
	27	Role.find(:all).each { \|r\|
	28	IssueStatus.find(:all).each { \|os\|
	29	IssueStatus.find(:all).each { \|ns\|
	30	Workflow.create(:tracker_id => t.id, :role_id => r.id, :old_status_id => os.id, :new_status_id => ns.id) unless os == ns
	31	}
	32	}
	33	}
	34	}
	35	# enumerations
	36	Enumeration.create(:opt => "DCAT", :name => l(:default_doc_category_user))
	37	Enumeration.create(:opt => "DCAT", :name => l(:default_doc_category_tech))
	38	Enumeration.create(:opt => "IPRI", :name => l(:default_priority_low))
	39	Enumeration.create(:opt => "IPRI", :name => l(:default_priority_normal))
	40	Enumeration.create(:opt => "IPRI", :name => l(:default_priority_high))
	41	Enumeration.create(:opt => "IPRI", :name => l(:default_priority_urgent))
	42	Enumeration.create(:opt => "IPRI", :name => l(:default_priority_immediate))
	43	end No newline at end of file

redmine/app/controllers/account_controller.rb +14 -8

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class AccountController < ApplicationController
               layout 'base'
               helper :custom_fields
               include CustomFieldsHelper
               # prevents login action to be filtered by check_if_login_required application scope filter
               skip_before_filter :check_if_login_required, :only => [:login, :lost_password, :register]
               before_filter :require_login, :except => [:show, :login, :lost_password, :register]
               # Show user's account
               def show
                 @user = User.find(params[:id])
               end
               # Login request and validation
               def login
                 if request.get?
                   # Logout user
                   self.logged_in_user = nil
                 else
                   # Authenticate user
                   user = User.try_to_login(params[:login], params[:password])
                   if user
                     self.logged_in_user = user
                     redirect_back_or_default :controller => 'account', :action => 'my_page'
                   else
-                    flash[:notice] = l(:notice_account_invalid_creditentials)
+                    flash.now[:notice] = l(:notice_account_invalid_creditentials)
                   end
                 end
               end
               # Log out current user and redirect to welcome page
               def logout
                 self.logged_in_user = nil
                 redirect_to :controller => ''
               end
               # Show logged in user's page
               def my_page
                 @user = self.logged_in_user
                 @reported_issues = Issue.find(:all, :conditions => ["author_id=?", @user.id], :limit => 10, :include => [ :status, :project, :tracker ], :order => 'issues.updated_on DESC')
                 @assigned_issues = Issue.find(:all, :conditions => ["assigned_to_id=?", @user.id], :limit => 10, :include => [ :status, :project, :tracker ], :order => 'issues.updated_on DESC')
               end
               # Edit logged in user's account
               def my_account
                 @user = self.logged_in_user
                 if request.post? and @user.update_attributes(@params[:user])
                   set_localization
-                  flash[:notice] = l(:notice_account_updated)
+                  flash.now[:notice] = l(:notice_account_updated)
                   self.logged_in_user.reload
                 end
               end
               # Change logged in user's password
               def change_password
                 @user = self.logged_in_user
+                flash.now[:notice] = l(:notice_can_t_change_password) and render :action => 'my_account' and return if @user.auth_source_id
                 if @user.check_password?(@params[:password])
                   @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
-                  flash[:notice] = l(:notice_account_password_updated) if @user.save
+                  flash.now[:notice] = l(:notice_account_password_updated) if @user.save
                 else
-                  flash[:notice] = l(:notice_account_wrong_password)
+                  flash.now[:notice] = l(:notice_account_wrong_password)
                 end
                 render :action => 'my_account'
               end
               # Enable user to choose a new password
               def lost_password
                 if params[:token]
                   @token = Token.find_by_action_and_value("recovery", params[:token])
                   redirect_to :controller => '' and return unless @token and !@token.expired?
                   @user = @token.user
                   if request.post?
                     @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
                     if @user.save
                       @token.destroy
                       flash[:notice] = l(:notice_account_password_updated)
                       redirect_to :action => 'login'
                       return
                     end
                   end
                   render :template => "account/password_recovery"
                   return
                 else
                   if request.post?
                     user = User.find_by_mail(params[:mail])
-                    flash[:notice] = l(:notice_account_unknown_email) and return unless user
+                    # user not found in db
+                    flash.now[:notice] = l(:notice_account_unknown_email) and return unless user
+                    # user uses an external authentification
+                    flash.now[:notice] = l(:notice_can_t_change_password) and return if user.auth_source_id
+                    # create a new token for password recovery
                     token = Token.new(:user => user, :action => "recovery")
                     if token.save
-                      Mailer.set_language_if_valid(Localization.lang)
+                      # send token to user via email
+                      Mailer.set_language_if_valid(user.language)
                       Mailer.deliver_lost_password(token)
                       flash[:notice] = l(:notice_account_lost_email_sent)
                       redirect_to :action => 'login'
                       return
                     end
                   end
                 end
               end
               # User self-registration
               def register
                 redirect_to :controller => '' and return if $RDM_SELF_REGISTRATION == false
                 if params[:token]
                   token = Token.find_by_action_and_value("register", params[:token])
                   redirect_to :controller => '' and return unless token and !token.expired?
                   user = token.user
                   redirect_to :controller => '' and return unless user.status == User::STATUS_REGISTERED
                   user.status = User::STATUS_ACTIVE
                   if user.save
                     token.destroy
                     flash[:notice] = l(:notice_account_activated)
                     redirect_to :action => 'login'
                     return
                   end
                 else
                   if request.get?
                     @user = User.new(:language => $RDM_DEFAULT_LANG)
                     @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
                   else
                     @user = User.new(params[:user])
                     @user.admin = false
                     @user.login = params[:user][:login]
                     @user.status = User::STATUS_REGISTERED
                     @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
                     @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
                     @user.custom_values = @custom_values
                     token = Token.new(:user => @user, :action => "register")
                     if @user.save and token.save
-                      Mailer.set_language_if_valid(Localization.lang)
+                      Mailer.set_language_if_valid(@user.language)
                       Mailer.deliver_register(token)
                       flash[:notice] = l(:notice_account_register_done)
                       redirect_to :controller => ''
                     end
                   end
                 end
               end
             end

redmine/app/controllers/application.rb +4 -6

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class ApplicationController < ActionController::Base
               before_filter :check_if_login_required, :set_localization
               def logged_in_user=(user)
                 @logged_in_user = user
                 session[:user_id] = (user ? user.id : nil)
               end
               def logged_in_user
                 if session[:user_id]
                   @logged_in_user ||= User.find(session[:user_id], :include => :memberships)
                 else
                   nil
                 end
               end
               # check if login is globally required to access the application
               def check_if_login_required
                 require_login if $RDM_LOGIN_REQUIRED
               end
               def set_localization
-                Localization.lang = begin
+                lang = begin
-                  if self.logged_in_user and Localization.langs.keys.include? self.logged_in_user.language
+                  if self.logged_in_user and self.logged_in_user.language and !self.logged_in_user.language.empty? and GLoc.valid_languages.include? self.logged_in_user.language.to_sym
                     self.logged_in_user.language
                   elsif request.env['HTTP_ACCEPT_LANGUAGE']
                     accept_lang = HTTPUtils.parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.split('-').first
-                    if Localization.langs.keys.include? accept_lang
+                    if accept_lang and !accept_lang.empty? and GLoc.valid_languages.include? accept_lang.to_sym
                       accept_lang
                     end
                   end
                 rescue
                   nil
                 end || $RDM_DEFAULT_LANG
+                set_language_if_valid(lang)
-                set_language_if_valid(Localization.lang)
               end
               def require_login
                 unless self.logged_in_user
                   store_location
                   redirect_to(:controller => "account", :action => "login")
                   return false
                 end
                 true
               end
               def require_admin
                 return unless require_login
                 unless self.logged_in_user.admin?
                   flash[:notice] = "Acces denied"
                   redirect_to:controller => ''
                   return false
                 end
                 true
               end
               # authorizes the user for the requested action.
               def authorize
                 # check if action is allowed on public projects
                 if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ @params[:controller], @params[:action] ]
                   return true
                 end
                 # if action is not public, force login
                 return unless require_login
                 # admin is always authorized
                 return true if self.logged_in_user.admin?
                 # if not admin, check membership permission
                 @user_membership ||= Member.find(:first, :conditions => ["user_id=? and project_id=?", self.logged_in_user.id, @project.id])
                 if @user_membership and Permission.allowed_to_role( "%s/%s" % [ @params[:controller], @params[:action] ], @user_membership.role_id )
                   return true
                 end
                 flash[:notice] = "Acces denied"
                 redirect_to :controller => ''
                 false
               end
               # store current uri in session.
               # return to this location by calling redirect_back_or_default
               def store_location
                 session[:return_to] = @request.request_uri
               end
               # move to the last store_location call or to the passed default one
               def redirect_back_or_default(default)
                 if session[:return_to].nil?
                   redirect_to default
                 else
                   redirect_to_url session[:return_to]
                   session[:return_to] = nil
                 end
               end
             end

redmine/app/controllers/enumerations_controller.rb +4 -3

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class EnumerationsController < ApplicationController
               layout 'base'
               before_filter :require_admin
               def index
                 list
                 render :action => 'list'
               end
               # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
               verify :method => :post, :only => [ :destroy, :create, :update ],
                      :redirect_to => { :action => :list }
               def list
               end
               def new
                 @enumeration = Enumeration.new(:opt => params[:opt])
               end
               def create
                 @enumeration = Enumeration.new(params[:enumeration])
                 if @enumeration.save
-                  flash[:notice] = 'Enumeration was successfully created.'
+                  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list', :opt => @enumeration.opt
                 else
                   render :action => 'new'
                 end
               end
               def edit
                 @enumeration = Enumeration.find(params[:id])
               end
               def update
                 @enumeration = Enumeration.find(params[:id])
                 if @enumeration.update_attributes(params[:enumeration])
-                  flash[:notice] = 'Enumeration was successfully updated.'
+                  flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list', :opt => @enumeration.opt
                 else
                   render :action => 'edit'
                 end
               end
               def destroy
                 Enumeration.find(params[:id]).destroy
+                flash[:notice] = l(:notice_successful_delete)
                 redirect_to :action => 'list'
               rescue
                 flash[:notice] = "Unable to delete enumeration"
                 redirect_to :action => 'list'
               end
             end

redmine/app/controllers/help_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class HelpController < ApplicationController
               skip_before_filter :check_if_login_required
               before_filter :load_help_config
               # displays help page for the requested controller/action
               def index
                 # select help page to display
                 if @params[:ctrl] and @help_config['pages'][@params[:ctrl]]
                   if @params[:page] and @help_config['pages'][@params[:ctrl]][@params[:page]]
                     template = @help_config['pages'][@params[:ctrl]][@params[:page]]
                   else
                     template = @help_config['pages'][@params[:ctrl]]['index']
                   end
                 end
                 # choose language according to available help translations
-                lang = (@help_config['langs'].include? Localization.lang) ? Localization.lang : @help_config['langs'].first
+                lang = (@help_config['langs'].include? current_language) ? current_language : @help_config['langs'].first
                 if template
                   redirect_to "/manual/#{lang}/#{template}"
                 else
                   redirect_to "/manual/#{lang}/"
                 end
               end
             private
               def load_help_config
                 @help_config = YAML::load(File.open("#{RAILS_ROOT}/config/help.yml"))
               end
             end

redmine/app/controllers/projects_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class ProjectsController < ApplicationController
               layout 'base'
               before_filter :find_project, :authorize, :except => [ :index, :list, :add ]
               before_filter :require_admin, :only => [ :add, :destroy ]
               helper :sort
               include SortHelper
               helper :search_filter
               include SearchFilterHelper
               helper :custom_fields
               include CustomFieldsHelper
               def index
                 list
                 render :action => 'list'
               end
               # Lists public projects
               def list
                 sort_init 'name', 'asc'
                 sort_update
                 @project_count = Project.count(["is_public=?", true])
                 @project_pages = Paginator.new self, @project_count,
 ,
             								@params['page']
                 @projects = Project.find :all, :order => sort_clause,
             						:conditions => ["is_public=?", true],
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset
               end
               # Add a new project
               def add
                 @custom_fields = IssueCustomField.find(:all)
                 @root_projects = Project.find(:all, :conditions => "parent_id is null")
                 @project = Project.new(params[:project])
                 if request.get?
                   @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
                 else
                   @project.custom_fields = CustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids]
                   @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                   @project.custom_values = @custom_values
                   if @project.save
                     flash[:notice] = 'Project was successfully created.'
                     redirect_to :controller => 'admin', :action => 'projects'
             	  end
                 end
               end
               # Show @project
               def show
                 @custom_values = @project.custom_values.find(:all, :include => :custom_field)
                 @members = @project.members.find(:all, :include => [:user, :role])
                 @subprojects = @project.children if @project.children_count > 0
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "news.created_on DESC")
                 @trackers = Tracker.find(:all)
               end
               def settings
                 @root_projects = Project::find(:all, :conditions => ["parent_id is null and id <> ?", @project.id])
                 @custom_fields = IssueCustomField::find_all
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
                 @roles = Role.find_all
                 @users = User.find_all - @project.members.find(:all, :include => :user).collect{|m| m.user }
                 @custom_values = ProjectCustomField.find(:all).collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
               end
               # Edit @project
               def edit
                 if request.post?
                   @project.custom_fields = IssueCustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids]
                   if params[:custom_fields]
                     @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                     @project.custom_values = @custom_values
                   end
                   if @project.update_attributes(params[:project])
                     flash[:notice] = 'Project was successfully updated.'
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Delete @project
               def destroy
                 if request.post? and params[:confirm]
                   @project.destroy
                   redirect_to :controller => 'admin', :action => 'projects'
                 end
               end
               # Add a new issue category to @project
               def add_issue_category
                 if request.post?
                   @issue_category = @project.issue_categories.build(params[:issue_category])
                   if @issue_category.save
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Add a new version to @project
               def add_version
               	@version = @project.versions.build(params[:version])
               	if request.post? and @version.save
                   redirect_to :action => 'settings', :id => @project
               	end
               end
               # Add a new member to @project
               def add_member
                 @member = @project.members.build(params[:member])
               	if request.post?
                   if @member.save
                     flash[:notice] = 'Member was successfully added.'
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Show members list of @project
               def list_members
                 @members = @project.members
               end
               # Add a new document to @project
               def add_document
                 @categories = Enumeration::get_values('DCAT')
                 @document = @project.documents.build(params[:document])
                 if request.post?
                   # Save the attachment
                   if params[:attachment][:file].size > 0
                     @attachment = @document.attachments.build(params[:attachment])
                     @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                   end
                   if @document.save
                     redirect_to :action => 'list_documents', :id => @project
                   end
                 end
               end
               # Show documents list of @project
               def list_documents
                 @documents = @project.documents
               end
               # Add a new issue to @project
               def add_issue
                 @tracker = Tracker.find(params[:tracker_id])
                 @priorities = Enumeration::get_values('IPRI')
                 @issue = Issue.new(:project => @project, :tracker => @tracker)
                 if request.get?
                   @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) }
                 else
                   @issue.attributes = params[:issue]
                   @issue.author_id = self.logged_in_user.id if self.logged_in_user
                   # Create the document if a file was sent
                   if params[:attachment][:file].size > 0
                     @attachment = @issue.attachments.build(params[:attachment])
                     @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                   end
                   @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                   @issue.custom_values = @custom_values
                   if @issue.save
                     flash[:notice] = "Issue was successfully added."
                     Mailer.deliver_issue_add(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
                     redirect_to :action => 'list_issues', :id => @project
                   end
                 end
               end
               # Show filtered/sorted issues list of @project
               def list_issues
                 sort_init 'issues.id', 'desc'
                 sort_update
                 search_filter_init_list_issues
                 search_filter_update if params[:set_filter] or request.post?
                 @issue_count = Issue.count(:include => [:status, :project], :conditions => search_filter_clause)
                 @issue_pages = Paginator.new self, @issue_count, 15, @params['page']
                 @issues = Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :project ],
             						:conditions => search_filter_clause,
             						:limit  =>  @issue_pages.items_per_page,
             						:offset =>  @issue_pages.current.offset
               end
               # Export filtered/sorted issues list to CSV
               def export_issues_csv
                 sort_init 'issues.id', 'desc'
                 sort_update
                 search_filter_init_list_issues
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :project ],
             						:conditions => search_filter_clause
                 export = StringIO.new
                 CSV::Writer.generate(export, ',') do |csv|
                   csv << %w(Id Status Tracker Subject Author Created Updated)
                   @issues.each do |issue|
-                    csv << [issue.id, issue.status.name, issue.tracker.name, issue.subject, issue.author.display_name, _('(time)', issue.created_on),  _('(time)', issue.updated_on)]
+                    csv << [issue.id, issue.status.name, issue.tracker.name, issue.subject, issue.author.display_name, l_datetime(issue.created_on),  l_datetime(issue.updated_on)]
                   end
                 end
                 export.rewind
                 send_data(export.read,
                   :type => 'text/csv; charset=utf-8; header=present',
                   :filename => 'export.csv')
               end
               # Add a news to @project
               def add_news
                 @news = News.new(:project => @project)
                 if request.post?
                   @news.attributes = params[:news]
                   @news.author_id = self.logged_in_user.id if self.logged_in_user
                   if @news.save
                     redirect_to :action => 'list_news', :id => @project
                   end
                 end
               end
               # Show news list of @project
               def list_news
                 @news_pages, @news = paginate :news, :per_page => 10, :conditions => ["project_id=?", @project.id], :include => :author, :order => "news.created_on DESC"
               end
               def add_file
                 if request.post?
                   # Save the attachment
                   if params[:attachment][:file].size > 0
                     @attachment = @project.versions.find(params[:version_id]).attachments.build(params[:attachment])
                     @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                     if @attachment.save
                       redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                     end
                   end
                 end
                 @versions = @project.versions
               end
               def list_files
                 @versions = @project.versions
               end
               # Show changelog of @project
               def changelog
                 @fixed_issues = @project.issues.find(:all,
                                                    :include => [ :fixed_version, :status, :tracker ],
                                                    :conditions => [ "issue_statuses.is_closed=? and trackers.is_in_chlog=? and issues.fixed_version_id is not null", true, true]
                                                   )
               end
             private
               # Find project of id params[:id]
               # if not found, redirect to project list
               # used as a before_filter
               def find_project
                 @project = Project.find(params[:id])
               rescue
                 flash[:notice] = 'Project not found.'
                 redirect_to :action => 'list'
               end
             end

redmine/app/controllers/roles_controller.rb +3 -4

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class RolesController < ApplicationController
             	layout 'base'
             	before_filter :require_admin
               def index
                 list
                 render :action => 'list'
               end
               def list
                 @role_pages, @roles = paginate :roles, :per_page => 10
               end
               def new
                 @role = Role.new(params[:role])
                 if request.post?
                   @role.permissions = Permission.find(@params[:permission_ids]) if @params[:permission_ids]
                   if @role.save
                     flash[:notice] = 'Role was successfully created.'
                     redirect_to :action => 'list'
                   end
                 end
-                @permissions = Permission.find(:all, :order => 'sort ASC')
+                @permissions = Permission.find(:all, :conditions => ["is_public=?", false], :order => 'sort ASC')
               end
               def edit
                 @role = Role.find(params[:id])
                 if request.post? and @role.update_attributes(params[:role])
                   @role.permissions = Permission.find(@params[:permission_ids] || [])
                   Permission.allowed_to_role_expired
                   flash[:notice] = 'Role was successfully updated.'
                   redirect_to :action => 'list'
                 end
-                @permissions = Permission.find(:all, :order => 'sort ASC')
+                @permissions = Permission.find(:all, :conditions => ["is_public=?", false], :order => 'sort ASC')
               end
               def destroy
                 @role = Role.find(params[:id])
                 unless @role.members.empty?
                   flash[:notice] = 'Some members have this role. Can\'t delete it.'
                 else
                   @role.destroy
                 end
                 redirect_to :action => 'list'
               end
               def workflow
                 @role = Role.find_by_id(params[:role_id])
                 @tracker = Tracker.find_by_id(params[:tracker_id])
                 if request.post?
                   Workflow.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
                   (params[:issue_status] || []).each { |old, news|
                     news.each { |new|
                       @role.workflows.build(:tracker_id => @tracker.id, :old_status_id => old, :new_status_id => new)
                     }
                   }
                   if @role.save
                     flash[:notice] = 'Workflow was successfully updated.'
                   end
                 end
                 @roles = Role.find_all
                 @trackers = Tracker.find_all
                 @statuses = IssueStatus.find(:all, :include => :workflows)
               end
             end

redmine/app/helpers/application_helper.rb +8 -4

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module ApplicationHelper
               # return current logged in user or nil
               def loggedin?
                 @logged_in_user
               end
               # return true if user is loggend in and is admin, otherwise false
               def admin_loggedin?
                 @logged_in_user and @logged_in_user.admin?
               end
               def authorize_for(controller, action)
                 # check if action is allowed on public projects
                 if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ controller, action ]
                   return true
                 end
                 # check if user is authorized
                 if @logged_in_user and (@logged_in_user.admin? or Permission.allowed_to_role( "%s/%s" % [ controller, action ], @logged_in_user.role_for_project(@project.id)  )  )
                   return true
                 end
                 return false
               end
               # Display a link if user is authorized
               def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
                 link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller], options[:action])
               end
               # Display a link to user's account page
               def link_to_user(user)
                 link_to user.display_name, :controller => 'account', :action => 'show', :id => user
               end
               def format_date(date)
-                _('(date)', date) if date
+                l_date(date) if date
               end
               def format_time(time)
-                _('(time)', time) if time
+                l_datetime(time) if time
               end
               def pagination_links_full(paginator, options={}, html_options={})
                 html =''
-                html << link_to(('&#171; ' + _('Previous') ), { :page => paginator.current.previous }) + ' ' if paginator.current.previous
+                html << link_to(('&#171; ' + l(:label_previous) ), { :page => paginator.current.previous }) + ' ' if paginator.current.previous
                 html << (pagination_links(paginator, options, html_options) || '')
-                html << ' ' + link_to((_('Next') + ' &#187;'), { :page => paginator.current.next }) if paginator.current.next
+                html << ' ' + link_to((l(:label_next) + ' &#187;'), { :page => paginator.current.next }) if paginator.current.next
                 html
               end
               def error_messages_for(object_name, options = {})
                 options = options.symbolize_keys
                 object = instance_variable_get("@#{object_name}")
                 if object && !object.errors.empty?
                   # build full_messages here with controller current language
                   full_messages = []
                   object.errors.each do |attr, msg|
                     next if msg.nil?
                     if attr == "base"
                       full_messages << l(msg)
                     else
                       full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg)
                     end
                   end
                   content_tag("div",
                     content_tag(
                       options[:header_tag] || "h2", lwr(:gui_validation_error, object.errors.count) + " :"
                     ) +
                     content_tag("ul", full_messages.collect { |msg| content_tag("li", msg) }),
                     "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
                   )
                 else
                   ""
                 end
               end
+              def lang_options_for_select
+                GLoc.valid_languages.collect {|lang| [ l_lang_name(lang.to_s, lang), lang.to_s]}
+              end
             end

redmine/app/helpers/search_filter_helper.rb +13 -12

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module SearchFilterHelper
               def search_filter_criteria(name, options = {})
                 @search_filter ||= {}
                 @search_filter[name] ||= {}
                 @search_filter[name][:options] = []
                 @search_filter[name][:conditions] = {}
                 yield.each { |c|
                   @search_filter[name][:options] << [c[0], c[1].to_s]
                   @search_filter[name][:conditions].store(c[1].to_s, c[2])
                 }
               end
               def search_filter_update
                 session[:search_filter] ||= {}
                 @search_filter.each_key {|field| session[:search_filter][field] = params[field]  }
               end
               def search_filter_clause
                 session[:search_filter] ||= {}
                 clause = ["1=1"]
                 @search_filter.each { |k, v|
                   filter_value = session[:search_filter][k] || v[:options][0][1]
                   if v[:conditions][filter_value]
                     clause[0] = clause[0] + " AND " + v[:conditions][filter_value].first
                     clause += v[:conditions][filter_value][1..-1]
                   end
                 }
                 clause
               end
               def search_filter_tag(criteria, options = {})
                 session[:search_filter] ||= {}
                 options[:name] = criteria
                 options[:class] += " active-filter" if session[:search_filter][criteria] and session[:search_filter][criteria] != @search_filter[criteria][:options][0][1]
                 content_tag("select",
             				options_for_select(@search_filter[criteria][:options], session[:search_filter][criteria]),
             				options
             				)
               end
               def search_filter_init_list_issues
             	search_filter_criteria('status_id') {
-                [ [_('[Open]'), "O", ["issue_statuses.is_closed=?", false]],
+                [ [('['+l(:label_open_issues_plural)+']'), "O", ["issue_statuses.is_closed=?", false]],
-                  [_('[All]'), "A", nil]
+                  [('['+l(:label_closed_issues_plural)+']'), "C", ["issue_statuses.is_closed=?", true]],
+                  [('['+l(:label_all)+']'), "A", nil]
                 ] + IssueStatus.find(:all).collect {|s| [s.name, s.id, ["issues.status_id=?", s.id]] }
                 }
                 search_filter_criteria('tracker_id') {
-                [ [_('[All]'), "A", nil]
+                [ [('['+l(:label_all)+']'), "A", nil]
                 ] + Tracker.find(:all).collect {|s| [s.name, s.id, ["issues.tracker_id=?", s.id]] }
                 }
                 search_filter_criteria('priority_id') {
-                [ [_('[All]'), "A", nil]
+                [ [('['+l(:label_all)+']'), "A", nil]
                 ] + Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect {|s| [s.name, s.id, ["issues.priority_id=?", s.id]] }
                 }
                 search_filter_criteria('category_id') {
-                [ [_('[All]'), "A", nil],
+                [ [('['+l(:label_all)+']'), "A", nil],
-                  [_('[None]'), "N", ["issues.category_id is null"]]
+                  [('['+l(:label_none)+']'), "N", ["issues.category_id is null"]]
                 ] + @project.issue_categories.find(:all).collect {|s| [s.name, s.id, ["issues.category_id=?", s.id]] }
                 }
                 search_filter_criteria('fixed_version_id') {
-                [ [_('[All]'), "A", nil],
+                [ [('['+l(:label_all)+']'), "A", nil],
-                  [_('[None]'), "N", ["issues.fixed_version_id is null"]]
+                  [('['+l(:label_none)+']'), "N", ["issues.fixed_version_id is null"]]
                 ] + @project.versions.collect {|s| [s.name, s.id, ["issues.fixed_version_id=?", s.id]] }
                 }
                 search_filter_criteria('assigned_to_id') {
-                [ [_('[All]'), "A", nil],
+                [ [('['+l(:label_all)+']'), "A", nil],
-                  [_('[None]'), "N", ["issues.assigned_to_id is null"]]
+                  [('['+l(:label_none)+']'), "N", ["issues.assigned_to_id is null"]]
                 ] + @project.users.collect {|s| [s.display_name, s.id, ["issues.assigned_to_id=?", s.id]] }
                 }
                 search_filter_criteria('subproject_id') {
-                [ [_('[None]'), "N", ["issues.project_id=?", @project.id]],
+                [ [('['+l(:label_none)+']'), "N", ["issues.project_id=?", @project.id]],
-                  [_('[All]'), "A", ["(issues.project_id=? or projects.parent_id=?)", @project.id, @project.id]]
+                  [('['+l(:label_all)+']'), "A", ["(issues.project_id=? or projects.parent_id=?)", @project.id, @project.id]]
                 ]
                 }
               end
             end

redmine/app/models/auth_source_ldap.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'net/ldap'
             require 'iconv'
             class AuthSourceLdap < AuthSource
               validates_presence_of :host, :port, :attr_login
               def after_initialize
                 self.port = 389 if self.port == 0
               end
               def authenticate(login, password)
                 attrs = []
                 # get user's DN
                 ldap_con = initialize_ldap_con(self.account, self.account_password)
                 login_filter = Net::LDAP::Filter.eq( self.attr_login, login )
-                object_filter = Net::LDAP::Filter.eq( "objectClass", "organizationalPerson" )
+                object_filter = Net::LDAP::Filter.eq( "objectClass", "*" )
                 dn = String.new
                 ldap_con.search( :base => self.base_dn,
                                  :filter => object_filter & login_filter,
                                  :attributes=> ['dn', self.attr_firstname, self.attr_lastname, self.attr_mail]) do |entry|
                   dn = entry.dn
                   attrs = [:firstname => AuthSourceLdap.get_attr(entry, self.attr_firstname),
                            :lastname => AuthSourceLdap.get_attr(entry, self.attr_lastname),
                            :mail => AuthSourceLdap.get_attr(entry, self.attr_mail),
                            :auth_source_id => self.id ]
                 end
                 return nil if dn.empty?
                 logger.debug "DN found for #{login}: #{dn}" if logger && logger.debug?
                 # authenticate user
                 ldap_con = initialize_ldap_con(dn, password)
                 return nil unless ldap_con.bind
                 # return user's attributes
                 logger.debug "Authentication successful for '#{login}'" if logger && logger.debug?
                 attrs
               rescue  Net::LDAP::LdapError => text
                 raise "LdapError: " + text
               end
               # test the connection to the LDAP
               def test_connection
                 ldap_con = initialize_ldap_con(self.account, self.account_password)
                 ldap_con.open { }
               rescue  Net::LDAP::LdapError => text
                 raise "LdapError: " + text
               end
               def auth_method_name
                 "LDAP"
               end
             private
               def initialize_ldap_con(ldap_user, ldap_password)
                 Net::LDAP.new( {:host => self.host,
                                 :port => self.port,
                                 :auth => { :method => :simple, :username => Iconv.new('iso-8859-15', 'utf-8').iconv(ldap_user), :password => Iconv.new('iso-8859-15', 'utf-8').iconv(ldap_password) }}
                 )
               end
               def self.get_attr(entry, attr_name)
                 entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name]
               end
             end

redmine/app/models/enumeration.rb +4 -8

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Enumeration < ActiveRecord::Base
               before_destroy :check_integrity
             	validates_presence_of :opt, :name
             	validates_uniqueness_of :name, :scope => [:opt]
-            	OPTIONS = [
+            	OPTIONS = {
-            		["Issue priorities", "IPRI"],
+            	  "IPRI" => :enumeration_issue_priorities,
-            		["Document categories", "DCAT"]
+                  "DCAT" => :enumeration_doc_categories
-            	].freeze
+            	}.freeze
             	def self.get_values(option)
             		find(:all, :conditions => ['opt=?', option])
             	end
-              def name
-                _ self.attributes['name']
-              end
             private
               def check_integrity
                 case self.opt
                 when "IPRI"
                   raise "Can't delete enumeration" if Issue.find(:first, :conditions => ["priority_id=?", self.id])
                 when "DCAT"
                   raise "Can't delete enumeration" if Document.find(:first, :conditions => ["category_id=?", self.id])
                 end
               end
             end

redmine/app/models/issue_status.rb 0 -4

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class IssueStatus < ActiveRecord::Base
               before_destroy :check_integrity
               has_many :workflows, :foreign_key => "old_status_id"
               validates_presence_of :name
               validates_uniqueness_of :name
               validates_length_of :html_color, :is=>6
               validates_format_of :html_color, :with => /^[a-f0-9]*$/i
               # Returns the default status for new issues
               def self.default
                 find(:first, :conditions =>["is_default=?", true])
               end
               # Returns an array of all statuses the given role can switch to
               def new_statuses_allowed_to(role, tracker)
                 statuses = []
                 for workflow in self.workflows
                   statuses << workflow.new_status if workflow.role_id == role.id and workflow.tracker_id == tracker.id
                 end unless role.nil? or tracker.nil?
                 statuses
               end
-              def name
-                _ self.attributes['name']
-              end
             private
               def check_integrity
                 raise "Can't delete status" if Issue.find(:first, :conditions => ["status_id=?", self.id]) or IssueHistory.find(:first, :conditions => ["status_id=?", self.id])
               end
             end

redmine/app/models/mailer.rb +1 -2

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Mailer < ActionMailer::Base
               def issue_change_status(issue)
                 # Sends to all project members
                 @recipients     = issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }
                 @from           = 'redmine@somenet.foo'
                 @subject        = "Issue ##{issue.id} has been updated"
                 @body['issue']  = issue
               end
               def issue_add(issue)
                 # Sends to all project members
                 @recipients     = issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }
                 @from           = 'redmine@somenet.foo'
                 @subject        = "Issue ##{issue.id} has been reported"
                 @body['issue']  = issue
               end
               def lost_password(token)
                 @recipients     = token.user.mail
                 @from           = 'redmine@somenet.foo'
                 @subject        = "redMine password"
                 @body['token']  = token
               end
               def register(token)
                 @recipients     = token.user.mail
                 @from           = 'redmine@somenet.foo'
                 @subject        = "redMine account activation"
                 @body['token']  = token
               end
             end

redmine/app/models/member.rb +9 -9

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Member < ActiveRecord::Base
-            	belongs_to :user
+              belongs_to :user
-            	belongs_to :role
+              belongs_to :role
-            	belongs_to :project
+              belongs_to :project
-            	validates_presence_of :role, :user, :project
+              validates_presence_of :role, :user, :project
               validates_uniqueness_of :user_id, :scope => :project_id
-            	def name
+              def name
-            		self.user.display_name
+                self.user.display_name
-            	end
+              end
             end

redmine/app/models/news.rb +9 -9

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class News < ActiveRecord::Base
-            	belongs_to :project
+              belongs_to :project
-            	belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
+              belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
-            	validates_presence_of :title, :description
+              validates_presence_of :title, :description
-            	# returns last created news
+              # returns last created news
-            	def self.latest
+              def self.latest
-            		find(:all, :limit => 5, :include => [ :author, :project ], :order => "news.created_on DESC")
+                find(:all, :limit => 5, :include => [ :author, :project ], :order => "news.created_on DESC")
-            	end
+              end
             end

redmine/app/models/permission.rb +16 -16

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Permission < ActiveRecord::Base
-            	has_and_belongs_to_many :roles
+              has_and_belongs_to_many :roles
-            	validates_presence_of :controller, :action, :description
+              validates_presence_of :controller, :action, :description
               GROUPS = {
-=> "Project",
+=> :label_project,
-=> "Membres",
+=> :label_member_plural,
-=> "Versions",
+=> :label_version_plural,
-=> "Issue categories",
+=> :label_issue_category_plural,
-=> "Issues",
+=> :label_issue_plural,
-=> "News",
+=> :label_news_plural,
-=> "Documents",
+=> :label_document_plural,
-=> "Files",
+=> :label_attachment_plural,
-            	}.freeze
+              }.freeze
               @@cached_perms_for_public = nil
               @@cached_perms_for_roles = nil
-             	def name
+              def name
-            		self.controller + "/" + self.action
+                self.controller + "/" + self.action
-            	end
+              end
               def group_id
                 (self.sort / 100)*100
               end
               def self.allowed_to_public(action)
                 @@cached_perms_for_public ||= find(:all, :conditions => ["is_public=?", true]).collect {|p| "#{p.controller}/#{p.action}"}
                 @@cached_perms_for_public.include? action
               end
               def self.allowed_to_role(action, role)
                 @@cached_perms_for_roles ||=
                   begin
                     perms = {}
                     find(:all, :include => :roles).each {|p| perms.store "#{p.controller}/#{p.action}", p.roles.collect {|r| r.id } }
                     perms
                   end
                 @@cached_perms_for_roles[action] and @@cached_perms_for_roles[action].include? role
               end
               def self.allowed_to_role_expired
                 @@cached_perms_for_roles = nil
               end
             end

redmine/app/models/role.rb +5 -5

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Role < ActiveRecord::Base
               before_destroy :check_integrity
-            	has_and_belongs_to_many :permissions
+              has_and_belongs_to_many :permissions
               has_many :workflows, :dependent => true
               has_many :members
-            	validates_presence_of :name
+              validates_presence_of :name
-            	validates_uniqueness_of :name
+              validates_uniqueness_of :name
             private
               def check_integrity
                 raise "Can't delete role" if Member.find(:first, :conditions =>["role_id=?", self.id])
               end
             end

redmine/app/models/tracker.rb 0 -4

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Tracker < ActiveRecord::Base
               before_destroy :check_integrity
               has_many :issues
               has_many :workflows, :dependent => true
               has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => 'custom_fields_trackers', :association_foreign_key => 'custom_field_id'
               validates_presence_of :name
               validates_uniqueness_of :name
-              def name
-                _ self.attributes['name']
-              end
             private
               def check_integrity
                 raise "Can't delete tracker" if Issue.find(:first, :conditions => ["tracker_id=?", self.id])
               end
             end

redmine/app/models/user.rb +2 -1

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require "digest/sha1"
             class User < ActiveRecord::Base
               has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :dependent => true
               has_many :custom_values, :dependent => true, :as => :customized
               belongs_to :auth_source
               attr_accessor :password, :password_confirmation
               attr_accessor :last_before_login_on
               # Prevents unauthorized assignments
               attr_protected :login, :admin, :password, :password_confirmation, :hashed_password
               validates_presence_of :login, :firstname, :lastname, :mail
               validates_uniqueness_of :login, :mail
               # Login must contain lettres, numbers, underscores only
               validates_format_of :login, :with => /^[a-z0-9_]+$/i
               validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
               # Password length between 4 and 12
               validates_length_of :password, :in => 4..12, :allow_nil => true
               validates_confirmation_of :password, :allow_nil => true
               validates_associated :custom_values, :on => :update
               # Account statuses
               STATUS_ACTIVE     = 1
               STATUS_REGISTERED = 2
               STATUS_LOCKED     = 3
               def before_save
                 # update hashed_password if password was set
                 self.hashed_password = User.hash_password(self.password) if self.password
               end
               # Returns the user that matches provided login and password, or nil
               def self.try_to_login(login, password)
                 user = find(:first, :conditions => ["login=?", login])
                 if user
                   # user is already in local database
                   return nil if !user.active?
                   if user.auth_source
                     # user has an external authentication method
                     return nil unless user.auth_source.authenticate(login, password)
                   else
-                    # local authentication
+                    # authentication with local password
                     return nil unless User.hash_password(password) == user.hashed_password
                   end
                 else
                   # user is not yet registered, try to authenticate with available sources
                   attrs = AuthSource.authenticate(login, password)
                   if attrs
                     onthefly = new(*attrs)
                     onthefly.login = login
                     onthefly.language = $RDM_DEFAULT_LANG
                     if onthefly.save
                       user = find(:first, :conditions => ["login=?", login])
+                      logger.info("User '#{user.login}' created on the fly.") if logger
                     end
                   end
                 end
                 user.update_attribute(:last_login_on, Time.now) if user
                 user
                 rescue => text
                   raise text
               end
               # Return user's full name for display
               def display_name
                 firstname + " " + lastname
               end
               def active?
                 self.status == STATUS_ACTIVE
               end
               def locked?
                 self.status == STATUS_LOCKED
               end
               def check_password?(clear_password)
                 User.hash_password(clear_password) == self.hashed_password
               end
               def role_for_project(project_id)
                 @role_for_projects ||=
                   begin
                     roles = {}
                     self.memberships.each { |m| roles.store m.project_id, m.role_id }
                     roles
                   end
                 @role_for_projects[project_id]
               end
             private
               # Return password digest
               def self.hash_password(clear_password)
                 Digest::SHA1.hexdigest(clear_password || "")
               end
             end

redmine/app/views/account/my_account.rhtml +5 -3

             <h2><%=l(:label_my_account)%></h2>
             <p><%=l(:field_login)%>: <strong><%= @user.login %></strong><br />
             <%=l(:field_created_on)%>: <%= format_time(@user.created_on) %>,
             <%=l(:field_updated_on)%>: <%= format_time(@user.updated_on) %></p>
             <%= error_messages_for 'user' %>
             <div class="splitcontentleft">
               <div class="box">
               <h3><%=l(:label_information_plural)%></h3>
               &nbsp;
               <%= start_form_tag :action => 'my_account' %>
               <!--[form:user]-->
               <p><label for="user_firstname"><%=l(:field_firstname)%> <span class="required">*</span></label><br/>
               <%= text_field 'user', 'firstname'  %></p>
               <p><label for="user_lastname"><%=l(:field_lastname)%> <span class="required">*</span></label><br/>
               <%= text_field 'user', 'lastname'  %></p>
               <p><label for="user_mail"><%=l(:field_mail)%> <span class="required">*</span></label><br/>
               <%= text_field 'user', 'mail' %></p>
               <p><label for="user_language"><%=l(:field_language)%></label><br/>
-              <%= select("user", "language", Localization.langs.invert) %></p>
+              <%= select("user", "language", lang_options_for_select) %></p>
               <!--[eoform:user]-->
               <p><%= check_box 'user', 'mail_notification' %> <label for="user_mail_notification"><%=l(:field_mail_notification)%></label></p>
               <center><%= submit_tag l(:button_save) %></center>
               <%= end_form_tag %>
               </div>
             </div>
             <div class="splitcontentright">
+            <% unless @user.auth_source_id %>
               <div class="box">
               <h3><%=l(:field_password)%></h3>
               &nbsp;
               <%= start_form_tag :action => 'change_password' %>
               <p><label for="password"><%=l(:field_password)%> <span class="required">*</span></label><br/>
               <%= password_field_tag 'password', nil, :size => 25 %></p>
               <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label><br/>
               <%= password_field_tag 'new_password', nil, :size => 25 %></p>
               <p><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label><br/>
               <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>
               <center><%= submit_tag l(:button_save) %></center>
               <%= end_form_tag %>
               </div>
+            <% end %>
             </div>

redmine/app/views/account/register.rhtml +4 -12

             <h2><%=l(:label_register)%></h2>
             <%= start_form_tag %>
             <%= error_messages_for 'user' %>
             <div class="box">
             <!--[form:user]-->
             <p><label for="user_login"><%=l(:field_login)%></label> <span class="required">*</span><br/>
             <%= text_field 'user', 'login', :size => 25  %></p>
             <p><label for="password"><%=l(:field_password)%></label> <span class="required">*</span><br/>
             <%= password_field_tag 'password', nil, :size => 25  %></p>
             <p><label for="password_confirmation"><%=l(:field_password_confirmation)%></label> <span class="required">*</span><br/>
             <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
             <p><label for="user_firstname"><%=l(:field_firstname)%></label> <span class="required">*</span><br/>
             <%= text_field 'user', 'firstname'  %></p>
             <p><label for="user_lastname"><%=l(:field_lastname)%></label> <span class="required">*</span><br/>
             <%= text_field 'user', 'lastname'  %></p>
             <p><label for="user_mail"><%=l(:field_mail)%></label> <span class="required">*</span><br/>
             <%= text_field 'user', 'mail'  %></p>
             <p><label for="user_language"><%=l(:field_language)%></label><br/>
-            <%= select("user", "language", Localization.langs.invert) %></p>
+            <%= select("user", "language", lang_options_for_select) %></p>
             <% for custom_value in @custom_values %>
-              <div style="float:left;margin-right:10px;">
+            	<p><%= custom_field_tag_with_label custom_value %></p>
-            	<p><%= content_tag "label", custom_value.custom_field.name %>
-            	<% if custom_value.custom_field.is_required? %><span class="required">*</span><% end %>
-            	<br />
-            	<%= custom_field_tag custom_value %></p>
-              </div>
             <% end %>
-            <div style="clear: both;"></div>
             <p><%= check_box 'user', 'mail_notification' %> <label for="user_mail_notification"><%=l(:field_mail_notification)%></label></p>
             <!--[eoform:user]-->
             </div>
-              <%= submit_tag l(:button_submit) %>
+            <%= submit_tag l(:button_submit) %>
             <%= end_form_tag %>

redmine/app/views/admin/info.rhtml +1 -1

-            <h2><%=_('Information')%></h2>
+            <h2><%=l(:label_information_plural)%></h2>
             <p><%=l(:field_version)%>: <strong><%= RDM_APP_NAME %> <%= RDM_APP_VERSION %></strong></p>
             <%=l(:label_environment)%>:
             <ul>
             <% Rails::Info.properties.each do |name, value| %>
             <li><%= name %>: <%= value %></li>
             <% end %>
             </ul>

redmine/app/views/custom_fields/list.rhtml +1 -1

             <h2><%=l(:label_custom_field_plural)%></h2>
             <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
             <tr class="ListHead">
             	<th><%=l(:field_name)%></th>
             	<th><%=l(:field_type)%></th>
             	<th><%=l(:field_field_format)%></th>
             	<th><%=l(:field_is_required)%></th>
             	<th><%=l(:field_is_for_all)%></th>
-            	<th><%=_('Used by')%></th>
+            	<th><%=l(:label_used_by)%></th>
             	<th></th>
             </tr>
             <% for custom_field in @custom_fields %>
               <tr class="<%= cycle("odd", "even") %>">
             	<td><%= link_to custom_field.name, :action => 'edit', :id => custom_field %></td>
             	<td align="center"><%= l(custom_field.type_name) %></td>
             	<td align="center"><%= l(CustomField::FIELD_FORMATS[custom_field.field_format]) %></td>
             	<td align="center"><%= image_tag 'true' if custom_field.is_required? %></td>
             	<td align="center"><%= image_tag 'true' if custom_field.is_for_all? %></td>
             	<td align="center"><%= custom_field.projects.count.to_s + ' ' + lwr(:label_project, custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td>
             	<td align="center">
                 <%= start_form_tag :action => 'destroy', :id => custom_field %>
                 <%= submit_tag l(:button_delete), :class => "button-small"  %>
                 <%= end_form_tag %>	</td>
               </tr>
             <% end %>
             </table>
             <%= pagination_links_full @custom_field_pages %>
             <br />
             <%=l(:label_custom_field_new)%>:
             <ul>
             <li><%= link_to l(:label_issue_plural), :action => 'new', :type => 'IssueCustomField' %></li>
             <li><%= link_to l(:label_project_plural), :action => 'new', :type => 'ProjectCustomField' %></li>
             <li><%= link_to l(:label_user_plural), :action => 'new', :type => 'UserCustomField' %></li>
             </ul>

redmine/app/views/documents/_form.rhtml +1 -1

             <%= error_messages_for 'document' %>
             <!--[form:document]-->
             <p><label for="document_category_id"><%=l(:field_category)%></label><br />
             <select name="document[category_id]">
             <%= options_from_collection_for_select @categories, "id", "name", @document.category_id %>
             </select></p>
             <p><label for="document_title"><%=l(:field_title)%> <span class="required">*</span></label><br />
             <%= text_field 'document', 'title', :size => 60 %></p>
-            <p><label for="document_description"><%=l(:field_description)%> <span class="required">*</span></label><br />
+            <p><label for="document_description"><%=l(:field_description)%></label><br />
             <%= text_area 'document', 'description', :cols => 60, :rows => 5 %></p>
             <!--[eoform:document]-->

redmine/app/views/documents/edit.rhtml +2 -2

-            <h2><%=_('Document')%></h2>
+            <h2><%=l(:label_document)%></h2>
             <%= start_form_tag :action => 'edit', :id => @document %>
               <%= render :partial => 'form' %>
-              <%= submit_tag _('Save') %>
+              <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>

redmine/app/views/documents/show.rhtml +10 -10

             <h2><%= @document.title %></h2>
-            <strong><%=_('Description')%>:</strong> <%= @document.description %><br />
+            <strong><%=l(:field_description)%>:</strong> <%= @document.description %><br />
-            <strong><%=_('Category')%>:</strong> <%= @document.category.name %><br />
+            <strong><%=l(:field_category)%>:</strong> <%= @document.category.name %><br />
             <br />
             <% if authorize_for('documents', 'edit') %>
-              <%= start_form_tag ({ :controller => 'documents', :action => 'edit', :id => @document }, :method => 'get' ) %>
+              <%= start_form_tag({ :controller => 'documents', :action => 'edit', :id => @document }, :method => 'get' ) %>
-              <%= submit_tag _('Edit') %>
+              <%= submit_tag l(:button_edit) %>
               <%= end_form_tag %>
             <% end %>
             <% if authorize_for('documents', 'destroy') %>
-              <%= start_form_tag ({ :controller => 'documents', :action => 'destroy', :id => @document } ) %>
+              <%= start_form_tag({ :controller => 'documents', :action => 'destroy', :id => @document } ) %>
-              <%= submit_tag _('Delete') %>
+              <%= submit_tag l(:button_delete) %>
               <%= end_form_tag %>
             <% end %>
             <br /><br />
             <table border="0" cellspacing="1" cellpadding="2" width="100%">
             <% for attachment in @document.attachments %>
               <tr style="background-color:#CEE1ED">
               <td><%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %></td>
               <td align="center"><%= format_date(attachment.created_on) %></td>
               <td align="center"><%= attachment.author.display_name %></td>
-              <td><%= human_size(attachment.filesize) %><br /><%= attachment.downloads %> <%=_('download')%>(s)</td>
+              <td><%= human_size(attachment.filesize) %><br /><%= lwr(:label_download, attachment.downloads) %></td>
               <% if authorize_for('documents', 'destroy_attachment') %>
               <td align="center">
                 <%= start_form_tag :action => 'destroy_attachment', :id => @document, :attachment_id => attachment %>
-                <%= submit_tag _('Delete'), :class => "button-small" %>
+                <%= submit_tag l(:button_delete), :class => "button-small" %>
                 <%= end_form_tag %>
               </tr>
               <% end %>
             <% end %>
             </table>
             <br />
             <% if authorize_for('documents', 'add_attachment') %>
               <%= start_form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true) %>
-              <%=_('Add file')%><br /><%= file_field 'attachment', 'file'  %>
+              <%=l(:label_attachment_new)%><br /><%= file_field 'attachment', 'file'  %>
-              <%= submit_tag _('Add') %>
+              <%= submit_tag l(:button_add) %>
               <%= end_form_tag %>
             <% end %>

redmine/app/views/enumerations/_form.rhtml +1 -1

             <%= error_messages_for 'enumeration' %>
             <!--[form:optvalue]-->
             <%= hidden_field 'enumeration', 'opt'  %>
-            <p><label for="enumeration_name"><%=_('Name')%></label><br/>
+            <p><label for="enumeration_name"><%=l(:field_name)%></label><br/>
             <%= text_field 'enumeration', 'name'  %></p>
             <!--[eoform:optvalue]-->

redmine/app/views/enumerations/edit.rhtml +3 -3

-            <h2><%=_('Enumerations')%></h2>
+            <h2><%=l(:label_enumerations)%></h2>
             <%= start_form_tag :action => 'update', :id => @enumeration %>
               <%= render :partial => 'form' %>
-              <%= submit_tag _('Save') %>
+              <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>
             <%= start_form_tag :action => 'destroy', :id => @enumeration %>
-              <%= submit_tag _('Delete') %>
+              <%= submit_tag l(:button_delete) %>
             <%= end_form_tag %>

redmine/app/views/enumerations/list.rhtml +8 -9

-            <h2><%=_('Enumerations')%></h2>
+            <h2><%=l(:label_enumerations)%></h2>
-            <% for option in Enumeration::OPTIONS %>
+            <% Enumeration::OPTIONS.each do |option, name| %>
-            	<% if @params[:opt]==option[1] %>
+            	<% if @params[:opt]==option %>
-            		<p><%= image_tag 'dir_open' %> <b><%=_ option[0] %></b></p>
+            		<p><%= image_tag 'dir_open' %> <b><%= l(name) %></b></p>
             		<ul>
-            		<% for value in Enumeration::find(:all, :conditions => [ "opt = ?", option[1]]) %>
+            		<% for value in Enumeration.find(:all, :conditions => ["opt = ?", option]) %>
             			<li><%= link_to value.name, :action => 'edit', :id => value %></li>
             		<% end %>
                 </ul>
                 <ul>
-                  <li><%= link_to ('&#187; ' + _('New')), :action => 'new', :opt => option[1] %></li>
+                  <li><%= link_to ('&#187; ' + l(:label_new)), :action => 'new', :opt => option %></li>
                 </ul>
             	<% else %>
-            		<p><%= image_tag 'dir' %> <%= link_to _(option[0]), :opt => option[1] %></p>
+            		<p><%= image_tag 'dir' %> <%= link_to l(name), :opt => option %></p>
             	<% end %>
-            <% end %>
+            <% end %>
  No newline at end of file

redmine/app/views/enumerations/new.rhtml +2 -2

-            <h2><%=_('New enumeration')%></h2>
+            <h2><%=l(:label_enumeration_new)%></h2>
             <%= start_form_tag :action => 'create' %>
               <%= render :partial => 'form' %>
-              <%= submit_tag _('Create') %>
+              <%= submit_tag l(:button_create) %>
             <%= end_form_tag %>

redmine/app/views/issue_categories/_form.rhtml +1 -1

             <%= error_messages_for 'issue_category' %>
             <!--[form:issue_category]-->
-            <p><label for="issue_category_name"><%=_('Name')%></label><br/>
+            <p><label for="issue_category_name"><%l(:field_name)%></label><br/>
             <%= text_field 'issue_category', 'name'  %></p>
             <!--[eoform:issue_category]-->

redmine/app/views/issue_categories/edit.rhtml +2 -2

-            <h2>Editing issue category</h2>
+            <h2><%=l(:label_issue_category)%></h2>
             <%= start_form_tag :action => 'edit', :id => @category %>
               <%= render :partial => 'form' %>
-              <%= submit_tag _('Save') %>
+              <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>

redmine/app/views/issue_statuses/_form.rhtml +4 -4

             <%= error_messages_for 'issue_status' %>
             <!--[form:issue_status]-->
-            <p><label for="issue_status_name"><%=_('Name')%></label> <span class="required">*</span><br/>
+            <p><label for="issue_status_name"><%=l(:field_name)%></label> <span class="required">*</span><br/>
             <%= text_field 'issue_status', 'name'  %></p>
             <p><%= check_box 'issue_status', 'is_closed' %>
-            <label for="issue_status_is_closed"><%=_('Issue closed')%></label></p>
+            <label for="issue_status_is_closed"><%=l(:field_is_closed)%></label></p>
             <p><%= check_box 'issue_status', 'is_default' %>
-            <label for="issue_status_is_default"><%=_('Default status')%></label></p>
+            <label for="issue_status_is_default"><%=l(:field_is_default)%></label></p>
-            <p><label for="issue_status_html_color"><%=_('Color')%></label>
+            <p><label for="issue_status_html_color"><%=l(:field_html_color)%></label>
             #<%= text_field 'issue_status', 'html_color', :maxlength => 6 %> <span class="required">*</span></p>
             <!--[eoform:issue_status]-->

redmine/app/views/issue_statuses/edit.rhtml +2 -2

-            <h2><%=_('Issue status')%></h2>
+            <h2><%=l(:label_issue_status)%></h2>
             <%= start_form_tag :action => 'update', :id => @issue_status %>
               <%= render :partial => 'form' %>
-              <%= submit_tag _('Save') %>
+              <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>

redmine/app/views/issue_statuses/list.rhtml +7 -7

-            <h2><%=_('Issue statuses')%></h2>
+            <h2><%=l(:label_issue_status_plural)%></h2>
             <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
               <tr class="ListHead">
-              <th><%=_('Status')%></th>
+              <th><%=l(:field_status)%></th>
-              <th><%=_('Default status')%></th>
+              <th><%=l(:field_is_default)%></th>
-              <th><%=_('Issue closed')%></th>
+              <th><%=l(:field_is_closed)%></th>
-              <th><%=_('Color')%></th>
+              <th><%=l(:field_html_color)%></th>
               <th></th>
               </tr>
             <% for status in @issue_statuses %>
               <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to status.name, :action => 'edit', :id => status %></td>
               <td align="center"><%= image_tag 'true' if status.is_default? %></td>
               <td align="center"><%= image_tag 'true' if status.is_closed? %></td>
               <td bgcolor="#<%= status.html_color %>">&nbsp</td>
               <td align="center">
                 <%= start_form_tag :action => 'destroy', :id => status %>
-                <%= submit_tag _('Delete'), :class => "button-small" %>
+                <%= submit_tag l(:button_delete), :class => "button-small" %>
                 <%= end_form_tag %>
               </td>
               </tr>
             <% end %>
             </table>
             <%= pagination_links_full @issue_status_pages %>
             <br />
-            <%= link_to '&#187; ' + _('New issue status'), :action => 'new' %>
+            <%= link_to '&#187; ' + l(:label_issue_status_new), :action => 'new' %>

redmine/app/views/issue_statuses/new.rhtml +2 -2

-            <h2><%=_('New issue status')%></h2>
+            <h2><%=l(:label_issue_status_new)%></h2>
             <%= start_form_tag :action => 'create' %>
               <%= render :partial => 'form' %>
-              <%= submit_tag _('Create') %>
+              <%= submit_tag l(:button_create) %>
             <%= end_form_tag %>

redmine/app/views/issues/_list_simple.rhtml +24 -24

@@ -1,28 +1,28
1	<% if issues.length > 0 %>	1	<% if issues.length > 0 %>
2	<table cellspacing="0" cellpadding="1" width="100%" border="0" class="listTable">	2	<table cellspacing="0" cellpadding="1" width="100%" border="0" class="listTable">
3	<tr><td>	3	<tr><td>
4	<table width="100%" border="0" cellspacing="1" cellpadding="2" class="listTableContent">	4	<table width="100%" border="0" cellspacing="1" cellpadding="2" class="listTableContent">
5	<tr class="ListHead">	5	<tr class="ListHead">
6	<th>#</th>	6	<th>#</th>
7	<th><%=_('Tracker')%></th>	7	<th><%=l(:field_tracker)%></th>
8	<th><%=_('Subject')%></th>	8	<th><%=l(:field_subject)%></th>
9	</tr>
10	<% for issue in issues %>
11	<tr bgcolor="#<%= issue.status.html_color %>">
12	<td align="center">
13	<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %><br />
14	</td>
15	<td><p class="small"><%= issue.project.name %> - <%= issue.tracker.name %><br />
16	<%= issue.status.name %> - <%= format_time(issue.updated_on) %></p></td>
17	<td>
18	<p class="small"><%= link_to issue.subject, :controller => 'issues', :action => 'show', :id => issue %></p>
19	</td>
20	</tr>
21	<% end %>
22	</table>
23	</td>
24	</tr>	9	</tr>
25	</table>	10	<% for issue in issues %>
		11	<tr bgcolor="#<%= issue.status.html_color %>">
		12	<td align="center">
		13	<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %><br />
		14	</td>
		15	<td><p class="small"><%= issue.project.name %> - <%= issue.tracker.name %><br />
		16	<%= issue.status.name %> - <%= format_time(issue.updated_on) %></p></td>
		17	<td>
		18	<p class="small"><%= link_to issue.subject, :controller => 'issues', :action => 'show', :id => issue %></p>
		19	</td>
		20	</tr>
		21	<% end %>
		22	</table>
		23	</td>
		24	</tr>
		25	</table>
26	<% else %>	26	<% else %>
27	<%=_('No issue')%>	27	<i><%=l(:label_no_data)%></i>
28	<% end %> No newline at end of file	28	<% end %>

redmine/app/views/issues/change_status.rhtml +6 -7

-            <h2><%=_('Issue')%> #<%= @issue.id %>: <%= @issue.subject %></h2>
+            <h2><%=l(:label_issue)%> #<%= @issue.id %>: <%= @issue.subject %></h2>
             <%= error_messages_for 'history' %>
             <%= start_form_tag :action => 'change_status', :id => @issue %>
             <%= hidden_field_tag 'confirm', 1 %>
             <%= hidden_field 'history', 'status_id' %>
             <div class="box">
-            <p><%=_('New status')%>: <b><%= @history.status.name %></b></p>
+            <p><%=l(:label_issue_status_new)%>: <b><%= @history.status.name %></b></p>
             <div>
-            <p><label for="issue_assigned_to_id"><%=_('Assigned to')%></label><br/>
+            <p><label for="issue_assigned_to_id"><%=l(:field_assigned_to)%></label><br/>
             <select name="issue[assigned_to_id]">
             <option value=""></option>
             <%= options_from_collection_for_select @assignable_to, "id", "display_name", @issue.assigned_to_id %></p>
             </select></p>
             </div>
-            <p><label for="issue_fixed_version"><%=_('Fixed in version')%></label><br/>
+            <p><label for="issue_fixed_version"><%=l(:field_fixed_version)%></label><br/>
             <select name="issue[fixed_version_id]">
             <option value="">--none--</option>
             <%= options_from_collection_for_select @issue.project.versions, "id", "name", @issue.fixed_version_id %>
             </select></p>
-            <p><label for="history_notes"><%=_('Notes')%></label><br />
+            <p><label for="history_notes"><%=l(:field_notes)%></label><br />
             <%= text_area 'history', 'notes', :cols => 60, :rows => 10  %></p>
             </div>
-            <%= submit_tag _('Save') %>
+            <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>

redmine/app/views/issues/edit.rhtml +12 -9

-            <h2><%=_@issue.tracker.name%> #<%= @issue.id %> - <%= @issue.subject %></h2>
+            <h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%= @issue.subject %></h2>
             <%= error_messages_for 'issue' %>
             <%= start_form_tag :action => 'edit', :id => @issue %>
             <div class="box">
             <!--[form:issue]-->
-            <p><%=_('Status')%>: <b><%= @issue.status.name %></b></p>
+            <p><%=l(:field_status)%>: <b><%= @issue.status.name %></b></p>
             <div style="float:left;margin-right:10px;">
-            <p><label for="issue_priority_id"><%=_('Priority')%> <span class="required">*</span></label><br/>
+            <p><label for="issue_priority_id"><%=l(:field_priority)%> <span class="required">*</span></label><br/>
             <select name="issue[priority_id]">
             <%= options_from_collection_for_select @priorities, "id", "name", @issue.priority_id %></p>
             </select></p>
             </div>
             <div style="float:left;margin-right:10px;">
-            <p><label for="issue_assigned_to_id"><%=_('Assigned to')%></label><br/>
+            <p><label for="issue_assigned_to_id"><%=l(:field_assigned_to)%></label><br/>
             <select name="issue[assigned_to_id]">
             <option value=""></option>
             <%= options_from_collection_for_select @issue.project.members, "user_id", "name", @issue.assigned_to_id %></p>
             </select></p>
             </div>
             <div>
-            <p><label for="issue_category_id"><%=_('Category')%></label><br/>
+            <p><label for="issue_category_id"><%=l(:field_category)%></label><br/>
             <select name="issue[category_id]">
             <option value=""></option>
             <%= options_from_collection_for_select @project.issue_categories, "id", "name", @issue.category_id %></p>
             </select></p>
             </div>
-            <p><label for="issue_subject"><%=_('Subject')%></label><span class="required">*</span><br/>
+            <p><label for="issue_subject"><%=l(:field_subject)%></label><span class="required">*</span><br/>
             <%= text_field 'issue', 'subject', :size => 60  %></p>
-            <p><label for="issue_description"><%=_('Description')%></label><span class="required">*</span><br/>
+            <p><label for="issue_description"><%=l(:field_description)%></label><span class="required">*</span><br/>
             <%= text_area 'issue', 'description', :cols => 60, :rows => 10  %></p>
+            <p><label for="issue_due_date"><%=l(:field_due_date)%></label><br />
+            <%= date_select 'issue', 'due_date', :start_year => Date.today.year, :include_blank => true %></p>
             <% for custom_value in @custom_values %>
             	<p><%= custom_field_tag_with_label custom_value %></p>
             <% end %>
-            <p><label for="issue_fixed_version"><%=_('Fixed in version')%></label><br/>
+            <p><label for="issue_fixed_version"><%=l(:field_fixed_version)%></label><br/>
             <select name="issue[fixed_version_id]">
             <option value="">--none--</option>
             <%= options_from_collection_for_select @project.versions, "id", "name", @issue.fixed_version_id %>
             </select></p>
             <!--[eoform:issue]-->
             </div>
-            <%= submit_tag _('Save') %>
+            <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>

redmine/app/views/issues/show.rhtml +22 -21

+            <h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%= @issue.subject %></h2>
-            <h2><%=_(@issue.tracker.name)%> #<%= @issue.id %> - <%= @issue.subject %></h2>
             <div class="box">
-            <p><b><%=_('Status')%>:</b> <%= @issue.status.name %></p>
+            <p>
-            <p><b><%=_('Priority')%>:</b> <%= @issue.priority.name %></p>
+            <b><%=l(:field_status)%> :</b> <%= @issue.status.name %> &nbsp &nbsp
-            <p><b><%=_('Category')%>:</b> <%= @issue.category.name unless @issue.category_id.nil? %></p>
+            <b><%=l(:field_priority)%> :</b> <%= @issue.priority.name %> &nbsp &nbsp
-            <p><b><%=_('Author')%>:</b> <%= @issue.author.display_name %></p>
+            <b><%=l(:field_assigned_to)%> :</b> <%= @issue.assigned_to ? @issue.assigned_to.display_name : "-" %> &nbsp &nbsp
-            <p><b><%=_('Assigned to')%>:</b> <%= @issue.assigned_to.display_name unless @issue.assigned_to.nil? %></p>
+            <b><%=l(:field_category)%> :</b> <%= @issue.category ? @issue.category.name : "-"  %>
+            </p>
-            <p><b><%=_('Subject')%>:</b> <%= @issue.subject %></p>
+            <p><b><%=l(:field_author)%> :</b> <%= @issue.author.display_name %></p>
-            <p><b><%=_('Description')%>:</b> <%= simple_format auto_link @issue.description %></p>
+            <p><b><%=l(:field_subject)%> :</b> <%= @issue.subject %></p>
-            <p><b><%=_('Created on')%>:</b> <%= format_date(@issue.created_on) %></p>
+            <p><b><%=l(:field_description)%> :</b> <%= simple_format auto_link @issue.description %></p>
+            <p><b><%=l(:field_due_date)%> :</b> <%= format_date(@issue.due_date) %></p>
+            <p><b><%=l(:field_created_on)%> :</b> <%= format_date(@issue.created_on) %></p>
             <% for custom_value in @custom_values %>
-            <p><b><%= custom_value.custom_field.name %></b>: <%= show_value custom_value %></p>
+            <p><b><%= custom_value.custom_field.name %></b> : <%= show_value custom_value %></p>
             <% end %>
             <% if authorize_for('issues', 'edit') %>
               <%= start_form_tag ({:controller => 'issues', :action => 'edit', :id => @issue}, :method => "get" ) %>
-              <%= submit_tag _('Edit') %>
+              <%= submit_tag l(:button_edit) %>
               <%= end_form_tag %>
               &nbsp;&nbsp;
             <% end %>
             <% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %>
               <%= start_form_tag ({:controller => 'issues', :action => 'change_status', :id => @issue}) %>
-              <label for="history_status_id"><%=_('Change status')%>:</label>
+              <label for="history_status_id"><%=l(:label_change_status)%> :</label>
               <select name="history[status_id]">
               <%= options_from_collection_for_select @status_options, "id", "name" %>
               </select>
-              <%= submit_tag _ "Update..." %>
+              <%= submit_tag l(:button_change) %>
               <%= end_form_tag %>
               &nbsp;&nbsp;
             <% end %>
             <% if authorize_for('issues', 'destroy') %>
               <%= start_form_tag ({:controller => 'issues', :action => 'destroy', :id => @issue} ) %>
-              <%= submit_tag _ "Delete" %>
+              <%= submit_tag l(:button_delete) %>
               <%= end_form_tag %>
               &nbsp;&nbsp;
             <% end %>
             </div>
             <div class="splitcontentleft">
             <div class="box">
-            <h3><%=_('History')%></h3>
+            <h3><%=l(:label_history)%></h3>
             <table width="100%">
             <% for history in @issue.histories.find(:all, :include => :author) %>
             <tr>
             <td><%= format_date(history.created_on) %></td>
             <td><%= history.author.display_name %></td>
             <td><b><%= history.status.name %></b></td>
             </tr>
             <% if history.notes? %>
             	<tr><td colspan=3><div class="notes"><%= history.notes %></td></tr>
             <% end %>
             <% end %>
             </table>
             </div>
             </div>
             <div class="splitcontentright">
             <div class="box">
-            <h3><%=_('Attachments')%></h3>
+            <h3><%=l(:label_attachment_plural)%></h3>
             <table width="100%">
             <% for attachment in @issue.attachments %>
             <tr>
             <td><%= link_to attachment.filename, :action => 'download', :id => @issue, :attachment_id => attachment %> (<%= human_size(attachment.filesize) %>)</td>
             <td><%= format_date(attachment.created_on) %></td>
             <td><%= attachment.author.display_name %></td>
             <% if authorize_for('issues', 'destroy_attachment') %>
               <td>
               <%= start_form_tag :action => 'destroy_attachment', :id => @issue, :attachment_id => attachment %>
-              <%= submit_tag _('Delete'), :class => "button-small" %>
+              <%= submit_tag l(:button_delete), :class => "button-small" %>
               <%= end_form_tag %>
               </td>
             <% end %>
             </tr>
             <% end %>
             </table>
             <br />
             <% if authorize_for('issues', 'add_attachment') %>
               <%= start_form_tag ({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true) %>
-              <%=_('Add file')%>: <%= file_field 'attachment', 'file'  %>
+              <%=l(:label_attachment_new)%>: <%= file_field 'attachment', 'file'  %>
-              <%= submit_tag _('Add') %>
+              <%= submit_tag l(:button_add) %>
               <%= end_form_tag %>
             <% end %>
             </div>
             </div>

redmine/app/views/layouts/base.rhtml +30 -30

             <!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><%= $RDM_HEADER_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" />
             <%= stylesheet_link_tag "application" %>
             <%= stylesheet_link_tag "menu" %>
             <%= stylesheet_link_tag "rails" %>
             <%= javascript_include_tag :defaults %>
             <%= javascript_include_tag 'menu' %>
             <script type='text/javascript'>
             var menu_contenu=' \
             <div id="menuAdmin" class="menu" onmouseover="menuMouseover(event)"> \
-            <a class="menuItem" href="\/admin\/projects" onmouseover="menuItemMouseover(event,\'menuProjects\');"><span class="menuItemText"><%=_('Projects')%><\/span><span class="menuItemArrow">&#9654;<\/span><\/a> \
+            <a class="menuItem" href="\/admin\/projects" onmouseover="menuItemMouseover(event,\'menuProjects\');"><span class="menuItemText"><%=l(:label_project_plural)%><\/span><span class="menuItemArrow">&#9654;<\/span><\/a> \
-            <a class="menuItem" href="\/users" onmouseover="menuItemMouseover(event,\'menuUsers\');"><span class="menuItemText"><%=_('Users')%><\/span><span class="menuItemArrow">&#9654;<\/span><\/a> \
+            <a class="menuItem" href="\/users" onmouseover="menuItemMouseover(event,\'menuUsers\');"><span class="menuItemText"><%=l(:label_user_plural)%><\/span><span class="menuItemArrow">&#9654;<\/span><\/a> \
-            <a class="menuItem" href="\/roles"><%=_('Roles and permissions')%><\/a> \
+            <a class="menuItem" href="\/roles"><%=l(:label_role_and_permissions)%><\/a> \
-            <a class="menuItem" href="\/trackers" onmouseover="menuItemMouseover(event,\'menuTrackers\');"><span class="menuItemText"><%=_('Trackers')%><\/span><span class="menuItemArrow">&#9654;<\/span><\/a> \
+            <a class="menuItem" href="\/trackers" onmouseover="menuItemMouseover(event,\'menuTrackers\');"><span class="menuItemText"><%=l(:label_tracker_plural)%><\/span><span class="menuItemArrow">&#9654;<\/span><\/a> \
-            <a class="menuItem" href="\/custom_fields"><%=_('Custom fields')%><\/a> \
+            <a class="menuItem" href="\/custom_fields"><%=l(:label_custom_field_plural)%><\/a> \
-            <a class="menuItem" href="\/enumerations"><%=_('Enumerations')%><\/a> \
+            <a class="menuItem" href="\/enumerations"><%=l(:label_enumerations)%><\/a> \
-            <a class="menuItem" href="\/admin\/mail_options"><%=_('Mail notifications')%><\/a> \
+            <a class="menuItem" href="\/admin\/mail_options"><%=l(:field_mail_notification)%><\/a> \
             <a class="menuItem" href="\/auth_sources"><%=l(:label_authentication)%><\/a> \
-            <a class="menuItem" href="\/admin\/info"><%=_('Information')%><\/a> \
+            <a class="menuItem" href="\/admin\/info"><%=l(:label_information_plural)%><\/a> \
             <\/div> \
             <div id="menuTrackers" class="menu"> \
-            <a class="menuItem" href="\/issue_statuses"><%=_('Issue Statuses')%><\/a> \
+            <a class="menuItem" href="\/issue_statuses"><%=l(:label_issue_status_plural)%><\/a> \
-            <a class="menuItem" href="\/roles\/workflow"><%=_('Workflow')%><\/a> \
+            <a class="menuItem" href="\/roles\/workflow"><%=l(:label_workflow)%><\/a> \
             <\/div> \
-            <div id="menuProjects" class="menu"><a class="menuItem" href="\/projects\/add"><%=_('New')%><\/a><\/div> \
+            <div id="menuProjects" class="menu"><a class="menuItem" href="\/projects\/add"><%=l(:label_new)%><\/a><\/div> \
-            <div id="menuUsers" class="menu"><a class="menuItem" href="\/users\/add"><%=_('New')%><\/a><\/div> \
+            <div id="menuUsers" class="menu"><a class="menuItem" href="\/users\/add"><%=l(:label_new)%><\/a><\/div> \
              \
             <% unless @project.nil? || @project.id.nil? %> \
             <div id="menuProject" class="menu" onmouseover="menuMouseover(event)"> \
-            <%= link_to _('Issues'), {:controller => 'projects', :action => 'list_issues', :id => @project }, :class => "menuItem" %> \
+            <%= link_to l(:label_issue_plural), {:controller => 'projects', :action => 'list_issues', :id => @project }, :class => "menuItem" %> \
-            <%= link_to _('Reports'), {:controller => 'reports', :action => 'issue_report', :id => @project }, :class => "menuItem" %> \
+            <%= link_to l(:label_report_plural), {:controller => 'reports', :action => 'issue_report', :id => @project }, :class => "menuItem" %> \
-            <%= link_to _('News'), {:controller => 'projects', :action => 'list_news', :id => @project }, :class => "menuItem" %> \
+            <%= link_to l(:label_news_plural), {:controller => 'projects', :action => 'list_news', :id => @project }, :class => "menuItem" %> \
-            <%= link_to _('Change log'), {:controller => 'projects', :action => 'changelog', :id => @project }, :class => "menuItem" %> \
+            <%= link_to l(:label_change_log), {:controller => 'projects', :action => 'changelog', :id => @project }, :class => "menuItem" %> \
-            <%= link_to _('Documents'), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %> \
+            <%= link_to l(:label_document_plural), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %> \
-            <%= link_to _('Members'), {:controller => 'projects', :action => 'list_members', :id => @project }, :class => "menuItem" %> \
+            <%= link_to l(:label_member_plural), {:controller => 'projects', :action => 'list_members', :id => @project }, :class => "menuItem" %> \
-            <%= link_to _('Files'), {:controller => 'projects', :action => 'list_files', :id => @project }, :class => "menuItem" %> \
+            <%= link_to l(:label_attachment_plural), {:controller => 'projects', :action => 'list_files', :id => @project }, :class => "menuItem" %> \
-            <%= link_to_if_authorized _('Settings'), {:controller => 'projects', :action => 'settings', :id => @project }, :class => "menuItem" %> \
+            <%= link_to_if_authorized l(:label_settings), {:controller => 'projects', :action => 'settings', :id => @project }, :class => "menuItem" %> \
             <\/div> \
             <% end %> \
             ';
             </script>
             </head>
             <body>
             <div id="container" >
                 <div id="header">
                 <div style="float: left;">
                     <h1><%= $RDM_HEADER_TITLE %></h1>
                     <h2><%= $RDM_HEADER_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 %>
                 </div>
                 </div>
             	<div id="navigation">
             		<ul>
             	<li class="selected"><%= link_to l(:label_home), { :controller => '' }, :class => "picHome" %></li>
             	<li><%= link_to l(:label_my_page), { :controller => 'account', :action => 'my_page'}, :class => "picUserPage" %></li>
             	<li><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "picProject" %></li>
                 <% unless @project.nil? || @project.id.nil? %>
                     <li><%= link_to @project.name, { :controller => 'projects', :action => 'show', :id => @project }, :class => "picProject", :onmouseover => "buttonMouseover(event, 'menuProject');"  %></li>
                 <% end %>
                 <% if loggedin? %>
             		<li><%= link_to l(:label_my_account), { :controller => 'account', :action => 'my_account' }, :class => "picUser" %></li>
                 <% end %>
             	<% if admin_loggedin? %>
             		<li><%= link_to l(:label_administration), { :controller => 'admin' }, :class => "picAdmin", :onmouseover => "buttonMouseover(event, 'menuAdmin');" %></li>
             	<% end %>
             	<li class="right"><%= link_to l(:label_help), { :controller => 'help', :ctrl => @params[:controller], :page => @params[:action] }, :target => "new", :class => "picHelp" %></li>
             	<% if loggedin? %>
             		<li class="right"><%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => "picUser" %></li>
             	<% else %>
             		<li class="right"><%= link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => "picUser" %></li>
             	<% end %>
             		</ul>
             	</div>
             	<script type='text/javascript'>if(document.getElementById) {document.write(menu_contenu);}</script>
             	<div id="subcontent">
             		<% unless @project.nil? || @project.id.nil? %>
             			<h2><%= @project.name %></h2>
             			<ul class="menublock">
-            				<li><%= link_to _('Overview'), :controller => 'projects', :action => 'show', :id => @project %></li>
+            				<li><%= link_to l(:label_overview), :controller => 'projects', :action => 'show', :id => @project %></li>
-            				<li><%= link_to _('Issues'), :controller => 'projects', :action => 'list_issues', :id => @project %></li>
+            				<li><%= link_to l(:label_issue_plural), :controller => 'projects', :action => 'list_issues', :id => @project %></li>
-            				<li><%= link_to _('Reports'), :controller => 'reports', :action => 'issue_report', :id => @project %></li>
+            				<li><%= link_to l(:label_report_plural), :controller => 'reports', :action => 'issue_report', :id => @project %></li>
-            				<li><%= link_to _('News'), :controller => 'projects', :action => 'list_news', :id => @project %></li>
+            				<li><%= link_to l(:label_news_plural), :controller => 'projects', :action => 'list_news', :id => @project %></li>
-            				<li><%= link_to _('Change log'), :controller => 'projects', :action => 'changelog', :id => @project %></li>
+            				<li><%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %></li>
-            				<li><%= link_to _('Documents'), :controller => 'projects', :action => 'list_documents', :id => @project %></li>
+            				<li><%= link_to l(:label_document_plural), :controller => 'projects', :action => 'list_documents', :id => @project %></li>
-            				<li><%= link_to _('Members'), :controller => 'projects', :action => 'list_members', :id => @project %></li>
+            				<li><%= link_to l(:label_member_plural), :controller => 'projects', :action => 'list_members', :id => @project %></li>
-            				<li><%= link_to _('Files'), :controller => 'projects', :action => 'list_files', :id => @project %></li>
+            				<li><%= link_to l(:label_attachment_plural), :controller => 'projects', :action => 'list_files', :id => @project %></li>
-            				<li><%= link_to_if_authorized _('Settings'), :controller => 'projects', :action => 'settings', :id => @project %></li>
+            				<li><%= link_to_if_authorized l(:label_settings), :controller => 'projects', :action => 'settings', :id => @project %></li>
             			</ul>
             		<% end %>
             		<% if loggedin? and @logged_in_user.memberships.length > 0 %>
-            			<h2><%=_('My projects') %></h2>
+            			<h2><%=l(:label_my_projects) %></h2>
             			<ul class="menublock">
             				<% for membership in @logged_in_user.memberships %>
             					<li><%= link_to membership.project.name, :controller => 'projects', :action => 'show', :id => membership.project %></li>
             				<% end %>
             			</ul>
             		<% end %>
             	</div>
             	<div id="content">
             		<% if flash[:notice] %><p style="color: green"><%= flash[:notice] %></p><% end %>
             		<%= @content_for_layout %>
             	</div>
             	<div id="footer">
             		<p>
             		<%= auto_link $RDM_FOOTER_SIG %> |
             		<a href="http://redmine.org/" target="_new"><%= RDM_APP_NAME %></a> <%= RDM_APP_VERSION %>
             		</p>
             	</div>
             </div>
             </body>
             </html>

redmine/app/views/mailer/_issue.rhtml +2 -2

-            <%=_('Issue')%> #<%= issue.id %> - <%= issue.subject %>
+            <%=l(:label_issue)%> #<%= issue.id %> - <%= issue.subject %>
-            <%=_('Author')%>: <%= issue.author.display_name %>
+            <%=l(:field_author)%>: <%= issue.author.display_name %>
             <%= issue.description %>
             http://<%= $RDM_HOST_NAME %>/issues/show/<%= issue.id %>

redmine/app/views/news/_form.rhtml +3 -3

             <%= error_messages_for 'news' %>
             <!--[form:news]-->
-            <p><label for="news_title"><%=_('Title')%></label> <span class="required">*</span><br/>
+            <p><label for="news_title"><%=l(:field_title)%></label> <span class="required">*</span><br/>
             <%= text_field 'news', 'title', :size => 60  %></p>
-            <p><label for="news_summary"><%=_('Summary')%></label><br/>
+            <p><label for="news_summary"><%=l(:field_summary)%></label><br/>
             <%= text_area 'news', 'summary', :cols => 60, :rows => 2 %></p>
-            <p><label for="news_description"><%=_('Description')%> <span class="required">*</span></label><br/>
+            <p><label for="news_description"><%=l(:field_description)%> <span class="required">*</span></label><br/>
             <%= text_area 'news', 'description', :cols => 60, :rows => 10 %></p>
             <!--[eoform:news]-->

redmine/app/views/news/edit.rhtml +2 -2

-            <h2><%=_('News')%></h2>
+            <h2><%=l(:label_news)%></h2>
             <%= start_form_tag :action => 'edit', :id => @news %>
               <%= render :partial => 'form' %>
-              <%= submit_tag _('Save') %>
+              <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>

redmine/app/views/news/show.rhtml +3 -3

             <h2><%= @news.title %></h2>
             <p>
-            <b><%=_('Summary')%></b>: <%= @news.summary %><br />
+            <b><%=l(:field_summary)%></b>: <%= @news.summary %><br />
-            <b><%=_('By')%></b>: <%= @news.author.display_name %><br />
+            <b><%=l(:field_author)%></b>: <%= @news.author.display_name %><br />
-            <b><%=_('Date')%></b>: <%= format_time(@news.created_on) %>
+            <b><%=l(:field_created_on)%></b>: <%= format_time(@news.created_on) %>
             </p>
             <%= simple_format auto_link @news.description %>

redmine/app/views/projects/_form.rhtml +6 -6

             <%= error_messages_for 'project' %>
             <div class="box">
             <!--[form:project]-->
-            <p><label for="project_name"><%=_('Name')%> <span class="required">*</span></label><br/>
+            <p><label for="project_name"><%=l(:field_name)%> <span class="required">*</span></label><br/>
             <%= text_field 'project', 'name'  %></p>
             <% if admin_loggedin? %>
-            <p><label for="project_parent_id"><%=_('Subproject of')%></label><br/>
+            <p><label for="project_parent_id"><%=l(:field_parent)%></label><br/>
             <select name="project[parent_id]">
             <option value=""></option>
             <%= options_from_collection_for_select @root_projects, "id", "name", @project.parent_id %>
             </select></p>
             <% end %>
-            <p><label for="project_description"><%=_('Description')%> <span class="required">*</span></label><br/>
+            <p><label for="project_description"><%=l(:field_description)%> <span class="required">*</span></label><br/>
             <%= text_area 'project', 'description', :cols => 60, :rows => 3 %></p>
-            <p><label for="project_homepage"><%=_('Homepage')%></label><br/>
+            <p><label for="project_homepage"><%=l(:field_homepage)%></label><br/>
             <%= text_field 'project', 'homepage', :size => 40 %></p>
             <p><%= check_box 'project', 'is_public' %>
-            <label for="project_is_public"><%=_('Public')%></label></p>
+            <label for="project_is_public"><%=l(:field_is_public)%></label></p>
             <% for custom_value in @custom_values %>
             	<p><%= custom_field_tag_with_label custom_value %></p>
             <% end %>
-            <fieldset><legend><%=_('Custom fields')%></legend>
+            <fieldset><legend><%=l(:label_custom_field_plural)%></legend>
             <% for custom_field in @custom_fields %>
             	<input type="checkbox"
             	name="custom_field_ids[]"
             	value="<%= custom_field.id %>"
             	<%if @project.custom_fields.include? custom_field%>checked="checked"<%end%>
             	> <%= custom_field.name %>
             <% end %></fieldset>
             </div>
             <!--[eoform:project]-->

redmine/app/views/projects/add.rhtml +2 -2

-            <h2><%=_('New project')%></h2>
+            <h2><%=l(:label_project_new)%></h2>
             <%= start_form_tag :action => 'add' %>
             <%= render :partial => 'form' %>
-            <%= submit_tag _('Create') %>
+            <%= submit_tag l(:button_create) %>
             <%= end_form_tag %>

redmine/app/views/projects/add_document.rhtml +4 -18

@@ -1,26 +1,12
1	<h2><%=_(~~'New document'~~)%></h2>	1	<h2><%=l(:label_document_new)%></h2>
2		2
3	<%= error_messages_for 'document' %>
4	<%= start_form_tag( { :action => 'add_document', :id => @project }, :multipart => true) %>	3	<%= start_form_tag( { :action => 'add_document', :id => @project }, :multipart => true) %>
5		4	<%= render :partial => 'documents/form' %>
6	<!--[form:document]-->
7	<p><label for="document_category_id"><%=_('Category')%></label><br />
8	<select name="document[category_id]">
9	<%= options_from_collection_for_select @categories, "id", "name",@document.category_id %>
10	</select></p>
11
12	<p><label for="document_title"><%=_('Title')%> <span class="required">*</span></label><br />
13	<%= text_field 'document', 'title', :size => 60 %></p>
14
15	<p><label for="document_description"><%=_('Description')%> <span class="required">*</span></label><br />
16	<%= text_area 'document', 'description', :cols => 60, :rows => 5 %></p>
17		5
18	<p><label for="attachment_file"><%=_(~~'File'~~)%></label><br/>	6	<p><label for="attachment_file"><%=l(:label_attachment)%></label><br/>
19	<%= file_field 'attachment', 'file' %></p>	7	<%= file_field 'attachment', 'file' %></p>
20		8
21	<!--[eoform:document]-->	9	<%= submit_tag l(:button_create) %>
22
23	<%= submit_tag _('Create') %>
24	<%= end_form_tag %>	10	<%= end_form_tag %>
25		11
26		12

redmine/app/views/projects/add_file.rhtml +5 -4

-            <h2><%=_('New file')%></h2>
+            <h2><%=l(:label_attachment_new)%></h2>
+            <%= error_messages_for 'attachment' %>
             <%= start_form_tag ({ :action => 'add_file', :project => @project }, :multipart => true) %>
-            <p><label for="version_id"><%=_('Version')%></label><br />
+            <p><label for="version_id"><%=l(:field_version)%></label><br />
             <select name="version_id">
             <%= options_from_collection_for_select @versions, "id", "name" %>
             </select></p>
-            <p><b><%=_('File')%><b><br /><%= file_field 'attachment', 'file'  %></p>
+            <p><b><%=l(:label_attachment)%><b><br /><%= file_field 'attachment', 'file'  %></p>
             <br/>
-            <%= submit_tag _('Add') %>
+            <%= submit_tag l(:button_add) %>
             <%= end_form_tag %>

redmine/app/views/projects/add_issue.rhtml +11 -10

-            <h2><%=_('New issue')%>: <%=_(@tracker.name)%></h2>
+            <h2><%=l(:label_issue_new)%>: <%= @tracker.name %></h2>
             <%= start_form_tag( { :action => 'add_issue', :id => @project }, :multipart => true) %>
             <%= error_messages_for 'issue' %>
             <div class="box">
             <!--[form:issue]-->
             <%= hidden_field_tag 'tracker_id', @tracker.id %>
             <div style="float:left;margin-right:10px;">
-            <p><label for="issue_priority_id"><%=_('Priority')%> <span class="required">*</span></label><br/>
+            <p><label for="issue_priority_id"><%=l(:field_priority)%> <span class="required">*</span></label><br />
             <select name="issue[priority_id]">
             <%= options_from_collection_for_select @priorities, "id", "name", @issue.priority_id %></p>
             </select></p>
             </div>
             <div style="float:left;margin-right:10px;">
-            <p><label for="issue_assigned_to_id"><%=_('Assigned to')%></label><br/>
+            <p><label for="issue_assigned_to_id"><%=l(:field_assigned_to)%></label><br />
             <select name="issue[assigned_to_id]">
             <option value=""></option>
             <%= options_from_collection_for_select @issue.project.members, "user_id", "name", @issue.assigned_to_id %></p>
             </select></p>
             </div>
             <div>
-            <p><label for="issue_category_id"><%=_('Category')%></label><br/>
+            <p><label for="issue_category_id"><%=l(:field_category)%></label><br />
             <select name="issue[category_id]">
             <option value=""></option><%= options_from_collection_for_select @project.issue_categories, "id", "name", @issue.category_id %>
             </select></p>
             </div>
-            <p><label for="issue_subject"><%=_('Subject')%> <span class="required">*</span></label><br/>
+            <p><label for="issue_subject"><%=l(:field_subject)%> <span class="required">*</span></label><br />
             <%= text_field 'issue', 'subject', :size => 80  %></p>
-            <p><label for="issue_description"><%=_('Description')%> <span class="required">*</span></label><br/>
+            <p><label for="issue_description"><%=l(:field_description)%> <span class="required">*</span></label><br />
             <%= text_area 'issue', 'description', :cols => 60, :rows => 10 %></p>
+            <p><label for="issue_due_date"><%=l(:field_due_date)%></label><br />
+            <%= date_select 'issue', 'due_date', :start_year => Date.today.year, :include_blank => true %></p>
             <% for custom_value in @custom_values %>
             	<p><%= custom_field_tag_with_label custom_value %></p>
             <% end %>
-            <p><label for="attachment_file"><%=_('Attachment')%></label><br/>
+            <p><label for="attachment_file"><%=l(:label_attachment)%></label><br />
             <%= file_field 'attachment', 'file'  %></p>
             <!--[eoform:issue]-->
             </div>
+            <%= submit_tag l(:button_create) %>
-            <%= submit_tag _('Create') %>
             <%= end_form_tag %>

redmine/app/views/projects/add_news.rhtml +2 -2

-            <h2><%=('Add news')%></h2>
+            <h2><%=l(:label_news_new)%></h2>
             <%= start_form_tag :action => 'add_news', :id => @project %>
               <%= render :partial => 'news/form' %>
-              <%= submit_tag _('Create') %>
+              <%= submit_tag l(:button_create) %>
             <%= end_form_tag %>

redmine/app/views/projects/add_version.rhtml +2 -2

-            <h2><%=_('New version')%></h2>
+            <h2><%=l(:label_version_new)%></h2>
             <%= start_form_tag :action => 'add_version', :id => @project  %>
               <%= render :partial => 'versions/form' %>
-              <%= submit_tag _('Create') %>
+              <%= submit_tag l(:button_create) %>
             <%= end_form_tag %>

redmine/app/views/projects/changelog.rhtml +1 -1

-            <h2><%=_('Change log')%></h2>
+            <h2><%=l(:label_change_log)%></h2>
             <% fixed_issues = @fixed_issues.group_by {|i| i.fixed_version } %>
             <% fixed_issues.each do |version, issues| %>
               <p><strong><%= version.name %></strong> - <%= format_date(version.effective_date) %><br />
               <%=h version.description %></p>
               <ul>
                 <% issues.each do |i| %>
                 <li><%= link_to i.long_id, :controller => 'issues', :action => 'show', :id => i %> [<%= i.tracker.name %>]: <%= i.subject %></li>
                 <% end %>
               </ul>
             <% end %>

redmine/app/views/projects/destroy.rhtml +5 -3

-            <h2><%=_('Confirmation')%></h2>
+            <h2><%=l(:label_confirmation)%></h2>
             <div class="box">
             <center>
-            <p><%=_('Are you sure you want to delete project')%> <strong><%= @project.name %></strong> ?</p>
+            <p><strong><%= @project.name %></strong><br />
+            <%=l(:text_project_destroy_confirmation)%></p>
             <p>
                 <%= start_form_tag({:controller => 'projects', :action => 'destroy', :id => @project}) %>
                 <%= hidden_field_tag "confirm", 1 %>
-                <%= submit_tag _('Delete') %>
+                <%= submit_tag l(:button_delete) %>
                 <%= end_form_tag %>
             </p>
             </center>
             </div>

redmine/app/views/projects/list.rhtml +4 -4

-            <h2><%=_('Public projects')%></h2>
+            <h2><%=l(:label_public_projects)%></h2>
             <table width="100%" cellspacing="1" cellpadding="2" class="listTableContent">
               <tr class="ListHead">
-            	<%= sort_header_tag('name', :caption => _('Project')) %>
+            	<%= sort_header_tag('name', :caption => l(:label_project)) %>
-            	<th>Description</th>
+            	<th><%=l(:field_description)%></th>
-            	<%= sort_header_tag('created_on', :caption => _('Created on')) %>
+            	<%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
               </tr>
             <% for project in @projects %>
               <tr class="<%= cycle("odd", "even") %>">
             	<td><%= link_to project.name, :action => 'show', :id => project %>
             	<td><%= project.description %>
             	<td align="center"><%= format_date(project.created_on) %>
               </tr>
             <% end %>
             </table>
             <%= pagination_links_full @project_pages %>
             [ <%= @project_pages.current.first_item %> - <%= @project_pages.current.last_item %> / <%= @project_count %> ]

redmine/app/views/projects/list_documents.rhtml +3 -3

-            <h2><%=_('Documents')%></h2>
+            <h2><%=l(:label_document_plural)%></h2>
             <% documents = @documents.group_by {|d| d.category } %>
             <% documents.each do |category, docs| %>
             <h3><%= category.name %></h3>
             <ul>
             <% docs.each do |d| %>
               <li>
                 <b><%= link_to d.title, :controller => 'documents', :action => 'show', :id => d %></b>
                 <br />
-                <%=_('Desciption')%>: <%= d.description %><br />
+                <%=l(:field_description)%>: <%= d.description %><br />
                 <%= format_time(d.created_on) %>
               </li>
             <% end %>
             </ul>
             <% end %>
             <p>
-            <%= link_to_if_authorized '&#187; ' + _('New'), :controller => 'projects', :action => 'add_document', :id => @project %>
+            <%= link_to_if_authorized '&#187; ' + l(:label_document_new), :controller => 'projects', :action => 'add_document', :id => @project %>
             </p>

redmine/app/views/projects/list_files.rhtml +7 -7

-            <h2><%=_('Files')%></h2>
+            <h2><%=l(:label_attachment_plural)%></h2>
             <% delete_allowed = authorize_for('versions', 'destroy_file') %>
             <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
               <tr class="ListHead">
-                <th><%=_('Version')%></th>
+                <th><%=l(:field_version)%></th>
-                <th><%=_('File')%></th>
+                <th><%=l(:field_filename)%></th>
-                <th><%=_('Date')%></th>
+                <th><%=l(:label_date)%></th>
-                <th><%=_('Size')%></th>
+                <th><%=l(:field_filesize)%></th>
                 <th>D/L</th>
                 <th>MD5</th>
                 <% if delete_allowed %><th></th><% end %>
               </tr>
             <% for version in @versions %>
               <tr>
                 <td colspan="7"><%= image_tag 'package' %> <b><%= version.name %></b></td>
               </tr>
               <% for file in version.attachments %>
               <tr class="<%= cycle("odd", "even") %>">
                 <td></td>
                 <td><%= link_to file.filename, :controller => 'versions', :action => 'download', :id => version, :attachment_id => file %></td>
                 <td align="center"><%= format_date(file.created_on) %></td>
                 <td align="center"><%= human_size(file.filesize) %></td>
                 <td align="center"><%= file.downloads %></td>
                 <td align="center"><small><%= file.digest %></small></td>
                 <% if delete_allowed %>
                 <td align="center">
                   <%= start_form_tag :controller => 'versions', :action => 'destroy_file', :id => version, :attachment_id => file %>
-                  <%= submit_tag _('Delete'), :class => "button-small" %>
+                  <%= submit_tag l(:button_delete), :class => "button-small" %>
                   <%= end_form_tag %>
                 </td>
                 <% end %>
               </tr>
               <% end
               reset_cycle %>
             <% end %>
             </table>
             <br />
             <p>
-            <%= link_to_if_authorized '&#187; ' + _('New'), :controller => 'projects', :action => 'add_file', :id => @project %>
+            <%= link_to_if_authorized '&#187; ' + l(:label_attachment_new), :controller => 'projects', :action => 'add_file', :id => @project %>
             </p>

redmine/app/views/projects/list_issues.rhtml +40 -43

@@ -1,56 +1,53
1	<h2><%=_(~~'Issues'~~)%></h2>	1	<h2><%=l(:label_issue_plural)%></h2>
2		2
3	<form method="post" class="noborder">	3	<form method="post" class="noborder">
4	<table cellpadding=2>	4	<table cellpadding=2>
5	<tr>	5	<tr>
6	<td><small><%=_(~~'Status'~~)%>:</small><br /><%= search_filter_tag 'status_id', :class => 'select-small' %></td>	6	<td><small><%=l(:field_status)%>:</small><br /><%= search_filter_tag 'status_id', :class => 'select-small' %></td>
7	<td><small><%=_('Tracker')%>:</small><br /><%= search_filter_tag 'tracker_id', :class => 'select-small' %></td>	7	<td><small><%=l(:field_tracker)%>:</small><br /><%= search_filter_tag 'tracker_id', :class => 'select-small' %></td>
8	<td><small><%=_('Priority')%>:</small><br /><%= search_filter_tag 'priority_id', :class => 'select-small' %></td>	8	<td><small><%=l(:field_priority)%>:</small><br /><%= search_filter_tag 'priority_id', :class => 'select-small' %></td>
9	<td><small><%=_('Category')%>:</small><br /><%= search_filter_tag 'category_id', :class => 'select-small' %></td>	9	<td><small><%=l(:field_category)%>:</small><br /><%= search_filter_tag 'category_id', :class => 'select-small' %></td>
10	<td><small><%=_(~~'Fixed in~~ version')%>:</small><br /><%= search_filter_tag 'fixed_version_id', :class => 'select-small' %></td>	10	<td><small><%=l(:field_fixed_version)%>:</small><br /><%= search_filter_tag 'fixed_version_id', :class => 'select-small' %></td>
11	<td><small><%=_(~~'Assigned to'~~)%>:</small><br /><%= search_filter_tag 'assigned_to_id', :class => 'select-small' %></td>	11	<td><small><%=l(:field_assigned_to)%>:</small><br /><%= search_filter_tag 'assigned_to_id', :class => 'select-small' %></td>
12	<td><small><%=_(~~'Subprojects'~~)%>:</small><br /><%= search_filter_tag 'subproject_id', :class => 'select-small' %></td>	12	<td><small><%=l(:label_subproject_plural)%>:</small><br /><%= search_filter_tag 'subproject_id', :class => 'select-small' %></td>
13		13
14	<td valign="bottom">	14	<td valign="bottom">
15	<%= submit_tag _(~~'Apply filter'~~), :class => 'button-small' %>	15	<%= submit_tag l(:button_apply), :class => 'button-small' %>
16	<%= end_form_tag %>	16	<%= end_form_tag %>
17		17
18	<%= start_form_tag %>	18	<%= start_form_tag %>
19	<%= submit_tag _(~~'Reset'~~), :class => 'button-small' %>	19	<%= submit_tag l(:button_clear), :class => 'button-small' %>
20	<%= end_form_tag %>	20	<%= end_form_tag %>
21	</td>	21	</td>
22	</tr>	22	</tr>
23	</table>	23	</table>
24		24
25	<table border="0" cellspacing="1" cellpadding="2" class="listTableContent">	25	<table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
26		26	<tr><td colspan="7" align="right">
27	<tr><td colspan="7" align="right">	27	<small><%= link_to l(:label_export_csv), :action => 'export_issues_csv', :id => @project.id %></small>
28	<small><%= link_to 'Export to CSV', :action => 'export_issues_csv', :id => @project.id %></small>	28	</td></tr>
29	</td></tr>	29	<tr class="ListHead">
30		30	<%= sort_header_tag('issues.id', :caption => '#') %>
31	<tr class="ListHead">	31	<%= sort_header_tag('issue_statuses.name', :caption => l(:field_status)) %>
32	<%= sort_header_tag('issues.id', :caption => ~~'#'~~) %>	32	<%= sort_header_tag('issues.tracker_id', :caption => l(:field_tracker)) %>
33	<%= sort_header_tag('issue_statuses.name', :caption => _('Status')) %>	33	<th><%=l(:field_subject)%></th>
34	<%= sort_header_tag('~~issues.tracker_id~~', :caption => _(~~'Tracker'~~)) %>	34	<%= sort_header_tag('users.lastname', :caption => l(:field_author)) %>
35	<th><%=_('Subject')%></th>	35	<%= sort_header_tag('issues.created_on', :caption => l(:field_created_on)) %>
36	<%= sort_header_tag('~~users.lastname~~', :caption => _(~~'Author'~~)) %>	36	<%= sort_header_tag('issues.updated_on', :caption => l(:field_updated_on)) %>
37	<%= sort_header_tag('issues.created_on', :caption => _('Created on')) %>	37	</tr>
38	<%= sort_header_tag('issues.updated_on', :caption => _('Last update')) %>	38	<% for issue in @issues %>
39	</tr>	39	<tr bgcolor="#<%= issue.status.html_color %>">
40		40	<td align="center"><%= link_to issue.long_id, :controller => 'issues', :action => 'show', :id => issue %></td>
41	<% for issue in @issues %>	41	<td align="center"><%= issue.status.name %></td>
42	<tr bgcolor="#<%= issue.status.html_color %>">	42	<td align="center"><%= issue.tracker.name %></td>
43	<td ~~align~~=~~"center"~~><%= link_to issue.~~long_id~~, :controller => 'issues', :action => 'show', :id => issue %></td>	43	<td><%= link_to issue.subject, :controller => 'issues', :action => 'show', :id => issue %></td>
44	<td align="center"><%= issue.~~status~~.name %></td>	44	<td align="center"><%= issue.author.display_name %></td>
45	<td align="center"><%= issue.~~tracker~~.~~name~~ %></td>	45	<td align="center"><%= format_time(issue.created_on) %></td>
46	<td><%= link_to issue.subject, :controller => 'issues', :action => 'show', :id => issue %></td>	46	<td align="center"><%= format_time(issue.updated_on) %></td>
47	<td align="center"><%= issue.author.display_name %></td>	47	</tr>
48	<td align="center"><%= format_time(issue.created_on) %></td>	48	<% end %>
49	<td align="center"><%= format_time(issue.updated_on) %></td>	49	</table>
50	</tr>	50	<p>
51	<% end %>	51	<%= pagination_links_full @issue_pages %>
52	</table>	52	[ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]
53	<p>	53	</p> No newline at end of file
54	<%= pagination_links_full @issue_pages %>
55	[ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]
56	</p> No newline at end of file

redmine/app/views/projects/list_members.rhtml +1 -1

-            <h2><%=_('Project members')%></h2>
+            <h2><%=l(:label_member_plural)%></h2>
             <% members = @members.group_by {|m| m.role } %>
             <% members.each do |role, member| %>
             <h3><%= role.name %></h3>
             <ul>
             <% member.each do |m| %>
             <li><%= link_to m.user.display_name, :controller => 'account', :action => 'show', :id => m.user %> (<%= format_date m.created_on %>)</li>
             <% end %>
             </ul>
             <% end %>

redmine/app/views/projects/list_news.rhtml +3 -3

-            <h2><%=_('News')%></h2>
+            <h2><%=l(:label_news_plural)%></h2>
             <% for news in @news %>
             	<p>
             	<b><%= news.title %></b> <small>(<%= link_to_user news.author %> <%= format_time(news.created_on) %>)</small>
             	<%= link_to_if_authorized image_tag('edit_small'), :controller => 'news', :action => 'edit', :id => news %>
             	<%= link_to_if_authorized image_tag('delete'), { :controller => 'news', :action => 'destroy', :id => news }, :confirm => 'Are you sure?' %>
             	<br />
             	<%= news.summary %>
-            	<small>[<%= link_to _('Read...'), :controller => 'news', :action => 'show', :id => news %>]</small>
+            	<small>[<%= link_to l(:label_read), :controller => 'news', :action => 'show', :id => news %>]</small>
             	</p>
             <% end %>
             <%= pagination_links_full @news_pages %>
             <p>
-            <%= link_to_if_authorized '&#187; ' + _('Add'), :controller => 'projects', :action => 'add_news', :id => @project %>
+            <%= link_to_if_authorized '&#187; ' + l(:label_news_new), :controller => 'projects', :action => 'add_news', :id => @project %>
             </p>

redmine/app/views/projects/settings.rhtml +15 -15

-            <h2><%=_('Settings')%></h2>
+            <h2><%=l(:label_settings)%></h2>
             <%= start_form_tag :action => 'edit', :id => @project %>
             <%= render :partial => 'form' %>
-            <center><%= submit_tag _('Save') %></center>
+            <center><%= submit_tag l(:button_save) %></center>
             <%= end_form_tag %>
             &nbsp;
             <div class="box">
-            <h3><%=_('Members')%></h3>
+            <h3><%=l(:label_member_plural)%></h3>
             <%= error_messages_for 'member' %>
             <table>
             <% for member in @project.members.find(:all, :include => :user) %>
             	<% unless member.new_record? %>
             	<tr>
             		<td><%= member.user.display_name %></td>
                 <td>
                   <%= start_form_tag :controller => 'members', :action => 'edit', :id => member %>
                   <select name="member[role_id]">
                     <%= options_from_collection_for_select @roles, "id", "name", member.role_id %>
                   </select>
                 </td>
                 <td>
-                  <%= submit_tag _('Save'), :class => "button-small" %>
+                  <%= submit_tag l(:button_change), :class => "button-small" %>
                   <%= end_form_tag %>
                 </td>
             		<td>
                   <%= start_form_tag :controller => 'members', :action => 'destroy', :id => member %>
-                  <%= submit_tag _('Delete'), :class => "button-small" %>
+                  <%= submit_tag l(:button_delete), :class => "button-small" %>
                   <%= end_form_tag %>
             		</td>
             	</tr>
             	<% end %>
             <% end %>
             </table>
             <hr />
-                <label><%=_('New member')%></label><br/>
+                <label><%=l(:label_member_new)%></label><br/>
                   <%= start_form_tag :controller => 'projects', :action => 'add_member', :id => @project %>
                   <select name="member[user_id]">
                     <%= options_from_collection_for_select @users, "id", "display_name", @member.user_id %>
                   </select>
                   <select name="member[role_id]">
                     <%= options_from_collection_for_select @roles, "id", "name", @member.role_id %>
                   </select>
-                  <%= submit_tag _('Add') %>
+                  <%= submit_tag l(:button_add) %>
                   <%= end_form_tag %>
             </div>
             <div class="box">
-            <h3><%=_('Versions')%></h3>
+            <h3><%=l(:label_version_plural)%></h3>
             <table>
             <% for version in @project.versions %>
               <tr>
               <td><%= link_to version.name, :controller => 'versions', :action => 'edit', :id => version %></td>
               <td><%=h version.description %></td>
               <td>
                   <%= start_form_tag :controller => 'versions', :action => 'destroy', :id => version %>
-                  <%= submit_tag _('Delete'), :class => "button-small" %>
+                  <%= submit_tag l(:button_delete), :class => "button-small" %>
                   <%= end_form_tag %>
               </td>
               </tr>
             <% end %>
             </table>
             <hr />
                   <%= start_form_tag ({ :controller => 'projects', :action => 'add_version', :id => @project }, :method => 'get' ) %>
-                  <%= submit_tag _('New version...') %>
+                  <%= submit_tag l(:label_version_new) %>
                   <%= end_form_tag %>
             </div>
             <div class="box">
-            <h3><%=_('Issue categories')%></h3>
+            <h3><%=l(:label_issue_category_plural)%></h3>
             <table>
             <% for @category in @project.issue_categories %>
             	<% unless @category.new_record? %>
             	<tr>
             		<td>
                   <%= start_form_tag :controller => 'issue_categories', :action => 'edit', :id => @category %>
                   <%= text_field 'category', 'name', :size => 25  %>
                 </td>
             		<td>
-                  <%= submit_tag _('Save'), :class => "button-small" %>
+                  <%= submit_tag l(:button_save), :class => "button-small" %>
                   <%= end_form_tag %>
                 </td>
                 <td>
                   <%= start_form_tag :controller => 'issue_categories', :action => 'destroy', :id => @category %>
-                  <%= submit_tag _('Delete'), :class => "button-small" %>
+                  <%= submit_tag l(:button_delete), :class => "button-small" %>
                   <%= end_form_tag %>
             		</td>
             	</tr>
             	<% end %>
             <% end %>
             </table>
             <hr />
             <%= start_form_tag :action => 'add_issue_category', :id => @project %>
+            <label for="issue_category_name"><%=l(:label_issue_category_new)%></label><br/>
             <%= error_messages_for 'issue_category' %>
-            <label for="issue_category_name"><%=_('New category')%></label><br/>
             <%= text_field 'issue_category', 'name', :size => 25 %>
-            <%= submit_tag _('Create') %>
+            <%= submit_tag l(:button_create) %>
             <%= end_form_tag %>
             </div>

redmine/app/views/projects/show.rhtml +14 -13

-            <h2><%=_('Overview')%></h2>
+            <h2><%=l(:label_overview)%></h2>
             <div class="splitcontentleft">
             	<%= @project.description %>
             	<ul>
-            	<li><%=_('Homepage')%>: <%= link_to @project.homepage, @project.homepage %></li>
+            	<li><%=l(:field_homepage)%>: <%= link_to @project.homepage, @project.homepage %></li>
-            	<li><%=_('Created on')%>: <%= format_date(@project.created_on) %></li>
+            	<li><%=l(:field_created_on)%>: <%= format_date(@project.created_on) %></li>
             	<% for custom_value in @custom_values %>
             	<% if !custom_value.value.empty? %>
             	   <li><%= custom_value.custom_field.name%>: <%= custom_value.value%></li>
             	<% end %>
             	<% end %>
             	</ul>
               <div class="box">
-                <h3><%= image_tag "tracker" %> <%=_('Trackers')%></h3>
+                <h3><%= image_tag "tracker" %> <%=l(:label_tracker_plural)%></h3>
                 <ul>
                 <% for tracker in @trackers %>
                   <li><%= link_to tracker.name, :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,
                                                             "tracker_id" => tracker.id %>:
-                  <%= Issue.count(:conditions => ["project_id=? and tracker_id=? and issue_statuses.is_closed=?", @project.id, tracker.id, false], :include => :status) %> <%=_('open')%>
+                  <%= issue_count = Issue.count(:conditions => ["project_id=? and tracker_id=? and issue_statuses.is_closed=?", @project.id, tracker.id, false], :include => :status) %>
+                  <%= lwr(:label_open_issues, issue_count) %>
                   </li>
                 <% end %>
                 </ul>
                 <% if authorize_for 'projects', 'add_issue' %>
-                    &#187; <%=_('Report an issue')%>:
+                    &#187; <%=l(:label_issue_new)%>:
                     <ul>
                     <% @trackers.each do |tracker| %>
-                    <li><%= link_to _(tracker.name), :controller => 'projects', :action => 'add_issue', :id => @project, :tracker_id => tracker %></li>
+                    <li><%= link_to tracker.name, :controller => 'projects', :action => 'add_issue', :id => @project, :tracker_id => tracker %></li>
                     <% end %>
                     </ul>
                 <% end %>
-                <center><small>[ <%= link_to _('View all issues'), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %> ]</small></center>
+                <center><small>[ <%= link_to l(:label_issue_view_all), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %> ]</small></center>
               </div>
             </div>
             <div class="splitcontentright">
             	<div class="box">
-            		<h3><%= image_tag "users" %> <%=_('Members')%></h3>
+            		<h3><%= image_tag "users" %> <%=l(:label_member_plural)%></h3>
             		<% for member in @members %>
             		<%= link_to_user member.user %> (<%= member.role.name %>)<br />
             		<% end %>
             	</div>
               <% if @subprojects %>
              	<div class="box">
-            		<h3><%= image_tag "projects" %> <%=_('Subprojects')%></h3>
+            		<h3><%= image_tag "projects" %> <%=l(:label_subproject_plural)%></h3>
             		<% for subproject in @subprojects %>
             		<%= link_to subproject.name, :action => 'show', :id => subproject %><br />
             		<% end %>
             	</div>
               <% end %>
               <div class="box">
-                <h3><%=_('Latest news')%></h3>
+                <h3><%=l(:label_news_latest)%></h3>
                 <% for news in @news %>
                   <p>
                   <b><%= news.title %></b> <small>(<%= link_to_user news.author %> <%= format_time(news.created_on) %>)</small><br />
                   <%= news.summary %>
-                  <small>[<%= link_to _('Read...'), :controller => 'news', :action => 'show', :id => news %>]</small>
+                  <small>[<%= link_to l(:label_read), :controller => 'news', :action => 'show', :id => news %>]</small>
                   </p>
                   <hr />
                 <% end %>
-                <center><small>[ <%= link_to _('View all news'), :controller => 'projects', :action => 'list_news', :id => @project %> ]</small></center>
+                <center><small>[ <%= link_to l(:label_news_view_all), :controller => 'projects', :action => 'list_news', :id => @project %> ]</small></center>
               </div>
             </div>

redmine/app/views/reports/_simple.rhtml +3 -3

             <% col_width = 70 / (@statuses.length+3) %>
             <table border="0" cellspacing="1" cellpadding="2" width="100%">
             <tr>
             <td width="25%"></td>
             <% for status in @statuses %>
               <td align="center" width="<%= col_width %>%" bgcolor="#<%= status.html_color %>"><small><%= status.name %></small></td>
             <% end %>
-            <td align="center" width="<%= col_width %>%"><strong><%=_('Open')%></strong></td>
+            <td align="center" width="<%= col_width %>%"><strong><%=l(:label_open_issues_plural)%></strong></td>
-            <td align="center" width="<%= col_width %>%"><strong><%=_('Closed')%></strong></td>
+            <td align="center" width="<%= col_width %>%"><strong><%=l(:label_closed_issues_plural)%></strong></td>
-            <td align="center" width="<%= col_width %>%"><strong><%=_('Total')%></strong></td>
+            <td align="center" width="<%= col_width %>%"><strong><%=l(:label_total)%></strong></td>
             </tr>
             <% for row in rows %>
             <tr style="background-color:#CEE1ED">
               <td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,
                                                             "#{field_name}" => row.id %></td>
               <% for status in @statuses %>
                 <td align="center"><%= link_to (aggregate data, { field_name => row.id, "status_id" => status.id }),
                                                             :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,
                                                             "status_id" => status.id,
                                                             "#{field_name}" => row.id %></td>
               <% end %>
               <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 0 }),
                                                             :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,
                                                             "#{field_name}" => row.id,
                                                             "status_id" => "O" %></td>
               <td align="center"><%= aggregate data, { field_name => row.id, "closed" => 1 } %></td>
               <td align="center"><%= link_to (aggregate data, { field_name => row.id }),
                                                             :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,
                                                             "#{field_name}" => row.id,
                                                             "status_id" => "A" %></td>
             <% end %>
             </tr>
             </table>

redmine/app/views/reports/issue_report.rhtml +4 -4

-            <h2><%=_('Reports')%></h2>
+            <h2><%=l(:label_report_plural)%></h2>
-            <strong><%=_('Issues by tracker')%></strong>
+            <strong><%=l(:field_tracker)%></strong>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_tracker, :field_name => "tracker_id", :rows => @trackers } %>
             <br />
-            <strong><%=_('Issues by priority')%></strong>
+            <strong><%=l(:field_priority)%></strong>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %>
             <br />
-            <strong><%=_('Issues by category')%></strong>
+            <strong><%=l(:field_category)%></strong>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %>

redmine/app/views/roles/_form.rhtml +8 -8

             <%= error_messages_for 'role' %>
             <div class="box">
             <!--[form:role]-->
-            <p><label for="role_name"><%=_('Name')%> <span class="required">*</span></label><br />
+            <p><label for="role_name"><%=l(:field_name)%> <span class="required">*</span></label><br />
             <%= text_field 'role', 'name' %></p>
-            <strong><%=_('Permissions')%></strong>
+            <strong><%=l(:label_permissions)%>:</strong>
             <% permissions = @permissions.group_by {|p| p.group_id } %>
             <% permissions.keys.sort.each do |group_id| %>
-            <fieldset><legend><%= _(Permission::GROUPS[group_id]) %></legend>
+            <fieldset style="margin-top: 6px;"><legend><strong><%= l(Permission::GROUPS[group_id]) %></strong></legend>
             <% permissions[group_id].each do |p| %>
-              <div style="width:200px;float:left;"><%= check_box_tag "permission_ids[]", p.id, (@role.permissions.include? p) %>
+              <div style="width:170px;float:left;"><%= check_box_tag "permission_ids[]", p.id, (@role.permissions.include? p) %>
-              <%= _(p.description) %>
+              <%= l(p.description.to_sym) %>
               </div>
             <% end %>
             </fieldset>
             <% end %>
             <br />
-            <a href="javascript:checkAll('role_form', true)"><%=_('Check all')%></a> |
+            <a href="javascript:checkAll('role_form', true)"><%=l(:button_check_all)%></a> |
-            <a href="javascript:checkAll('role_form', false)"><%=_('Uncheck all')%></a><br />
+            <a href="javascript:checkAll('role_form', false)"><%=l(:button_uncheck_all)%></a><br />
             <!--[eoform:role]-->
             </div>

redmine/app/views/roles/edit.rhtml +2 -4

-            <h2><%=_('Role')%></h2>
+            <h2><%=l(:label_role)%></h2>
             <%= start_form_tag ({ :action => 'edit', :id => @role }, :id => 'role_form') %>
             <%= render :partial => 'form' %>
+            <%= submit_tag l(:button_save) %>
-            <br />
-            <%= submit_tag _('Save') %>
             <%= end_form_tag %>

redmine/app/views/roles/list.rhtml +4 -4

-            <h2><%=_('Roles')%></h2>
+            <h2><%=l(:label_role_plural)%></h2>
             <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
               <tr class="ListHead">
-                <th><%=_('Role')%></th>
+                <th><%=l(:label_role)%></th>
             	<th></th>
               </tr>
             <% for role in @roles %>
               <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to role.name, :action => 'edit', :id => role %></td>
               <td align="center">
                 <%= start_form_tag :action => 'destroy', :id => role %>
-                <%= submit_tag _('Delete'), :class => "button-small" %>
+                <%= submit_tag l(:button_delete), :class => "button-small" %>
                 <%= end_form_tag %>
               </tr>
             <% end %>
             </table>
             <%= pagination_links_full @role_pages %>
             <br />
-            <%= link_to '&#187; ' + _('New role'), :action => 'new' %>
+            <%= link_to '&#187; ' + l(:label_role_new), :action => 'new' %>

redmine/app/views/roles/new.rhtml +3 -4

-            <h2><%=_('New role')%></h2>
+            <h2><%=l(:label_role_new)%></h2>
             <%= start_form_tag ({ :action => 'new' }, :id => 'role_form') %>
             <%= render :partial => 'form' %>
+            <%= submit_tag l(:button_create) %>
-            <br /><%= submit_tag _('Create') %>
             <%= end_form_tag %>

redmine/app/views/roles/workflow.rhtml +10 -10

-            <h2><%=_('Workflow setup')%></h2>
+            <h2><%=l(:label_workflow)%></h2>
-            <p><%=_('Select a workflow to edit')%>:</p>
+            <p><%=l(:text_workflow_edit)%>:</p>
             <%= start_form_tag ({:action => 'workflow'}, :method => 'get') %>
             <div style="float:left;margin-right:10px;">
-            <p><label for="role_id"><%=_('Role')%></label><br/>
+            <p><label for="role_id"><%=l(:label_role)%></label><br/>
             <select id="role_id" name="role_id">
               <%= options_from_collection_for_select @roles, "id", "name", (@role.id unless @role.nil?) %>
             </select></p>
             </div>
             <div>
-            <p><label for="tracker_id"><%=_('Tracker')%></label><br/>
+            <p><label for="tracker_id"><%=l(:label_tracker)%></label><br/>
             <select id="tracker_id" name="tracker_id">
               <%= options_from_collection_for_select @trackers, "id", "name", (@tracker.id unless @tracker.nil?) %>
             </select>
-            <%= submit_tag _('Edit') %>
+            <%= submit_tag l(:button_edit) %>
             </p>
             </div>
             <%= end_form_tag %>
             <% unless @tracker.nil? or @role.nil? %>
             <div class="box">
               <%= form_tag ({:action => 'workflow', :role_id => @role, :tracker_id => @tracker }, :id => 'workflow_form' ) %>
             	<table>
             	<tr>
-            	<td align="center"><strong><%=_('Issue status')%></strong></td>
+            	<td align="center"><strong><%=l(:label_current_status)%></strong></td>
-            	<td align="center" colspan="<%= @statuses.length %>"><strong><%=_('New statuses allowed')%></strong></td>
+            	<td align="center" colspan="<%= @statuses.length %>"><strong><%=l(:label_new_statuses_allowed)%></strong></td>
             	</tr>
             	<tr>
             	<td></td>
             	<% for new_status in @statuses %>
             		<td width="60" align="center"><%= new_status.name %></td>
             	<% end %>
             	</tr>
             	<% for old_status in @statuses %>
             		<tr>
             		<td><%= old_status.name %></td>
             		<% for new_status in @statuses %>
             			<td align="center">
                  <input type="checkbox"
                   name="issue_status[<%= old_status.id %>][]"
                   value="<%= new_status.id %>"
                   <%if old_status.new_statuses_allowed_to(@role, @tracker).include? new_status%>checked="checked"<%end%>
                   <%if old_status==new_status%>disabled<%end%>
                   >
             			</td>
             		<% end %>
             		</tr>
             	<% end %>
             	</table>
             <br />
             <p>
-            <a href="javascript:checkAll('workflow_form', true)"><%=_('Check all')%></a> |
+            <a href="javascript:checkAll('workflow_form', true)"><%=l(:button_check_all)%></a> |
-            <a href="javascript:checkAll('workflow_form', false)"><%=_('Uncheck all')%></a>
+            <a href="javascript:checkAll('workflow_form', false)"><%=l(:button_uncheck_all)%></a>
             </p>
             <br />
-            <%= submit_tag _('Save') %>
+            <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>
             <% end %>
             </div>

redmine/app/views/trackers/_form.rhtml +2 -2

             <%= error_messages_for 'tracker' %>
             <!--[form:tracker]-->
-            <p><label for="tracker_name"><%=_('Name')%></label> <span class="required">*</span><br/>
+            <p><label for="tracker_name"><%=l(:field_name)%></label> <span class="required">*</span><br/>
             <%= text_field 'tracker', 'name'  %></p>
             <p><%= check_box 'tracker', 'is_in_chlog' %>
-            <label for="tracker_is_in_chlog"><%=_('View issues in change log')%></label></p>
+            <label for="tracker_is_in_chlog"><%=l(:field_is_in_chlog)%></label></p>
             <!--[eoform:tracker]-->

redmine/app/views/trackers/edit.rhtml +2 -2

-            <h2><%=_('Tracker')%></h2>
+            <h2><%=l(:label_tracker)%></h2>
             <%= start_form_tag :action => 'edit', :id => @tracker %>
               <%= render :partial => 'form' %>
-              <%= submit_tag _('Save') %>
+              <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>

redmine/app/views/trackers/list.rhtml +4 -4

-            <h2><%=_('Trackers')%></h2>
+            <h2><%=l(:label_tracker_plural)%></h2>
             <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
               <tr class="ListHead">
-              <th><%=_('Tracker')%></th>
+              <th><%=l(:label_tracker)%></th>
               <th></th>
               </tr>
             <% for tracker in @trackers %>
               <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to tracker.name, :action => 'edit', :id => tracker %></td>
               <td align="center">
                 <%= start_form_tag :action => 'destroy', :id => tracker %>
-                <%= submit_tag _('Delete'), :class => "button-small" %>
+                <%= submit_tag l(:button_delete), :class => "button-small" %>
                 <%= end_form_tag %>
               </td>
               </tr>
             <% end %>
             </table>
             <%= pagination_links_full @tracker_pages %>
             <br />
-            <%= link_to '&#187; ' + _('New tracker'), :action => 'new' %>
+            <%= link_to '&#187; ' + l(:label_tracker_new), :action => 'new' %>

redmine/app/views/trackers/new.rhtml +2 -2

-            <h2><%=_('New tracker')%></h2>
+            <h2><%=l(:label_tracker_new)%></h2>
             <%= start_form_tag :action => 'new' %>
               <%= render :partial => 'form' %>
-              <%= submit_tag _('Create') %>
+              <%= submit_tag l(:button_create) %>
             <%= end_form_tag %>

redmine/app/views/users/_form.rhtml +10 -10

             <%= error_messages_for 'user' %>
             <div class="box">
             <!--[form:user]-->
-            <p><label for="user_login"><%=_('Login')%></label> <span class="required">*</span><br/>
+            <p><label for="user_login"><%=l(:field_login)%></label> <span class="required">*</span><br/>
             <%= text_field 'user', 'login', :size => 25  %></p>
-            <p><label for="password"><%=_('Password')%></label> <span class="required">*</span><br/>
+            <p><label for="password"><%=l(:field_password)%></label> <span class="required">*</span><br/>
             <%= password_field_tag 'password', nil, :size => 25  %></p>
-            <p><label for="password_confirmation"><%=_('Confirmation')%></label> <span class="required">*</span><br/>
+            <p><label for="password_confirmation"><%=l(:field_password_confirmation)%></label> <span class="required">*</span><br/>
             <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
-            <p><label for="user_firstname"><%=_('Firstname')%></label> <span class="required">*</span><br/>
+            <p><label for="user_firstname"><%=l(:field_firstname)%></label> <span class="required">*</span><br/>
             <%= text_field 'user', 'firstname'  %></p>
-            <p><label for="user_lastname"><%=_('Lastname')%></label> <span class="required">*</span><br/>
+            <p><label for="user_lastname"><%=l(:field_lastname)%></label> <span class="required">*</span><br/>
             <%= text_field 'user', 'lastname'  %></p>
-            <p><label for="user_mail"><%=_('Mail')%></label> <span class="required">*</span><br/>
+            <p><label for="user_mail"><%=l(:field_mail)%></label> <span class="required">*</span><br/>
             <%= text_field 'user', 'mail'  %></p>
-            <p><label for="user_language"><%=_('Language')%></label><br/>
+            <p><label for="user_language"><%=l(:field_language)%></label><br/>
-            <%= select("user", "language", Localization.langs.invert) %></p>
+            <%= select("user", "language", lang_options_for_select) %></p>
             <% for custom_value in @custom_values %>
             	<p><%= custom_field_tag_with_label custom_value %></p>
             <% end %>
             <div style="clear: both;"></div>
-            <p><%= check_box 'user', 'admin' %> <label for="user_admin"><%=_('Administrator')%></label></p>
+            <p><%= check_box 'user', 'admin' %> <label for="user_admin"><%=l(:field_admin)%></label></p>
-            <p><%= check_box 'user', 'mail_notification' %> <label for="user_mail_notification"><%=_('Mail notifications')%></label></p>
+            <p><%= check_box 'user', 'mail_notification' %> <label for="user_mail_notification"><%=l(:field_mail_notification)%></label></p>
             <!--[eoform:user]-->
             </div>

redmine/app/views/users/add.rhtml +2 -2

-            <h2><%=_('New user')%></h2>
+            <h2><%=l(:label_user_new)%></h2>
             <%= start_form_tag :action => 'add' %>
               <%= render :partial => 'form' %>
-              <%= submit_tag _('Create') %>
+              <%= submit_tag l(:button_create) %>
             <%= end_form_tag %>

redmine/app/views/users/edit.rhtml +2 -3

-            <h2><%=_('User')%></h2>
+            <h2><%=l(:label_user)%></h2>
             <%= start_form_tag :action => 'edit', :id => @user %>
               <%= render :partial => 'form' %>
-              <%= submit_tag _('Save') %>
+              <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>

redmine/app/views/users/list.rhtml +12 -12

-            <h2><%=_('Users')%></h2>
+            <h2><%=l(:label_user_plural)%></h2>
             <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
             <tr class="ListHead">
-            	<%= sort_header_tag('login', :caption => _('Login')) %>
+            	<%= sort_header_tag('login', :caption => l(:field_login)) %>
-            	<%= sort_header_tag('firstname', :caption => _('Firstname')) %>
+            	<%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
-            	<%= sort_header_tag('lastname', :caption => _('Lastname')) %>
+            	<%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
-            	<th><%=_('Mail')%></th>
+            	<th><%=l(:field_mail)%></th>
-            	<%= sort_header_tag('admin', :caption => _('Admin')) %>
+            	<%= sort_header_tag('admin', :caption => l(:field_admin)) %>
-            	<%= sort_header_tag('status', :caption => _('Status')) %>
+            	<%= sort_header_tag('status', :caption => l(:field_status)) %>
-            	<%= sort_header_tag('created_on', :caption => _('Created on')) %>
+            	<%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
-            	<%= sort_header_tag('last_login_on', :caption => _('Last login')) %>
+            	<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on)) %>
               <th></th>
             </tr>
             <% for user in @users %>
               <tr class="<%= cycle("odd", "even") %>">
             	<td><%= link_to user.login, :action => 'edit', :id => user %></td>
             	<td><%= user.firstname %></td>
             	<td><%= user.lastname %></td>
             	<td><%= user.mail %></td>
             	<td align="center"><%= image_tag 'true' if user.admin? %></td>
             	<td align="center"><%= image_tag 'locked' if user.locked? %></td>
             	<td align="center"><%= format_time(user.created_on) %></td>
             	<td align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
               <td align="center">
                 <%= start_form_tag :action => 'edit', :id => user %>
                 <% if user.locked? %>
                   <%= hidden_field_tag 'user[status]', User::STATUS_ACTIVE %>
-                  <%= submit_tag _('Unlock'), :class => "button-small"  %>
+                  <%= submit_tag l(:button_unlock), :class => "button-small"  %>
                 <% else %>
                   <%= hidden_field_tag 'user[status]', User::STATUS_LOCKED %>
-                  <%= submit_tag _('Lock'), :class => "button-small"  %>
+                  <%= submit_tag l(:button_lock), :class => "button-small"  %>
                 <% end %>
                 <%= end_form_tag %>
               </td>
               </tr>
             <% end %>
             </table>
             <p><%= pagination_links_full @user_pages %>
             [ <%= @user_pages.current.first_item %> - <%= @user_pages.current.last_item %> / <%= @user_count %> ]
             </p>
             <p>
-            <%= link_to '&#187; ' + _('New user'), :action => 'add' %>
+            <%= link_to '&#187; ' + l(:label_user_new), :action => 'add' %>
             </p>

redmine/app/views/versions/_form.rhtml +3 -3

             <%= error_messages_for 'version' %>
             <!--[form:version]-->
-            <p><label for="version_name"><%=_('Version')%></label> <span class="required">*</span><br/>
+            <p><label for="version_name"><%=l(:field_name)%></label> <span class="required">*</span><br/>
             <%= text_field 'version', 'name', :size => 20  %></p>
-            <p><label for="version_description"><%=_('Description')%></label><br/>
+            <p><label for="version_description"><%=l(:field_description)%></label><br/>
             <%= text_field 'version', 'description', :size => 60  %></p>
-            <p><label for="version_effective_date"><%=_('Date')%></label><br/>
+            <p><label for="version_effective_date"><%=l(:field_effective_date)%></label><br/>
             <%= date_select 'version', 'effective_date'  %></p>
             <!--[eoform:version]-->

redmine/app/views/versions/edit.rhtml +2 -2

-            <h2><%=_('Version')%></h2>
+            <h2><%=l(:label_version)%></h2>
             <%= start_form_tag :action => 'edit', :id => @version %>
               <%= render :partial => 'form' %>
-              <%= submit_tag _('Save') %>
+              <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>

redmine/app/views/welcome/index.rhtml +6 -7

             <div class="splitcontentleft">
-                <h2><%= $RDM_WELCOME_TITLE || _('Welcome') %> !</h2>
+                <h2><%= $RDM_WELCOME_TITLE || l(:label_home) %></h2>
                 <p><%= $RDM_WELCOME_TEXT %></p>
               <div class="box">
-            	<h3><%=_('Latest news')%></h3>
+            	<h3><%=l(:label_news_latest)%></h3>
             		<% for news in @news %>
             			<p>
             			<b><%= news.title %></b> (<%= link_to_user news.author %> <%= format_time(news.created_on) %> - <%= news.project.name %>)<br />
             			<%= news.summary %><br />
-            			[<%= link_to 'Read...', :controller => 'news', :action => 'show', :id => news %>]
+            			[<%= link_to l(:label_read), :controller => 'news', :action => 'show', :id => news %>]
             			</p>
             			<hr />
             		<% end %>
             	</div>
             </div>
             <div class="splitcontentright">
             	<div class="box">
-            	<h3><%=_('Latest projects')%></h3>
+            	<h3><%=l(:label_project_latest)%></h3>
             		<ul>
             		<% for project in @projects %>
             			<li>
-            			<%= link_to project.name, :controller => 'projects', :action => 'show', :id => project %> (added <%= format_time(project.created_on) %>)<br />
+            			<%= link_to project.name, :controller => 'projects', :action => 'show', :id => project %> (<%= format_time(project.created_on) %>)<br />
             			<%= project.description %>
             			</li>
             		<% end %>
             		</ul>
             	</div>
             </div>

redmine/db/migrate/001_setup.rb +45 -44

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Setup < ActiveRecord::Migration
               def self.up
                 create_table "attachments", :force => true do |t|
                   t.column "container_id", :integer, :default => 0, :null => false
                   t.column "container_type", :string, :limit => 30, :default => "", :null => false
                   t.column "filename", :string, :default => "", :null => false
                   t.column "disk_filename", :string, :default => "", :null => false
                   t.column "filesize", :integer, :default => 0, :null => false
                   t.column "content_type", :string, :limit => 60, :default => ""
                   t.column "digest", :string, :limit => 40, :default => "", :null => false
                   t.column "downloads", :integer, :default => 0, :null => false
                   t.column "author_id", :integer, :default => 0, :null => false
                   t.column "created_on", :timestamp
                 end
                 create_table "auth_sources", :force => true do |t|
                   t.column "type", :string, :limit => 30, :default => "", :null => false
                   t.column "name", :string, :limit => 60, :default => "", :null => false
                   t.column "host", :string, :limit => 60
                   t.column "port", :integer
                   t.column "account", :string, :limit => 60
                   t.column "account_password", :string, :limit => 60
                   t.column "base_dn", :string, :limit => 255
                   t.column "attr_login", :string, :limit => 30
                   t.column "attr_firstname", :string, :limit => 30
                   t.column "attr_lastname", :string, :limit => 30
                   t.column "attr_mail", :string, :limit => 30
                   t.column "onthefly_register", :boolean, :default => false, :null => false
                 end
                 create_table "custom_fields", :force => true do |t|
                   t.column "type", :string, :limit => 30, :default => "", :null => false
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                   t.column "field_format", :string, :limit => 30, :default => "", :null => false
                   t.column "possible_values", :text, :default => ""
                   t.column "regexp", :string, :default => ""
                   t.column "min_length", :integer, :default => 0, :null => false
                   t.column "max_length", :integer, :default => 0, :null => false
                   t.column "is_required", :boolean, :default => false, :null => false
                   t.column "is_for_all", :boolean, :default => false, :null => false
                 end
                 create_table "custom_fields_projects", :id => false, :force => true do |t|
                   t.column "custom_field_id", :integer, :default => 0, :null => false
                   t.column "project_id", :integer, :default => 0, :null => false
                 end
                 create_table "custom_fields_trackers", :id => false, :force => true do |t|
                   t.column "custom_field_id", :integer, :default => 0, :null => false
                   t.column "tracker_id", :integer, :default => 0, :null => false
                 end
                 create_table "custom_values", :force => true do |t|
                   t.column "customized_type", :string, :limit => 30, :default => "", :null => false
                   t.column "customized_id", :integer, :default => 0, :null => false
                   t.column "custom_field_id", :integer, :default => 0, :null => false
                   t.column "value", :text, :default => "", :null => false
                 end
                 create_table "documents", :force => true do |t|
                   t.column "project_id", :integer, :default => 0, :null => false
                   t.column "category_id", :integer, :default => 0, :null => false
                   t.column "title", :string, :limit => 60, :default => "", :null => false
-                  t.column "description", :text, :default => "", :null => false
+                  t.column "description", :text, :default => ""
                   t.column "created_on", :timestamp
                 end
                 create_table "enumerations", :force => true do |t|
                   t.column "opt", :string, :limit => 4, :default => "", :null => false
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                 end
                 create_table "issue_categories", :force => true do |t|
                   t.column "project_id", :integer, :default => 0, :null => false
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                 end
                 create_table "issue_histories", :force => true do |t|
                   t.column "issue_id", :integer, :default => 0, :null => false
                   t.column "status_id", :integer, :default => 0, :null => false
                   t.column "author_id", :integer, :default => 0, :null => false
                   t.column "notes", :text, :default => ""
                   t.column "created_on", :timestamp
                 end
                 add_index "issue_histories", ["issue_id"], :name => "issue_histories_issue_id"
                 create_table "issue_statuses", :force => true do |t|
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                   t.column "is_closed", :boolean, :default => false, :null => false
                   t.column "is_default", :boolean, :default => false, :null => false
                   t.column "html_color", :string, :limit => 6, :default => "FFFFFF", :null => false
                 end
                 create_table "issues", :force => true do |t|
                   t.column "tracker_id", :integer, :default => 0, :null => false
                   t.column "project_id", :integer, :default => 0, :null => false
                   t.column "subject", :string, :default => "", :null => false
                   t.column "description", :text, :default => "", :null => false
+                  t.column "due_date", :date
                   t.column "category_id", :integer
                   t.column "status_id", :integer, :default => 0, :null => false
                   t.column "assigned_to_id", :integer
                   t.column "priority_id", :integer, :default => 0, :null => false
                   t.column "fixed_version_id", :integer
                   t.column "author_id", :integer, :default => 0, :null => false
                   t.column "created_on", :timestamp
                   t.column "updated_on", :timestamp
                 end
                 add_index "issues", ["project_id"], :name => "issues_project_id"
                 create_table "members", :force => true do |t|
                   t.column "user_id", :integer, :default => 0, :null => false
                   t.column "project_id", :integer, :default => 0, :null => false
                   t.column "role_id", :integer, :default => 0, :null => false
                   t.column "created_on", :timestamp
                 end
                 create_table "news", :force => true do |t|
                   t.column "project_id", :integer
                   t.column "title", :string, :limit => 60, :default => "", :null => false
                   t.column "summary", :string, :limit => 255, :default => ""
                   t.column "description", :text, :default => "", :null => false
                   t.column "author_id", :integer, :default => 0, :null => false
                   t.column "created_on", :timestamp
                 end
                 create_table "permissions", :force => true do |t|
                   t.column "controller", :string, :limit => 30, :default => "", :null => false
                   t.column "action", :string, :limit => 30, :default => "", :null => false
                   t.column "description", :string, :limit => 60, :default => "", :null => false
                   t.column "is_public", :boolean, :default => false, :null => false
                   t.column "sort", :integer, :default => 0, :null => false
                   t.column "mail_option", :boolean, :default => false, :null => false
                   t.column "mail_enabled", :boolean, :default => false, :null => false
                 end
                 create_table "permissions_roles", :id => false, :force => true do |t|
                   t.column "permission_id", :integer, :default => 0, :null => false
                   t.column "role_id", :integer, :default => 0, :null => false
                 end
                 add_index "permissions_roles", ["role_id"], :name => "permissions_roles_role_id"
                 create_table "projects", :force => true do |t|
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                   t.column "description", :string, :default => "", :null => false
                   t.column "homepage", :string, :limit => 60, :default => ""
                   t.column "is_public", :boolean, :default => true, :null => false
                   t.column "parent_id", :integer
                   t.column "projects_count", :integer, :default => 0
                   t.column "created_on", :timestamp
                   t.column "updated_on", :timestamp
                 end
                 create_table "roles", :force => true do |t|
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                 end
                 create_table "tokens", :force => true do |t|
                   t.column "user_id", :integer, :default => 0, :null => false
                   t.column "action", :string, :limit => 30, :default => "", :null => false
                   t.column "value", :string, :limit => 40, :default => "", :null => false
                   t.column "created_on", :datetime, :null => false
                 end
                 create_table "trackers", :force => true do |t|
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                   t.column "is_in_chlog", :boolean, :default => false, :null => false
                 end
                 create_table "users", :force => true do |t|
                   t.column "login", :string, :limit => 30, :default => "", :null => false
                   t.column "hashed_password", :string, :limit => 40, :default => "", :null => false
                   t.column "firstname", :string, :limit => 30, :default => "", :null => false
                   t.column "lastname", :string, :limit => 30, :default => "", :null => false
                   t.column "mail", :string, :limit => 60, :default => "", :null => false
                   t.column "mail_notification", :boolean, :default => true, :null => false
                   t.column "admin", :boolean, :default => false, :null => false
                   t.column "status", :integer, :default => 1, :null => false
                   t.column "last_login_on", :datetime
                   t.column "language", :string, :limit => 2, :default => ""
                   t.column "auth_source_id", :integer
                   t.column "created_on", :timestamp
                   t.column "updated_on", :timestamp
                 end
                 create_table "versions", :force => true do |t|
                   t.column "project_id", :integer, :default => 0, :null => false
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                   t.column "description", :string, :default => ""
                   t.column "effective_date", :date, :null => false
                   t.column "created_on", :timestamp
                   t.column "updated_on", :timestamp
                 end
                 create_table "workflows", :force => true do |t|
                   t.column "tracker_id", :integer, :default => 0, :null => false
                   t.column "old_status_id", :integer, :default => 0, :null => false
                   t.column "new_status_id", :integer, :default => 0, :null => false
                   t.column "role_id", :integer, :default => 0, :null => false
                 end
                 # project
-                Permission.create :controller => "projects", :action => "show", :description => "Overview", :sort => 100, :is_public => true
+                Permission.create :controller => "projects", :action => "show", :description => "label_overview", :sort => 100, :is_public => true
-                Permission.create :controller => "projects", :action => "changelog", :description => "View change log", :sort => 105, :is_public => true
+                Permission.create :controller => "projects", :action => "changelog", :description => "label_change_log", :sort => 105, :is_public => true
-                Permission.create :controller => "reports", :action => "issue_report", :description => "View reports", :sort => 110, :is_public => true
+                Permission.create :controller => "reports", :action => "issue_report", :description => "label_report_plural", :sort => 110, :is_public => true
-                Permission.create :controller => "projects", :action => "settings", :description => "Settings", :sort => 150
+                Permission.create :controller => "projects", :action => "settings", :description => "label_settings", :sort => 150
-                Permission.create :controller => "projects", :action => "edit", :description => "Edit", :sort => 151
+                Permission.create :controller => "projects", :action => "edit", :description => "button_edit", :sort => 151
                 # members
-                Permission.create :controller => "projects", :action => "list_members", :description => "View list", :sort => 200, :is_public => true
+                Permission.create :controller => "projects", :action => "list_members", :description => "button_list", :sort => 200, :is_public => true
-                Permission.create :controller => "projects", :action => "add_member", :description => "New member", :sort => 220
+                Permission.create :controller => "projects", :action => "add_member", :description => "button_add", :sort => 220
-                Permission.create :controller => "members", :action => "edit", :description => "Edit", :sort => 221
+                Permission.create :controller => "members", :action => "edit", :description => "button_edit", :sort => 221
-                Permission.create :controller => "members", :action => "destroy", :description => "Delete", :sort => 222
+                Permission.create :controller => "members", :action => "destroy", :description => "button_delete", :sort => 222
                 # versions
-                Permission.create :controller => "projects", :action => "add_version", :description => "New version", :sort => 320
+                Permission.create :controller => "projects", :action => "add_version", :description => "button_add", :sort => 320
-                Permission.create :controller => "versions", :action => "edit", :description => "Edit", :sort => 321
+                Permission.create :controller => "versions", :action => "edit", :description => "button_edit", :sort => 321
-                Permission.create :controller => "versions", :action => "destroy", :description => "Delete", :sort => 322
+                Permission.create :controller => "versions", :action => "destroy", :description => "button_delete", :sort => 322
                 # issue categories
-                Permission.create :controller => "projects", :action => "add_issue_category", :description => "New issue category", :sort => 420
+                Permission.create :controller => "projects", :action => "add_issue_category", :description => "button_add", :sort => 420
-                Permission.create :controller => "issue_categories", :action => "edit", :description => "Edit", :sort => 421
+                Permission.create :controller => "issue_categories", :action => "edit", :description => "button_edit", :sort => 421
-                Permission.create :controller => "issue_categories", :action => "destroy", :description => "Delete", :sort => 422
+                Permission.create :controller => "issue_categories", :action => "destroy", :description => "button_delete", :sort => 422
                 # issues
-                Permission.create :controller => "projects", :action => "list_issues", :description => "View list", :sort => 1000, :is_public => true
+                Permission.create :controller => "projects", :action => "list_issues", :description => "button_list", :sort => 1000, :is_public => true
-                Permission.create :controller => "projects", :action => "export_issues_csv", :description => "Export list to CSV", :sort => 1001, :is_public => true
+                Permission.create :controller => "projects", :action => "export_issues_csv", :description => "label_export_csv", :sort => 1001, :is_public => true
-                Permission.create :controller => "issues", :action => "show", :description => "View", :sort => 1005, :is_public => true
+                Permission.create :controller => "issues", :action => "show", :description => "button_view", :sort => 1005, :is_public => true
-                Permission.create :controller => "issues", :action => "download", :description => "Download file", :sort => 1010, :is_public => true
+                Permission.create :controller => "issues", :action => "download", :description => "button_download", :sort => 1010, :is_public => true
-                Permission.create :controller => "projects", :action => "add_issue", :description => "Report an issue", :sort => 1050, :mail_option => 1, :mail_enabled => 1
+                Permission.create :controller => "projects", :action => "add_issue", :description => "button_add", :sort => 1050, :mail_option => 1, :mail_enabled => 1
-                Permission.create :controller => "issues", :action => "edit", :description => "Edit", :sort => 1055
+                Permission.create :controller => "issues", :action => "edit", :description => "button_edit", :sort => 1055
-                Permission.create :controller => "issues", :action => "change_status", :description => "Change status", :sort => 1060, :mail_option => 1, :mail_enabled => 1
+                Permission.create :controller => "issues", :action => "change_status", :description => "label_change_status", :sort => 1060, :mail_option => 1, :mail_enabled => 1
-                Permission.create :controller => "issues", :action => "destroy", :description => "Delete", :sort => 1065
+                Permission.create :controller => "issues", :action => "destroy", :description => "button_delete", :sort => 1065
-                Permission.create :controller => "issues", :action => "add_attachment", :description => "Add file", :sort => 1070
+                Permission.create :controller => "issues", :action => "add_attachment", :description => "label_attachment_new", :sort => 1070
-                Permission.create :controller => "issues", :action => "destroy_attachment", :description => "Delete file", :sort => 1075
+                Permission.create :controller => "issues", :action => "destroy_attachment", :description => "label_attachment_delete", :sort => 1075
                 # news
-                Permission.create :controller => "projects", :action => "list_news", :description => "View list", :sort => 1100, :is_public => true
+                Permission.create :controller => "projects", :action => "list_news", :description => "button_list", :sort => 1100, :is_public => true
-                Permission.create :controller => "news", :action => "show", :description => "View", :sort => 1101, :is_public => true
+                Permission.create :controller => "news", :action => "show", :description => "button_view", :sort => 1101, :is_public => true
-                Permission.create :controller => "projects", :action => "add_news", :description => "Add", :sort => 1120
+                Permission.create :controller => "projects", :action => "add_news", :description => "button_add", :sort => 1120
-                Permission.create :controller => "news", :action => "edit", :description => "Edit", :sort => 1121
+                Permission.create :controller => "news", :action => "edit", :description => "button_edit", :sort => 1121
-                Permission.create :controller => "news", :action => "destroy", :description => "Delete", :sort => 1122
+                Permission.create :controller => "news", :action => "destroy", :description => "button_delete", :sort => 1122
                 # documents
-                Permission.create :controller => "projects", :action => "list_documents", :description => "View list", :sort => 1200, :is_public => true
+                Permission.create :controller => "projects", :action => "list_documents", :description => "button_list", :sort => 1200, :is_public => true
-                Permission.create :controller => "documents", :action => "show", :description => "View", :sort => 1201, :is_public => true
+                Permission.create :controller => "documents", :action => "show", :description => "button_view", :sort => 1201, :is_public => true
-                Permission.create :controller => "documents", :action => "download", :description => "Download", :sort => 1202, :is_public => true
+                Permission.create :controller => "documents", :action => "download", :description => "button_download", :sort => 1202, :is_public => true
-                Permission.create :controller => "projects", :action => "add_document", :description => "Add", :sort => 1220
+                Permission.create :controller => "projects", :action => "add_document", :description => "button_add", :sort => 1220
-                Permission.create :controller => "documents", :action => "edit", :description => "Edit", :sort => 1221
+                Permission.create :controller => "documents", :action => "edit", :description => "button_edit", :sort => 1221
-                Permission.create :controller => "documents", :action => "destroy", :description => "Delete", :sort => 1222
+                Permission.create :controller => "documents", :action => "destroy", :description => "button_delete", :sort => 1222
-                Permission.create :controller => "documents", :action => "add_attachment", :description => "Add file", :sort => 1223
+                Permission.create :controller => "documents", :action => "add_attachment", :description => "label_attachment_new", :sort => 1223
-                Permission.create :controller => "documents", :action => "destroy_attachment", :description => "Delete file", :sort => 1224
+                Permission.create :controller => "documents", :action => "destroy_attachment", :description => "label_attachment_delete", :sort => 1224
                 # files
-                Permission.create :controller => "projects", :action => "list_files", :description => "View list", :sort => 1300, :is_public => true
+                Permission.create :controller => "projects", :action => "list_files", :description => "button_list", :sort => 1300, :is_public => true
-                Permission.create :controller => "versions", :action => "download", :description => "Download", :sort => 1301, :is_public => true
+                Permission.create :controller => "versions", :action => "download", :description => "button_download", :sort => 1301, :is_public => true
-                Permission.create :controller => "projects", :action => "add_file", :description => "Add", :sort => 1320
+                Permission.create :controller => "projects", :action => "add_file", :description => "button_add", :sort => 1320
-                Permission.create :controller => "versions", :action => "destroy_file", :description => "Delete", :sort => 1322
+                Permission.create :controller => "versions", :action => "destroy_file", :description => "button_delete", :sort => 1322
                 # create default administrator account
                 user = User.create :firstname => "redMine", :lastname => "Admin", :mail => "admin@somenet.foo", :mail_notification => true, :language => "en"
                 user.login = "admin"
                 user.password = "admin"
                 user.admin = true
                 user.save
               end
               def self.down
                 drop_table :attachments
                 drop_table :auth_sources
                 drop_table :custom_fields
                 drop_table :custom_fields_projects
                 drop_table :custom_fields_trackers
                 drop_table :custom_values
                 drop_table :documents
                 drop_table :enumerations
                 drop_table :issue_categories
                 drop_table :issue_histories
                 drop_table :issue_statuses
                 drop_table :issues
                 drop_table :members
                 drop_table :news
                 drop_table :permissions
                 drop_table :permissions_roles
                 drop_table :projects
                 drop_table :roles
                 drop_table :trackers
                 drop_table :tokens
                 drop_table :users
                 drop_table :versions
                 drop_table :workflows
               end
             end

redmine/doc/CHANGELOG +5 -4

             == redMine changelog
             redMine - project management software
             Copyright (C) 2006  Jean-Philippe Lang
             http://redmine.org/
             == xx/xx/2006 v0.3.0
             * user authentication against multiple LDAP
             * token based "lost password" functionality
             * user self-registration functionality (optional)
             * custom fields now available for issues, users and projects
-            * new custom field format "text" (textarea)
+            * new custom field format "text" (displayed as a textarea field)
-            * project & administration drop down menus in navigation bar
+            * project & administration drop down menus in navigation bar for quicker access
+            * "due date" field added on issues
             * error messages internationalization
             * Localization plugin replaced with GLoc 1.1.0
             * new filter in issues list: "Fixed version"
-            * colored background for active filters on issues list
+            * active filters are displayed with colored background on issues list
             * custom configuration is now defined in config/config_custom.rb
             * user object no more stored in session (only user_id)
             * news summary field is no longer required
             * Fixed: boolean custom field not working
             * Fixed: error messages for custom fields are not displayed
             * Fixed: custom fields values are not validated on issue update
-            * Fixed: user unable to choose an empty value for 'List' custom fields
+            * Fixed: unable to choose an empty value for 'List' custom fields
             * Fixed: no issue categories sorting
             * Fixed: incorrect versions sorting
             == 07/12/2006 - v0.2.2
             * Fixed: bug in "issues list"
             == 07/09/2006 - v0.2.1
             * new databases supported: Oracle, PostgreSQL, SQL Server
             * projects/subprojects hierarchy (1 level of subprojects only)
             * environment information display in admin/info
             * more filter options in issues list (rev6)
             * default language based on browser settings (Accept-Language HTTP header)
             * issues list exportable to CSV (rev6)
             * simple_format and auto_link on long text fields
             * more data validations
             * Fixed: error when all mail notifications are unchecked in admin/mail_options
             * Fixed: all project news are displayed on project summary
             * Fixed: Can't change user password in users/edit
             * Fixed: Error on tables creation with PostgreSQL (rev5)
             * Fixed: SQL error in "issue reports" view with PostgreSQL (rev5)
             == 06/25/2006 - v0.1.0
             * multiple users/multiple projects
             * role based access control
             * issue tracking system
             * fully customizable workflow
             * documents/files repository
             * email notifications on issue creation and update
             * multilanguage support (except for error messages):english, french, spanish
             * online manual in french (unfinished)

redmine/lang/en.yml +1 0

             _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
             actionview_datehelper_select_day_prefix:
             actionview_datehelper_select_month_names: January,February,March,April,May,June,July,August,September,October,November,December
             actionview_datehelper_select_month_names_abbr: Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec
             actionview_datehelper_select_month_prefix:
             actionview_datehelper_select_year_prefix:
             actionview_datehelper_time_in_words_day: 1 day
             actionview_datehelper_time_in_words_day_plural: %d days
             actionview_datehelper_time_in_words_hour_about: about an hour
             actionview_datehelper_time_in_words_hour_about_plural: about %d hours
             actionview_datehelper_time_in_words_hour_about_single: about an hour
             actionview_datehelper_time_in_words_minute: 1 minute
             actionview_datehelper_time_in_words_minute_half: half a minute
             actionview_datehelper_time_in_words_minute_less_than: less than a minute
             actionview_datehelper_time_in_words_minute_plural: %d minutes
             actionview_datehelper_time_in_words_minute_single: 1 minute
             actionview_datehelper_time_in_words_second_less_than: less than a second
             actionview_datehelper_time_in_words_second_less_than_plural: less than %d seconds
             actionview_instancetag_blank_option: Please select
             activerecord_error_inclusion: is not included in the list
             activerecord_error_exclusion: is reserved
             activerecord_error_invalid: is invalid
             activerecord_error_confirmation: doesn't match confirmation
             activerecord_error_accepted: must be accepted
             activerecord_error_empty: can't be empty
             activerecord_error_blank: can't be blank
             activerecord_error_too_long: is too long
             activerecord_error_too_short: is too short
             activerecord_error_wrong_length: is the wrong length
             activerecord_error_taken: has already been taken
             activerecord_error_not_a_number: is not a number
             general_fmt_age: %d yr
             general_fmt_age_plural: %d yrs
             general_fmt_date: %%b %%d, %%Y (%%a)
             general_fmt_datetime: %%b %%d, %%Y (%%a), %%I:%%M %%p
             general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
             general_fmt_time: %%I:%%M %%p
             general_text_No: 'No'
             general_text_Yes: 'Yes'
             general_text_no: 'no'
             general_text_yes: 'yes'
+            general_lang_en: 'English'
             notice_account_updated: Account was successfully updated.
             notice_account_invalid_creditentials: Invalid user or password
             notice_account_password_updated: Password was successfully updated.
             notice_account_wrong_password: Wrong password
             notice_account_register_done: Account was successfully created.
             notice_account_unknown_email: Unknown user.
             notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
             gui_menu_home: Home
             gui_menu_my_page: My page
             gui_menu_projects: Projects
             gui_menu_my_account: My account
             gui_menu_admin: Administration
             gui_menu_login: Login
             gui_menu_logout: Logout
             gui_menu_help: Help
             gui_validation_error: 1 error
             gui_validation_error_plural: %d errors
             field_name: Name
             field_description: Description
             field_summary: Summary
             field_is_required: Required
             field_firstname: Firstname
             field_lastname: Lastname
             field_mail: Email
             field_filename: File
             field_filesize: Size
             field_downloads: Downloads
             field_author: Author
             field_created_on: Created
             field_updated_on: Updated
             field_field_format: Format
             field_is_for_all: For all projects
             field_possible_values: Possible values
             field_regexp: Regular expression
             field_min_length: Minimum length
             field_max_length: Maximum length
             field_value: Value
             field_category: Catogory
             field_title: Title
             field_project: Project
             field_issue: Issue
             field_status: Status
             field_notes: Notes
             field_is_closed: Issue closed
             field_is_default: Default status
             field_html_color: Color
             field_tracker: Tracker
             field_subject: Subject
             field_assigned_to: Assigned to
             field_priority: Priority
             field_fixed_version: Fixed version
             field_user: User
             field_role: Role
             field_homepage: Homepage
             field_is_public: Public
             field_parent: Subproject de
             field_is_in_chlog: Issues displayed in changelog
             field_login: Login
             field_mail_notification: Mail notifications
             field_admin: Administrator
             field_locked: Locked
             field_last_login_on: Last connection
             field_language: Language
             field_effective_date: Date
             field_password: Password
             field_password_confirmation: Confirmation

redmine/lang/fr.yml +96 -7

-            _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
+            _gloc_rule_default: '|n| n<=1 ? "" : "_plural" '
             actionview_datehelper_select_day_prefix:
             actionview_datehelper_select_month_names: Janvier,Février,Mars,Avril,Mai,Juin,Juillet,Août,Septembre,Octobre,Novembre,Décembre
             actionview_datehelper_select_month_names_abbr: Jan,Fév,Mars,Avril,Mai,Juin,Juil,Août,Sept,Oct,Nov,Déc
             actionview_datehelper_select_month_prefix:
             actionview_datehelper_select_year_prefix:
             actionview_datehelper_time_in_words_day: 1 jour
             actionview_datehelper_time_in_words_day_plural: %d jours
             actionview_datehelper_time_in_words_hour_about: about an hour
             actionview_datehelper_time_in_words_hour_about_plural: about %d hours
             actionview_datehelper_time_in_words_hour_about_single: about an hour
             actionview_datehelper_time_in_words_minute: 1 minute
             actionview_datehelper_time_in_words_minute_half: 30 secondes
             actionview_datehelper_time_in_words_minute_less_than: moins d'une minute
             actionview_datehelper_time_in_words_minute_plural: %d minutes
             actionview_datehelper_time_in_words_minute_single: 1 minute
             actionview_datehelper_time_in_words_second_less_than: moins d'une seconde
             actionview_datehelper_time_in_words_second_less_than_plural: moins de %d secondes
             actionview_instancetag_blank_option: Choisir
             activerecord_error_inclusion: n'est pas inclus dans la liste
             activerecord_error_exclusion: est reservé
             activerecord_error_invalid: est invalide
             activerecord_error_confirmation: ne correspond pas à la confirmation
             activerecord_error_accepted: doit être accepté
             activerecord_error_empty: doit être renseigné
             activerecord_error_blank: doit être renseigné
             activerecord_error_too_long: est trop long
             activerecord_error_too_short: est trop court
             activerecord_error_wrong_length: n'est pas de la bonne longueur
             activerecord_error_taken: est déjà utilisé
             activerecord_error_not_a_number: n'est pas un nombre
             general_fmt_age: %d an
             general_fmt_age_plural: %d ans
             general_fmt_date: %%d/%%m/%%Y
             general_fmt_datetime: %%d/%%m/%%Y %%H:%%M
             general_fmt_datetime_short: %%d/%%m %%H:%%M
             general_fmt_time: %%H:%%M
             general_text_No: 'Non'
             general_text_Yes: 'Oui'
             general_text_no: 'non'
             general_text_yes: 'oui'
+            general_lang_fr: 'Français'
             notice_account_updated: Le compte a été mis à jour avec succès.
             notice_account_invalid_creditentials: Identifiant ou mot de passe invalide.
             notice_account_password_updated: Mot de passe mis à jour avec succès.
             notice_account_wrong_password: Mot de passe incorrect
             notice_account_register_done: Un message contenant les instructions pour activer votre compte vous a été envoyé.
             notice_account_unknown_email: Aucun compte ne correspond à cette adresse.
+            notice_can_t_change_password: Ce compte utilise une authentification externe. Impossible de changer le mot de passe.
             notice_account_lost_email_sent: Un message contenant les instructions pour choisir un nouveau mot de passe vous a été envoyé.
             notice_account_activated: Votre compte a été activé. Vous pouvez à présent vous connecter.
-            notice_successful_update: Mise à jour effectuée avec succès.
             notice_successful_create: Création effectuée avec succès.
+            notice_successful_update: Mise à jour effectuée avec succès.
             notice_successful_delete: Suppression effectuée avec succès.
             notice_successful_connection: Connection réussie.
             gui_validation_error: 1 erreur
             gui_validation_error_plural: %d erreurs
             field_name: Nom
             field_description: Description
             field_summary: Résumé
             field_is_required: Obligatoire
             field_firstname: Prénom
             field_lastname: Nom
             field_mail: Email
             field_filename: Fichier
             field_filesize: Taille
             field_downloads: Téléchargements
             field_author: Auteur
             field_created_on: Créé
             field_updated_on: Mis à jour
             field_field_format: Format
             field_is_for_all: Pour tous les projets
             field_possible_values: Valeurs possibles
             field_regexp: Expression régulière
             field_min_length: Longueur minimum
             field_max_length: Longueur maximum
             field_value: Valeur
             field_category: Catégorie
             field_title: Titre
             field_project: Projet
             field_issue: Demande
             field_status: Statut
             field_notes: Notes
             field_is_closed: Demande fermée
             field_is_default: Statut par défaut
             field_html_color: Couleur
             field_tracker: Tracker
             field_subject: Sujet
+            field_due_date: Date d'échéance
             field_assigned_to: Assigné à
             field_priority: Priorité
             field_fixed_version: Version corrigée
             field_user: Utilisateur
             field_role: Rôle
             field_homepage: Site web
             field_is_public: Public
             field_parent: Sous-projet de
             field_is_in_chlog: Demandes affichées dans l'historique
             field_login: Identifiant
             field_mail_notification: Notifications par mail
             field_admin: Administrateur
             field_locked: Verrouillé
             field_last_login_on: Dernière connexion
             field_language: Langue
             field_effective_date: Date
             field_password: Mot de passe
             field_new_password: Nouveau mot de passe
             field_password_confirmation: Confirmation
             field_version: Version
             field_type: Type
             field_host: Hôte
             field_port: Port
             field_account: Compte
             field_base_dn: Base DN
             field_attr_login: Attribut Identifiant
             field_attr_firstname: Attribut Prénom
             field_attr_lastname: Attribut Nom
             field_attr_mail: Attribut Email
             field_onthefly: Création des utilisateurs à la volée
             label_user: Utilisateur
             label_user_plural: Utilisateurs
             label_user_new: Nouvel utilisateur
             label_project: Projet
             label_project_new: Nouveau projet
             label_project_plural: Projets
+            label_project_latest: Derniers projets
             label_issue: Demande
             label_issue_new: Nouvelle demande
             label_issue_plural: Demandes
+            label_issue_view_all: Voir toutes les demandes
+            label_document: Document
+            label_document_new: Nouveau document
+            label_document_plural: Documents
             label_role: Rôle
             label_role_plural: Rôles
-            label_role_add: Nouveau rôle
+            label_role_new: Nouveau rôle
             label_role_and_permissions: Rôles et permissions
+            label_member: Membre
+            label_member_new: Nouveau membre
+            label_member_plural: Membres
             label_tracker: Tracker
             label_tracker_plural: Trackers
-            label_tracker_add: Nouveau tracker
+            label_tracker_new: Nouveau tracker
             label_workflow: Workflow
             label_issue_status: Statut de demandes
             label_issue_status_plural: Statuts de demandes
-            label_issue_status_add: Nouveau statut
+            label_issue_status_new: Nouveau statut
+            label_issue_category: Catégorie de demandes
+            label_issue_category_plural: Catégories de demandes
+            label_issue_category_new: Nouvelle catégorie
             label_custom_field: Champ personnalisé
             label_custom_field_plural: Champs personnalisés
             label_custom_field_new: Nouveau champ personnalisé
             label_enumerations: Listes de valeurs
+            label_enumeration_new: Nouvelle valeur
             label_information: Information
             label_information_plural: Informations
             label_please_login: Identification
             label_register: S'enregistrer
             label_password_lost: Mot de passe perdu
             label_home: Accueil
             label_my_page: Ma page
             label_my_account: Mon compte
+            label_my_projects: Mes projets
             label_administration: Administration
             label_login: Connexion
             label_logout: Déconnexion
             label_help: Aide
             label_reported_issues: Demandes soumises
             label_assigned_to_me_issues: Demandes qui me sont assignées
             label_last_login: Dernière connexion
             label_last_updates: Dernière mise à jour
             label_last_updates_plural: %d dernières mises à jour
             label_registered_on: Inscrit le
             label_activity: Activité
             label_new: Nouveau
             label_logged_as: Connecté en tant que
             label_environment: Environnement
             label_authentication: Authentification
             label_auth_source: Mode d'authentification
             label_auth_source_new: Nouveau mode d'authentification
             label_auth_source_plural: Modes d'authentification
             label_subproject: Sous-projet
             label_subproject_plural: Sous-projets
             label_min_max_length: Longueurs mini - maxi
             label_list: Liste
             label_date: Date
             label_integer: Entier
             label_boolean: Booléen
             label_string: Chaîne
             label_text: Texte
             label_attribute: Attribut
             label_attribute_plural: Attributs
+            label_download: %d Téléchargement
+            label_download_plural: %d Téléchargements
+            label_no_data: Aucune donnée à afficher
+            label_change_status: Changer le statut
+            label_history: Historique
+            label_attachment: Fichier
+            label_attachment_new: Nouveau fichier
+            label_attachment_delete: Supprimer le fichier
+            label_attachment_plural: Fichiers
+            label_report: Rapport
+            label_report_plural: Rapports
+            label_news: Annonce
+            label_news_new: Nouvelle annonce
+            label_news_plural: Annonces
+            label_news_latest: Dernières annonces
+            label_news_view_all: Voir toutes les annonces
+            label_change_log: Historique
+            label_settings: Configuration
+            label_overview: Aperçu
+            label_version: Version
+            label_version_new: Nouvelle version
+            label_version_plural: Versions
+            label_confirmation: Confirmation
+            label_export_csv: Exporter en CSV
+            label_read: Lire...
+            label_public_projects: Projets publics
+            label_open_issues: Ouverte
+            label_open_issues_plural: Ouvertes
+            label_closed_issues: Fermée
+            label_closed_issues_plural: Fermées
+            label_total: Total
+            label_permissions: Permissions
+            label_current_status: Statut actuel
+            label_new_statuses_allowed: Nouveaux statuts autorisés
+            label_all: Tous
+            label_none: Aucun
+            label_next: Suivant
+            label_previous: Précédent
+            label_used_by: Utilisé par
             button_login: Connexion
             button_submit: Soumettre
             button_save: Valider
             button_check_all: Tout cocher
             button_uncheck_all: Tout décocher
             button_delete: Supprimer
             button_create: Créer
             button_test: Tester
+            button_edit: Modifier
+            button_add: Ajouter
+            button_change: Changer
+            button_apply: Appliquer
+            button_clear: Effacer
+            button_lock: Verrouiller
+            button_unlock: Déverrouiller
+            button_download: Télécharger
+            button_list: Lister
+            button_view: Voir
             text_select_mail_notifications: Sélectionner les actions pour lesquelles la notification par mail doit être activée.
             text_regexp_info: eg. ^[A-Z0-9]+$
             text_min_max_length_info: 0 pour aucune restriction
-            text_possible_values_info: valeurs séparées par |
  No newline at end of file
+            text_possible_values_info: valeurs séparées par |
+            text_project_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce projet et tout ce qui lui est rattaché ?
+            text_workflow_edit: Sélectionner un tracker et un rôle pour éditer le workflow
+            default_role_manager: Manager
+            default_role_developper: Développeur
+            default_role_reporter: Rapporteur
+            default_tracker_bug: Anomalie
+            default_tracker_feature: Evolution
+            default_tracker_support: Assistance
+            default_issue_status_new: Nouveau
+            default_issue_status_assigned: Assigné
+            default_issue_status_resolved: Résolu
+            default_issue_status_feedback: Commentaire
+            default_issue_status_closed: Fermé
+            default_issue_status_rejected: Rejeté
+            default_doc_category_user: Documentation utilisateur
+            default_doc_category_tech: Documentation technique
+            default_priority_low: Bas
+            default_priority_normal: Normal
+            default_priority_high: Haut
+            default_priority_urgent: Urgent
+            default_priority_immediate: Immédiat
+            enumeration_issue_priorities: Priorités des demandes
+            enumeration_doc_categories: Catégories des documents

redmine/test/fixtures/permissions.yml +42 -42

             ---
             permissions_041:
               action: add_file
               id: 41
-              description: Add
+              description: button_add
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 1320
               is_public: false
             permissions_030:
               action: destroy
               id: 30
-              description: Delete
+              description: button_delete
               controller: news
               mail_enabled: false
               mail_option: false
               sort: 1122
               is_public: false
             permissions_019:
               action: download
               id: 19
-              description: Download file
+              description: button_download
               controller: issues
               mail_enabled: false
               mail_option: false
               sort: 1010
               is_public: true
             permissions_008:
               action: edit
               id: 8
-              description: Edit
+              description: button_edit
               controller: members
               mail_enabled: false
               mail_option: false
               sort: 221
               is_public: false
             permissions_042:
               action: destroy_file
               id: 42
-              description: Delete
+              description: button_delete
               controller: versions
               mail_enabled: false
               mail_option: false
               sort: 1322
               is_public: false
             permissions_031:
               action: list_documents
               id: 31
-              description: View list
+              description: button_list
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 1200
               is_public: true
             permissions_020:
               action: add_issue
               id: 20
-              description: Report an issue
+              description: button_add
               controller: projects
               mail_enabled: true
               mail_option: true
               sort: 1050
               is_public: false
             permissions_009:
               action: destroy
               id: 9
-              description: Delete
+              description: button_delete
               controller: members
               mail_enabled: false
               mail_option: false
               sort: 222
               is_public: false
             permissions_032:
               action: show
               id: 32
-              description: View
+              description: button_view
               controller: documents
               mail_enabled: false
               mail_option: false
               sort: 1201
               is_public: true
             permissions_021:
               action: edit
               id: 21
-              description: Edit
+              description: button_edit
               controller: issues
               mail_enabled: false
               mail_option: false
               sort: 1055
               is_public: false
             permissions_010:
               action: add_version
               id: 10
-              description: New version
+              description: button_add
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 320
               is_public: false
             permissions_033:
               action: download
               id: 33
-              description: Download
+              description: button_download
               controller: documents
               mail_enabled: false
               mail_option: false
               sort: 1202
               is_public: true
             permissions_022:
               action: change_status
               id: 22
-              description: Change status
+              description: label_change_status
               controller: issues
               mail_enabled: true
               mail_option: true
               sort: 1060
               is_public: false
             permissions_011:
               action: edit
               id: 11
-              description: Edit
+              description: button_edit
               controller: versions
               mail_enabled: false
               mail_option: false
               sort: 321
               is_public: false
             permissions_034:
               action: add_document
               id: 34
-              description: Add
+              description: button_add
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 1220
               is_public: false
             permissions_023:
               action: destroy
               id: 23
-              description: Delete
+              description: button_delete
               controller: issues
               mail_enabled: false
               mail_option: false
               sort: 1065
               is_public: false
             permissions_012:
               action: destroy
               id: 12
-              description: Delete
+              description: button_delete
               controller: versions
               mail_enabled: false
               mail_option: false
               sort: 322
               is_public: false
             permissions_001:
               action: show
               id: 1
-              description: Overview
+              description: label_overview
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 100
               is_public: true
             permissions_035:
               action: edit
               id: 35
-              description: Edit
+              description: button_edit
               controller: documents
               mail_enabled: false
               mail_option: false
               sort: 1221
               is_public: false
             permissions_024:
               action: add_attachment
               id: 24
-              description: Add file
+              description: label_attachment_new
               controller: issues
               mail_enabled: false
               mail_option: false
               sort: 1070
               is_public: false
             permissions_013:
               action: add_issue_category
               id: 13
-              description: New issue category
+              description: button_add
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 420
               is_public: false
             permissions_002:
               action: changelog
               id: 2
-              description: View change log
+              description: label_change_log
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 105
               is_public: true
             permissions_036:
               action: destroy
               id: 36
-              description: Delete
+              description: button_delete
               controller: documents
               mail_enabled: false
               mail_option: false
               sort: 1222
               is_public: false
             permissions_025:
               action: destroy_attachment
               id: 25
-              description: Delete file
+              description: label_attachment_delete
               controller: issues
               mail_enabled: false
               mail_option: false
               sort: 1075
               is_public: false
             permissions_014:
               action: edit
               id: 14
-              description: Edit
+              description: button_edit
               controller: issue_categories
               mail_enabled: false
               mail_option: false
               sort: 421
               is_public: false
             permissions_003:
               action: issue_report
               id: 3
-              description: View reports
+              description: label_report_plural
               controller: reports
               mail_enabled: false
               mail_option: false
               sort: 110
               is_public: true
             permissions_037:
               action: add_attachment
               id: 37
-              description: Add file
+              description: label_attachment_new
               controller: documents
               mail_enabled: false
               mail_option: false
               sort: 1223
               is_public: false
             permissions_026:
               action: list_news
               id: 26
-              description: View list
+              description: button_list
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 1100
               is_public: true
             permissions_015:
               action: destroy
               id: 15
-              description: Delete
+              description: button_delete
               controller: issue_categories
               mail_enabled: false
               mail_option: false
               sort: 422
               is_public: false
             permissions_004:
               action: settings
               id: 4
-              description: Settings
+              description: label_settings
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 150
               is_public: false
             permissions_038:
               action: destroy_attachment
               id: 38
-              description: Delete file
+              description: label_attachment_delete
               controller: documents
               mail_enabled: false
               mail_option: false
               sort: 1224
               is_public: false
             permissions_027:
               action: show
               id: 27
-              description: View
+              description: button_view
               controller: news
               mail_enabled: false
               mail_option: false
               sort: 1101
               is_public: true
             permissions_016:
               action: list_issues
               id: 16
-              description: View list
+              description: button_list
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 1000
               is_public: true
             permissions_005:
               action: edit
               id: 5
-              description: Edit
+              description: button_edit
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 151
               is_public: false
             permissions_039:
               action: list_files
               id: 39
-              description: View list
+              description: button_list
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 1300
               is_public: true
             permissions_028:
               action: add_news
               id: 28
-              description: Add
+              description: button_add
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 1120
               is_public: false
             permissions_017:
               action: export_issues_csv
               id: 17
-              description: Export list to CSV
+              description: label_export_csv
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 1001
               is_public: true
             permissions_006:
               action: list_members
               id: 6
-              description: View list
+              description: button_list
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 200
               is_public: true
             permissions_040:
               action: download
               id: 40
-              description: Download
+              description: button_download
               controller: versions
               mail_enabled: false
               mail_option: false
               sort: 1301
               is_public: true
             permissions_029:
               action: edit
               id: 29
-              description: Edit
+              description: button_edit
               controller: news
               mail_enabled: false
               mail_option: false
               sort: 1121
               is_public: false
             permissions_018:
               action: show
               id: 18
-              description: View
+              description: button_view
               controller: issues
               mail_enabled: false
               mail_option: false
               sort: 1005
               is_public: true
             permissions_007:
               action: add_member
               id: 7
-              description: New member
+              description: button_add
               controller: projects
               mail_enabled: false
               mail_option: false
               sort: 220
               is_public: false

redmine/test/integration/account_test.rb 0 -4

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require "#{File.dirname(__FILE__)}/../test_helper"
             class AccountTest < ActionController::IntegrationTest
               fixtures :users
               # Replace this with your real tests.
               def test_login
                 get "account/my_page"
                 assert_redirected_to "account/login"
                 log_user('jsmith', 'jsmith')
                 get "account/my_account"
                 assert_response :success
                 assert_template "account/my_account"
               end
               def test_change_password
                 log_user('jsmith', 'jsmith')
                 get "account/my_account"
                 assert_response :success
                 assert_template "account/my_account"
                 post "account/change_password", :password => 'jsmith', :new_password => "hello", :new_password_confirmation => "hello2"
                 assert_response :success
                 assert_tag :tag => "div", :attributes => { :class => "errorExplanation" }
-                post "account/change_password", :password => 'admiN', :new_password => "hello", :new_password_confirmation => "hello"
-                assert_response :success
-                assert_equal 'Wrong password', flash[:notice]
                 post "account/change_password", :password => 'jsmith', :new_password => "hello", :new_password_confirmation => "hello"
                 assert_response :success
                 log_user('jsmith', 'hello')
               end
               def test_my_account
                 log_user('jsmith', 'jsmith')
                 get "account/my_account"
                 assert_response :success
                 assert_template "account/my_account"
                 post "account/my_account", :user => {:firstname => "Joe", :login => "root", :admin => 1}
                 assert_response :success
                 assert_template "account/my_account"
                 user = User.find(2)
                 assert_equal "Joe", user.firstname
                 assert_equal "jsmith", user.login
                 assert_equal false, user.admin?
               end
               def test_my_page
                 log_user('jsmith', 'jsmith')
                 get "account/my_page"
                 assert_response :success
                 assert_template "account/my_page"
               end
               def test_lost_password
                 get "account/lost_password"
                 assert_response :success
                 assert_template "account/lost_password"
                 post "account/lost_password", :mail => 'jsmith@somenet.foo'
                 assert_redirected_to "account/login"
                 token = Token.find(:first)
                 assert_equal 'recovery', token.action
                 assert_equal 'jsmith@somenet.foo', token.user.mail
                 assert !token.expired?
                 get "account/lost_password", :token => token.value
                 assert_response :success
                 assert_template "account/password_recovery"
                 post "account/lost_password", :token => token.value, :new_password => 'newpass', :new_password_confirmation => 'newpass'
                 assert_redirected_to "account/login"
                 assert_equal 'Password was successfully updated.', flash[:notice]
                 log_user('jsmith', 'newpass')
                 assert_equal 0, Token.count
               end
             end

redmine/db/migrate/002_default_configuration.rb removed 0 -61

NO CONTENT: file was removed

redmine/db/redmine_demo.db removed binary 0 0

NO CONTENT: file was removed, binary diff hidden

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages