summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorTingPing <tingping@tingping.se>2013-06-02 20:44:05 -0400
committerTingPing <tingping@tingping.se>2013-06-02 20:44:05 -0400
commit39923e05f34b1f7a19d4464a3f56bc0fcf645932 (patch)
tree436341dd7f4987c6109b0ae7096b6d1dd0dcf1bf
parent51bf9165b25adf1cf4f370e7bfc88119ecc51552 (diff)
Rename favorite channels to autojoin channels
-rw-r--r--src/fe-gtk/menu.c4
-rw-r--r--src/fe-gtk/servlistgui.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c
index 014ef3e7..9819d7be 100644
--- a/src/fe-gtk/menu.c
+++ b/src/fe-gtk/menu.c
@@ -1049,11 +1049,11 @@ menu_addfavoritemenu (server *serv, GtkWidget *menu, char *channel)
 
 	if (joinlist_is_in_list (serv, channel))
 	{
-		mg_create_icon_item (_("_Remove from Favorites"), GTK_STOCK_REMOVE, menu, menu_delfav_cb, serv);
+		mg_create_icon_item (_("_Remove from Autojoin"), GTK_STOCK_REMOVE, menu, menu_delfav_cb, serv);
 	}
 	else
 	{
-		mg_create_icon_item (_("_Add to Favorites"), GTK_STOCK_ADD, menu, menu_addfav_cb, serv);
+		mg_create_icon_item (_("_Add to Autojoin"), GTK_STOCK_ADD, menu, menu_addfav_cb, serv);
 	}
 }
 
diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c
index 101a2460..d89dacf5 100644
--- a/src/fe-gtk/servlistgui.c
+++ b/src/fe-gtk/servlistgui.c
@@ -1066,14 +1066,14 @@ servlist_autojoinedit (ircnet *net, char *channel, gboolean add)
 	{
 		servlist_favchan_add (net, channel);
 		servlist_save ();
-		buf = g_strdup_printf (_("Channel %s added to favorites."), channel);
+		buf = g_strdup_printf (_("Channel %s added to autojoin."), channel);
 	}
 	else
 	{
 		fav = servlist_favchan_find (net, channel, NULL);
 		servlist_favchan_remove (net, fav);
 		servlist_save ();
-		buf = g_strdup_printf (_("Channel %s removed from favorites."), channel);
+		buf = g_strdup_printf (_("Channel %s removed from autojoin."), channel);
 	}
 
 	fe_message (buf, FE_MSG_INFO);
@@ -1659,7 +1659,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 
 	notebook = gtk_notebook_new ();
 	gtk_notebook_append_page (GTK_NOTEBOOK (notebook), scrolledwindow2, gtk_label_new ("Servers"));
-	gtk_notebook_append_page (GTK_NOTEBOOK (notebook), scrolledwindow4, gtk_label_new ("Favorite channels"));
+	gtk_notebook_append_page (GTK_NOTEBOOK (notebook), scrolledwindow4, gtk_label_new ("Autojoin channels"));
 	gtk_notebook_append_page (GTK_NOTEBOOK (notebook), scrolledwindow5, gtk_label_new ("Connect commands"));
 	gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_BOTTOM);
 	gtk_box_pack_start (GTK_BOX (hbox1), notebook, TRUE, TRUE, SERVLIST_X_PADDING);