l10n: restore translations after upstream revert
Restore translations for the new translatable strings reintroduced by
commit 0f8e75abeb (Revert "Merge branch 'en/no-amend-during-conflicts'",
2026-09-23).
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
maint
Jiang Xin
parent
a2a8f6ba37
commit
0a961ebf01
56
po/ca.po
56
po/ca.po
|
|
@ -283,7 +283,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2026-09-22 17:15+0200\n"
|
||||
"POT-Creation-Date: 2026-09-27 15:58+0800\n"
|
||||
"PO-Revision-Date: 2026-09-22 18:20+0200\n"
|
||||
"Last-Translator: Mikel Forcada <mikel.forcada@gmail.com>\n"
|
||||
"Language-Team: Catalan\n"
|
||||
|
|
@ -6533,18 +6533,8 @@ msgid "cannot do a partial commit during a cherry-pick."
|
|||
msgstr "no es pot fer una comissió parcial durant un «cherry pick»."
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "cannot do a partial commit during a revert."
|
||||
msgstr "no es pot fer una comissió parcial durant una reversió."
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "cannot do a partial commit during an am session."
|
||||
msgstr "no es pot fer una comissió parcial durant una sessió «am»."
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "cannot do a partial commit while resolving conflicts during a rebase."
|
||||
msgstr ""
|
||||
"no es pot fer una comissió parcial mentre es resolen conflictes durant un "
|
||||
"«rebase»"
|
||||
msgid "cannot do a partial commit during a rebase."
|
||||
msgstr "no es pot fer una comissió parcial durant un «rebase»."
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "cannot read the index"
|
||||
|
|
@ -6771,20 +6761,8 @@ msgid "You are in the middle of a cherry-pick -- cannot amend."
|
|||
msgstr "Esteu enmig d'un «cherry pick» -- no es pot esmenar."
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "The now-empty commit has been dropped -- cannot amend."
|
||||
msgstr "La comissió que ara és buida s'ha descartat: no es pot esmenar"
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "You are in the middle of a revert -- cannot amend."
|
||||
msgstr "Esteu enmig d'una reversió; no es pot esmenar."
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "You are in the middle of an am session -- cannot amend."
|
||||
msgstr "Esteu enmig d'una sessió «am»; no es pot esmenar."
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "You are resolving conflicts during a rebase -- cannot amend."
|
||||
msgstr "Esteu resolent conflictes durant un «rebase»; no es pot esmenar."
|
||||
msgid "You are in the middle of a rebase -- cannot amend."
|
||||
msgstr "Esteu enmig d'un «rebase» -- no es pot esmenar."
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "--reset-author can be used only with -C, -c or --amend."
|
||||
|
|
@ -33657,3 +33635,27 @@ msgstr "S'omet %s amb el sufix de còpia de seguretat «%s».\n"
|
|||
#, perl-format
|
||||
msgid "Do you really want to send %s? [y|N]: "
|
||||
msgstr "Esteu segur que voleu enviar %s? [y|N]: "
|
||||
|
||||
#~ msgid "cannot do a partial commit during a revert."
|
||||
#~ msgstr "no es pot fer una comissió parcial durant una reversió."
|
||||
|
||||
#~ msgid "cannot do a partial commit during an am session."
|
||||
#~ msgstr "no es pot fer una comissió parcial durant una sessió «am»."
|
||||
|
||||
#~ msgid ""
|
||||
#~ "cannot do a partial commit while resolving conflicts during a rebase."
|
||||
#~ msgstr ""
|
||||
#~ "no es pot fer una comissió parcial mentre es resolen conflictes durant un "
|
||||
#~ "«rebase»"
|
||||
|
||||
#~ msgid "The now-empty commit has been dropped -- cannot amend."
|
||||
#~ msgstr "La comissió que ara és buida s'ha descartat: no es pot esmenar"
|
||||
|
||||
#~ msgid "You are in the middle of a revert -- cannot amend."
|
||||
#~ msgstr "Esteu enmig d'una reversió; no es pot esmenar."
|
||||
|
||||
#~ msgid "You are in the middle of an am session -- cannot amend."
|
||||
#~ msgstr "Esteu enmig d'una sessió «am»; no es pot esmenar."
|
||||
|
||||
#~ msgid "You are resolving conflicts during a rebase -- cannot amend."
|
||||
#~ msgstr "Esteu resolent conflictes durant un «rebase»; no es pot esmenar."
|
||||
|
|
|
|||
58
po/fr.po
58
po/fr.po
|
|
@ -87,7 +87,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2026-09-15 23:12+0000\n"
|
||||
"POT-Creation-Date: 2026-09-27 15:58+0800\n"
|
||||
"PO-Revision-Date: 2026-09-20 16:00+0200\n"
|
||||
"Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"
|
||||
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
|
||||
|
|
@ -5134,16 +5134,8 @@ msgstr "impossible de faire une validation partielle pendant une fusion."
|
|||
msgid "cannot do a partial commit during a cherry-pick."
|
||||
msgstr "impossible de faire une validation partielle pendant un picorage."
|
||||
|
||||
msgid "cannot do a partial commit during a revert."
|
||||
msgstr "impossible de faire une validation partielle pendant un revert."
|
||||
|
||||
msgid "cannot do a partial commit during an am session."
|
||||
msgstr "impossible de faire une validation partielle pendant une session am."
|
||||
|
||||
msgid "cannot do a partial commit while resolving conflicts during a rebase."
|
||||
msgstr ""
|
||||
"impossible de faire une validation partielle en résolvant les conflits "
|
||||
"pendant un rebasage."
|
||||
msgid "cannot do a partial commit during a rebase."
|
||||
msgstr "impossible de faire une validation partielle pendant un rebasage."
|
||||
|
||||
msgid "cannot read the index"
|
||||
msgstr "impossible de lire l'index"
|
||||
|
|
@ -5334,20 +5326,8 @@ msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
|
|||
msgid "You are in the middle of a cherry-pick -- cannot amend."
|
||||
msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."
|
||||
|
||||
msgid "The now-empty commit has been dropped -- cannot amend."
|
||||
msgstr ""
|
||||
"Le commit désormais vide a été éliminé -- impossible de corriger (amend)."
|
||||
|
||||
msgid "You are in the middle of a revert -- cannot amend."
|
||||
msgstr "Vous êtes en plein retour -- impossible de corriger (amend)."
|
||||
|
||||
msgid "You are in the middle of an am session -- cannot amend."
|
||||
msgstr "Vous êtes en pleine session am -- impossible de corriger (amend)."
|
||||
|
||||
msgid "You are resolving conflicts during a rebase -- cannot amend."
|
||||
msgstr ""
|
||||
"Vous résolvez des conflits pendant un rebasage -- impossible de corriger "
|
||||
"(amend)."
|
||||
msgid "You are in the middle of a rebase -- cannot amend."
|
||||
msgstr "Vous êtes en plein rebasage -- impossible de corriger (amend)."
|
||||
|
||||
msgid "--reset-author can be used only with -C, -c or --amend."
|
||||
msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."
|
||||
|
|
@ -27022,3 +27002,31 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"
|
|||
#, perl-format
|
||||
msgid "Do you really want to send %s? [y|N]: "
|
||||
msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
|
||||
|
||||
#~ msgid "cannot do a partial commit during a revert."
|
||||
#~ msgstr "impossible de faire une validation partielle pendant un revert."
|
||||
|
||||
#~ msgid "cannot do a partial commit during an am session."
|
||||
#~ msgstr ""
|
||||
#~ "impossible de faire une validation partielle pendant une session am."
|
||||
|
||||
#~ msgid ""
|
||||
#~ "cannot do a partial commit while resolving conflicts during a rebase."
|
||||
#~ msgstr ""
|
||||
#~ "impossible de faire une validation partielle en résolvant les conflits "
|
||||
#~ "pendant un rebasage."
|
||||
|
||||
#~ msgid "The now-empty commit has been dropped -- cannot amend."
|
||||
#~ msgstr ""
|
||||
#~ "Le commit désormais vide a été éliminé -- impossible de corriger (amend)."
|
||||
|
||||
#~ msgid "You are in the middle of a revert -- cannot amend."
|
||||
#~ msgstr "Vous êtes en plein retour -- impossible de corriger (amend)."
|
||||
|
||||
#~ msgid "You are in the middle of an am session -- cannot amend."
|
||||
#~ msgstr "Vous êtes en pleine session am -- impossible de corriger (amend)."
|
||||
|
||||
#~ msgid "You are resolving conflicts during a rebase -- cannot amend."
|
||||
#~ msgstr ""
|
||||
#~ "Vous résolvez des conflits pendant un rebasage -- impossible de corriger "
|
||||
#~ "(amend)."
|
||||
|
|
|
|||
58
po/ga.po
58
po/ga.po
|
|
@ -7,7 +7,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2026-09-15 23:12+0000\n"
|
||||
"POT-Creation-Date: 2026-09-27 15:58+0800\n"
|
||||
"PO-Revision-Date: 2026-09-20 12:43+0100\n"
|
||||
"Last-Translator: Aindriú Mac Giolla Eoin <aindriu80@yahoo.com>\n"
|
||||
"Language-Team: none\n"
|
||||
|
|
@ -5078,16 +5078,8 @@ msgstr "ní féidir le tiomantas páirteach a dhéanamh le linn cumaisc."
|
|||
msgid "cannot do a partial commit during a cherry-pick."
|
||||
msgstr "ní féidir le tiomantas páirteach a dhéanamh le linn pioc silíní."
|
||||
|
||||
msgid "cannot do a partial commit during a revert."
|
||||
msgstr "ní féidir tiomantas páirteach a dhéanamh le linn aisiompaithe."
|
||||
|
||||
msgid "cannot do a partial commit during an am session."
|
||||
msgstr "ní féidir tiomantas páirteach a dhéanamh le linn seisiúin am."
|
||||
|
||||
msgid "cannot do a partial commit while resolving conflicts during a rebase."
|
||||
msgstr ""
|
||||
"ní féidir tiomantas páirteach a dhéanamh agus coinbhleachtaí á réiteach le "
|
||||
"linn athbhunaithe (rebase)."
|
||||
msgid "cannot do a partial commit during a rebase."
|
||||
msgstr "ní féidir le tiomantas páirteach a dhéanamh le linn athbhunaithe."
|
||||
|
||||
msgid "cannot read the index"
|
||||
msgstr "ní féidir leis an innéacs a léamh"
|
||||
|
|
@ -5277,20 +5269,8 @@ msgstr "Tá tú i lár cumaisc - ní féidir leat leasú."
|
|||
msgid "You are in the middle of a cherry-pick -- cannot amend."
|
||||
msgstr "Tá tú i lár rogha silíní - ní féidir leat leasú."
|
||||
|
||||
msgid "The now-empty commit has been dropped -- cannot amend."
|
||||
msgstr ""
|
||||
"Tá an tiomantas, atá folamh anois, curtha ar ceal -- ní féidir é a leasú."
|
||||
|
||||
msgid "You are in the middle of a revert -- cannot amend."
|
||||
msgstr "Tá tú i mbun aisiompaithe faoi láthair -- ní féidir leasú a dhéanamh."
|
||||
|
||||
msgid "You are in the middle of an am session -- cannot amend."
|
||||
msgstr "Tá tú i lár seisiúin am -- ní féidir leasú a dhéanamh."
|
||||
|
||||
msgid "You are resolving conflicts during a rebase -- cannot amend."
|
||||
msgstr ""
|
||||
"Tá tú ag réiteach coinbhleachtaí le linn rebase -- ní féidir leasú a "
|
||||
"dhéanamh."
|
||||
msgid "You are in the middle of a rebase -- cannot amend."
|
||||
msgstr "Tá tú i lár athbhunaithe - ní féidir leat leasú."
|
||||
|
||||
msgid "--reset-author can be used only with -C, -c or --amend."
|
||||
msgstr "Ní féidir --reset-author a úsáid ach le -C, -c nó --amend."
|
||||
|
|
@ -26770,3 +26750,31 @@ msgstr "Ag scipeáil %s leis an iarmhír chúltaca '%s'.\n"
|
|||
#, perl-format
|
||||
msgid "Do you really want to send %s? [y|N]: "
|
||||
msgstr "An bhfuil tú ag iarraidh %s a sheoladh i ndáiríre? [y|N]: "
|
||||
|
||||
#~ msgid "cannot do a partial commit during a revert."
|
||||
#~ msgstr "ní féidir tiomantas páirteach a dhéanamh le linn aisiompaithe."
|
||||
|
||||
#~ msgid "cannot do a partial commit during an am session."
|
||||
#~ msgstr "ní féidir tiomantas páirteach a dhéanamh le linn seisiúin am."
|
||||
|
||||
#~ msgid ""
|
||||
#~ "cannot do a partial commit while resolving conflicts during a rebase."
|
||||
#~ msgstr ""
|
||||
#~ "ní féidir tiomantas páirteach a dhéanamh agus coinbhleachtaí á réiteach "
|
||||
#~ "le linn athbhunaithe (rebase)."
|
||||
|
||||
#~ msgid "The now-empty commit has been dropped -- cannot amend."
|
||||
#~ msgstr ""
|
||||
#~ "Tá an tiomantas, atá folamh anois, curtha ar ceal -- ní féidir é a leasú."
|
||||
|
||||
#~ msgid "You are in the middle of a revert -- cannot amend."
|
||||
#~ msgstr ""
|
||||
#~ "Tá tú i mbun aisiompaithe faoi láthair -- ní féidir leasú a dhéanamh."
|
||||
|
||||
#~ msgid "You are in the middle of an am session -- cannot amend."
|
||||
#~ msgstr "Tá tú i lár seisiúin am -- ní féidir leasú a dhéanamh."
|
||||
|
||||
#~ msgid "You are resolving conflicts during a rebase -- cannot amend."
|
||||
#~ msgstr ""
|
||||
#~ "Tá tú ag réiteach coinbhleachtaí le linn rebase -- ní féidir leasú a "
|
||||
#~ "dhéanamh."
|
||||
|
|
|
|||
60
po/id.po
60
po/id.po
|
|
@ -7,7 +7,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2026-09-21 08:19+0700\n"
|
||||
"POT-Creation-Date: 2026-09-27 15:58+0800\n"
|
||||
"PO-Revision-Date: 2026-09-21 14:57+0700\n"
|
||||
"Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n"
|
||||
"Language-Team: Indonesian\n"
|
||||
|
|
@ -6198,18 +6198,8 @@ msgid "cannot do a partial commit during a cherry-pick."
|
|||
msgstr "tidak dapat melakukan komit sebagian selama pemetikan ceri."
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "cannot do a partial commit during a revert."
|
||||
msgstr "tidak dapat melakukan komit sebagian selama pembalikan."
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "cannot do a partial commit during an am session."
|
||||
msgstr "tidak dapat melakukan komit sebagian dalam sesi am."
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "cannot do a partial commit while resolving conflicts during a rebase."
|
||||
msgstr ""
|
||||
"tidak dapat melakukan komit sebagian ketika menyelesaikan konflik di tengah "
|
||||
"pendasaran ulang."
|
||||
msgid "cannot do a partial commit during a rebase."
|
||||
msgstr "tidak dapat melakukan komit sebagian selama pendasaran ulang."
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "cannot read the index"
|
||||
|
|
@ -6433,22 +6423,8 @@ msgid "You are in the middle of a cherry-pick -- cannot amend."
|
|||
msgstr "Anda berada di tengah pemetikan ceri -- tidak dapat mengubah."
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "The now-empty commit has been dropped -- cannot amend."
|
||||
msgstr "Komit yang tak kosong telah dijatuhkan -- tidak dapat mengubah."
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "You are in the middle of a revert -- cannot amend."
|
||||
msgstr "Anda berada di tengah pembalikan -- tidak dapat mengubah."
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "You are in the middle of an am session -- cannot amend."
|
||||
msgstr "Anda berada di tengah sesi am -- tidak dapat mengubah."
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "You are resolving conflicts during a rebase -- cannot amend."
|
||||
msgstr ""
|
||||
"Anda sedang menyelesaikan konflik di tengah pendasaran ulang -- tidak dapat "
|
||||
"mengubah."
|
||||
msgid "You are in the middle of a rebase -- cannot amend."
|
||||
msgstr "Anda berada di tengah pendasaran ulang -- tidak dapat mengubah."
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "--reset-author can be used only with -C, -c or --amend."
|
||||
|
|
@ -32854,3 +32830,29 @@ msgstr "Melewati %s dengan akhiran cadangan '%s'.\n"
|
|||
#, perl-format
|
||||
msgid "Do you really want to send %s? [y|N]: "
|
||||
msgstr "Anda benar-benar ingin mengirim %s? [y|N]: "
|
||||
|
||||
#~ msgid "cannot do a partial commit during a revert."
|
||||
#~ msgstr "tidak dapat melakukan komit sebagian selama pembalikan."
|
||||
|
||||
#~ msgid "cannot do a partial commit during an am session."
|
||||
#~ msgstr "tidak dapat melakukan komit sebagian dalam sesi am."
|
||||
|
||||
#~ msgid ""
|
||||
#~ "cannot do a partial commit while resolving conflicts during a rebase."
|
||||
#~ msgstr ""
|
||||
#~ "tidak dapat melakukan komit sebagian ketika menyelesaikan konflik di "
|
||||
#~ "tengah pendasaran ulang."
|
||||
|
||||
#~ msgid "The now-empty commit has been dropped -- cannot amend."
|
||||
#~ msgstr "Komit yang tak kosong telah dijatuhkan -- tidak dapat mengubah."
|
||||
|
||||
#~ msgid "You are in the middle of a revert -- cannot amend."
|
||||
#~ msgstr "Anda berada di tengah pembalikan -- tidak dapat mengubah."
|
||||
|
||||
#~ msgid "You are in the middle of an am session -- cannot amend."
|
||||
#~ msgstr "Anda berada di tengah sesi am -- tidak dapat mengubah."
|
||||
|
||||
#~ msgid "You are resolving conflicts during a rebase -- cannot amend."
|
||||
#~ msgstr ""
|
||||
#~ "Anda sedang menyelesaikan konflik di tengah pendasaran ulang -- tidak "
|
||||
#~ "dapat mengubah."
|
||||
|
|
|
|||
51
po/sv.po
51
po/sv.po
|
|
@ -7,7 +7,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: git 2.56.0\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2026-09-15 23:12+0000\n"
|
||||
"POT-Creation-Date: 2026-09-27 15:58+0800\n"
|
||||
"PO-Revision-Date: 2026-09-21 14:24+0100\n"
|
||||
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
|
||||
"Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n"
|
||||
|
|
@ -4926,16 +4926,8 @@ msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
|
|||
msgid "cannot do a partial commit during a cherry-pick."
|
||||
msgstr "kan inte utföra en delvis incheckning under en cherry-pick."
|
||||
|
||||
msgid "cannot do a partial commit during a revert."
|
||||
msgstr "kan inte utföra en delvis incheckning under en återställning."
|
||||
|
||||
msgid "cannot do a partial commit during an am session."
|
||||
msgstr "kan inte utföra en delvis incheckning under en am-körning."
|
||||
|
||||
msgid "cannot do a partial commit while resolving conflicts during a rebase."
|
||||
msgstr ""
|
||||
"kan inte utföra en delvis incheckning vid konfliktlösning under en "
|
||||
"ombasering."
|
||||
msgid "cannot do a partial commit during a rebase."
|
||||
msgstr "kan inte utföra en delvis incheckning under en ombasering."
|
||||
|
||||
msgid "cannot read the index"
|
||||
msgstr "kan inte läsa indexet"
|
||||
|
|
@ -5119,17 +5111,8 @@ msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."
|
|||
msgid "You are in the middle of a cherry-pick -- cannot amend."
|
||||
msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."
|
||||
|
||||
msgid "The now-empty commit has been dropped -- cannot amend."
|
||||
msgstr "Den numera tomma incheckningen har kastats -- kan inte utöka."
|
||||
|
||||
msgid "You are in the middle of a revert -- cannot amend."
|
||||
msgstr "Du är i mitten av en återställning -- kan inte utöka."
|
||||
|
||||
msgid "You are in the middle of an am session -- cannot amend."
|
||||
msgstr "Du är i mitten av en am-körning -- kan inte utöka."
|
||||
|
||||
msgid "You are resolving conflicts during a rebase -- cannot amend."
|
||||
msgstr "Du löser konflikter under en ombasering -- kan inte utöka."
|
||||
msgid "You are in the middle of a rebase -- cannot amend."
|
||||
msgstr "Du är i mitten av en ombasering -- kan inte utöka."
|
||||
|
||||
msgid "--reset-author can be used only with -C, -c or --amend."
|
||||
msgstr "--reset-author kan endast användas med -C, -c eller --amend."
|
||||
|
|
@ -26209,3 +26192,27 @@ msgstr ""
|
|||
#, perl-format
|
||||
msgid "Do you really want to send %s? [y|N]: "
|
||||
msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
|
||||
|
||||
#~ msgid "cannot do a partial commit during a revert."
|
||||
#~ msgstr "kan inte utföra en delvis incheckning under en återställning."
|
||||
|
||||
#~ msgid "cannot do a partial commit during an am session."
|
||||
#~ msgstr "kan inte utföra en delvis incheckning under en am-körning."
|
||||
|
||||
#~ msgid ""
|
||||
#~ "cannot do a partial commit while resolving conflicts during a rebase."
|
||||
#~ msgstr ""
|
||||
#~ "kan inte utföra en delvis incheckning vid konfliktlösning under en "
|
||||
#~ "ombasering."
|
||||
|
||||
#~ msgid "The now-empty commit has been dropped -- cannot amend."
|
||||
#~ msgstr "Den numera tomma incheckningen har kastats -- kan inte utöka."
|
||||
|
||||
#~ msgid "You are in the middle of a revert -- cannot amend."
|
||||
#~ msgstr "Du är i mitten av en återställning -- kan inte utöka."
|
||||
|
||||
#~ msgid "You are in the middle of an am session -- cannot amend."
|
||||
#~ msgstr "Du är i mitten av en am-körning -- kan inte utöka."
|
||||
|
||||
#~ msgid "You are resolving conflicts during a rebase -- cannot amend."
|
||||
#~ msgstr "Du löser konflikter under en ombasering -- kan inte utöka."
|
||||
|
|
|
|||
53
po/tr.po
53
po/tr.po
|
|
@ -97,7 +97,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Git Turkish Localization Project\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2026-09-15 23:12+0000\n"
|
||||
"POT-Creation-Date: 2026-09-27 15:58+0800\n"
|
||||
"PO-Revision-Date: 2026-09-16 10:00+0300\n"
|
||||
"Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
|
||||
"Language-Team: Turkish <kde-i18n-doc@kde.org>\n"
|
||||
|
|
@ -5030,15 +5030,8 @@ msgstr "Birleştirme sırasında kısmi işleme yapılamaz."
|
|||
msgid "cannot do a partial commit during a cherry-pick."
|
||||
msgstr "Seç-al sırasında kısmi işleme yapılamaz."
|
||||
|
||||
msgid "cannot do a partial commit during a revert."
|
||||
msgstr "Geri alma sırasında kısmi işleme yapılamaz."
|
||||
|
||||
msgid "cannot do a partial commit during an am session."
|
||||
msgstr "\"am\" oturumu sırasında kısmi işleme yapılamaz."
|
||||
|
||||
msgid "cannot do a partial commit while resolving conflicts during a rebase."
|
||||
msgstr ""
|
||||
"Yeniden temellendirme sırasında çakışmaları çözerken kısmi işleme yapılamaz."
|
||||
msgid "cannot do a partial commit during a rebase."
|
||||
msgstr "Bir yeniden temellendirme sırasında kısmi işleme yapılamaz."
|
||||
|
||||
msgid "cannot read the index"
|
||||
msgstr "indeks okunamıyor"
|
||||
|
|
@ -5223,19 +5216,9 @@ msgstr "Bir birleştirmenin tam ortasındasınız -- değiştirme yapılamıyor.
|
|||
msgid "You are in the middle of a cherry-pick -- cannot amend."
|
||||
msgstr "Bir seç-al'ın tam ortasındasınız -- değiştirme yapılamıyor."
|
||||
|
||||
msgid "The now-empty commit has been dropped -- cannot amend."
|
||||
msgstr "Şimdi boş olan işleme bırakıldı -- değiştirme yapılamıyor."
|
||||
|
||||
msgid "You are in the middle of a revert -- cannot amend."
|
||||
msgstr "Bir geri almanın tam ortasındasınız -- değiştirme yapılamıyor."
|
||||
|
||||
msgid "You are in the middle of an am session -- cannot amend."
|
||||
msgstr "Bir \"am\" oturumunun tam ortasındasınız -- değiştirme yapılamıyor."
|
||||
|
||||
msgid "You are resolving conflicts during a rebase -- cannot amend."
|
||||
msgid "You are in the middle of a rebase -- cannot amend."
|
||||
msgstr ""
|
||||
"Bir yeniden temellendirme sırasında çakışma çözüyorsunuz -- değiştirme "
|
||||
"yapılamıyor."
|
||||
"Bir yeniden temellendirmenin tam ortasındasınız -- değiştirme yapılamıyor."
|
||||
|
||||
msgid "--reset-author can be used only with -C, -c or --amend."
|
||||
msgstr ""
|
||||
|
|
@ -26354,3 +26337,29 @@ msgstr "%s, yedek sonek \"%s\" ile atlanıyor.\n"
|
|||
#, perl-format
|
||||
msgid "Do you really want to send %s? [y|N]: "
|
||||
msgstr "%s ögesini göndermeyi gerçekten istiyor musunuz? [y|N]: "
|
||||
|
||||
#~ msgid "cannot do a partial commit during a revert."
|
||||
#~ msgstr "Geri alma sırasında kısmi işleme yapılamaz."
|
||||
|
||||
#~ msgid "cannot do a partial commit during an am session."
|
||||
#~ msgstr "\"am\" oturumu sırasında kısmi işleme yapılamaz."
|
||||
|
||||
#~ msgid ""
|
||||
#~ "cannot do a partial commit while resolving conflicts during a rebase."
|
||||
#~ msgstr ""
|
||||
#~ "Yeniden temellendirme sırasında çakışmaları çözerken kısmi işleme "
|
||||
#~ "yapılamaz."
|
||||
|
||||
#~ msgid "The now-empty commit has been dropped -- cannot amend."
|
||||
#~ msgstr "Şimdi boş olan işleme bırakıldı -- değiştirme yapılamıyor."
|
||||
|
||||
#~ msgid "You are in the middle of a revert -- cannot amend."
|
||||
#~ msgstr "Bir geri almanın tam ortasındasınız -- değiştirme yapılamıyor."
|
||||
|
||||
#~ msgid "You are in the middle of an am session -- cannot amend."
|
||||
#~ msgstr "Bir \"am\" oturumunun tam ortasındasınız -- değiştirme yapılamıyor."
|
||||
|
||||
#~ msgid "You are resolving conflicts during a rebase -- cannot amend."
|
||||
#~ msgstr ""
|
||||
#~ "Bir yeniden temellendirme sırasında çakışma çözüyorsunuz -- değiştirme "
|
||||
#~ "yapılamıyor."
|
||||
|
|
|
|||
53
po/uk.po
53
po/uk.po
|
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Git v2.55\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2026-09-19 18:45-0700\n"
|
||||
"POT-Creation-Date: 2026-09-27 15:58+0800\n"
|
||||
"PO-Revision-Date: 2026-06-27 10:23-0700\n"
|
||||
"Last-Translator: Arkadii Yakovets <ark@cho.red>\n"
|
||||
"Language-Team: Ukrainian <https://github.com/arkid15r/git-uk-l10n/>\n"
|
||||
|
|
@ -5038,16 +5038,8 @@ msgstr "неможливо зробити частковий коміт під
|
|||
msgid "cannot do a partial commit during a cherry-pick."
|
||||
msgstr "неможливо зробити частковий коміт під час висмикування."
|
||||
|
||||
msgid "cannot do a partial commit during a revert."
|
||||
msgstr "неможливо зробити частковий коміт під час вивертання."
|
||||
|
||||
msgid "cannot do a partial commit during an am session."
|
||||
msgstr "неможливо зробити частковий коміт під час сесії am."
|
||||
|
||||
msgid "cannot do a partial commit while resolving conflicts during a rebase."
|
||||
msgstr ""
|
||||
"неможливо зробити частковий коміт під час вирішення конфліктів при "
|
||||
"перебазуванні."
|
||||
msgid "cannot do a partial commit during a rebase."
|
||||
msgstr "неможливо зробити частковий коміт під час перебазування."
|
||||
|
||||
msgid "cannot read the index"
|
||||
msgstr "неможливо прочитати індекс"
|
||||
|
|
@ -5232,18 +5224,8 @@ msgstr "Ви перебуваєте в процесі злиття -- немож
|
|||
msgid "You are in the middle of a cherry-pick -- cannot amend."
|
||||
msgstr "Ви перебуваєте в процесі висмикування - неможливо внести зміни."
|
||||
|
||||
msgid "The now-empty commit has been dropped -- cannot amend."
|
||||
msgstr "Тепер порожній коміт було відкинуто -- неможливо внести зміни."
|
||||
|
||||
msgid "You are in the middle of a revert -- cannot amend."
|
||||
msgstr "Ви перебуваєте в процесі вивертання -- неможливо внести зміни."
|
||||
|
||||
msgid "You are in the middle of an am session -- cannot amend."
|
||||
msgstr "Ви перебуваєте в процесі сесії am -- неможливо внести зміни."
|
||||
|
||||
msgid "You are resolving conflicts during a rebase -- cannot amend."
|
||||
msgstr ""
|
||||
"Ви вирішуєте конфлікти під час перебазування -- неможливо внести зміни."
|
||||
msgid "You are in the middle of a rebase -- cannot amend."
|
||||
msgstr "Ви перебуваєте в процесі перебазуавння -- неможливо внести зміни."
|
||||
|
||||
msgid "--reset-author can be used only with -C, -c or --amend."
|
||||
msgstr "--reset-author можна використовувати лише з -C, -c або --amend."
|
||||
|
|
@ -26691,3 +26673,28 @@ msgstr "Пропуск %s з суфіксом резервної копії \"%s
|
|||
#, perl-format
|
||||
msgid "Do you really want to send %s? [y|N]: "
|
||||
msgstr "Ви дійсно хочете відправити %s? [y|N]: "
|
||||
|
||||
#~ msgid "cannot do a partial commit during a revert."
|
||||
#~ msgstr "неможливо зробити частковий коміт під час вивертання."
|
||||
|
||||
#~ msgid "cannot do a partial commit during an am session."
|
||||
#~ msgstr "неможливо зробити частковий коміт під час сесії am."
|
||||
|
||||
#~ msgid ""
|
||||
#~ "cannot do a partial commit while resolving conflicts during a rebase."
|
||||
#~ msgstr ""
|
||||
#~ "неможливо зробити частковий коміт під час вирішення конфліктів при "
|
||||
#~ "перебазуванні."
|
||||
|
||||
#~ msgid "The now-empty commit has been dropped -- cannot amend."
|
||||
#~ msgstr "Тепер порожній коміт було відкинуто -- неможливо внести зміни."
|
||||
|
||||
#~ msgid "You are in the middle of a revert -- cannot amend."
|
||||
#~ msgstr "Ви перебуваєте в процесі вивертання -- неможливо внести зміни."
|
||||
|
||||
#~ msgid "You are in the middle of an am session -- cannot amend."
|
||||
#~ msgstr "Ви перебуваєте в процесі сесії am -- неможливо внести зміни."
|
||||
|
||||
#~ msgid "You are resolving conflicts during a rebase -- cannot amend."
|
||||
#~ msgstr ""
|
||||
#~ "Ви вирішуєте конфлікти під час перебазування -- неможливо внести зміни."
|
||||
|
|
|
|||
52
po/zh_CN.po
52
po/zh_CN.po
|
|
@ -176,7 +176,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Git\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2026-09-16 23:08+0800\n"
|
||||
"POT-Creation-Date: 2026-09-27 15:58+0800\n"
|
||||
"PO-Revision-Date: 2025-11-16 01:03+0800\n"
|
||||
"Last-Translator: Teng Long <dyroneteng@gmail.com>\n"
|
||||
"Language-Team: GitHub <https://github.com/dyrone/git/>\n"
|
||||
|
|
@ -6242,16 +6242,8 @@ msgid "cannot do a partial commit during a cherry-pick."
|
|||
msgstr "在拣选过程中不能做部分提交。"
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "cannot do a partial commit during a revert."
|
||||
msgstr "在还原过程中不能做部分提交。"
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "cannot do a partial commit during an am session."
|
||||
msgstr "在 am 会话过程中不能做部分提交。"
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "cannot do a partial commit while resolving conflicts during a rebase."
|
||||
msgstr "在解决变基冲突过程中不能做部分提交。"
|
||||
msgid "cannot do a partial commit during a rebase."
|
||||
msgstr "在变基过程中不能做部分提交。"
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "cannot read the index"
|
||||
|
|
@ -6470,20 +6462,8 @@ msgid "You are in the middle of a cherry-pick -- cannot amend."
|
|||
msgstr "您正处于一个拣选过程中 -- 不能修订提交。"
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "The now-empty commit has been dropped -- cannot amend."
|
||||
msgstr "当前为空的提交已经被丢弃 -- 不能修订提交。"
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "You are in the middle of a revert -- cannot amend."
|
||||
msgstr "您正处于一个还原过程中 -- 不能修订提交。"
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "You are in the middle of an am session -- cannot amend."
|
||||
msgstr "您正处于一个 am 会话过程中 -- 不能修订提交。"
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "You are resolving conflicts during a rebase -- cannot amend."
|
||||
msgstr "您正处于一个解决变基冲突的过程中 -- 不能修订提交。"
|
||||
msgid "You are in the middle of a rebase -- cannot amend."
|
||||
msgstr "您正处于一个变基过程中 -- 不能修订提交。"
|
||||
|
||||
#: builtin/commit.c
|
||||
msgid "--reset-author can be used only with -C, -c or --amend."
|
||||
|
|
@ -32335,3 +32315,25 @@ msgstr "略过 %s 含备份后缀 '%s'。\n"
|
|||
#, perl-format
|
||||
msgid "Do you really want to send %s? [y|N]: "
|
||||
msgstr "您真的要发送 %s？[y|N]："
|
||||
|
||||
#~ msgid "cannot do a partial commit during a revert."
|
||||
#~ msgstr "在还原过程中不能做部分提交。"
|
||||
|
||||
#~ msgid "cannot do a partial commit during an am session."
|
||||
#~ msgstr "在 am 会话过程中不能做部分提交。"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "cannot do a partial commit while resolving conflicts during a rebase."
|
||||
#~ msgstr "在解决变基冲突过程中不能做部分提交。"
|
||||
|
||||
#~ msgid "The now-empty commit has been dropped -- cannot amend."
|
||||
#~ msgstr "当前为空的提交已经被丢弃 -- 不能修订提交。"
|
||||
|
||||
#~ msgid "You are in the middle of a revert -- cannot amend."
|
||||
#~ msgstr "您正处于一个还原过程中 -- 不能修订提交。"
|
||||
|
||||
#~ msgid "You are in the middle of an am session -- cannot amend."
|
||||
#~ msgstr "您正处于一个 am 会话过程中 -- 不能修订提交。"
|
||||
|
||||
#~ msgid "You are resolving conflicts during a rebase -- cannot amend."
|
||||
#~ msgstr "您正处于一个解决变基冲突的过程中 -- 不能修订提交。"
|
||||
|
|
|
|||
Loading…
Reference in New Issue