gnome-desktop r5324 - trunk/libgnome-desktop

[federico svn gnome org]

Author: federico
Date: Tue Dec  9 18:18:59 2008
New Revision: 5324
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5324&view=rev

Log:
bgo563831 - Make some gnome-rr strings more friendly to translators
2008-12-09  Federico Mena Quintero  <federico novell com>

	Fix http://bugzilla.gnome.org/show_bug.cgi?id=563831

	* gnome-rr.c (gnome_rr_crtc_set_config): Make an error string more
	friendly to translation.

	* gnome-rr-config.c (crtc_assignment_new): Likewise.

Signed-off-by: Federico Mena Quintero <federico novell com>

Modified:
   trunk/libgnome-desktop/ChangeLog
   trunk/libgnome-desktop/gnome-rr-config.c
   trunk/libgnome-desktop/gnome-rr.c

Modified: trunk/libgnome-desktop/gnome-rr-config.c
==============================================================================
--- trunk/libgnome-desktop/gnome-rr-config.c	(original)
+++ trunk/libgnome-desktop/gnome-rr-config.c	Tue Dec  9 18:18:59 2008
@@ -1543,15 +1543,16 @@
 	if (width < min_width || width > max_width ||
 	    height < min_height || height > max_height)
 	{
+	    /* Translators: the "requested", "minimum", and "maximum" words here
+	     * are not keywords; please translate them as usual.
+	     */
 	    g_set_error (error, GNOME_RR_ERROR, GNOME_RR_ERROR_BOUNDS_ERROR,
 			 _("required virtual size does not fit available size: "
-			   "req_width = %d, req_height = %d, "
-			   "min_width = %d, min_height = %d, "
-			   "max_width = %d, max_height = %d"),
+			   "requested=(%d, %d), minimum=(%d, %d), maximum=(%d, %d)"),
 			 width, height,
 			 min_width, min_height,
 			 max_width, max_height);
-	    goto fail;
+	    goto epic_fail;
 	}
 
 	assignment->screen = screen;

Modified: trunk/libgnome-desktop/gnome-rr.c
==============================================================================
--- trunk/libgnome-desktop/gnome-rr.c	(original)
+++ trunk/libgnome-desktop/gnome-rr.c	Tue Dec  9 18:18:59 2008
@@ -1100,13 +1100,16 @@
 	if (x + mode->width > info->max_width
 	    || y + mode->height > info->max_height)
 	{
+	    /* Translators: the "position", "size", and "maximum" words here are
+	     * not keywords; please translate them as usual.
+	     */
 	    g_set_error (error, GNOME_RR_ERROR, GNOME_RR_ERROR_BOUNDS_ERROR,
 			 _("requested position/size for CRTC %d is outside the allowed limit: "
-			   "req_x = %d, req_width = %d, max_width = %d, "
-			   "req_y = %d, req_height = %d, max_height = %d"),
+			   "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"),
 			 (int) crtc->id,
-			 x, mode->width, info->max_width,
-			 y, mode->height, info->max_height);
+			 x, y,
+			 mode->width, mode->height,
+			 info->max_width, info->max-height);
 	    return FALSE;
 	}
     }