gparted r852 - in trunk: . src

[gedakc svn gnome org]

Author: gedakc
Date: Tue Jun 10 19:16:26 2008
New Revision: 852
URL: http://svn.gnome.org/viewvc/gparted?rev=852&view=rev

Log:
Added proper plural handling for PO files

Modified:
   trunk/ChangeLog
   trunk/src/Dialog_Progress.cc
   trunk/src/Win_GParted.cc

Modified: trunk/src/Dialog_Progress.cc
==============================================================================
--- trunk/src/Dialog_Progress.cc	(original)
+++ trunk/src/Dialog_Progress.cc	Tue Jun 10 19:16:26 2008
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 Bart
+/* Copyright (C) 2004, 2005, 2006, 2007, 2008 Bart Hakvoort
  *
  *  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
@@ -236,7 +236,7 @@
 
 	if ( cancel )
 	{
-		progressbar_current .set_text( _("Operation canceled") ) ;
+		progressbar_current .set_text( _("Operation cancelled") ) ;
 		progressbar_current .set_fraction( 0.0 ) ;
 	}
 	else
@@ -253,7 +253,9 @@
 		str_temp = _("All operations successfully completed") ;
 
 		if ( warnings > 0 )
-			str_temp += " (" + String::ucompose( _("%1 warnings"), warnings ) + ")" ;
+			str_temp += " ("
+			         +  String::ucompose( ngettext("%1 warning", "%1 warnings", warnings), warnings )
+			         +  ")" ;
 
 		progressbar_all .set_text( str_temp ) ;
 		progressbar_all .set_fraction( 1.0 ) ;
@@ -313,7 +315,7 @@
 				   Gtk::BUTTONS_NONE,
 				   true ) ;
 		
-	dialog .set_secondary_text( _("Canceling an operation may cause SEVERE filesystem damage.") ) ;
+	dialog .set_secondary_text( _("Cancelling an operation may cause SEVERE file system damage.") ) ;
 
 	dialog .add_button( _("Continue Operation"), Gtk::RESPONSE_NONE ) ;
 	dialog .add_button( _("Cancel Operation"), Gtk::RESPONSE_CANCEL ) ;

Modified: trunk/src/Win_GParted.cc
==============================================================================
--- trunk/src/Win_GParted.cc	(original)
+++ trunk/src/Win_GParted.cc	Tue Jun 10 19:16:26 2008
@@ -667,10 +667,13 @@
 
 	//set new statusbartext
 	statusbar .pop() ;
-	if ( operations .size() != 1 )
-		statusbar .push( String::ucompose( _("%1 operations pending"), operations .size() ) );
-	else
-		statusbar .push( _( "1 operation pending" ) );
+	statusbar .push( String::ucompose( ngettext( "%1 operation pending"
+	                                           , "%1 operations pending"
+	                                           , operations .size()
+	                                           )
+	                                 , operations .size()
+	                                 )
+	               );
 		
 	if ( ! operations .size() ) 
 		allow_undo_clear_apply( false ) ;
@@ -724,11 +727,13 @@
 					   Gtk::BUTTONS_NONE,
 					   true );
 
-		if ( operations .size() != 1 )
-			dialog .set_secondary_text( String::ucompose( _("%1 operations are currently pending."), 
-							  	      operations .size() ) ) ;
-		else
-			dialog .set_secondary_text( _("1 operation is currently pending.") ) ;
+		dialog .set_secondary_text( String::ucompose( ngettext( "%1 operation is currently pending."
+		                                                      , "%1 operations are currently pending."
+		                                                      , operations .size()
+		                                                      )
+		                                            , operations .size()
+		                                            )
+		                          ) ;
 	
 		dialog .add_button( Gtk::Stock::QUIT, Gtk::RESPONSE_CLOSE );
 		dialog .add_button( Gtk::Stock::CANCEL,Gtk::RESPONSE_CANCEL );