/cpw/tomkiewicz/gg11: ae843cc7b7dd: Merge from trunk

[Tomasz Wasilczyk]

Changeset: ae843cc7b7ddb16654d0595e38896f7555eeadae
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2012-10-21 22:51 +0200
Branch:	 default
URL: http://hg.pidgin.im/cpw/tomkiewicz/gg11/rev/ae843cc7b7dd

Description:

Merge from trunk

diffstat:

 libpurple/util.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (15 lines):

diff --git a/libpurple/util.c b/libpurple/util.c
--- a/libpurple/util.c
+++ b/libpurple/util.c
@@ -3701,9 +3701,9 @@ purple_str_size_to_units(goffset size)
 		}
 
 		if (size_index == 0) {
-			return g_strdup_printf("%" G_GSIZE_FORMAT " %s", size, size_str[size_index]);
+			return g_strdup_printf("%" G_GOFFSET_FORMAT " %s", size, _(size_str[size_index]));
 		} else {
-			return g_strdup_printf("%.2f %s", size_mag, size_str[size_index]);
+			return g_strdup_printf("%.2f %s", size_mag, _(size_str[size_index]));
 		}
 	}
 }