diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2004-08-21 09:02:52 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2004-08-21 09:02:52 +0000 |
| commit | d530bd4e14072e9677395d60b9948c04f579ab13 (patch) | |
| tree | 3f9be27e5d8ec59d4de5368c091899d003ce2201 /epan/dissectors/packet-clnp.c | |
| parent | 747f63150b44eb32bc8e0bdff66f82ef70f86ce9 (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...
svn path=/trunk/; revision=11784
Diffstat (limited to 'epan/dissectors/packet-clnp.c')
| -rw-r--r-- | epan/dissectors/packet-clnp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index 68139bd7cf..686e769eac 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -2379,7 +2379,8 @@ void proto_register_cotp(void) prefs_register_bool_preference(cotp_module, "reassemble", "Reassemble segmented COTP datagrams", - "Whether segmented COTP datagrams should be reassembled", + "Whether segmented COTP datagrams should be reassembled." + " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &cotp_reassemble); prefs_register_enum_preference(cotp_module, "tsap_display", |