Skip to content

Commit ad86620

Browse files
committed
Merge remote-tracking branch 'weblate/master'
2 parents a387266 + 1fd674b commit ad86620

File tree

5 files changed

+65988
-132
lines changed

5 files changed

+65988
-132
lines changed

po/documentation.de.po

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ msgstr ""
1111
"Project-Id-Version: git documentation\n"
1212
"Report-Msgid-Bugs-To: [email protected]\n"
1313
"POT-Creation-Date: 2025-08-11 22:13+0200\n"
14-
"PO-Revision-Date: 2025-04-23 02:39+0000\n"
15-
"Last-Translator: Jean-Luc Tibaux <eugentoptic@outlook.de>\n"
14+
"PO-Revision-Date: 2025-10-15 08:07+0000\n"
15+
"Last-Translator: Blubberland <[email protected].de>\n"
1616
"Language-Team: Matthias Aßhauer <[email protected]>\n"
1717
"Language: de\n"
1818
"MIME-Version: 1.0\n"
1919
"Content-Type: text/plain; charset=UTF-8\n"
2020
"Content-Transfer-Encoding: 8bit\n"
2121
"Plural-Forms: nplurals=2; plural=n != 1;\n"
22-
"X-Generator: Weblate 5.11.1-dev\n"
22+
"X-Generator: Weblate 5.14-dev\n"
2323

2424
#. type: Labeled list
2525
#: en/blame-options.adoc:1 en/git-instaweb.adoc:45 en/git-ls-remote.adoc:24 en/git-mailinfo.adoc:49 en/git-mailsplit.adoc:35 en/git-repack.adoc:185 en/git-status.adoc:31
@@ -8781,7 +8781,7 @@ msgstr ""
87818781

87828782
#. type: Plain text
87838783
#: en/gitignore.adoc:116 en/glossary-content.adoc:418
8784-
#, fuzzy, priority:310
8784+
#, priority:310
87858785
msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
87868786
msgstr "Zwei aufeinanderfolgende Sternchen (\"`**`\") in Mustern, die gegen den vollen Pfadnamen angepasst sind, können besondere Bedeutung haben:"
87878787

@@ -8801,7 +8801,7 @@ msgstr ""
88018801
#: en/gitignore.adoc:130 en/glossary-content.adoc:431
88028802
#, priority:310
88038803
msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
8804-
msgstr ""
8804+
msgstr "Ein Schrägstrich mit zwei darauffolgenden Sternchen und einem Schrägstrich entspricht keinem oder mehreren Ordnern. Zum Beispiel: \"`a/**/b`\" entspricht \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" und so weiter."
88058805

88068806
#. type: Plain text
88078807
#: en/gitignore.adoc:133
@@ -67393,7 +67393,7 @@ msgstr "[[def_changeset]]Änderungssatz"
6739367393
#: en/glossary-content.adoc:43
6739467394
#, placeholders:'<<def_commit,', priority:310
6739567395
msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
67396-
msgstr ""
67396+
msgstr "BitKeeper/cvsps sprechen für \"<<def_commit,commit>>\". Da Git nicht die Änderung, sondern den Status speichert, macht es in diesem Zusammenhang keinen Sinn von \"Changesets\" zu sprechen."
6739767397

6739867398
#. type: Labeled list
6739967399
#: en/glossary-content.adoc:44
@@ -67411,7 +67411,7 @@ msgstr ""
6741167411
#: en/glossary-content.adoc:52
6741267412
#, no-wrap, placeholders:'[[def_cherry-picking]]', priority:310
6741367413
msgid "[[def_cherry-picking]]cherry-picking"
67414-
msgstr ""
67414+
msgstr "[[def_cherry-picking]]Rosinenpicken"
6741567415

6741667416
#. type: Plain text
6741767417
#: en/glossary-content.adoc:59

po/documentation.es.po

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: [email protected]\n"
1010
"POT-Creation-Date: 2025-08-11 22:13+0200\n"
11-
"PO-Revision-Date: 2025-09-08 00:02+0000\n"
12-
"Last-Translator: Salvador Peña <salvadorp74@hotmail.com>\n"
11+
"PO-Revision-Date: 2025-11-05 18:51+0000\n"
12+
"Last-Translator: Adolfo Jayme Barrientos <fitojb@ubuntu.com>\n"
1313
"Language-Team: LANGUAGE <[email protected]>\n"
1414
"Language: es\n"
1515
"MIME-Version: 1.0\n"
1616
"Content-Type: text/plain; charset=UTF-8\n"
1717
"Content-Transfer-Encoding: 8bit\n"
1818
"Plural-Forms: nplurals=2; plural=n != 1;\n"
19-
"X-Generator: Weblate 5.14-dev\n"
19+
"X-Generator: Weblate 5.15-dev\n"
2020

2121
#. type: Labeled list
2222
#: en/blame-options.adoc:1 en/git-instaweb.adoc:45 en/git-ls-remote.adoc:24 en/git-mailinfo.adoc:49 en/git-mailsplit.adoc:35 en/git-repack.adoc:185 en/git-status.adoc:31
@@ -5592,7 +5592,7 @@ msgstr "`--no-indent-heuristic`"
55925592
#: en/diff-options.adoc:179
55935593
#, priority:280
55945594
msgid "Disable the indent heuristic."
5595-
msgstr "Deshabilita la heurística de indentación."
5595+
msgstr "Desactiva la heurística de sangrado."
55965596

55975597
#. type: Labeled list
55985598
#: en/diff-options.adoc:180

po/documentation.fr.po

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ msgstr ""
1212
"Content-Type: text/plain; charset=UTF-8\n"
1313
"Content-Transfer-Encoding: 8bit\n"
1414
"Plural-Forms: nplurals=2; plural=n > 1;\n"
15-
"X-Generator: Weblate 5.14-dev\n"
15+
"X-Generator: Weblate 5.14.1-dev\n"
1616

1717
#. type: Labeled list
1818
#: en/blame-options.adoc:1 en/git-instaweb.adoc:45 en/git-ls-remote.adoc:24 en/git-mailinfo.adoc:49 en/git-mailsplit.adoc:35 en/git-repack.adoc:185 en/git-status.adoc:31
@@ -72235,7 +72235,7 @@ msgstr "Les options booléennes acceptent une valeur optionnelle `[=<booléen>]`
7223572235
#: en/pretty-formats.adoc:353
7223672236
#, priority:260
7223772237
msgid "If you add a `+` (plus sign) after +%+ of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
72238-
msgstr "Si vous ajoutez un `+` (signe plus) après+%+ d'un espace réservé, un saut de ligne est inséré immédiatement avant l'expansion si et seulement si l'espace réservé se développe en une chaîne non vide."
72238+
msgstr "Si vous ajoutez un `+` (signe plus) après +%+ d'un espace réservé, un saut de ligne est inséré immédiatement avant l'expansion si et seulement si l'espace réservé se développe en une chaîne non vide."
7223972239

7224072240
#. type: Plain text
7224172241
#: en/pretty-formats.adoc:357
@@ -74426,10 +74426,9 @@ msgstr "`--ancestry-path[=<commit>]`"
7442674426

7442774427
#. type: Plain text
7442874428
#: en/rev-list-options.adoc:446
74429-
#, fuzzy, priority:260
74430-
#| msgid "When given a range of commits to display (e.g. 'commit1..commit2' or 'commit2 {caret}commit1'), and a commit <commit> in that range, only display commits in that range that are ancestors of <commit>, descendants of <commit>, or <commit> itself. If no commit is specified, use 'commit1' (the excluded part of the range) as <commit>. Can be passed multiple times; if so, a commit is included if it is any of the commits given or if it is an ancestor or descendant of one of them."
74429+
#, priority:260
7443174430
msgid "When given a range of commits to display (e.g. `<commit1>..<commit2>` or `<commit2> ^<commit1>`), and a commit _<commit>_ in that range, only display commits in that range that are ancestors of _<commit>_, descendants of _<commit>_, or _<commit>_ itself. If no commit is specified, use _<commit1>_ (the excluded part of the range) as _<commit>_. Can be passed multiple times; if so, a commit is included if it is any of the commits given or if it is an ancestor or descendant of one of them."
74432-
msgstr "Lorsque l'on donne une plage de commits à afficher (par exemple 'commit1..commit2' ou 'commit2 {caret}commit1'), n'afficher que les commits de cette plage qui sont des ancêtres de <commit>, des descendants de <commit>, ou <commit> lui-même. Si aucun commit n'est spécifié, utiliser 'commit1' (la partie exclue de la plage) comme <commit>. Peut être passée plusieurs fois ; si c'est le cas, un commit est inclus s'il est l'un des commits donnés ou s'il est un ancêtre ou un descendant de l'un d'eux."
74431+
msgstr "Lorsque l'on donne une plage de commits à afficher (par exemple `<commit1>..<commit2>` ou `<commit2> ^<commit1>`) et un _<commit>_ dans cette plage, n'afficher que les commits de cette plage qui sont des ancêtres de _<commit>_, des descendants de _<commit>_, ou _<commit>_ lui-même. Si aucun commit n'est spécifié, utiliser _<commit1>_ (la partie exclue de la plage) comme _<commit>_. Peut être passée plusieurs fois ; si c'est le cas, un commit est inclus s'il est l'un des commits donnés ou s'il est un ancêtre ou un descendant de l'un d'eux."
7443374432

7443474433
#. type: Plain text
7443574434
#: en/rev-list-options.adoc:448

0 commit comments

Comments
 (0)