Documentation/articles/committers-guide/

Language	Translated	Unfinished	Unfinished words	Unfinished characters	Untranslated	Checks	Suggestions	Comments
English BSD-2-Clause		0	0	0	0	274	0	0

Chinese (Simplified) (zh_CN) BSD-2-Clause	1%	1,088	28,194	178,841	1,086	1	0	0

Chinese (Traditional) (zh_TW) BSD-2-Clause	1%	1,088	28,194	178,841	1,086	1	0	0

Dutch (nl_NL) BSD-2-Clause	0%	1,091	28,197	178,859	1,091	1	0	0

French (fr_FR) BSD-2-Clause	1%	1,090	28,196	178,856	1,090	0	0	0

German (de_DE) BSD-2-Clause	1%	1,089	28,195	178,848	1,089	0	0	0

Indonesian BSD-2-Clause	1%	1,089	28,195	178,848	1,089	0	0	0

Italian (it_IT) BSD-2-Clause	16%	912	25,273	159,864	839	40	0	0

Korean BSD-2-Clause	31%	743	20,821	131,789	2	737	0	0

Norwegian Bokmål BSD-2-Clause	1%	1,090	28,196	178,849	1,090	0	0	0

Persian BSD-2-Clause	1%	1,088	28,194	178,844	1,086	1	0	0

Polish BSD-2-Clause	1%	1,089	28,195	178,848	1,089	0	0	0

Portuguese (Brazil) BSD-2-Clause	19%	877	25,005	158,698	758	90	4	0

Spanish BSD-2-Clause	98%	16	248	2,082	6	0	0	5

Turkish (tr_TR) BSD-2-Clause	0%	1,091	28,197	178,859	1,091	0	0	0

Please sign in to see the alerts.

Overview

Project website	docs.freebsd.org/en
Translation license	BSD 2-Clause "Simplified" License
Translation process	Translations can be made directly. Translation suggestions can be made. Only chosen users can contribute. The translation uses bilingual files.
File mask	`documentation/content/*/articles/committers-guide/_index.po`

String statistics

	Strings percent	Hosted strings	Words percent	Hosted words	Characters percent	Hosted characters
Total		16,365		422,955		2,682,885
Source		1,091		28,197		178,859
Translated	17%	2,924	16%	69,655	16%	441,959
Needs editing	5%	949	6%	28,760	6%	182,991
Read-only	6%	1,091	6%	28,197	6%	178,859
Failing checks	6%	1,145	8%	35,567	8%	225,784
Strings with suggestions	1%	4	1%	143	1%	872
Untranslated strings	76%	12,492	76%	324,540	76%	2,057,935

Last 12 months Previous

Activity in last 12 months


Dec	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov

Quick numbers

422 k

Hosted words

16,365

Hosted strings

17%

Translated

Contributors

and previous 30 days

Trends of last 30 days

—

Hosted words

+100%

—

Hosted strings

+100%

—

Translated

+17%

—

Contributors

+100%

Search

Advanced query builder

Query examples

Review strings changed by other users	`changed:>=2023-11-03 AND NOT changed_by:anonymous`	Add
Translated strings	`state:>=translated`	Add
Strings with comments	`has:comment`	Add
Strings with any failing checks	`has:check`	Add
Strings with suggestions from others	`has:suggestion AND NOT suggestion_author:anonymous`	Add
Approved strings with suggestions	`state:approved AND has:suggestion`	Add
All untranslated strings added the past month	`added:>=2023-11-03 AND state:<=needs-editing`	Add
Translated strings in a certain language	`is:translated AND language:en`	Add

None Committed changes Documentation / articles/committers-guide/_index — Korean	Committed changes 2 months ago
cygnus6960 Translation changed Documentation / articles/committers-guide/_index — Korean	English * cd to the top of the repo * Create a side branch `XXX` with the contents of the merged tree. * Update this side branch `XXX` to be merged and up-to-date with FreeBSD's `main` branch. In the worst case scenario, you would still have to resolve merge conflicts, if there was any, but this should be really rare. Resolve conflicts, and collapse multiple commits down to 1 if need be (without conflicts, there's no collapse needed) * checkout `main` * create a branch `YYY` (allows for easier unwinding if things go wrong) * Re-do the subtree merge * Instead of resolving any conflicts from the subtree merge, checkout the contents of XXX on top of it. The trailing `.` is important, as is being at the top level of the repo. Rather than switching branches to XXX, it splats the contents of XXX on top of the repo * Commit the results with the prior commit message (the example assumes there's only one merge on the XXX branch). * Make sure the branches are the same. * Do whatever review you need, including having others check it out if you think that's needed. * Push the commit, if you 'lost the race' again, just redo these steps again (see below for a recipe) * Delete the branches once the commit is upstream. They are throw-a-way. Korean 1028 characters edited Current translation Translated * 리포지토리 상단에 CD를 복사합니다 * 병합된 트리의 내용으로 사이드 브랜치 `XXX`를 만듭니다. * 이 사이드 브랜치 `XXX`를 FreeBSD의 `메인` 브랜치와 병합하고 최신 상태로 업데이트합니다. 최악의 경우 병합 충돌이 발생하면 이를 해결해야 하지만, 이런 경우는 매우 드물 것입니다. 충돌을 해결하고 필요한 경우 여러 커밋을 1로 축소합니다(충돌이 없으면 축소할 필요가 없습니다) * 체크 아웃 `메인` * 브랜치 `YYY`를 생성한다(문제가 발생하면 쉽게 풀 수 있다) * 하위 트리 병합을 다시 수행한다 * 하위 트리 병합으로 인한 충돌을 해결하는 대신 그 위에 있는 XXX의 내용을 체크 아웃합니다. 뒤의 `.`는 리포지토리의 최상위 레벨에 있는 것과 마찬가지로 중요합니다. 브랜치를 XXX로 전환하는 대신 리포지토리 위에 XXX의 내용을 스플래트한다 * 이전 커밋 메시지와 함께 결과를 커밋한다(이 예제에서는 XXX 브랜치에 병합이 하나만 있다고 가정한다). * 브랜치가 동일한지 확인한다. * 검토가 필요하다고 생각되면 다른 사람에게 확인을 요청하는 등 필요한 모든 검토를 수행하세요. * 커밋을 푸시하고, 다시 '경쟁에서 졌다'면 다음 단계를 다시 실행하세요(레시피는 아래 참조) * 커밋이 업스트림에 올라가면 브랜치를 삭제한다. 브랜치는 버려야 한다cd to the top of the repo * Create a side branch `XXX` with the contents of the merged tree. * Update this side branch `XXX` to be merged and up-to-date with FreeBSD's `main` branch. In the worst case scenario, you would still have to resolve merge conflicts, if there was any, but this should be really rare. Resolve conflicts, and collapse multiple commits down to 1 if need be (without conflicts, there's no collapse needed) * checkout `main` * create a branch `YYY` (allows for easier unwinding if things go wrong) * Re-do the subtree merge * Instead of resolving any conflicts from the subtree merge, checkout the contents of XXX on top of it. The trailing `.` is important, as is being at the top level of the repo. Rather than switching branches to XXX, it splats the contents of XXX on top of the repo * Commit the results with the prior commit message (the example assumes there's only one merge on the XXX branch). * Make sure the branches are the same. * Do whatever review you need, including having others check it out if you think that's needed. * Push the commit, if you 'lost the race' again, just redo these steps again (see below for a recipe) * Delete the branches once the commit is upstream. They are throw-a-way. 2 months ago
cygnus6960 Translation changed Documentation / articles/committers-guide/_index — Korean	English The following steps should be taken to easily recreate the merge commit as if `git rebase --merge-commits` worked properly: Korean 3 characters edited Current translation Translated 다음 단계를 수행하면 `git rebase --merge-commits` 가 제대로 작동하는 것처럼 병합 커밋을 쉽게 다시 생성할 수 있습니다: 2 months ago
cygnus6960 Translation changed Documentation / articles/committers-guide/_index — Korean	English Regular `git rebase` or `git pull --rebase` doesn't know how to rebase a merge commit as a merge commit, so instead of that you would have to recreate the commit. Korean 1 character edited Current translation Translated 일반적인 `git rebase` 또는 `git pull --rebase` 는 병합 커밋을 병합 커밋으로 리베이스하는 방법을 모르기 때문에 대신 커밋을 다시 만들어야 합니다. 2 months ago
cygnus6960 Translation changed Documentation / articles/committers-guide/_index — Korean	English Because the current policy recommends against using merges, if the upstream FreeBSD `main` moved forward before you get a chance to push, you would have to redo the merge. Korean 7 characters edited Current translation Translated 현재 정책은 병합을 사용하지 말 것을 권장하기 때문에, 푸시할 기회를 얻기 전에 업스트림 FreeBSD ~~'메인'~~`main` 이 앞으로 나아간다면 병합을 다시 실행해야 합니다. 2 months ago
cygnus6960 Translation changed Documentation / articles/committers-guide/_index — Korean	English Rebasing your change against latest FreeBSD source tree Korean 0 characters edited Current translation Translated 최신 FreeBSD 소스 트리를 기준으로 변경 사항 리베이스하기 2 months ago
cygnus6960 Translation changed Documentation / articles/committers-guide/_index — Korean	English This would generate a subtree merge commit of `contrib/mtree` against the local `vendor/NetBSD/mtree` branch. If there were conflicts, you would need to fix them before committing. Include details about the changes being merged in the merge commit message. Korean 207 characters edited Current translation Translated 그러면 로컬 `vendor/NetBSD/mtree` 브랜치에 대해 `contrib/mtree`의 서브트리 병합 커밋이 생성됩니다. 충돌이 있는 경우 커밋하기 전에 수정해야 한다. 병합 커밋 메시지에 병합되는 변경 사항에 대한 세부 정보를 포함한다This would generate a subtree merge commit of `contrib/mtree` against the local `vendor/NetBSD/mtree` branch. If there were conflicts, you would need to fix them before committing. Include details about the changes being merged in the merge commit message. 2 months ago
cygnus6960 Translation changed Documentation / articles/committers-guide/_index — Korean	English % cd ../src % git subtree merge -P contrib/mtree vendor/NetBSD/mtree Korean 12 characters edited Current translation Translated % cd ../src % git ~~서브트리 병합~~subtree merge -P contrib/mtree vendor/NetBSD/mtree 2 months ago
cygnus6960 Translation changed Documentation / articles/committers-guide/_index — Korean	English Now you need to update the mtree in FreeBSD. The sources live in `contrib/mtree` since it is upstream software. Korean 1 character edited Current translation Translated 이제 FreeBSD에서 mtree를 업데이트해야 합니다. 소스는 업스트림 소프트웨어이므로 `contrib/mtree` 에 있습니다. 2 months ago
cygnus6960 Translation changed Documentation / articles/committers-guide/_index — Korean	English Updating the FreeBSD source tree Korean 0 characters edited Current translation Translated FreeBSD 소스 트리 업데이트하기 2 months ago

Browse all component changes