f-spot r3704 - in trunk: po src/Core

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Wed Feb 20 15:30:51 2008
New Revision: 3704
URL: http://svn.gnome.org/viewvc/f-spot?rev=3704&view=rev

Log:
i18n issues. Fixes bgo#517428

Modified:
   trunk/po/POTFILES.skip
   trunk/src/Core/Photo.cs

Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip	(original)
+++ trunk/po/POTFILES.skip	Wed Feb 20 15:30:51 2008
@@ -10,6 +10,9 @@
 extensions/FacebookExport/FacebookExport.addin.xml
 extensions/FacebookExport/FacebookExport.cs
 extensions/FacebookExport/FacebookExport.glade
+extensions/FlickrExport/FlickrExport.addin.xml
+extensions/FlickrExport/FlickrExport.cs
+extensions/FlickrExport/FlickrExport.glade
 extensions/FolderExport/FolderExport.addin.xml
 extensions/FolderExport/FolderExport.cs
 extensions/FolderExport/FolderExport.glade
@@ -25,3 +28,10 @@
 extensions/PicasaWebExport/PicasaWebExport.cs
 extensions/PicasaWebExport/PicasaWebExport.glade
 extensions/PicasaWebExport/PicasaWebRemote.cs
+extensions/PicasaWebExport/google-sharp/CaptchaException.cs
+extensions/PictureTile/PictureTile.addin.xml
+extensions/PictureTile/PictureTile.glade
+extensions/PictureTile/PictureTile.cs
+extensions/MetaPixel/MetaPixel.addin.xml
+extensions/MetaPixel/MetaPixel.glade
+extensions/MetaPixel/MetaPixel.cs

Modified: trunk/src/Core/Photo.cs
==============================================================================
--- trunk/src/Core/Photo.cs	(original)
+++ trunk/src/Core/Photo.cs	Wed Feb 20 15:30:51 2008
@@ -409,7 +409,7 @@
 			int num = 0;
 			while (true) {
 				num++;
-				string name = Catalog.GetPluralString ("Reparented", "Reparented ({0})", num);
+				string name = (num == 1) ? Catalog.GetString ("Reparented") : String.Format (Catalog.GetString( "Reparented ({0})"), num);
 				name = String.Format (name, num);
 				if (VersionNameExists (name))
 					continue;
@@ -445,7 +445,7 @@
 			string final_name;
 			while (true) {
 				final_name = String.Format (
-						Catalog.GetPluralString ("Modified in {1}", "Modified in {1} ({0})", num),
+						(num == 1) ? Catalog.GetString ("Modified in {1}") : Catalog.GetString ("Modified in {1} ({0})"),
 						num, name);
 	
 				if (num > 1)