kov changed libgksu/trunk/ChangeLog, libgksu/trunk/libgksu/libgksu.c

[Gustavo Noronha]

Mensagem de log: 
enhancements to messages


-----


Modified: libgksu/trunk/ChangeLog
===================================================================
--- libgksu/trunk/ChangeLog	2006-04-30 21:50:34 UTC (rev 592)
+++ libgksu/trunk/ChangeLog	2006-05-01 11:12:02 UTC (rev 593)
@@ -17,6 +17,9 @@
 	- standardize the get methods that return string to
 	  return NULL if they were not set, and updated
 	  "docstrings" to fit;
+	- removed translatable marks for strings that are
+	  errors printed to stderr
+	- made some strings look better or more HIG compliant
 
 	* libgksuui/libgksu.{c,h}, libgksuui/gksuui-dialog.c:
 	- accepted changes from the Ubuntu people to make the dialog

Modified: libgksu/trunk/libgksu/libgksu.c
===================================================================
--- libgksu/trunk/libgksu/libgksu.c	2006-04-30 21:50:34 UTC (rev 592)
+++ libgksu/trunk/libgksu/libgksu.c	2006-05-01 11:12:02 UTC (rev 593)
@@ -484,21 +484,25 @@
     {
     case FAILED_GRAB_MOUSE:
       gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG(dialog),
-				     _("<b>Could not grab your mouse.</b>\n\n"
-				       "A malicious client may be eavesdropping\n"
-				       "on your session or you may have just clicked\n"
-				       "a menu or some application just decided to get\n"
-				       "focus.\n\n"
+				     _("<b><big>Could not grab your mouse.</big></b>"
+				       "\n\n"
+				       "A malicious client may be eavesdropping "
+				       "on your session or you may have just clicked "
+				       "a menu or some application just decided to get "
+				       "focus."
+				       "\n\n"
 				       "Try again."));
 
       break;
     case FAILED_GRAB_KEYBOARD:
       gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG(dialog),
-				     _("Could not grab your keyboard.\n"
-				       "A malicious client may be eavesdropping\n"
-				       "on your session or you may have just clicked\n"
-				       "a menu or some application just decided to get\n"
-				       "focus.\n\n"
+				     _("<b><big>Could not grab your keyboard.</big></b>"
+				       "\n\n"
+				       "A malicious client may be eavesdropping "
+				       "on your session or you may have just clicked "
+				       "a menu or some application just decided to get "
+				       "focus."
+				       "\n\n"
 				       "Try again."));
       break;
     }
@@ -842,7 +846,7 @@
 				   command);
 	  else
 	    msg = g_strdup_printf (_("<b><big>Enter your password to run "
-				     "the application \"%s\" as user %s"
+				     "the application '%s' as user %s"
 				     "</big></b>"),
 				   command, context->user);
 	}
@@ -857,7 +861,7 @@
 				   command);
         else
           msg = g_strdup_printf (_("<b><big>Enter the password of %s to run "
-                                   "the application \"%s\""
+                                   "the application '%s'"
                                    "</big></b>"),
 				   command, context->user);
       }
@@ -926,13 +930,23 @@
   GtkWidget *alignment;
   GtkWidget *check_button;
 
+  gchar *command = NULL;
+
+  if (context->description)
+    command = context->description;
+  else
+    command = context->command;
+
   dialog = gtk_message_dialog_new_with_markup (NULL, 0,
 					       GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE,
-					       _("<b>The \"%s\" program was started with "
+					       _("<b><big>Granted permissions without asking "
+						 "for password</big></b>"
+						 "\n\n"
+						 "The '%s' program was started with "
 						 "the privileges of the %s user without "
 						 "the need to ask for a password, due to "
 						 "your system's authentication mechanism "
-						 "setup.</b>"
+						 "setup."
 						 "\n\n"
 						 "It is possible that you are being allowed "
 						 "to run specific programs as user %s "
@@ -942,7 +956,7 @@
 						 "This is not a problem report; it's "
 						 "simply a notification to make sure "
 						 "you are aware of this."),
-					       context->command,
+					       command,
 					       context->user,
 					       context->user);
 
@@ -1057,8 +1071,8 @@
   else
     {
       fprintf (stderr,
-	       _("Failed to obtain xauth key: xauth binary not found "
-		 "at usual locations"));
+	       "Failed to obtain xauth key: xauth binary not found "
+	       "at usual locations");
 
       return 1;
     }
@@ -1071,7 +1085,7 @@
   if ((xauth_output = popen (tmp, "r")) == NULL)
     {
       fprintf (stderr,
-	       _("Failed to obtain xauth key: %s"),
+	       "Failed to obtain xauth key: %s",
 	       strerror(errno));
       return 1;
     }
@@ -1131,13 +1145,13 @@
     {
       if (errno == EEXIST)
 	fprintf (stderr,
-		 _("Impossible to create the .Xauthority file: a file "
-		   "already exists. This might be a security issue; "
-		   "please investigate or warn your system administrator."));
+		 "Impossible to create the .Xauthority file: a file "
+		 "already exists. This might be a security issue; "
+		 "please investigate.");
       else
 	fprintf (stderr,
-		   _("Error copying '%s' to '%s': %s"),
-		   fn, dir, strerror(errno));
+		 "Error copying '%s' to '%s': %s",
+		 fn, dir, strerror(errno));
 
       return TRUE;
     }
@@ -1146,7 +1160,7 @@
   if (in == -1)
     {
       fprintf (stderr,
-	       _("Error copying '%s' to '%s': %s"),
+	       "Error copying '%s' to '%s': %s",
 	       fn, dir, strerror(errno));
       return TRUE;
     }
@@ -1156,7 +1170,7 @@
       if (full_write(out, buf, r) == -1)
 	{
 	  fprintf (stderr,
-		   _("Error copying '%s' to '%s': %s"),
+		   "Error copying '%s' to '%s': %s",
 		   fn, dir, strerror(errno));
 	  return TRUE;
 	}
@@ -1165,7 +1179,7 @@
   if (r == -1)
     {
       fprintf (stderr,
-	       _("Error copying '%s' to '%s': %s"),
+	       "Error copying '%s' to '%s': %s",
 	       fn, dir, strerror(errno));
       return TRUE;
     }
@@ -1642,7 +1656,7 @@
       if (execv (cmd[0], cmd) == -1)
 	{
 	  fprintf (stderr,
-		   _("Unable to run /bin/su: %s"),
+		   "Unable to run /bin/su: %s",
 		   strerror(errno));
 	}