From 4bf46637adbec1bd6793e490a5950cfc5deb4daa Mon Sep 17 00:00:00 2001 From: krueschi <krueschi@t-online.de> Date: Sun, 15 Mar 2020 08:42:19 +0000 Subject: [PATCH] Translated using Weblate (German) Currently translated at 25.6% (2532 of 9866 strings) Translation: Git Manpages/Translations Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/de/ Signed-off-by: krueschi <krueschi@t-online.de> --- po/documentation.de.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/documentation.de.po b/po/documentation.de.po index 7f53eaa..66ca5e2 100644 --- a/po/documentation.de.po +++ b/po/documentation.de.po @@ -11,15 +11,15 @@ msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" "POT-Creation-Date: 2020-02-11 22:37+0100\n" -"PO-Revision-Date: 2019-10-22 09:53+0000\n" -"Last-Translator: villabunterkunt <helene.wiesinger@mailbox.org>\n" +"PO-Revision-Date: 2020-03-16 21:35+0000\n" +"Last-Translator: krueschi <krueschi@t-online.de>\n" "Language-Team: Matthias A횩hauer <mha1993@live.de>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.9.1-dev\n" +"X-Generator: Weblate 4.0-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31 @@ -5185,7 +5185,7 @@ msgstr "" #: en/fetch-options.txt:26 en/git-clone.txt:224 en/git-fetch-pack.txt:94 #, no-wrap, priority:300 msgid "--shallow-exclude=<revision>" -msgstr "" +msgstr "--shallow-exclude=<Revision>" #. type: Plain text #: en/fetch-options.txt:30 en/git-fetch-pack.txt:98 @@ -12292,10 +12292,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 "" @@ -52886,8 +52886,8 @@ msgstr "" msgid "`GIT_COMMON_DIR`" msgstr "`GIT_COMMON_DIR`" -#. type: Plain text # noqa +#. type: Plain text #: en/git.txt:481 #, 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