Some more rebranding

15 files changed, 28 insertions, 30 deletions

diff --git a/src/fe-gtk/about.c b/src/fe-gtk/about.c
index dc1cbf08..cf7e03c9 100644
--- a/src/fe-gtk/about.c
+++ b/src/fe-gtk/about.c
@@ -124,10 +124,8 @@ menu_about (GtkWidget * wid, gpointer sess)
 				"<b>Compiled</b>: "__DATE__"\n"
 				"<b>Portable Mode</b>: %s\n"
 				"<b>Build Type</b>: x%d\n\n"
-				"<small>This version is unofficial and comes with no support.\n"
-				"\302\251 1998-2010 Peter \305\275elezn\303\275 &lt;zed@xchat.org>"
-				/* "\n<a href=\"http://code.google.com/p/xchat-wdk/\">http://code.google.com/p/xchat-wdk/</a>" this is broken in gtk ATM */
-				"</small>",
+				"<small>\302\251 1998-2010 Peter \305\275elezn\303\275 &lt;zed@xchat.org>\n"
+				"\302\251 2009-2011 Berke Viktor &lt;bviktor@hexchat.org></small>",
 				(strcmp (prefs.gui_license, "") ? "<span size=\"x-large\">" : ""),
 				(strcmp (prefs.gui_license, "") ? prefs.gui_license : ""),
 				(strcmp (prefs.gui_license, "") ? "</span>\n" : ""),
diff --git a/src/fe-gtk/banlist.c b/src/fe-gtk/banlist.c
index fecb62a5..43bc9e42 100644
--- a/src/fe-gtk/banlist.c
+++ b/src/fe-gtk/banlist.c
@@ -129,7 +129,7 @@ banlist_do_refresh (struct session *sess)
 
 		gtk_widget_set_sensitive (sess->res->banlist_butRefresh, FALSE);
 
-		snprintf (tbuf, sizeof tbuf, "XChat: Ban List (%s, %s)",
+		snprintf (tbuf, sizeof tbuf, DISPLAY_NAME": Ban List (%s, %s)",
 						sess->channel, sess->server->servername);
 		mg_set_title (sess->res->banlist_window, tbuf);
 
@@ -388,7 +388,7 @@ banlist_opengui (struct session *sess)
 		return;
 	}
 
-	snprintf (tbuf, sizeof tbuf, _("XChat: Ban List (%s)"),
+	snprintf (tbuf, sizeof tbuf, _(DISPLAY_NAME": Ban List (%s)"),
 					sess->server->servername);
 
 	sess->res->banlist_window = mg_create_generic_tab ("BanList", tbuf, FALSE,
diff --git a/src/fe-gtk/chanlist.c b/src/fe-gtk/chanlist.c
index 4dca935b..5090e9c4 100644
--- a/src/fe-gtk/chanlist.c
+++ b/src/fe-gtk/chanlist.c
@@ -724,7 +724,7 @@ chanlist_opengui (server *serv, int do_refresh)
 		return;
 	}
 
-	snprintf (tbuf, sizeof tbuf, _("XChat: Channel List (%s)"),
+	snprintf (tbuf, sizeof tbuf, _(DISPLAY_NAME": Channel List (%s)"),
 				 server_get_network (serv, TRUE));
 
 	serv->gui->chanlist_pending_rows = NULL;
diff --git a/src/fe-gtk/dccgui.c b/src/fe-gtk/dccgui.c
index 61f6d502..b3f538f8 100644
--- a/src/fe-gtk/dccgui.c
+++ b/src/fe-gtk/dccgui.c
@@ -742,7 +742,7 @@ fe_dcc_open_recv_win (int passive)
 			mg_bring_tofront (dccfwin.window);
 		return TRUE;
 	}
-	dccfwin.window = mg_create_generic_tab ("Transfers", _("XChat: Uploads and Downloads"),
+	dccfwin.window = mg_create_generic_tab ("Transfers", _(DISPLAY_NAME": Uploads and Downloads"),
 														 FALSE, TRUE, close_dcc_file_window, NULL,
 														 win_width, win_height, &vbox, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (dccfwin.window), 3);
@@ -987,7 +987,7 @@ fe_dcc_open_chat_win (int passive)
 	}
 
 	dcccwin.window =
-			  mg_create_generic_tab ("DCCChat", _("XChat: DCC Chat List"),
+			  mg_create_generic_tab ("DCCChat", _(DISPLAY_NAME": DCC Chat List"),
 						FALSE, TRUE, dcc_chat_close_cb, NULL, 550, 180, &vbox, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (dcccwin.window), 3);
 	gtk_box_set_spacing (GTK_BOX (vbox), 3);
diff --git a/src/fe-gtk/fkeys.c b/src/fe-gtk/fkeys.c
index 4fbbebf6..e4a7ff19 100644
--- a/src/fe-gtk/fkeys.c
+++ b/src/fe-gtk/fkeys.c
@@ -718,7 +718,7 @@ key_dialog_show ()
 	}
 
 	key_dialog =
-			  mg_create_generic_tab ("editkeys", _("XChat: Keyboard Shortcuts"),
+			  mg_create_generic_tab ("editkeys", _(DISPLAY_NAME": Keyboard Shortcuts"),
 							TRUE, FALSE, key_dialog_close, NULL, 560, 330, &vbox, 0);
 
 	hbox = gtk_hbox_new (0, 2);
diff --git a/src/fe-gtk/ignoregui.c b/src/fe-gtk/ignoregui.c
index dc5fce9c..717f7d85 100644
--- a/src/fe-gtk/ignoregui.c
+++ b/src/fe-gtk/ignoregui.c
@@ -350,7 +350,7 @@ ignore_gui_open ()
 	}
 
 	ignorewin =
-			  mg_create_generic_tab ("IgnoreList", _("XChat: Ignore list"),
+			  mg_create_generic_tab ("IgnoreList", _(DISPLAY_NAME": Ignore list"),
 											FALSE, TRUE, close_ignore_gui_callback,
 											NULL, 600, 256, &vbox, 0);
 
diff --git a/src/fe-gtk/joind.c b/src/fe-gtk/joind.c
index e645f0bc..02196573 100644
--- a/src/fe-gtk/joind.c
+++ b/src/fe-gtk/joind.c
@@ -125,7 +125,7 @@ joind_show_dialog (server *serv)
 	char buf2[256];
 
 	serv->gui->joind_win = dialog1 = gtk_dialog_new ();
-	gtk_window_set_title (GTK_WINDOW (dialog1), _("XChat: Connection Complete"));
+	gtk_window_set_title (GTK_WINDOW (dialog1), _(DISPLAY_NAME": Connection Complete"));
 	gtk_window_set_type_hint (GTK_WINDOW (dialog1), GDK_WINDOW_TYPE_HINT_DIALOG);
 	gtk_window_set_position (GTK_WINDOW (dialog1), GTK_WIN_POS_MOUSE);
 
diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c
index 2a683604..662608d3 100644
--- a/src/fe-gtk/menu.c
+++ b/src/fe-gtk/menu.c
@@ -1068,7 +1068,7 @@ menu_settings (GtkWidget * wid, gpointer none)
 static void
 menu_usermenu (void)
 {
-	editlist_gui_open (NULL, NULL, usermenu_list, _("XChat: User menu"),
+	editlist_gui_open (NULL, NULL, usermenu_list, _(DISPLAY_NAME": User menu"),
 							 "usermenu", "usermenu.conf", 0);
 }
 
@@ -1460,28 +1460,28 @@ menu_pluginlist (void)
 static void
 menu_usercommands (void)
 {
-	editlist_gui_open (NULL, NULL, command_list, _("XChat: User Defined Commands"),
+	editlist_gui_open (NULL, NULL, command_list, _(DISPLAY_NAME": User Defined Commands"),
 							 "commands", "commands.conf", usercommands_help);
 }
 
 static void
 menu_ulpopup (void)
 {
-	editlist_gui_open (NULL, NULL, popup_list, _("XChat: Userlist Popup menu"), "popup",
+	editlist_gui_open (NULL, NULL, popup_list, _(DISPLAY_NAME": Userlist Popup menu"), "popup",
 							 "popup.conf", ulbutton_help);
 }
 
 static void
 menu_rpopup (void)
 {
-	editlist_gui_open (_("Text"), _("Replace with"), replace_list, _("XChat: Replace"), "replace",
+	editlist_gui_open (_("Text"), _("Replace with"), replace_list, _(DISPLAY_NAME": Replace"), "replace",
 							 "replace.conf", 0);
 }
 
 static void
 menu_urlhandlers (void)
 {
-	editlist_gui_open (NULL, NULL, urlhandler_list, _("XChat: URL Handlers"), "urlhandlers",
+	editlist_gui_open (NULL, NULL, urlhandler_list, _(DISPLAY_NAME": URL Handlers"), "urlhandlers",
 							 "urlhandlers.conf", url_help);
 }
 
@@ -1500,21 +1500,21 @@ menu_keypopup (void)
 static void
 menu_ulbuttons (void)
 {
-	editlist_gui_open (NULL, NULL, button_list, _("XChat: Userlist buttons"), "buttons",
+	editlist_gui_open (NULL, NULL, button_list, _(DISPLAY_NAME": Userlist buttons"), "buttons",
 							 "buttons.conf", ulbutton_help);
 }
 
 static void
 menu_dlgbuttons (void)
 {
-	editlist_gui_open (NULL, NULL, dlgbutton_list, _("XChat: Dialog buttons"), "dlgbuttons",
+	editlist_gui_open (NULL, NULL, dlgbutton_list, _(DISPLAY_NAME": Dialog buttons"), "dlgbuttons",
 							 "dlgbuttons.conf", dlgbutton_help);
 }
 
 static void
 menu_ctcpguiopen (void)
 {
-	editlist_gui_open (NULL, NULL, ctcp_list, _("XChat: CTCP Replies"), "ctcpreply",
+	editlist_gui_open (NULL, NULL, ctcp_list, _(DISPLAY_NAME": CTCP Replies"), "ctcpreply",
 							 "ctcpreply.conf", ctcp_help);
 }
 
@@ -1620,7 +1620,7 @@ menu_metres_both (GtkWidget *item, gpointer none)
 }
 
 static struct mymenu mymenu[] = {
-	{N_("_XChat"), 0, 0, M_NEWMENU, 0, 0, 1},
+	{N_("He_xChat"), 0, 0, M_NEWMENU, 0, 0, 1},
 	{N_("Network Li_st..."), menu_open_server_list, (char *)&pix_book, M_MENUPIX, 0, 0, 1, GDK_s},
 	{0, 0, 0, M_SEP, 0, 0, 0},
 
diff --git a/src/fe-gtk/notifygui.c b/src/fe-gtk/notifygui.c
index 135a548d..33d09a48 100644
--- a/src/fe-gtk/notifygui.c
+++ b/src/fe-gtk/notifygui.c
@@ -410,7 +410,7 @@ notify_opengui (void)
 	}
 
 	notify_window =
-		mg_create_generic_tab ("Notify", _("XChat: Friends List"), FALSE, TRUE,
+		mg_create_generic_tab ("Notify", _(DISPLAY_NAME": Friends List"), FALSE, TRUE,
 		                       notify_closegui, NULL, 400, 250, &vbox, 0);
 
 	view = notify_treeview_new (vbox);
diff --git a/src/fe-gtk/plugingui.c b/src/fe-gtk/plugingui.c
index 7d2dc85d..0f316f09 100644
--- a/src/fe-gtk/plugingui.c
+++ b/src/fe-gtk/plugingui.c
@@ -223,7 +223,7 @@ plugingui_open (void)
 	action_area = GTK_DIALOG (plugin_window)->action_area;
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
 	gtk_window_set_position (GTK_WINDOW (plugin_window), GTK_WIN_POS_CENTER);
-	gtk_window_set_title (GTK_WINDOW (plugin_window), _("XChat: Plugins and Scripts"));
+	gtk_window_set_title (GTK_WINDOW (plugin_window), _(DISPLAY_NAME": Plugins and Scripts"));
 
 	view = plugingui_treeview_new (vbox);
 	g_object_set_data (G_OBJECT (plugin_window), "view", view);
diff --git a/src/fe-gtk/rawlog.c b/src/fe-gtk/rawlog.c
index 593468c1..e2862b2d 100644
--- a/src/fe-gtk/rawlog.c
+++ b/src/fe-gtk/rawlog.c
@@ -95,7 +95,7 @@ open_rawlog (struct server *serv)
 		return;
 	}
 
-	snprintf (tbuf, sizeof tbuf, _("XChat: Rawlog (%s)"), serv->servername);
+	snprintf (tbuf, sizeof tbuf, _(DISPLAY_NAME": Rawlog (%s)"), serv->servername);
 	serv->gui->rawlog_window =
 		mg_create_generic_tab ("RawLog", tbuf, FALSE, TRUE, close_rawlog, serv,
 							 640, 320, &vbox, serv);
diff --git a/src/fe-gtk/search.c b/src/fe-gtk/search.c
index 30ef266f..c794704c 100644
--- a/src/fe-gtk/search.c
+++ b/src/fe-gtk/search.c
@@ -162,7 +162,7 @@ search_open (session * sess)
 		gtk_widget_destroy (searchwin);
 		searchwin = NULL;
 	}
-	win = mg_create_generic_tab ("search", _("XChat: Search"), TRUE, FALSE,
+	win = mg_create_generic_tab ("search", _(DISPLAY_NAME": Search"), TRUE, FALSE,
 								 search_cleanup_cb, NULL, 0, 0, &vbox, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (win), 12);
 	gtk_box_set_spacing (GTK_BOX (vbox), 4);
diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c
index 96feb5f4..a19ea233 100644
--- a/src/fe-gtk/servlistgui.c
+++ b/src/fe-gtk/servlistgui.c
@@ -841,7 +841,7 @@ servlist_autojoinedit (ircnet *net, char *channel, gboolean add)
 
 	win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtk_container_set_border_width (GTK_CONTAINER (win), 4);
-	gtk_window_set_title (GTK_WINDOW (win), _("XChat: Favorite Channels (Auto-Join List)"));
+	gtk_window_set_title (GTK_WINDOW (win), _(DISPLAY_NAME": Favorite Channels (Auto-Join List)"));
 	gtk_window_set_default_size (GTK_WINDOW (win), 354, 256);
 	gtk_window_set_position (GTK_WINDOW (win), GTK_WIN_POS_MOUSE);
 	if (edit_win)
@@ -1399,7 +1399,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 
 	editwindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtk_container_set_border_width (GTK_CONTAINER (editwindow), 4);
-	snprintf (buf, sizeof (buf), _("XChat: Edit %s"), net->name);
+	snprintf (buf, sizeof (buf), _(DISPLAY_NAME": Edit %s"), net->name);
 	gtk_window_set_title (GTK_WINDOW (editwindow), buf);
 	gtk_window_set_default_size (GTK_WINDOW (editwindow), 354, 0);
 	gtk_window_set_position (GTK_WINDOW (editwindow), GTK_WIN_POS_MOUSE);
@@ -1653,7 +1653,7 @@ servlist_open_networks (void)
 
 	servlist = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtk_container_set_border_width (GTK_CONTAINER (servlist), 4);
-	gtk_window_set_title (GTK_WINDOW (servlist), _("XChat: Network List"));
+	gtk_window_set_title (GTK_WINDOW (servlist), _(DISPLAY_NAME": Network List"));
 	gtk_window_set_default_size (GTK_WINDOW (servlist), win_width, win_height);
 	gtk_window_set_position (GTK_WINDOW (servlist), GTK_WIN_POS_MOUSE);
 	gtk_window_set_role (GTK_WINDOW (servlist), "servlist");
diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c
index cec06b25..ab17626a 100644
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -2182,7 +2182,7 @@ setup_window_open (void)
 {
 	GtkWidget *wid, *win, *vbox, *hbox, *hbbox;
 
-	win = gtkutil_window_new (_("XChat: Preferences"), "prefs", 0, 0, 3);
+	win = gtkutil_window_new (_(DISPLAY_NAME": Preferences"), "prefs", 0, 0, 3);
 
 	vbox = gtk_vbox_new (FALSE, 5);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
diff --git a/src/fe-gtk/urlgrab.c b/src/fe-gtk/urlgrab.c
index 7f23af92..14b446a8 100644
--- a/src/fe-gtk/urlgrab.c
+++ b/src/fe-gtk/urlgrab.c
@@ -194,7 +194,7 @@ url_opengui ()
 	}
 
 	urlgrabberwindow =
-		mg_create_generic_tab ("UrlGrabber", _("XChat: URL Grabber"), FALSE,
+		mg_create_generic_tab ("UrlGrabber", _(DISPLAY_NAME": URL Grabber"), FALSE,
 							 TRUE, url_closegui, NULL, 400, 256, &vbox, 0);
 	view = url_treeview_new (vbox);
 	g_object_set_data (G_OBJECT (urlgrabberwindow), "model",