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, 4 insertions, 4 deletions

diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c
index f89aa99af5..2348f6926e 100644
--- a/epan/dissectors/packet-isns.c
+++ b/epan/dissectors/packet-isns.c
@@ -1932,10 +1932,10 @@ void proto_register_isns(void)
     /* Register preferences */
     isns_module = prefs_register_protocol(proto_isns, NULL);
     prefs_register_bool_preference(isns_module, "desegment",
-	"Desegment iSNS over TCP messages",
-	"Whether the dissector should desegment "
-	"multi-segment iSNS messages", &isns_desegment);
-
+	"Reassemble iSNS messages spanning multiple TCP segments",
+	"Whether the iSNS 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.",
+    &isns_desegment);
 }
 
 /* If this dissector uses sub-dissector registration add a registration routine.