f-spot r4714 - in trunk/extensions/Exporters: . PicasaWebExport

[lmilesi svn gnome org]

Author: lmilesi
Date: Mon Feb 16 10:53:17 2009
New Revision: 4714
URL: http://svn.gnome.org/viewvc/f-spot?rev=4714&view=rev

Log:
2009-02-16  Lorenzo Milesi  <maxxer yetopen it>

	* PicasaWebExport/PicasaWebExport.cs: make some strings
	translatable. Fix bgo#571818. Patch by Gabor Kelemen.
	* PicasaWebExport/PicasaWebExport.addin.xml: bump addin ver.


Modified:
   trunk/extensions/Exporters/ChangeLog
   trunk/extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml
   trunk/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs

Modified: trunk/extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml
==============================================================================
--- trunk/extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml	(original)
+++ trunk/extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml	Mon Feb 16 10:53:17 2009
@@ -1,5 +1,5 @@
 <Addin namespace="FSpot"
-	version="0.5.0.0"
+	version="0.5.0.1"
 	name="PicasaWeb Export"
 	description="This extension allows you to export your photos to PicasaWeb."
 	author="F-Spot team"

Modified: trunk/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs
==============================================================================
--- trunk/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs	(original)
+++ trunk/extensions/Exporters/PicasaWebExport/PicasaWebExport.cs	Mon Feb 16 10:53:17 2009
@@ -773,15 +773,11 @@
 					long ql = account.Picasa.QuotaLimit;
 
 					StringBuilder sb = new StringBuilder("<small>");
-					sb.Append(Catalog.GetString("Available space:"));
-					sb.Append(SizeUtil.ToHumanReadable (ql - qu));
-					sb.Append(" (");
-					sb.Append(100 * qu / ql);
-					sb.Append("% used out of ");
-					sb.Append(SizeUtil.ToHumanReadable (ql));
-					sb.Append(")");
+					sb.Append(String.Format (Catalog.GetString ("Available space: {0}, {1}% used out of {2}"),
+								GLib.Format.SizeForDisplay(ql - qu),
+								(100 * qu / ql),
+								GLib.Format.SizeForDisplay (ql)));
 					sb.Append("</small>");
-
 					status_label.Text = sb.ToString();
 					status_label.UseMarkup = true;
 
@@ -890,9 +886,12 @@
 			PicasaAlbum a = albums [album_optionmenu.History];
 			export_button.Sensitive = a.PicturesRemaining >= items.Length;
 			if (album_status_label.Visible = !export_button.Sensitive) {
-				album_status_label.Text = String.Format (Catalog.GetString ("<small>The selected album has a limit of {0} pictures,\n" +
-									   "which would be passed with the current selection of {1} images</small>"),
-									a.PicturesCount + a.PicturesRemaining, items.Length);
+				StringBuilder sb = new StringBuilder("<small>");
+				sb.Append(String.Format (Catalog.GetString ("The selected album has a limit of {0} pictures,\n" +
+								"which would be passed with the current selection of {1} images"),
+								a.PicturesCount + a.PicturesRemaining, items.Length));
+				sb.Append("</small>");
+				album_status_label.Text = String.Format (sb.ToString());
 				album_status_label.UseMarkup = true;
 			} else {
 				album_status_label.Text = String.Empty;