+
Skip to content

po: use switch over checkout in error message #1308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion builtin/checkout.c
Original file line number Diff line number Diff line change
Expand Up @@ -1222,7 +1222,7 @@ static const char *parse_remote_branch(const char *arg,
advise(_("If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
" git switch --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
Expand Down
4 changes: 2 additions & 2 deletions po/bg.po
Original file line number Diff line number Diff line change
Expand Up @@ -3883,7 +3883,7 @@ msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
" git switch --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
Expand All @@ -3892,7 +3892,7 @@ msgstr ""
"Ако искате да изтеглите клона от конкретно хранилище, напр. „origin“,\n"
"изрично го укажете към опцията „--track“:\n"
"\n"
" git checkout --track origin/ИМЕ_НА_КЛОН\n"
" git switch --track origin/ИМЕ_НА_КЛОН\n"
"\n"
"Ако искате винаги да се предпочита конкретно хранилище при нееднозначно\n"
"ИМЕ_НА_КЛОН, напр. „origin“, задайте следната настройка в конфигурационния\n"
Expand Down
4 changes: 2 additions & 2 deletions po/ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -3679,7 +3679,7 @@ msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
" git switch --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
Expand All @@ -3688,7 +3688,7 @@ msgstr ""
"Si voleu agafar una branca de seguiment remota, p. ex. «origin», podeu\n"
"fer-ho especificant el nom complet amb l'opció --track:\n"
"\n"
" git checkout --track origin/<nom>\n"
" git switch --track origin/<nom>\n"
"\n"
"Si voleu que en agafar un branca amb un <nom> ambigu s'usi una branca\n"
"remota, p. ex. «origin» al remot, considereu configurar l'opció\n"
Expand Down
4 changes: 2 additions & 2 deletions po/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -3676,7 +3676,7 @@ msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
" git switch --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
Expand All @@ -3687,7 +3687,7 @@ msgstr ""
"können Sie das tun, indem Sie den vollständig qualifizierten Namen mit der\n"
"--track Option angeben:\n"
"\n"
" git checkout --track origin/<Name>\n"
" git switch --track origin/<Name>\n"
"\n"
"Falls Sie beim Auschecken mit mehrdeutigen <Namen> immer ein Remote-"
"Repository\n"
Expand Down
4 changes: 2 additions & 2 deletions po/el.po
Original file line number Diff line number Diff line change
Expand Up @@ -9448,7 +9448,7 @@ msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
" git switch --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
Expand All @@ -9464,7 +9464,7 @@ msgstr ""
"'origin',\n"
"μπορείτε να το κάνετε ορίζοντας ολογράφως το όνομα με την επιλογή --track:\n"
"\n"
" git checkout --track origin/<όνομα>\n"
" git switch --track origin/<όνομα>\n"
"\n"
"Αν θα θέλατε οι εξαγωγές από ένα αμφίσημο <όνομα> να προτιμούν πάντα\n"
"έναν απομακρυσμένο εξυπηρετητή, π.χ. το απομακρυσμένο 'origin', σκεφτείτε να "
Expand Down
4 changes: 2 additions & 2 deletions po/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -3612,7 +3612,7 @@ msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
" git switch --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
Expand All @@ -3621,7 +3621,7 @@ msgstr ""
"Si querías hacer un check out a una rama rastreada remota, como 'origin',\n"
"puedes hacerlo proporcionando el nombre completo con la opción --track:\n"
"\n"
" git checkout --track origin/<nombre>\n"
" git switch --track origin/<nombre>\n"
"\n"
"Si quisieras que siempre los checkouts de nombres ambiguos prefieran\n"
"un remoto particular, como 'origin', considera configurar\n"
Expand Down
4 changes: 2 additions & 2 deletions po/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -3712,7 +3712,7 @@ msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
" git switch --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
Expand All @@ -3721,7 +3721,7 @@ msgstr ""
"Si vous souhaitiez extraire une branche de suivi distant sur 'origin',\n"
"par exemple, qualifiez-la complètement avec l'option --track :\n"
"\n"
" git checkout --track origin/<nom>\n"
" git switch --track origin/<nom>\n"
"\n"
"Si vous souhaitez privilégier un distant particulier lorsque <nom> est\n"
"ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n"
Expand Down
4 changes: 2 additions & 2 deletions po/id.po
Original file line number Diff line number Diff line change
Expand Up @@ -4422,7 +4422,7 @@ msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
" git switch --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
Expand All @@ -4431,7 +4431,7 @@ msgstr ""
"Jika maksud Anda check out cabang pelacak remote, seperti 'origin',\n"
"Anda bisa lakukan dengan kualifikasi penuh nama dengan opsi --track:\n"
"\n"
" git checkout --track origin/<nama>\n"
" git switch --track origin/<nama>\n"
"\n"
"Jika Anda ingin checkout <nama> ambigu selalu memilih satu remote,\n"
"seperti remote 'origin', pertimbangkan untuk menyetel\n"
Expand Down
4 changes: 2 additions & 2 deletions po/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -12097,7 +12097,7 @@ msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
" git switch --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
Expand All @@ -12107,7 +12107,7 @@ msgstr ""
"puoi farlo usando la versione completamente qualificata del nome\n"
"con l'opzione --track:\n"
"\n"
" git checkout --track origin/<nome>\n"
" git switch --track origin/<nome>\n"
"\n"
"Se preferisci che i checkout di un <nome> ambiguo siano sempre risolti\n"
"rispetto a un particolare remoto, ad es. 'origin', potresti voler\n"
Expand Down
4 changes: 2 additions & 2 deletions po/pl.po
Original file line number Diff line number Diff line change
Expand Up @@ -12668,7 +12668,7 @@ msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
" git switch --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
Expand All @@ -12677,7 +12677,7 @@ msgstr ""
"Jeśli chodziło o wybranie gałęzi śledzącej, np. na „origin”,\n"
"możesz to zrobić podając pełną nazwę z opcją --track:\n"
"\n"
" git checkout --track origin/<nazwa>\n"
" git switch --track origin/<nazwa>\n"
"\n"
"Jeśli chcesz, żeby wybrania wszystkich niejednoznacznych\n"
"<nazw> preferowały jedno zdalne repozytorium, rozważ ustawienie\n"
Expand Down
2 changes: 1 addition & 1 deletion po/pt_PT.po
Original file line number Diff line number Diff line change
Expand Up @@ -12919,7 +12919,7 @@ msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
" git switch --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
Expand Down
2 changes: 1 addition & 1 deletion po/ru.po
Original file line number Diff line number Diff line change
Expand Up @@ -3570,7 +3570,7 @@ msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
" git switch --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
Expand Down
4 changes: 2 additions & 2 deletions po/sv.po
Original file line number Diff line number Diff line change
Expand Up @@ -3572,7 +3572,7 @@ msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
" git switch --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
Expand All @@ -3581,7 +3581,7 @@ msgstr ""
"Om du menade checka ut en spårad fjärrgren på t.ex \"origin\", kan du\n"
"göra det genom att ange hela namnet med flaggan --track:\n"
"\n"
" git checkout --track origin/<namn>\n"
" git switch --track origin/<namn>\n"
"\n"
"Om du alltid vill att utcheckningar med tvetydiga <namn> ska\n"
"föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n"
Expand Down
4 changes: 2 additions & 2 deletions po/tr.po
Original file line number Diff line number Diff line change
Expand Up @@ -3645,7 +3645,7 @@ msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
" git switch --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
Expand All @@ -3654,7 +3654,7 @@ msgstr ""
"Eğer bir uzak izleme dalını çıkış yapmak istediyseniz örn. 'origin',\n"
"bunu adı --track seçeneği ile tam olarak nitelendirip yapabilirsiniz.\n"
"\n"
"\tgit checkout --track origin/<ad>\n"
"\tgit switch --track origin/<ad>\n"
"\n"
"Eğer her zaman belirsiz <ad> çıkışlarının bir uzak konumu tercih etmesini\n"
"isterseniz, örn. 'origin', yapılandırmanızda checkout.defaultRemote=origin\n"
Expand Down
4 changes: 2 additions & 2 deletions po/vi.po
Original file line number Diff line number Diff line change
Expand Up @@ -3589,7 +3589,7 @@ msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
" git switch --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
Expand All @@ -3598,7 +3598,7 @@ msgstr ""
"Nếu ý bạn là lấy ra nhánh máy chủ được theo dõi, ví dụ “origin”,\n"
"bạn có thể làm như vậy bằng cách chỉ định đầy đủ tên với tùy chọn --track:\n"
"\n"
" git checkout --track origin/<tên>\n"
" git switch --track origin/<tên>\n"
"\n"
"Nếu bạn muốn luôn lấy ra từ một <tên> một máy chủ ưa thích\n"
"chưa rõ ràng, ví dụ máy chủ “origin”, cân nhắc cài đặt\n"
Expand Down
4 changes: 2 additions & 2 deletions po/zh_CN.po
Original file line number Diff line number Diff line change
Expand Up @@ -4500,7 +4500,7 @@ msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
" git switch --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
Expand All @@ -4509,7 +4509,7 @@ msgstr ""
"如果您想要检出一个远程跟踪分支,例如在 'origin' 上的,您可以使用分支\n"
"全名和 --track 选项:\n"
"\n"
" git checkout --track origin/<名称>\n"
" git switch --track origin/<名称>\n"
"\n"
"如果您总是喜欢使用模糊的简短分支名 <名称>,而不喜欢如 'origin' 的远程\n"
"名称,可以在配置中设置 checkout.defaultRemote=origin。"
Expand Down
4 changes: 2 additions & 2 deletions po/zh_TW.po
Original file line number Diff line number Diff line change
Expand Up @@ -4362,7 +4362,7 @@ msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
" git switch --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
Expand All @@ -4371,7 +4371,7 @@ msgstr ""
"如果您想要簽出一個遠端追蹤分支,例如 'origin',您可以\n"
"使用 --track 選項寫出全名:\n"
"\n"
" git checkout --track origin/<name>\n"
" git switch --track origin/<name>\n"
"\n"
"如果您總是喜歡使用模糊的簡短分支名 <name>,而不喜歡如 'origin' 的遠端\n"
"版本庫名,可以在設定中設定 checkout.defaultRemote=origin。"
Expand Down
点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载