Resolved conflict.

This commit is contained in:
Henry Whitney 2019-06-13 14:09:12 -04:00
parent 1d3d422ef7
commit 93543f23d5
1 changed files with 2 additions and 8 deletions

View File

@ -11,19 +11,13 @@ There are two basic kinds of metaphors: "dead" metaphors and "live" metaphors. T
A dead metaphor is a metaphor that has been used so much in the language that its speakers no longer regard it as one concept standing for another. Dead metaphors are extremely common. Examples in English are "table leg," "family tree," "leaf" meaning a page in a book, and "crane" meaning a large machine for lifting heavy loads. English speakers simply think of these words as having more than one meaning. Examples in Biblical Hebrew are "hand" to mean "power," "face" to mean "presence," and speaking of emotions or moral qualities as if they were "clothing."
To learn how to deal with dead metaphors, see [Dead Metaphor] [[rc://en/ta/man/jit/figs-metaphordead]]
To learn how to deal with dead metaphors, see [[rc://en/ta/man/jit/figs-metaphordead]].
##### Live Metaphors
These are metaphors that people recognize as one concept standing for another concept, or one thing for another thing. They make people think about how the one thing is like the other thing, because in most ways the two things are very different. People also easily recognize these metaphors as giving strength and unusual qualities to the message. For this reason, people pay attention to these metaphors.
<<<<<<< HEAD
Live metaphors are the metaphors that need special care to translate correctly. To do so, we need to understand the parts of a metaphor and how they work together to produce meaning. See [[rc://en/ta/man/jit/figs-metaphorparts]]
=======
Live metaphors are the metaphors that need special care to translate correctly. To do so, we need to understand the parts of a metaphor and how they work together to produce meaning. See [Metaphor Parts and Purposes](../figs-metaphorparts/01.md)
>>>>>>> Conform file to have EOL at end
Live metaphors are the metaphors that need special care to translate correctly. To do so, we need to understand the parts of a metaphor and how they work together to produce meaning. See [[rc://en/ta/man/jit/figs-metaphorparts]].
The rest of this topic deals with live metaphors.