Revision d064a7734e5f0180f59fd1a438a5cd4d5800d02d

nwalp at pidgin.im nwalp at pidgin.im
Sat Apr 7 18:47:01 EDT 2007


o   -----------------------------------------------------------------
|   Revision: d064a7734e5f0180f59fd1a438a5cd4d5800d02d
|   Ancestor: 7d39711c2b4accfad185529c71cd16c374790786
|   Author: nwalp at pidgin.im
|   Date: 2007-04-07T22:46:39
|   Branch: im.pidgin.pidgin
|   
|   Modified files:
|           pidgin/gtkaccount.c pidgin/gtkblist.c pidgin/gtkconn.c
|           pidgin/gtkdialogs.c pidgin/gtkmain.c pidgin/gtkutils.c
|   
|   ChangeLog: 
|   
|   make things cleaner for translators
|   
|   ============================================================
|   --- pidgin/gtkaccount.c	d47c35929d6d8af01095c6f6dc0bc0c52da584ae
|   +++ pidgin/gtkaccount.c	75d4b765945f709435e355b7272b94dfee25e12d
|   @@ -2127,7 +2127,7 @@ create_accounts_list(AccountsWindow *dia
|    	GtkWidget *treeview;
|    	GtkTreeSelection *sel;
|    	GtkTargetEntry gte[] = {{"PURPLE_ACCOUNT", GTK_TARGET_SAME_APP, 0}};
|   -	char *pretty;
|   +	char *pretty, *tmp;
|    
|    	frame = gtk_frame_new(NULL);
|    	gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
|   @@ -2140,17 +2140,19 @@ create_accounts_list(AccountsWindow *dia
|    	/* Create a helpful first-time-use label */
|    	label = gtk_label_new(NULL);
|    	/* Translators: Please maintain the use of -> or <- to represent the menu heirarchy */
|   -	pretty = pidgin_make_pretty_arrows(_(
|   -						 "<span size='larger' weight='bold'>Welcome to " PIDGIN_NAME "!</span>\n\n"
|   +	tmp = g_strdup_printf(_(
|   +						 "<span size='larger' weight='bold'>Welcome to %s!</span>\n\n"
|    
|   -						 "You have no IM accounts configured. To start connecting with " PIDGIN_NAME " "
|   +						 "You have no IM accounts configured. To start connecting with %s "
|    						 "press the <b>Add</b> button below and configure your first "
|   -						 "account. If you want " PIDGIN_NAME " to connect to multiple IM accounts, "
|   +						 "account. If you want %s to connect to multiple IM accounts, "
|    						 "press <b>Add</b> again to configure them all.\n\n"
|    
|    						 "You can come back to this window to add, edit, or remove "
|    						 "accounts from <b>Accounts->Add/Edit</b> in the Buddy "
|   -						 "List window"));
|   +						 "List window"), PIDGIN_NAME, PIDGIN_NAME, PIDGIN_NAME);
|   +	pretty = pidgin_make_pretty_arrows(tmp);
|   +	g_free(tmp);
|    	gtk_label_set_markup(GTK_LABEL(label), pretty);
|    	g_free(pretty);
|    
|   ============================================================
|   --- pidgin/gtkblist.c	473ff4dacd06be14ccca59dcc9ea95020da984e5
|   +++ pidgin/gtkblist.c	90122486b8ff7d463038b8a33f82f6f9cac643ee
|   @@ -4107,7 +4107,7 @@ static void pidgin_blist_show(PurpleBudd
|    	GtkWidget *sep;
|    	GtkWidget *label;
|    	GList *accounts;
|   -	char *pretty;
|   +	char *pretty, *tmp;
|    	GtkAccelGroup *accel_group;
|    	GtkTreeSelection *selection;
|    	GtkTargetEntry dte[] = {{"PURPLE_BLIST_NODE", GTK_TARGET_SAME_APP, DRAG_ROW},
|   @@ -4180,12 +4180,14 @@ static void pidgin_blist_show(PurpleBudd
|    #endif
|    
|    	/* Translators: Please maintain the use of -> and <- to refer to menu heirarchy */
|   -	pretty = pidgin_make_pretty_arrows(_("<span weight='bold' size='larger'>Welcome to " PIDGIN_NAME "!</span>\n\n"
|   +	tmp = g_strdup_printf(_("<span weight='bold' size='larger'>Welcome to %s!</span>\n\n"
|    
|    					       "You have no accounts enabled. Enable your IM accounts from the "
|    					       "<b>Accounts</b> window at <b>Accounts->Add/Edit</b>. Once you "
|    					       "enable accounts, you'll be able to sign on, set your status, "
|   -					       "and talk to your friends."));
|   +					       "and talk to your friends."), PIDGIN_NAME);
|   +	pretty = pidgin_make_pretty_arrows(tmp);
|   +	g_free(tmp);
|    	label = gtk_label_new(NULL);
|    	gtk_widget_set_size_request(label, purple_prefs_get_int("/purple/gtk/blist/width") - 12, -1);
|    	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
|   ============================================================
|   --- pidgin/gtkconn.c	74731bfe2bde9e5720a02dd578840775317d53e5
|   +++ pidgin/gtkconn.c	9165091df963b3e0aa2853fec736067f5072fca2
|   @@ -177,8 +177,8 @@ pidgin_connection_report_disconnect(Purp
|    
|    		p = g_strdup_printf(_("%s disconnected"), n);
|    		s = g_strdup_printf(_("%s\n\n"
|   -				PIDGIN_NAME " will not attempt to reconnect the account until you "
|   -				"correct the error and re-enable the account."), text);
|   +				"%s will not attempt to reconnect the account until you "
|   +				"correct the error and re-enable the account."), text, PIDGIN_NAME);
|    		purple_notify_error(NULL, NULL, p, s);
|    		g_free(p);
|    		g_free(s);
|   ============================================================
|   --- pidgin/gtkdialogs.c	9c04f05a649978594d37d5162947eea575d1c423
|   +++ pidgin/gtkdialogs.c	dad3bcc80a0d94c46ce45ca38b12c7680ce6f9f0
|   @@ -311,7 +311,7 @@ void pidgindialogs_about()
|    	GString *str;
|    	int i;
|    	AtkObject *obj;
|   -	char* filename;
|   +	char* filename, *tmp;
|    	GdkPixbuf *pixbuf;
|    
|    	if (about != NULL) {
|   @@ -320,7 +320,9 @@ void pidgindialogs_about()
|    	}
|    
|    	PIDGIN_DIALOG(about);
|   -	gtk_window_set_title(GTK_WINDOW(about), _("About " PIDGIN_NAME));
|   +	tmp = g_strdup_printf(_("About %s"), PIDGIN_NAME);
|   +	gtk_window_set_title(GTK_WINDOW(about), tmp);
|   +	g_free(tmp);
|    	gtk_window_set_role(GTK_WINDOW(about), "about");
|    	gtk_window_set_resizable(GTK_WINDOW(about), TRUE);
|    	gtk_window_set_default_size(GTK_WINDOW(about), 340, 450);
|   @@ -353,18 +355,18 @@ void pidgindialogs_about()
|    
|    	str = g_string_sized_new(4096);
|    
|   -	g_string_append(str,
|   -		_(PIDGIN_NAME " is a modular messaging client capable of using "
|   +	g_string_append_printf(str,
|   +		_("%s is a modular messaging client capable of using "
|    		  "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, "
|    		  "Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
|    		  "Gadu-Gadu, and QQ all at once.  "
|    		  "It is written using GTK+.<BR><BR>"
|    		  "You may modify and redistribute the program under "
|    		  "the terms of the GPL (version 2 or later).  A copy of the GPL is "
|   -		  "contained in the 'COPYING' file distributed with " PIDGIN_NAME ".  "
|   -		  PIDGIN_NAME " is copyrighted by its contributors.  See the 'COPYRIGHT' "
|   +		  "contained in the 'COPYING' file distributed with %s.  "
|   +		  "%s is copyrighted by its contributors.  See the 'COPYRIGHT' "
|    		  "file for the complete list of contributors.  We provide no "
|   -		  "warranty for this program.<BR><BR>"));
|   +		  "warranty for this program.<BR><BR>"), PIDGIN_NAME, PIDGIN_NAME, PIDGIN_NAME);
|    
|    	g_string_append(str, "<FONT SIZE=\"4\">URL:</FONT> <A HREF=\""
|    					PURPLE_WEBSITE "\">" PURPLE_WEBSITE "</A><BR/><BR/>");
|   ============================================================
|   --- pidgin/gtkmain.c	23b4461df1ea7c12fa7eea3d381dcffebdf1101d
|   +++ pidgin/gtkmain.c	5116d2b415cd468025b2d810a464e0c7de02247c
|   @@ -361,9 +361,9 @@ show_usage(const char *name, gboolean te
|    	char *text;
|    
|    	if (terse) {
|   -		text = g_strdup_printf(_(PIDGIN_NAME " %s. Try `%s -h' for more information.\n"), VERSION, name);
|   +		text = g_strdup_printf(_("%s %s. Try `%s -h' for more information.\n"), PIDGIN_NAME, VERSION, name);
|    	} else {
|   -		text = g_strdup_printf(_(PIDGIN_NAME " %s\n"
|   +		text = g_strdup_printf(_("%s %s\n"
|    		       "Usage: %s [OPTION]...\n\n"
|    		       "  -c, --config=DIR    use DIR for config files\n"
|    		       "  -d, --debug         print debugging messages to stdout\n"
|   @@ -371,7 +371,7 @@ show_usage(const char *name, gboolean te
|    		       "  -n, --nologin       don't automatically login\n"
|    		       "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
|    		       "                      account(s) to use, separated by commas)\n"
|   -		       "  -v, --version       display the current version and exit\n"), VERSION, name);
|   +		       "  -v, --version       display the current version and exit\n"), PIDGIN_NAME, VERSION, name);
|    	}
|    
|    	purple_print_utf8_to_console(stdout, text);
|   @@ -547,7 +547,7 @@ int main(int argc, char *argv[])
|    #ifndef DEBUG
|    		/* We translate this here in case the crash breaks gettext. */
|    		segfault_message_tmp = g_strdup_printf(_(
|   -			PIDGIN_NAME " has segfaulted and attempted to dump a core file.\n"
|   +			"%s has segfaulted and attempted to dump a core file.\n"
|    			"This is a bug in the software and has happened through\n"
|    			"no fault of your own.\n\n"
|    			"If you can reproduce the crash, please notify the Pidgin\n"
|   @@ -561,7 +561,7 @@ int main(int argc, char *argv[])
|    			"LSchiere (via AIM).  Contact information for Sean and Luke \n"
|    			"on other protocols is at\n"
|    			"%scontactinfo.php\n"),
|   -			PURPLE_WEBSITE, PURPLE_WEBSITE, PURPLE_WEBSITE
|   +			PIDGIN_NAME, PURPLE_WEBSITE, PURPLE_WEBSITE, PURPLE_WEBSITE
|    		);
|    
|    		/* we have to convert the message (UTF-8 to console
|   ============================================================
|   --- pidgin/gtkutils.c	0f28d896edbf234173b46cd2ca720ac3200fedc9
|   +++ pidgin/gtkutils.c	ff1d00ef6d4a2b74cb9fcf11ac0d93f1e8540a50
|   @@ -1415,13 +1415,16 @@ pidgin_dnd_file_manage(GtkSelectionData 
|    		/* XXX - make ft api suupport sending a directory */
|    		/* Are we dealing with a directory? */
|    		if (g_file_test(filename, G_FILE_TEST_IS_DIR)) {
|   -			char *str;
|   +			char *str, *str2;
|    
|    			str = g_strdup_printf(_("Cannot send folder %s."), basename);
|   +			str2 = g_strdup_printf(_("%s cannot transfer a folder. You will need to send the files within individually"), PIDGIN_NAME);
|   +
|    			purple_notify_error(NULL, NULL,
|   -					  str,_(PIDGIN_NAME " cannot transfer a folder. You will need to send the files within individually"));
|   +					  str, str2);
|    
|    			g_free(str);
|   +			g_free(str2);
|    
|    			continue;
|    		}

To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from d064a7734e5f0180f59fd1a438a5cd4d5800d02d


More information about the Commits mailing list