From 7aec7bd0dd10abe78f6635baaa303d6d997998bc Mon Sep 17 00:00:00 2001 From: Dieter Ziller <max123kl@ziller.de> Date: Mon, 6 Apr 2020 20:11:33 +0000 Subject: [PATCH] Translated using Weblate (German) Currently translated at 24.7% (2539 of 10245 strings) Translation: Git Manpages/Translations Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/de/ Signed-off-by: Dieter Ziller <max123kl@ziller.de> --- po/documentation.de.po | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/po/documentation.de.po b/po/documentation.de.po index 85ce994..2a09121 100644 --- a/po/documentation.de.po +++ b/po/documentation.de.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" "POT-Creation-Date: 2020-04-04 19:51+0200\n" -"PO-Revision-Date: 2020-04-03 22:30+0000\n" +"PO-Revision-Date: 2020-04-07 07:14+0000\n" "Last-Translator: Dieter Ziller <max123kl@ziller.de>\n" "Language-Team: Matthias A횩hauer <mha1993@live.de>\n" "Language: de\n" @@ -12299,10 +12299,10 @@ msgstr "$ git checkout mytopic\n" msgid "However, your \"wrong\" branch and correct `mytopic` branch may differ in files that you have modified locally, in which case the above checkout would fail like this:" msgstr "Der \"falsche\" Branch und der korrekte Branch \"mytopic\" k철nnen sich in lokal ge채nderten Dateien unterscheiden, was daz f체hrt, dass der obige Checkout folgenderma횩en fehlschl채gt:" -#. type: delimited block - # git-checkout.txt is not up to date. The fuzzy msgid is the message prior to 142183d0 2010-07-09 "checkout: accord documentation to what git does", the msgid is the message in the documentation afterwards. # At that time there weren't even po files in the git tree. This message does not exist since 23cbf11b 2010-08-11 "merge-recursive: porcelain messages for checkout". # The current message is "Your local changes to the following files would be overwritten by merge:\n%%s" as of 2e3926b9 2016-05-13 "i18n: unpack-trees: avoid substituting only a verb in sentences" +#. type: delimited block - #: en/git-checkout.txt:561 #, fuzzy, no-wrap, priority:240 #| msgid "" @@ -44886,13 +44886,15 @@ msgstr "git-rm - Entferne Dateien aus dem Arbeitsbereich und dem Index" #. type: Plain text #: en/git-rm.txt:14 -#, fuzzy, ignore-ellipsis, no-wrap, priority:280 -#| msgid "'git rm' [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>..." +#, ignore-ellipsis, no-wrap, priority:280 msgid "" "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" "\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" "\t [--] [<pathspec>...]\n" -msgstr "'git rm' [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <Datei>..." +msgstr "" +"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +"\t [--quiet] [--pathspec-from-file=<Datei> [--pathspec-file-nul]]\n" +"\t [--] [<pathspec>...]\n" #. type: Plain text #: en/git-rm.txt:27 @@ -53288,8 +53290,8 @@ msgstr "" msgid "`GIT_COMMON_DIR`" msgstr "`GIT_COMMON_DIR`" -#. type: Plain text # noqa +#. type: Plain text #: en/git.txt:495 #, ignore-ellipsis, priority:100 msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..." -- GitLab