aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-slsk.c
diff options
context:
space:
mode:
authorulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>2004-08-21 09:02:52 +0000
committerulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>2004-08-21 09:02:52 +0000
commit630433000c83f91aa2015ad1e1d548890b2ed324 (patch)
tree3f9be27e5d8ec59d4de5368c091899d003ce2201 /epan/dissectors/packet-slsk.c
parent8fa64a2ad84489afa97e7a43f87021e6c1b2838e (diff)
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
Diffstat (limited to 'epan/dissectors/packet-slsk.c')
-rw-r--r--epan/dissectors/packet-slsk.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c
index a9f75795e8..ad1b55d9cb 100644
--- a/epan/dissectors/packet-slsk.c
+++ b/epan/dissectors/packet-slsk.c
@@ -2454,8 +2454,9 @@ proto_register_slsk(void)
/* Registers the options in the menu preferences */
prefs_register_bool_preference(slsk_module, "desegment",
- "Desegment all SoulSeek messages spanning multiple TCP segments",
- "Whether the SoulSeek dissector should desegment all messages spanning multiple TCP segments",
+ "Reassemble SoulSeek messages spanning multiple TCP segments",
+ "Whether the SoulSeek 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.",
&slsk_desegment);
#ifdef HAVE_LIBZ
prefs_register_bool_preference(slsk_module, "decompress",