Modification de propriétés sur .
___________________________________________________________________
Modifié : svn:ignore
   - gp-config.php
db-settings.php
.htaccess
glotpress.tmproj

   + gp-config.php
db-settings.php
.htaccess
glotpress.tmproj
languages
diff


Index: scripts/recheck-warnings.php
===================================================================
--- scripts/recheck-warnings.php	(révision 491)
+++ scripts/recheck-warnings.php	(copie de travail)
@@ -10,7 +10,7 @@
 			$warnings = GP::$translation_warnings->check( $entry->singular, $entry->plural, $entry->translations, $locale );
 			if ( $warnings != $entry->warnings ) {
 				$translation = new GP_Translation( array('id' => $entry->id) );
-				echo sprintf( __("Updating warnings for %s"), $entry->id ) . "\n";
+				printf( __("Updating warnings for %s"), $entry->id ) . "\n";
 				$translation->update( array('warnings' => $warnings) );
 			}
 		}
Index: scripts/wporg2slug.php
===================================================================
--- scripts/wporg2slug.php	(révision 491)
+++ scripts/wporg2slug.php	(copie de travail)
@@ -18,7 +18,7 @@
 			}
 		}
 		if ( !$slug )
-			$this->to_stderr("No slug match for $wporg_slug.");
+			$this->to_stderr( sprintf(__("No slug match for %s."), $wporg_slug) );
 		else
 			echo $slug;
 	}
Index: scripts/import-originals.php
===================================================================
--- scripts/import-originals.php	(révision 491)
+++ scripts/import-originals.php	(copie de travail)
@@ -15,7 +15,7 @@
 		if ( !$project ) $this->error( __('Project not found!') );
 
 		$format = gp_array_get( GP::$formats, isset( $this->options['o'] )? $this->options['o'] : 'po', null );
-		if ( !$format ) $this->error( __('No such format.') );;
+		if ( !$format ) $this->error( __('No such format.') );
 
 		$translations = $format->read_originals_from_file( $this->options['f'], $project );
 		if ( !$translations ) {
@@ -23,7 +23,7 @@
 		}
 
 		list( $originals_added, $originals_existing ) = GP::$original->import_for_project( $project, $translations );
-		echo sprintf( __("%s new strings were added, %s existing were updated."), $originals_added, $originals_existing )."\n";
+		printf( __("%s new strings were added, %s existing were updated."), $originals_added, $originals_existing )."\n";
 	}
 }
 
Index: scripts/export.php
===================================================================
--- scripts/export.php	(révision 491)
+++ scripts/export.php	(copie de travail)
@@ -12,7 +12,7 @@
 	function action_on_translation_set( $translation_set ) {
 
 		$format = gp_array_get( GP::$formats, isset( $this->options['o'] )? $this->options['o'] : 'po', null );
-		if ( !$format ) $this->error( __('No such format.') );;
+		if ( !$format ) $this->error( __('No such format.') );
 		
 		$entries = GP::$translation->for_translation( $this->project, $translation_set, 'no-limit', gp_get( 'filters', array() ) );
 		echo $format->print_exported_file( $this->project, $this->locale, $translation_set, $entries )."\n";
Index: gp-templates/translation-row.php
===================================================================
--- gp-templates/translation-row.php	(révision 491)
+++ gp-templates/translation-row.php	(copie de travail)
@@ -148,7 +148,7 @@
     $permalink = gp_url_project_locale( $project, $locale->slug, $translation_set->slug,
         array_merge( array('filters[status]' => 'either', 'filters[original_id]' => $t->original_id ), $extra_args ) );
 ?>
-			    <dt><a tabindex="-1" href="<?php echo $permalink; ?>" title="Permanent link to this translation">&infin;</a></dt>
+			    <dt><a tabindex="-1" href="<?php echo $permalink; ?>" title="<?php _e('Permanent link to this translation'); ?>">&infin;</a></dt>
 			</dl>
 		</div>
 		<div class="actions">
Index: gp-templates/project.php
===================================================================
--- gp-templates/project.php	(révision 491)
+++ gp-templates/project.php	(copie de travail)
@@ -16,17 +16,17 @@
 <ul>
 <?php foreach($sub_projects as $sub_project): ?>
 	<li>
-		<?php gp_link_project( $sub_project, esc_html( $sub_project->name )); ?>			
-		<?php gp_link_project_edit( $sub_project ); ?>			
+		<?php gp_link_project( $sub_project, esc_html( $sub_project->name )); ?>
+		<?php gp_link_project_edit( $sub_project ); ?>
 		<?php gp_link_project_delete( $sub_project ); ?>
 	</li>
 <?php endforeach; ?>
-</ul>	
+</ul>
 <?php endif; ?>
 <?php if ( $translation_sets ): ?>
 	<?php _e('Translations:'); ?>
 	<ul class="translation-sets">
-	<?php foreach( $translation_sets as $set ): ?>    
+	<?php foreach( $translation_sets as $set ): ?>
 		<li>
 			<?php gp_link( gp_url_project( $project, gp_url_join( $set->locale, $set->slug ) ), $set->name_with_locale() ); ?>
 			<span class="stats secondary">
@@ -66,7 +66,7 @@
 		<p>
 			<input type="submit" name="submit" value="<?php echo esc_attr(__('Save &rarr;')); ?>" id="save" />
 			<a class="ternary" href="#" onclick="jQuery('#personal-options-toggle').click();return false;"><?php _e('Cancel'); ?></a>
-		</p>		
+		</p>
 		</form>
 	</div>
 	</div>
Index: gp-templates/project-form.php
===================================================================
--- gp-templates/project-form.php	(révision 491)
+++ gp-templates/project-form.php	(copie de travail)
@@ -9,7 +9,7 @@
 		<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> <span class="ternary">can include HTML</span></dt>
+	<dt><label for="project[description]"><?php _e('Description');  ?></label> <span class="ternary"><?php _e('can include HTML'); ?></span></dt>
 	<dd><textarea name="project[description]" rows="4" cols="40" id="project[description]"><?php echo esc_html( $project->description ); ?></textarea></dd>
 
 	<dt><label for="project[source_url_template]"><?php _e('Source file URL');  ?></label></dt>
Index: gp-templates/project-permissions.php
===================================================================
--- gp-templates/project-permissions.php	(révision 491)
+++ gp-templates/project-permissions.php	(copie de travail)
@@ -22,9 +22,9 @@
 		<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">can <?php echo esc_html( $permission->action ); ?> strings with locale</span>
+			<span class="permission-action"><?php printf( __('can %s strings with locale'), esc_html( $permission->action ) ); ?></span>
 			<span class="user"><?php echo esc_html( $permission->locale_slug ); ?></span>
-			<span class="permission-action">and slug</span>
+			<span class="permission-action"><?php _e('and slug'); ?></span>
 			<span class="user"><?php echo esc_html( $permission->set_slug ); ?></span>
 			<a href="<?php echo gp_url_join( gp_url_current(), '-delete/'.$permission->id ); ?>" class="action delete"><?php _e('Remove'); ?></a>
 		</li>
@@ -38,11 +38,11 @@
 			<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">can <?php echo esc_html( $permission->action ); ?> strings with locale</span>
+				<span class="permission-action"><?php printf(__('can %s strings with locale'), esc_html( $permission->action )); ?></span>
 				<span class="user"><?php echo esc_html( $permission->locale_slug ); ?></span>
-				<span class="permission-action">and slug</span>
+				<span class="permission-action"><?php _e('and slug'); ?></span>
 				<span class="user"><?php echo esc_html( $permission->set_slug ); ?></span>
-				<span class="permission-action">in the project </span>
+				<span class="permission-action"><?php _e('in the project'); ?> </span>
 				<span class="user"><?php gp_link_project( $permission->project, esc_html( $permission->project->name ) ); ?></span>
 			</li>
 		<? endforeach; ?>
Index: gp-templates/project-mass-create-sets.php
===================================================================
--- gp-templates/project-mass-create-sets.php	(révision 491)
+++ gp-templates/project-mass-create-sets.php	(copie de travail)
@@ -11,9 +11,7 @@
 gp_tmpl_header();
 ?>
 <h2><?php _e( sprintf( __('Mass-create Project Sets in <q>%s</q>'), esc_html( $project->name ) ) ); ?></h2>
-<p><?php _e('Here you can mass-create translation sets in this project.
-The list of translation sets will be mirrored with the sets of a project you choose.
-Usually this is one of the parent projects.'); ?></p>
+<p><?php _e('Here you can mass-create translation sets in this project. The list of translation sets will be mirrored with the sets of a project you choose. Usually this is one of the parent projects.'); ?></p>
 <form action="<?php echo esc_url( gp_url_current() ); ?>" method="post">
 	<dl>
 		<dt><label for="project_id"><?php _e('Project to take translation sets from:');  ?></label></dt>
Index: gp-templates/translation-set-form.php
===================================================================
--- gp-templates/translation-set-form.php	(révision 491)
+++ gp-templates/translation-set-form.php	(copie de travail)
@@ -12,7 +12,7 @@
 	<dt><label for="set[slug]"><?php _e('Slug');  ?></label></dt>
 	<dd><input type="text" name="set[slug]" value="<?php echo esc_html( $set->slug? $set->slug : 'default' ); ?>" id="set[slug]"></dd>
 
-	<dt><label for="set[project_id]"><?php _e('Project');  ?></label></dt>
+	<dt><label for="set[project_id]"><?php _e('Project'); ?></label></dt>
 	<dd><?php echo gp_projects_dropdown( 'set[project_id]', $set->project_id ); ?></dd>
 </dl>
 <?php echo gp_js_focus_on( 'set[locale]' ); ?>
Index: pomo/po.php
===================================================================
--- pomo/po.php	(révision 491)
+++ pomo/po.php	(copie de travail)
@@ -254,7 +254,7 @@
 					return false;
 				}
 				// add comment
-				$this->add_comment_to_entry($entry, $line);;
+				$this->add_comment_to_entry($entry, $line);
 			} elseif (preg_match('/^msgctxt\s+(".*")/', $line, $m)) {
 				if ($is_final($context)) {
 					PO::read_line($f, 'put-back');
Index: gp-includes/routes/translation.php
===================================================================
--- gp-includes/routes/translation.php	(révision 491)
+++ gp-includes/routes/translation.php	(copie de travail)
@@ -18,7 +18,7 @@
 		$this->can_or_redirect( 'approve', 'translation-set', $translation_set->id );
 
 		$format = gp_array_get( GP::$formats, gp_post( 'format', 'po' ), null );
-		if ( !$format ) $this->redirect_with_error( __('No such format.') );;
+		if ( !$format ) $this->redirect_with_error( __('No such format.') );
 
 		if ( !is_uploaded_file( $_FILES['import-file']['tmp_name'] ) ) {
 			$this->redirect_with_error( __('Error uploading the file.') );