Hi Christian, thanks for your review. On Tue, Jul 3, 2012 at 10:03 PM, Christian Stimming <stimming@xxxxxxx> wrote: > Hi Ralf, > Am Dienstag, 3. Juli 2012, 19:04:46 schrieb Ralf Thielow: >> #: wt-status.c:874 wt-status.c:884 >> -#, fuzzy >> msgid "You are currently rebasing." >> -msgstr "Du befindest dich auf keinem Zweig." >> +msgstr "Du bist gerade beim Neuaufbau." > > Is "rebase" = "Neuaufbau"? My last thought on this wording was "rebase" = > "Umpflanzen". According to the current state of the glossary on GitHub, "rebase" as a verb is translated as "neu aufbauen". There are already translations using this. For example: #: builtin/remote.c:998 #, c-format msgid "rebases onto remote %s" msgstr "baut neu auf externen Zweig %s auf" In this translation, "rebase" is used as a noun for the very first time. So, I simply translate it with "Neuaufbau". In fact, we can use different translations for verbs and nouns. Not really sure whether we should do this for "rebase". Using "Umpflanzen" for "rebase" as a noun, would result in msgstr "Du bist gerade beim Umplanzen." Using "Umplanzen" was a verb, would result in msgstr "Du planzt gerade um." For me, "Umpflanzen" sounds a bit like "working with plants in the garden". I do not have a strong opinion on this, though. Are there thoughts from others? >> #: wt-status.c:889 >> msgid "You are currently splitting a commit during a rebase." >> -msgstr "" >> +msgstr "Du teilst gerade eine Version während eines Neuaufbaus auf." > > Maybe > "Du teilst gerade eine Version auf während eines Neuaufbaus." > I don't think that this is grammatically correct. >> #: wt-status.c:909 >> msgid "You are currently cherry-picking." >> -msgstr "" >> +msgstr "Du führst gerade \"cherry-pick\" aus." > > I thought "cherry-pick" = "pflücken", or is there a different glossary choice? At the moment we do not have a translation for "cherry-pick" in the glossary. In older parts of the translation we left it as it is, and I prefer to follow this for now. If we decide to translate it, we should do this in the whole translation. I've added your suggestion to the glossary. 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