On Fri, Jul 6, 2012 at 8:20 PM, Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> wrote: > Ralf Thielow venit, vidit, dixit 05.07.2012 20:16: >>>>> Is "rebase" = "Neuaufbau"? My last thought on this wording was "rebase" = >>>>> "Umpflanzen". >>> >>> "Basisumbau"? >>> >> >> I have added both suggestions to the glossary that they don't get lost when >> we discuss about non-optimal and/or missing parts within the glossary. > > Not the base is being reconstructed, but what's on top of it. So, > "Basiswechsel" would be more appropriate. > I agree with you. There is no question what it means, but what are the best german words for it. > But: "Umpflanzen" is really a great term which stays within the context > of trees, roots and branches. Strictly speaking, "Umpflanzen" refers to > something you do at the root level. The corresponding action for > branches would be "Umpfropfen". I think that also conveys the effort > that is sometimes necessary ;) "Neuaufbau": it contains the concept of rebase "Umpflanzen": it contains the concept of rebase "Umpfropfen": Actually, this word isn't familiar to me. It's a bit unusual, isn't it? (but it might contains the concept of rebase) The whole point is that the user needs to know what it actually meant in git-context. If a user read "sie pflanzen gerade um" or "sie pfropfen gerade um", I don't think that this is the best solution. I haven't said that "sie bauen gerade neu auf" is the optimal one, for me it's better, though. We really need to discuss (and thats indeed also an issue on other translation teams), which git (or SCM) related words we shouldn't translate at all. Thanks, Ralf -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html