Index: src/callbacks.c
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/callbacks.c,v
retrieving revision 1.137
diff -u -r1.137 callbacks.c
--- src/callbacks.c	20 Dec 2003 20:27:04 -0000	1.137
+++ src/callbacks.c	30 Dec 2003 16:51:47 -0000
@@ -212,7 +212,7 @@
 	if (!save_path_filesel) {
 		save_path_filesel =
 			gtk_file_selection_new
-			("Please choose where to store files while downloading");
+			(_("Please choose where to store files while downloading"));
 
 		gtk_signal_connect(GTK_OBJECT
 						   (GTK_FILE_SELECTION(save_path_filesel)->
@@ -269,7 +269,7 @@
 	if (!move_path_filesel) {
 		move_path_filesel =
 			gtk_file_selection_new
-			("Please choose where to move files after download");
+			(_("Please choose where to move files after download"));
 
 		gtk_signal_connect(GTK_OBJECT
 						   (GTK_FILE_SELECTION(move_path_filesel)->
@@ -326,7 +326,7 @@
 	if (!bad_path_filesel) {
 		bad_path_filesel =
 			gtk_file_selection_new
-			("Please choose where to move files corrupted files");
+			(_("Please choose where to move files corrupted files"));
 
 		gtk_signal_connect(GTK_OBJECT
 						   (GTK_FILE_SELECTION(bad_path_filesel)->
@@ -379,7 +379,7 @@
 {
 	if (!add_dir_filesel) {
 		add_dir_filesel =
-			gtk_file_selection_new("Please choose a directory to share");
+			gtk_file_selection_new(_("Please choose a directory to share"));
 
 		gtk_signal_connect(GTK_OBJECT
 						   (GTK_FILE_SELECTION(add_dir_filesel)->
Index: src/filter_gui.c
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/filter_gui.c,v
retrieving revision 1.41
diff -u -r1.41 filter_gui.c
--- src/filter_gui.c	20 Aug 2003 17:34:26 -0000	1.41
+++ src/filter_gui.c	30 Dec 2003 16:51:47 -0000
@@ -776,7 +776,7 @@
 
     m = GTK_MENU(gtk_menu_new());
 
-    menu_new_item_with_data(m, "no default filter", NULL);
+    menu_new_item_with_data(m, _("no default filter"), NULL);
     for (l = buf; l != NULL; l = l->next) {
         filter_t *filter = (filter_t *)l->data;
         /*
Index: src/gnet_stats_gui2.c
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/gnet_stats_gui2.c,v
retrieving revision 1.35
diff -u -r1.35 gnet_stats_gui2.c
--- src/gnet_stats_gui2.c	10 Dec 2003 18:45:54 -0000	1.35
+++ src/gnet_stats_gui2.c	30 Dec 2003 16:51:48 -0000
@@ -41,12 +41,12 @@
 static GtkNotebook *notebook_gnet_stats = NULL;
 
 static const gchar *msg_stats_label[] = {
-	"Type",
-	"Received",
-	"Expired",
-	"Dropped",
-	"Relayed",
-	"Generated"
+	N_("Type"),
+	N_("Received"),
+	N_("Expired"),
+	N_("Dropped"),
+	N_("Relayed"),
+	N_("Generated")
 };
 
 enum {
@@ -448,7 +448,7 @@
 				PROP_GNET_STATS_MSG_COL_WIDTHS, NULL, 0, 0);
 	for (n = 0; n < G_N_ELEMENTS(msg_stats_label); n++)
 		add_column(treeview, n, width[n], (gfloat) (n != 0),
-			msg_stats_label[n]);
+			_(msg_stats_label[n]));
 	G_FREE_NULL(width);
 
     gtk_tree_view_set_model(treeview, model);
@@ -470,7 +470,7 @@
 		gm_snprintf(buf, sizeof(buf), "%d%c", n - 1,
 				n + 1 < STATS_FLOWC_COLUMNS ? '\0' : '+');
 		add_column(treeview, n, width[n], (gfloat) (n != 0),
-			n == 0 ? "Type" : buf);
+			n == 0 ? _("Type") : buf);
 	}
 	G_FREE_NULL(width);
 
@@ -530,7 +530,7 @@
 		}
 
 		add_column(treeview, n, width[n], (gfloat) n != 0,
-			n == 0 ? "Type" : "Count");
+			n == 0 ? _("Type") : _("Count"));
 	}
 	G_FREE_NULL(width);
 
@@ -556,7 +556,7 @@
 				0, general_type_str(i), 1, "-", (-1));
 		}
 		add_column(treeview, n, width[n], (gfloat) n != 0,
-			n == 0 ? "Type" : "Count");
+			n == 0 ? _("Type") : _("Count"));
 	}
 	G_FREE_NULL(width);
 
@@ -581,7 +581,7 @@
 		gm_snprintf(buf, sizeof(buf), "%d%c", n - 1,
 				n + 1 < STATS_RECV_COLUMNS ? '\0' : '+');
 		add_column(treeview, n, width[n], (gfloat) (n != 0),
-			n == 0 ? "Type" : buf);
+			n == 0 ? _("Type") : buf);
 	}
 	G_FREE_NULL(width);
 
Index: src/monitor_gui2.c
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/monitor_gui2.c,v
retrieving revision 1.18
diff -u -r1.18 monitor_gui2.c
--- src/monitor_gui2.c	9 Aug 2003 22:16:03 -0000	1.18
+++ src/monitor_gui2.c	30 Dec 2003 16:51:48 -0000
@@ -110,7 +110,7 @@
     renderer = gtk_cell_renderer_text_new();
 	g_object_set(renderer, "ypad", GUI_CELL_RENDERER_YPAD, NULL);
     column = gtk_tree_view_column_new_with_attributes 
-        ("Query", renderer, "text", QUERY_COLUMN, NULL);
+        (_("Query"), renderer, "text", QUERY_COLUMN, NULL);
     gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
 
     /* Add the column to the view. */
Index: src/nodes_gui2.c
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/nodes_gui2.c,v
retrieving revision 1.42
diff -u -r1.42 nodes_gui2.c
--- src/nodes_gui2.c	28 Dec 2003 10:08:34 -0000	1.42
+++ src/nodes_gui2.c	30 Dec 2003 16:51:48 -0000
@@ -215,6 +215,16 @@
 		"ypad", GUI_CELL_RENDERER_YPAD, NULL);
 
 	width = gui_prop_get_guint32(PROP_NODES_COL_WIDTHS, NULL, 0, 0);
+<<<<<<< nodes_gui2.c
+    add_column(tree, COL_NODE_HOST, width[COL_NODE_HOST], _("Host"));
+    add_column(tree, COL_NODE_TYPE, width[COL_NODE_TYPE], _("Flags"));
+    add_column(tree, COL_NODE_VENDOR, width[COL_NODE_VENDOR], _("User-agent"));
+    add_column(tree, COL_NODE_VERSION, width[COL_NODE_VERSION], _("Ver"));
+    add_column(tree, COL_NODE_CONNECTED, width[COL_NODE_CONNECTED],
+		_("Connected"));
+    add_column(tree, COL_NODE_UPTIME, width[COL_NODE_UPTIME], _("Uptime"));
+    add_column(tree, COL_NODE_INFO, width[COL_NODE_INFO], _("Info"));
+=======
     add_column(tree, c_gnet_host, width[c_gnet_host], "Host");
     add_column(tree, c_gnet_flags, width[c_gnet_flags], "Flags");
     add_column(tree, c_gnet_user_agent, width[c_gnet_user_agent], "User-agent");
@@ -223,6 +233,7 @@
 		"Connected");
     add_column(tree, c_gnet_uptime, width[c_gnet_uptime], "Uptime");
     add_column(tree, c_gnet_info, width[c_gnet_info], "Info");
+>>>>>>> 1.42
 	G_FREE_NULL(width);
 
 	nodes_handles = g_hash_table_new_full(
Index: src/props.tpl
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/props.tpl,v
retrieving revision 1.17
diff -u -r1.17 props.tpl
--- src/props.tpl	6 Oct 2003 14:52:36 -0000	1.17
+++ src/props.tpl	30 Dec 2003 16:51:48 -0000
@@ -254,7 +254,7 @@
         IF (= (get "type") "multichoice")=]
 prop_def_choice_t [=(. item)=]_choices[] = { [=    
             FOR choice =]
-    {"[=name=]", [=value=]},[=
+    {N_("[=name=]"), [=value=]},[=
             ENDFOR choice =]
     {NULL, 0}
 };[=
Index: src/search_gui2.c
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/search_gui2.c,v
retrieving revision 1.68
diff -u -r1.68 search_gui2.c
--- src/search_gui2.c	27 Dec 2003 12:13:51 -0000	1.68
+++ src/search_gui2.c	30 Dec 2003 16:51:48 -0000
@@ -858,10 +858,10 @@
 	guint32 *width;
 
     width = gui_prop_get_guint32(PROP_SEARCH_LIST_COL_WIDTHS, NULL, 0, 0);
-	add_list_column(treeview, "Search", c_sl_name, width[c_sl_name],
+	add_list_column(treeview, _("Search"), c_sl_name, width[c_sl_name],
 		(gfloat) 0.0);
-	add_list_column(treeview, "Hits", c_sl_hit, width[c_sl_hit], (gfloat) 1.0);
-	add_list_column(treeview, "New", c_sl_new, width[c_sl_new], (gfloat) 1.0);
+	add_list_column(treeview, _("Hits"), c_sl_hit, width[c_sl_hit], (gfloat) 1.0);
+	add_list_column(treeview, _("New"), c_sl_new, width[c_sl_new], (gfloat) 1.0);
 	G_FREE_NULL(width);
 }
 
@@ -1279,13 +1279,13 @@
 
     width = gui_prop_get_guint32(PROP_SEARCH_RESULTS_COL_WIDTHS, NULL, 0, 0);
 
-	add_results_column(treeview, "File", c_sr_filename, width[c_sr_filename],
+	add_results_column(treeview, _("File"), c_sr_filename, width[c_sr_filename],
 		(gfloat) 0.0, NULL);
-	add_results_column(treeview, "Size", c_sr_size, width[c_sr_size],
+	add_results_column(treeview, _("Size"), c_sr_size, width[c_sr_size],
 		(gfloat) 1.0, search_gui_compare_size_func);
 	add_results_column(treeview, "#", c_sr_count, width[c_sr_count],
 		(gfloat) 1.0, search_gui_compare_count_func);
-	add_results_column(treeview, "Info", c_sr_info, width[c_sr_info],
+	add_results_column(treeview, _("Info"), c_sr_info, width[c_sr_info],
 		(gfloat) 0.0, NULL);
 
 	G_FREE_NULL(width);
Index: src/search_stats_gui.c
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/search_stats_gui.c,v
retrieving revision 1.18
diff -u -r1.18 search_stats_gui.c
--- src/search_stats_gui.c	9 Aug 2003 22:16:04 -0000	1.18
+++ src/search_stats_gui.c	30 Dec 2003 16:51:48 -0000
@@ -399,7 +399,7 @@
 	gtk_clist_thaw(GTK_CLIST(clist_search_stats));
 
 	/* update the counter */
-	gm_snprintf(tmpstr, sizeof(tmpstr), "%u terms counted", stat_count);
+	gm_snprintf(tmpstr, sizeof(tmpstr), _("%u terms counted"), stat_count);
 	gtk_label_set_text(GTK_LABEL(label_search_stats_count), tmpstr);
 }
 
Index: src/search_stats_gui2.c
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/search_stats_gui2.c,v
retrieving revision 1.9
diff -u -r1.9 search_stats_gui2.c
--- src/search_stats_gui2.c	9 Aug 2003 22:16:04 -0000	1.9
+++ src/search_stats_gui2.c	30 Dec 2003 16:51:48 -0000
@@ -379,9 +379,9 @@
 	gtk_tree_view_set_model(treeview, model);
     store_search_stats = GTK_LIST_STORE(model);
 	g_object_unref(model);
-	add_column(treeview, 0, 200, 0.0, "Search Term");
-	add_column(treeview, 1, 60, 1.0, "This Interval");
-	add_column(treeview, 2, 60, 1.0, "Total");
+	add_column(treeview, 0, 200, 0.0, _("Search Term"));
+	add_column(treeview, 1, 60, 1.0, _("This Interval"));
+	add_column(treeview, 2, 60, 1.0, _("Total"));
 	stat_hash = g_hash_table_new(g_str_hash, g_str_equal);
 }
 
@@ -415,7 +415,7 @@
 	g_object_thaw_notify(G_OBJECT(treeview_search_stats));
 
 	/* update the counter */
-	gm_snprintf(tmpstr, sizeof(tmpstr), "%lu terms counted", stat_count);
+	gm_snprintf(tmpstr, sizeof(tmpstr), _("%lu terms counted"), stat_count);
 	gtk_label_set_text(label_search_stats_count, tmpstr);
 }
 
Index: src/settings_gui.c
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/settings_gui.c,v
retrieving revision 1.156
diff -u -r1.156 settings_gui.c
--- src/settings_gui.c	30 Dec 2003 09:42:40 -0000	1.156
+++ src/settings_gui.c	30 Dec 2003 16:51:49 -0000
@@ -4091,13 +4091,13 @@
         gtk_label_set_text(
             GTK_LABEL(lookup_widget(top, 
                 "label_search_results_show_settings")),
-            "Hide settings");
+            _("Hide settings"));
         gtk_widget_show(frame);
     } else {
         gtk_label_set_text(
             GTK_LABEL(lookup_widget(top, 
                 "label_search_results_show_settings")),
-            "Show settings");
+            _("Show settings"));
         gtk_widget_hide(frame);
     }
 
@@ -4127,13 +4127,13 @@
         gtk_label_set_text(
             GTK_LABEL(lookup_widget(top, 
                 "label_dl_show_settings")),
-            "Hide settings");
+            _("Hide settings"));
         gtk_widget_show(frame);
     } else {
         gtk_label_set_text(
             GTK_LABEL(lookup_widget(top, 
                 "label_dl_show_settings")),
-            "Show settings");
+            _("Show settings"));
         gtk_widget_hide(frame);
     }
 
Index: src/upload_stats_gui2.c
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/upload_stats_gui2.c,v
retrieving revision 1.20
diff -u -r1.20 upload_stats_gui2.c
--- src/upload_stats_gui2.c	8 Sep 2003 18:06:37 -0000	1.20
+++ src/upload_stats_gui2.c	30 Dec 2003 16:51:49 -0000
@@ -313,19 +313,19 @@
 	width = gui_prop_get_guint32(PROP_UL_STATS_COL_WIDTHS, NULL, 0, 0);
 */
 	upload_stats_gui_add_column(upload_stats_treeview,
-		c_us_filename, "Filename", 300, (gfloat) 0.0,
+		c_us_filename, _("Filename"), 300, (gfloat) 0.0,
 		NULL);
 	upload_stats_gui_add_column(upload_stats_treeview,
-		c_us_size, "Size", 60, (gfloat) 1.0,
+		c_us_size, _("Size"), 60, (gfloat) 1.0,
 		upload_stats_cell_render_size_func);
 	upload_stats_gui_add_column(upload_stats_treeview,
-		c_us_attempts, "Attempts", 60, (gfloat) 1.0,
+		c_us_attempts, _("Attempts"), 60, (gfloat) 1.0,
 		NULL);
 	upload_stats_gui_add_column(upload_stats_treeview,
-	 	c_us_complete,"Complete", 60, (gfloat) 1.0,
+	 	c_us_complete,_("Complete"), 60, (gfloat) 1.0,
 		NULL);
 	upload_stats_gui_add_column(upload_stats_treeview,
-		c_us_norm, "Normalized", 60, (gfloat) 1.0,
+		c_us_norm, _("Normalized"), 60, (gfloat) 1.0,
 		upload_stats_cell_render_norm_func);
 /* XXX:	G_FREE_NULL(width); */
 
Index: src/uploads_gui2.c
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/uploads_gui2.c,v
retrieving revision 1.36
diff -u -r1.36 uploads_gui2.c
--- src/uploads_gui2.c	28 Dec 2003 09:41:12 -0000	1.36
+++ src/uploads_gui2.c	30 Dec 2003 16:51:49 -0000
@@ -390,7 +390,7 @@
 		"ypad", GUI_CELL_RENDERER_YPAD,
 		NULL);
 	column = gtk_tree_view_column_new_with_attributes(
-		column_titles[column_id], renderer, "text", column_id, NULL);
+		_(column_titles[column_id]), renderer, "text", column_id, NULL);
 	g_object_set(G_OBJECT(column),
 		"min-width", 1,
 		"fixed-width", MAX(1, width),