Prevent the word "desegmentation" at the GUI, but use reassembling at that places, as we also use "defragmentation" and "reassembling". Use reassembling as the general term for such actions.

I (hopefully) didn't changed any protocol fields or preference file names, but only the GUI labels appearing in the protocol display and the protocol preferences.

Also added a note to the protocol preferences (where appropriate), that you have to enable "Allow subdissectors to reassemble TCP streams" at the corresponding protocol settings for TCP reassembling to take effect.

If you encounter any mistakes I've made here, please let me know...


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11784 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 3 insertions, 2 deletions

diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c
index f3e0d50ed7..b42e75ca51 100644
--- a/epan/dissectors/packet-tns.c
+++ b/epan/dissectors/packet-tns.c
@@ -1325,8 +1325,9 @@ void proto_register_tns(void)
 
 	tns_module = prefs_register_protocol(proto_tns, NULL);
 	prefs_register_bool_preference(tns_module, "desegment_tns_messages",
-	  "Desegment all TNS messages spanning multiple TCP segments",
-	  "Whether the TNS dissector should desegment all messages spanning multiple TCP segments",
+	  "Reassemble TNS messages spanning multiple TCP segments",
+	  "Whether the TNS dissector should reassemble messages spanning multiple TCP segments. "
+	  "To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
 	  &tns_desegment);
 }