Index: gp-templates/footer.php
===================================================================
--- gp-templates/footer.php	(révision 390)
+++ gp-templates/footer.php	(copie de travail)
@@ -1,6 +1,6 @@
 	<p id="footer"class="secondary">
-		Proudly powered by <a href="http://glotpress.org/" title="Found in translation">GlotPress</a>.
-		<?php gp_footer(); ?>		
+		<?php printf( __('Proudly powered by <a href="%s" title="Found in translation">GlotPress</a>.'), 'http://glotpress.org/' ); ?>
+		<?php gp_footer(); ?>
 	</p>
 	</body>
 </html>
\ No newline at end of file
Index: gp-templates/translation-set-permissions.php
===================================================================
--- gp-templates/translation-set-permissions.php	(révision 390)
+++ gp-templates/translation-set-permissions.php	(copie de travail)
@@ -4,28 +4,36 @@
 	gp_link_project_get( $project, $project->name ),
 	$locale->english_name,
 	'default' != $translation_set->slug? $translation_set->name : '',
-	'Permissions'
+	__('Permissions')
 ) );
 gp_tmpl_header();
 ?>
-<h2>Permissions</h2>
+<h2><?php _e('Permissions'); ?></h2>
 <ul id="translation-set-permissions">
-<? foreach( $permissions as $permission ): ?>
-	<li>
-		<span class="permission-action">user</span>
-		<span class="user"><?php echo esc_html( $permission->user->user_login ); ?></span>
-		<span class="permission-action">can <?php echo esc_html( $permission->action ); ?></span>
-		<a href="<?php echo gp_url_join( gp_url_current(), '_delete/'.$permission->id ); ?>" class="action delete">Remove</a>
-	</li>
-<? endforeach; ?>
-<?php if ( !$permissions ): ?>
-	<strong>No validators defined for this translation set.</strong>
-<?php endif; ?>
+	<?php foreach( $permissions as $permission ): ?>
+		<li>
+			<span class="permission-action"><?php _e('user'); ?></span>
+			<span class="user"><?php echo esc_html( $permission->user->user_login ); ?></span>
+			<span class="permission-action"><?php printf(__('can %s'), esc_html( $permission->action ) ); ?></span>
+			<a href="<?php echo gp_url_join( gp_url_current(), '_delete/'.$permission->id ); ?>" class="action delete"><?php _e('Remove'); ?></a>
+		</li>
+	<? endforeach; ?>
+
+	<?php if ( !$permissions ): ?>
+		<strong><?php _e('No validators defined for this translation set.'); ?></strong>
+	<?php endif; ?>
 </ul>
+
 <form action="" method="post" class="secondary">
-	<h3>Add a validator for this translation set</h3>
-	<p><label for="user_login">Username:</label> <input type="text" name="user_login" value="" id="user_login" /></p>
-	<p><input type="submit" name="submit" value="Add &rarr;" id="submit" /></p>
+	<h3><?php _e('Add a validator for this translation set'); ?></h3>
+	<p>
+		<label for="user_login"><?php _e('Username:'); ?></label>
+		<input type="text" name="user_login" value="" id="user_login" />
+	</p>
+	<p>
+		<input type="submit" name="submit" value="<?php esc_attr_e(__('Add &rarr;')); ?>" id="submit" />
+	</p>
+	
 	<input type="hidden" name="action" value="add-approver" />
 </form>
 <?php
Index: gp-templates/translation-row.php
===================================================================
--- gp-templates/translation-row.php	(révision 390)
+++ gp-templates/translation-row.php	(copie de travail)
@@ -16,26 +16,26 @@
 	<td class="priority" title="<?php echo esc_attr('Priority: '.gp_array_get( GP::$original->get_static( 'priorities' ), $t->priority )); ?>">
 	   <?php echo $priority_char[$t->priority][0] ?>
 	</td>
-	<td class="original">			
+	<td class="original">
 		<?php echo prepare_original( esc_translation( $t->singular ) ); ?>
 		<?php if ( $t->context ): ?>
 		<span class="context" title="<?php printf( __('Context: %s'), esc_html($t->context) ); ?>"><?php echo esc_html($t->context); ?></span>
 		<?php endif; ?>
-
+	
 	</td>
 	<td class="translation">
 	<?php
-		$edit_text = $can_edit? 'Double-click to add' : 'You <a href="'.gp_url_login().'">have to login</a> to add a translation.';
+		$edit_text = $can_edit? __('Double-click to add') : sprintf(__('You <a href="%s">have to login</a> to add a translation.'), gp_url_login());
 		$missing_text = "<span class='missing'>$edit_text</span>";
 		if ( !count( array_filter( $t->translations ) ) ):
 			echo $missing_text;
 		elseif ( !$t->plural ):
 			echo esc_translation( $t->translations[0] );
-		else: ?>				
+		else: ?>
 		<ul>
 			<?php
 				foreach( $t->translations as $translation ):
-			?>			
+			?>
 				<li><?php echo $translation? esc_translation( $translation ) : $missing_text; ?></li>
 			<?php
 				endforeach;
@@ -73,66 +73,67 @@
 				</p>
 				<?php foreach( range( 0, $locale->nplurals - 1 ) as $plural_index ): ?>
 					<?php if ( $locale->nplurals > 1 ): ?>
-					<p class="plural-numbers">This plural form is used for numbers like: <span class="numbers"><?php  echo implode(', ', $locale->numbers_for_index( $plural_index) ); ?></span></p>										
+					<p class="plural-numbers"><?php printf(__('This plural form is used for numbers like: <span class="numbers">%s</span>'), implode(', ', $locale->numbers_for_index( $plural_index) ) ); ?></p>
 					<?php endif; ?>
-					<?php textareas( $t, $can_edit, $plural_index ); ?>					
+					<?php textareas( $t, $can_edit, $plural_index ); ?>
 				<?php endforeach; ?>
 			<?php endif; ?>
 		<?php endif; ?>
 		</div>
+		
 		<div class="meta">
-			<h3>Meta</h3>
+			<h3><?php _e('Meta'); ?></h3>
 			<dl>
-				<dt>Status:</dt>
+				<dt><?php _e('Status:'); ?></dt>
 				<dd><?php echo display_status( $t->translation_status ); ?></dd>
 				<!--
 				TODO: ajaxy actions for approve/set as current/reject
 			<?php if ( $can_approve ): ?>
 				<?php if ( gp_startswith( $t->translation_status, '-' ) ): ?>
-				<dd><a href="#" tabindex="-1">Set as current</a></dd>
+				<dd><a href="#" tabindex="-1"><?php _e('Set as current'); ?></a></dd>
 				<?php endif; ?>
 				<?php if ( $t->translation_status ): ?>
-				<dd><a href="#" tabindex="-1">Reject</a></dd>
+				<dd><a href="#" tabindex="-1"><?php _e('Reject'); ?></a></dd>
 				<?php endif; ?>
 			<?php endif; ?>
 				-->
 			</dl>
 			<!--
-			<dl>					
-				<dt>Priority:</dt>
+			<dl>
+				<dt><?php _e('Priority:'); ?></dt>
 				<dd><?php echo esc_html($t->priority); ?></dd>
 			</dl>
-			-->	
+			-->
 			
 			<?php if ( $t->context ): ?>
-			<dl>					
-				<dt>Context:</dt>
+			<dl>
+				<dt><?php _e('Context:'); ?></dt>
 				<dd><span class="context"><?php echo esc_translation($t->context); ?></span></dd>
 			</dl>
-			<?php endif; ?>				
+			<?php endif; ?>
 			<?php if ( $t->extracted_comment ): ?>
-			<dl>					
-				<dt>Comment:</dt>
+			<dl>
+				<dt><?php _e('Comment:'); ?></dt>
 				<dd><?php echo make_clickable( esc_translation($t->extracted_comment) ); ?></dd>
 			</dl>
 			<?php endif; ?>
 			<?php if ( $t->translation_added && $t->translation_added != '0000-00-00 00:00:00' ): ?>
 			<dl>
-				<dt>Date added:</dt>
+				<dt><?php _e('Date added:'); ?></dt>
 				<dd><?php echo $t->translation_added; ?> GMT</dd>
-			</dl>								
+			</dl>
 			<?php endif; ?>
 			<?php if ( $t->user_login ): ?>
 			<dl>
-				<dt>Translated by:</dt>
-				<dd><?php echo $t->user_login; ?></dd>				
-			</dl>								
+				<dt><?php _e('Translated by:'); ?></dt>
+				<dd><?php echo $t->user_login; ?></dd>
+			</dl>
 			<?php endif; ?>
 			
 			<?php references( $project, $t ); ?>
 			
 			<dl>
-			    <dt>Priority of the original:</dt>
+			    <dt><?php _e('Priority of the original:'); ?></dt>
 			<?php if ( $can_write ): ?>
 			    <?php echo gp_select( 'priority-'.$t->original_id, GP::$original->get_static( 'priorities' ), $t->priority, array('class' => 'priority') ); ?>
 			<?php else: ?>
@@ -143,9 +144,9 @@
 		<div class="actions">
 		<?php if ( $can_edit ): ?>
 			<button class="ok">
-				<?php echo $can_approve? 'Add translation &rarr;' : 'Suggest new translation &rarr;'; ?>
+				<?php echo $can_approve? __('Add translation &rarr;') : __('Suggest new translation &rarr;'); ?>
 			</button>
-		<?php endif; ?>				
+		<?php endif; ?>
 			<a href="#" class="close"><?php _e('Cancel'); ?></a>
 		</div>
 	</td>
Index: gp-templates/project.php
===================================================================
--- gp-templates/project.php	(révision 390)
+++ gp-templates/project.php	(copie de travail)
@@ -44,23 +44,23 @@
 	<?php endforeach; ?>
 	</ul>
 <?php else: ?>
-	<p>There are no translations of this project.</p>
+	<p><?php _e('There are no translations of this project.'); ?></p>
 <?php endif; ?>
 <?php if ( $can_write ): ?>
 	<div class="secondary actionlist">
-	<a href="#" class="personal-options" id="personal-options-toggle">Personal project options &darr;</a>
+	<a href="#" class="personal-options" id="personal-options-toggle"><?php _e('Personal project options &darr;'); ?></a>
 	<div class="personal-options">
 		<form action="<?php echo gp_url_project( $project, '_personal' ); ?>" method="post">
 		<dl>
 			<dt><label for="source-url-template"><?php _e('Source file URL');  ?></label></dt>
 			<dd>
 				<input type="text" value="<?php echo esc_html( $project->source_url_template() ); ?>" name="source-url-template" id="source-url-template" />
-				<small>URL to a source file in the project. You can use <code>%file%</code> and <code>%line%</code>. Ex. <code>http://trac.example.org/browser/%file%#L%line%</code></small>
+				<small><?php _e('URL to a source file in the project. You can use <code>%file%</code> and <code>%line%</code>. Ex. <code>http://trac.example.org/browser/%file%#L%line%</code>'); ?></small>
 			</dd>
 		</dl>
 		<p>
-			<input type="submit" name="submit" value="Save &rarr;" id="save" />
-			<a class="ternary" href="#" onclick="jQuery('#personal-options-toggle').click();return false;">Cancel</a>
+			<input type="submit" name="submit" value="<?php esc_attr_e(__('Save &rarr;')); ?>" id="save" />
+			<a class="ternary" href="#" onclick="jQuery('#personal-options-toggle').click();return false;"><?php _e('Cancel'); ?></a>
 		</p>		
 		</form>
 	</div>
Index: gp-templates/install.php
===================================================================
--- gp-templates/install.php	(révision 390)
+++ gp-templates/install.php	(copie de travail)
@@ -6,31 +6,36 @@
 
 gp_tmpl_header();
 ?>
+
 <?php if ($errors): ?>
-There were some errors:
-<pre>
-	<?php echo implode("\n", $errors); ?>
-</pre>
-<?php
+	<?php _e('There were some errors:'); ?>
+	<pre>
+		<?php echo implode("\n", $errors); ?>
+	</pre>
+<?php 
 	else:
 		echo $success_message;
 	endif;
-	// TODO: deny access to scripts folder
-	if ( $show_htaccess_instructions ): ?>
-<p>
-Please add this to your <code>.htacess</code> file:
-<pre>
-# BEGIN GlotPress
-&lt;IfModule mod_rewrite.c&gt;
-RewriteEngine On
-RewriteBase <?php echo $path . "\n"; ?>
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule . <?php echo $path; ?>index.php [L]
-&lt;/IfModule&gt;
-# END GlotPress
-</pre>
-<strong>The default username is <code>admin</code>, whose password is simply <code>a</code>.</strong>
-</p>
+?>
+
+<?php
+// TODO: deny access to scripts folder
+if ( $show_htaccess_instructions ): ?>
+	<p>
+		<?php _e('Please add this to your <code>.htaccess</code> file:'); ?>
+		<pre>
+		# BEGIN GlotPress
+		&lt;IfModule mod_rewrite.c&gt;
+		RewriteEngine On
+		RewriteBase <?php echo $path . "\n"; ?>
+		RewriteCond %{REQUEST_FILENAME} !-f
+		RewriteCond %{REQUEST_FILENAME} !-d
+		RewriteRule . <?php echo $path; ?>index.php [L]
+		&lt;/IfModule&gt;
+		# END GlotPress
+		</pre>
+		<?php _e('<strong>The default username is <code>admin</code>, whose password is simply <code>a</code>.</strong>'); ?>
+	</p>
 <?php endif; ?>
+	
 <?php gp_tmpl_footer(); ?>
\ No newline at end of file
Index: gp-templates/project-form.php
===================================================================
--- gp-templates/project-form.php	(révision 390)
+++ gp-templates/project-form.php	(copie de travail)
@@ -6,7 +6,7 @@
 	<dt><label for="project[slug]"><?php _e('Slug');  ?></label></dt>
 	<dd>
 		<input type="text" name="project[slug]" value="<?php echo esc_html( $project->slug ); ?>" id="project[slug]">
-		<small>If you leave the slug empty, it will be derived from the name.</small>
+		<small><?php _e('If you leave the slug empty, it will be derived from the name.'); ?></small>
 	</dd>	
 
 	<dt><label for="project[description]"><?php _e('Description');  ?></label></dt>
@@ -15,10 +15,11 @@
 	<dt><label for="project[source_url_template]"><?php _e('Source file URL');  ?></label></dt>
 	<dd>
 		<input type="text" value="<?php echo esc_html( $project->source_url_template ); ?>" name="project[source_url_template]" id="project[source_url_template]" style="width: 30em;" />
-		<small>Public URL to a source file in the project. You can use <code>%file%</code> and <code>%line%</code>. Ex. <code>http://trac.example.org/browser/%file%#L%line%</code></small>
+		<small><?php _e('Public URL to a source file in the project. You can use <code>%file%</code> and <code>%line%</code>. Ex. <code>http://trac.example.org/browser/%file%#L%line%</code>'); ?></small>
 	</dd>
 
 	<dt><label for="project[parent_project_id]"><?php _e('Parent Project');  ?></label></dt>
 	<dd><?php echo gp_select( 'project[parent_project_id]', $all_project_options, $project->parent_project_id); ?></dd>
 </dl>
+
 <?php echo gp_js_focus_on( 'project[name]' ); ?>
\ No newline at end of file
Index: gp-templates/404.php
===================================================================
--- gp-templates/404.php	(révision 390)
+++ gp-templates/404.php	(copie de travail)
@@ -1,6 +1,8 @@
 <?php
 gp_title( __('Not Found &lt; GlotPress') );
 gp_tmpl_header();
-?>
-Not Found
-<?php gp_tmpl_footer(); ?>
\ No newline at end of file
+
+_e('Not found');
+
+gp_tmpl_footer();
+?>
\ No newline at end of file
Index: gp-templates/translations.php
===================================================================
--- gp-templates/translations.php	(révision 390)
+++ gp-templates/translations.php	(copie de travail)
@@ -7,144 +7,170 @@
 ) );
 wp_enqueue_script( 'editor' );
 wp_enqueue_script( 'translations-page' );
+
 // localizer adds var in front of the variable name, so we can't use $gp.editor.options
-wp_localize_script( 'editor', '$gp_editor_options', compact('can_approve', 'can_write', 'url', 'discard_warning_url', 'set_priority_url') );
-wp_localize_script( 'translations-page', '$gp_translations_options', array('action' => $approve_action) );
+wp_localize_script( 'editor', '$gp_editor_options', array(
+	'can_approve' 			=> $can_approve, 
+	'can_write' 			=> $can_write, 
+	'url' 					=> $url, 
+	'discard_warning_url' 	=> $discard_warning_url, 
+	'set_priority_url' 		=> $set_priority_url, 
+	'saving_hellip' 		=> __('Saving&hellip;'),
+	'error_start' 			=> __('Error: '),
+	'error_translation' 	=> __('Error saving the translation!'),
+	'setting_prio' 			=> __('Setting priority&hellip;'),
+	'set_prio' 				=> __('Priority set!'),
+	'error_prio' 			=> __('Error setting the priority!'),
+	'discarding' 			=> __('Discarding&hellip;'),
+	'saved' 				=> __('Saved!')
+) );
+wp_localize_script( 'translations-page', '$gp_translations_options', array(
+	'action' => $approve_action,
+	'sort_d' => __('Sort &darr;'),
+	'sort_u' => __('Sort &uarr;'),
+	'filt_d' => __('Filter &darr;'),
+	'filt_u' => __('Filter &uarr;'),
+	'bulk_d' => __('Bulk &darr;'),
+	'bulk_u' => __('Bulk &uarr;'),
+	'approv' => __('Approve'),
+	'reject' => __('Reject')
+) );
+
+
 $parity = gp_parity_factory();
 gp_tmpl_header();
 $i = 0;
 ?>
 <!-- TODO: use another form for bulk actions -->
 <form id="upper-filters-toolbar" class="filters-toolbar" action="" method="get" accept-charset="utf-8">
-	<?php if ( $can_approve ): ?>	
-	<a href="#" class="revealing bulk">Bulk &darr;</a> <strong class="separator">&bull;</strong>
+	<?php if ( $can_approve ): ?>
+	<a href="#" class="revealing bulk"><?php _e('Bulk &darr;'); ?></a> <strong class="separator">&bull;</strong>
 	<?php endif; ?>
-	<a href="#" class="revealing filter">Filter &darr;</a> <span class="separator">&bull;</span>
-	<a href="#" class="revealing sort">Sort &darr;</a> <strong class="separator">&bull;</strong>
+	<a href="#" class="revealing filter"><?php _e('Filter &darr;'); ?></a> <span class="separator">&bull;</span>
+	<a href="#" class="revealing sort"><?php _e('Sort &darr;'); ?></a> <strong class="separator">&bull;</strong>
 	<?php
 	$filter_links = array();
-	$filter_links[] = gp_link_get( $url, 'All' );
-	$filter_links[] = gp_link_get( add_query_arg( array('filters[translated]' => 'no', 'sort[by]' => 'priority', 'sort[how]' => 'desc',
-	    'filters[status]' => 'either'), $url ), 'Untranslated' );
-	$filter_links[] = gp_link_get( add_query_arg( array('filters[translated]' => 'no', 'sort[by]' => 'random', 'filters[status]' => 'either'), $url ), 'Random Untranslated' );
+	$filter_links[] = gp_link_get( $url, __('All') );
+	$filter_links[] = gp_link_get( add_query_arg( array('filters[translated]' => 'no', 'sort[by]' => 'priority', 'sort[how]' => 'desc', 'filters[status]' => 'either'), $url ), __('Untranslated') );
+	$filter_links[] = gp_link_get( add_query_arg( array('filters[translated]' => 'no', 'sort[by]' => 'random', 'filters[status]' => 'either'), $url ), __('Random Untranslated') );
 	if ( $can_approve ) {
 		$filter_links[] = gp_link_get( add_query_arg( array('filters[translated]' => 'yes', 'filters[status]' => 'waiting'), $url ),
-				'Waiting' );
+				__('Waiting') );
 		$filter_links[] = gp_link_get( add_query_arg( array('filters[warnings]' => 'yes', 'filters[status]' => 'current_or_waiting', 'sort[by]' => 'translation_date_added'), $url ),
-				'Warnings' );
-				
+				__('Warnings') );
+	
 	}
 	// TODO: with warnings
 	// TODO: saved searches
 	echo implode( '&nbsp;<span class="separator">&bull;</span>&nbsp;', $filter_links );
 	?>
-	<dl class="filters-expanded filters hidden clearfix">		
- 		<dt><label for="filters[term]">Term:</label></dt>
-		<dd><input type="text" value="<?php echo gp_esc_attr_with_entities( gp_array_get( $filters, 'term' ) ); ?>" name="filters[term]" id="filters[term]" /></dd>		
- 		<dt><label for="filters[translated]">With translation:</label></dt>
+	<dl class="filters-expanded filters hidden clearfix">
+ 		<dt><label for="filters[term]"><?php _e('Term:'); ?></label></dt>
+		<dd><input type="text" value="<?php echo gp_esc_attr_with_entities( gp_array_get( $filters, 'term' ) ); ?>" name="filters[term]" id="filters[term]" /></dd>
+ 		<dt><label for="filters[translated]"><?php _e('With translation:'); ?></label></dt>
 		<dd>
 			<?php echo gp_radio_buttons('filters[translated]',
 				array(
-					'yes' => 'Yes',
-					'no' => 'No',
-					'either' => 'Either',
+					'yes' => __('Yes'),
+					'no'  => __('No'),
+					'either' => __('Either'),
 				), gp_array_get( $filters, 'translated', 'either' ) );
-			?>			
-		</dd>		
-
- 		<dt><label for="filters[status]">Status:</label></dt>
+			?>
+		</dd>
+ 		
+ 		<dt><label for="filters[status]"><?php _e('Status:'); ?></label></dt>
 		<dd>
 			<?php echo gp_radio_buttons('filters[status]', //TODO: show only these, which user is allowed to see afterwards
 				array(
-					'current_or_waiting' => 'Current or waiting',
-					'current' => 'Current only',
-					'old' => 'Approved, but obsoleted by another string',
-					'waiting' => 'Waiting approval',
-					'rejected' => 'Rejected',
-					'either' => 'Any',
+					'current_or_waiting' => __('Current or waiting'),
+					'current' => __('Current only'),
+					'old' => __('Approved, but obsoleted by another string'),
+					'waiting' => __('Waiting approval'),
+					'rejected' => __('Rejected'),
+					'either' => __('Any'),
 				), gp_array_get( $filters, 'status', 'current_or_waiting' ) );
-			?>			
-		</dd>		
+			?>
+		</dd>
 		
-		<dd><input type="submit" value="Filter" name="filter" /></dd>
+		<dd><input type="submit" value="<?php esc_attr_e(__('Filter')); ?>" name="filter" /></dd>
 	</dl>
-	<dl class="filters-expanded sort hidden clearfix">		
-		<dt>By:</dt>
+	<dl class="filters-expanded sort hidden clearfix">
+		<dt><?php _e('By:'); ?></dt>
 		<dd>
 		<?php echo gp_radio_buttons('sort[by]',
 			array(
-				'original_date_added' => 'Date added (original)',
-				'translation_date_added' => 'Date added (translation)',
-				'original' => 'Original string',
-				'translation' => 'Translation',
-				'priority' => 'Priority',
-				'references' => 'Filename in source',
-				'random' => 'Random',
+				'original_date_added' => __('Date added (original)'),
+				'translation_date_added' => __('Date added (translation)'),
+				'original' => __('Original string'),
+				'translation' => __('Translation'),
+				'priority' => __('Priority'),
+				'references' => __('Filename in source'),
+				'random' => __('Random'),
 			), gp_array_get( $sort, 'by', 'original_date_added' ) );
 		?>
 		</dd>
-		<dt>How:</dt>
+		<dt><?php _e('How:'); ?></dt>
 		<dd>
 		<?php echo gp_radio_buttons('sort[how]',
 			array(
-				'asc' => 'Ascending',
-				'desc' => 'Descending',
+				'asc' => __('Ascending'),
+				'desc' => __('Descending'),
 			), gp_array_get( $sort, 'how', 'desc' ) );
 		?>
 		</dd>
-		<dd><input type="submit" value="Sort" name="sorts" /></dd>
+		<dd><input type="submit" value="<?php esc_attr_e('Sort')); ?>" name="sorts" /></dd>
 	</dl>
 	<dl class="hidden bulk-actions filters-expanded clearfix">
-		<dt class="select">Select:</dt>
+		<dt class="select"><?php _e('Select:'); ?></dt>
 		<dd>
-			<a href="#" class="all">All</a>
-			<a href="#" class="none">None</a>			
+			<a href="#" class="all"><?php _e('All'); ?></a>
+			<a href="#" class="none"><?php _e('None'); ?></a>
 		</dd>
-		<dt>Approve:</dt>
+		<dt><?php _e('Approve:'); ?></dt>
 		<dd>
 			<?php echo gp_radio_buttons('bulk[action]',
 				array(
- 					'approve-all' => 'All',
-					'approve-selected' => 'Selected',
+ 					'approve-all' => __('All'),
+					'approve-selected' => __('Selected'),
 				), null );
-			?>			
+			?>
 		</dd>
-		<dt>Reject:</dt>
+		<dt><?php _e('Reject:'); ?></dt>
 		<dd>
 			<?php echo gp_radio_buttons('bulk[action]',
 				array(
-					'reject-all' => 'All',
-					'reject-selected' => 'Selected',
+					'reject-all' => __('All'),
+					'reject-selected' => __('Selected'),
 				), null );
-			?>			
+			?>
 		</dd>
 		<dd>
 			<input type="hidden" name="bulk[redirect_to]" value="<?php echo esc_attr(gp_url_current()); ?>" id="bulk[redirect_to]">
 			<input type="hidden" name="bulk[translation-ids]" value="" id="bulk[translation-ids]">
-			<input type="submit" value="Approve/Reject" name="approve" />
-			<p class="ternary"><strong>Note:</strong>&nbsp;Bulk edit works only on the current page.</p>
-		</dd>		
-	</dl>	
-	
+			<input type="submit" value="<?php esc_attr_e(__('Approve/Reject')); ?>" name="approve" />
+			<p class="ternary"><?php _e('<strong>Note:</strong>&nbsp;Bulk edit works only on the current page.'); ?></p>
+		</dd>
+	</dl>
+
 </form>
 
 <?php echo gp_pagination( $page, $per_page, $total_translations_count ); ?>
 <table id="translations" class="translations clear">
 	<tr>
-		<th>&bull;</th>
-		<th>Prio</th>
+		<th><?php _e('&bull;'); ?></th>
+		<th><?php _e('Prio'); ?></th>
 		<th class="original"><?php _e('Original string'); ?></th>
 		<th class="translation"><?php _e('Translation'); ?></th>
 		<th>&mdash;</th>
 	</tr>
 <?php foreach( $translations as $t ):
 		gp_tmpl_load( 'translation-row', get_defined_vars() );
-?>	
+?>
 <?php endforeach; ?>
 <?php
 	if ( !$translations ):
 ?>
-	<tr><td colspan="4">No translations were found!</td></tr>
+	<tr><td colspan="4"><?php _e('No translations were found!'); ?></td></tr>
 <?php
 	endif;
 ?>
@@ -163,7 +189,7 @@
 			$footer_links[] = $export_link;
 		}
 		if ( $can_write ) {
-		    $footer_links[] = gp_link_get( gp_url_project( $project, array( $locale->slug, $translation_set->slug, '_permissions' ) ), 'Permissions' );
+		    $footer_links[] = gp_link_get( gp_url_project( $project, array( $locale->slug, $translation_set->slug, '_permissions' ) ), __('Permissions') );
 		}
 		echo implode( ' &bull; ', $footer_links );
 	?>
Index: gp-templates/helper-functions.php
===================================================================
--- gp-templates/helper-functions.php	(révision 390)
+++ gp-templates/helper-functions.php	(copie de travail)
@@ -1,39 +1,40 @@
 <?php
-
 function prepare_original( $text ) {
-	$text = str_replace( array("\r", "\n"), "<span class='invisibles' title='New line'>&crarr;</span>\n", $text);
-	$text = str_replace( "\t", "<span class='invisibles' title='Tab character'>&rarr;</span>\t", $text);
+	$text = str_replace( array("\r", "\n"), "<span class='invisibles' title='".esc_attr(__('New line'))."'>&crarr;</span>\n", $text);
+	$text = str_replace( "\t", "<span class='invisibles' title='".esc_attr(__('Tab character'))."'>&rarr;</span>\t", $text);
 	return $text;
 }
 
 function textareas( $entry, $can_edit, $index = 0 ) {
 	$disabled = $can_edit? '' : 'disabled="disabled"';
-?>
-<div class="textareas">
-	<?php if( isset( $entry->warnings[$index] ) ):
+	?>
+	<div class="textareas">
+		<?php 
+		if( isset( $entry->warnings[$index] ) ):
 			$referenceable = $entry->warnings[$index];
 			$warning = each( $referenceable );
-	?>
-		<div class="warning secondary">
-			<strong>Warning:</strong> <?php  echo esc_html( $warning['value'] ); ?>
-			<?php if( GP::$user->current()->admin() ): // TODO: allow users with write permissions, too ?>
-			<a href="#" class="discard-warning" key="<?php echo $warning['key'] ?>" index="<?php echo $index; ?>">Discard</a>
-			<?php endif; ?>
-		</div>
-	<?php endif; ?>
-	<textarea name="translation[<?php echo $entry->original_id; ?>][]" <?php echo $disabled; ?>><?php echo esc_translation(gp_array_get($entry->translations, $index)); ?></textarea>
-<?php if ( $can_edit ): ?>
-	<p>
-		<a href="#" class="copy" tabindex="-1">Copy from original</a>
-	</p>
-<?php else: ?>
-	<p>
-		You <a href="<?php echo gp_url_login(); ?>">have to log in</a> to edit this translation.
-	</p>
-	
-<?php endif; ?>
-</div>
-<?php
+			?>
+			<div class="warning secondary">
+				<?php printf( __('<strong>Warning:</strong> %s'), esc_html( $warning['value'] ) ); ?>
+				
+				<?php if( GP::$user->current()->admin() ): // TODO: allow users with write permissions, too ?>
+					<a href="#" class="discard-warning" key="<?php echo $warning['key'] ?>" index="<?php echo $index; ?>"><?php _e('Discard'); ?></a>
+				<?php endif; ?>
+			</div>
+		<?php endif; ?>
+		<textarea name="translation[<?php echo $entry->original_id; ?>][]" <?php echo $disabled; ?>><?php echo esc_translation(gp_array_get($entry->translations, $index)); ?></textarea>
+
+		<?php if ( $can_edit ): ?>
+			<p>
+				<a href="#" class="copy" tabindex="-1"><?php _e('Copy from original'); ?></a>
+			</p>
+		<?php else: ?>
+			<p>
+				<?php printf( __('You <a href="%s">have to log in</a> to edit this translation.'), gp_url_login() ); ?>
+			</p>
+		<?php endif; ?>
+	</div>
+	<?php
 }
 
 /**
@@ -45,26 +46,25 @@
 
 function display_status( $status ) {
 	$status = preg_replace( '/^[+-]/', '', $status);
-	return $status? $status : 'untranslated';
+	return $status ? $status : 'untranslated';
 }
 
 function references( $project, $entry ) {
 	if ( !$project->source_url_template() ) return;
-?>
-	References:
-			<ul class="refs">
-	<?php
+	?>
+	<?php _e('References:'); ?>
+	<ul class="refs">	
+		<?php
 		foreach( $entry->references as $reference ):
 			list( $file, $line ) = array_pad( explode( ':', $reference ), 2, 0 );
 			// TODO: allow the user to override the project setting
 			if ( $source_url = $project->source_url( $file, $line ) ):
-	?>
+				?>
 				<li><a target="_blank" tabindex="-1" href="<?php echo $source_url; ?>"><?php echo $file.':'.$line ?></a></li>
-
-	<?php
+				<?php
 			endif;
 		endforeach;
-	?>
-			</ul>
+		?>
+	</ul>
 <?php
 }
\ No newline at end of file
Index: gp-templates/header.php
===================================================================
--- gp-templates/header.php	(révision 390)
+++ gp-templates/header.php	(copie de travail)
@@ -11,18 +11,23 @@
 		<?php gp_head(); ?>
 	</head>
 	<body>
-	    <div id="gp-js-message"></div>		
+	    <div id="gp-js-message"></div>
 		<h1>
-			<a href="<?php echo gp_url( '/' ); ?>"><img alt="GlotPress logo" src="<?php echo gp_url_img( 'glotpress-logo.png' ); ?>" /></a>
+			<a href="<?php echo gp_url( '/' ); ?>">
+				<img alt="<?php esc_attr_e(__('GlotPress logo')); ?>" src="<?php echo gp_url_img( 'glotpress-logo.png' ); ?>" />
+			</a>
+			
 			<?php echo gp_breadcrumb(); ?>
 			<span id="hello">
-			<?php if (GP::$user->logged_in()):
-					$user = GP::$user->current();
-			?>
-				Hi, <?php echo $user->user_login; ?>.
-				<a href="<?php echo gp_url('/logout')?>">Log out</a>
+			<?php 
+			if (GP::$user->logged_in()):
+				$user = GP::$user->current();
+				
+				printf( __('Hi, %s.'), $user->user_login );
+				?>
+				<a href="<?php echo gp_url('/logout')?>"><?php _e('Log out'); ?></a>
 			<?php else: ?>
-				<a href="<?php echo gp_url_login(); ?>">Log in</a>
+				<a href="<?php echo gp_url_login(); ?>"><?php _e('Log in'); ?></a>
 			<?php endif; ?>
 			</span>
 		</h1>
Index: gp-templates/translation-set-form.php
===================================================================
--- gp-templates/translation-set-form.php	(révision 390)
+++ gp-templates/translation-set-form.php	(copie de travail)
@@ -2,7 +2,7 @@
 	<dt><label for="set[locale]"><?php _e('Locale');  ?></label></dt>
 	<dd>
 		<?php echo gp_select( 'set[locale]', $all_locale_options, $set->locale); ?>
-		<a href="#" id="copy">Use as name</a>
+		<a href="#" id="copy"><?php _e('Use as name'); ?></a>
 	</dd>
 	
 	<dt><label for="set[name]"><?php _e('Name');  ?></label></dt>