Merge revisions 36016:36303 from trunk.

svn path=/branches/kill-bonobo/; revision=36307

1 files changed, 19 insertions, 16 deletions

diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 506522750b..b871d28203 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Authors: Michael Zucchi <notzed@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * 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
- * the Free Software Foundation; version 2.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -188,11 +189,13 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent,
 			if (!info->total)
 				continue;
 
-			/* show quota name only when available and have more than one quota info */
+			/* Show quota name only when available and we
+			 * have more than one quota info. */
 			if (info->name && quota->next)
-				descr = g_strdup_printf ("%s (%s):", _("Quota usage"), _(info->name));
+				descr = g_strdup_printf (
+					_("Quota usage (%s):"), _(info->name));
 			else
-				descr = g_strdup_printf ("%s:", _("Quota usage"));
+				descr = g_strdup_printf (_("Quota usage"));
 
 			procs = (int) ((((double) info->used) / ((double) info->total)) * 100.0 + 0.5);