Overview
String statistics
| Strings percent | Hosted strings | Words percent | Hosted words | Characters percent | Hosted characters | |
|---|---|---|---|---|---|---|
| Total | 38,057 | 660,318 | 4,514,291 | |||
| Translated | 33% | 12,685 | 37% | 249,885 | 37% | 1,687,735 |
| Needs editing | 2% | 1,111 | 4% | 29,194 | 4% | 187,270 |
| Read-only | 0% | 0 | 0% | 0 | 0% | 0 |
| Failing checks | 2% | 1,015 | 4% | 27,114 | 3% | 171,542 |
| Strings with suggestions | 1% | 89 | 1% | 3,005 | 1% | 20,150 |
| Untranslated strings | 63% | 24,261 | 57% | 381,239 | 58% | 2,639,286 |
Quick numbers
660 k
Hosted words
38,057
Hosted strings
33%
Translated
1
Contributors
and previous 30 days
Trends of last 30 days
−1%
Hosted words
+100%
+1%
Hosted strings
+100%
+1%
Translated
+32%
−100%
Contributors
+100%
 cygnus6960
Translation changed |
|
|
cygnus6960
Translation changed |
|
|
cygnus6960
Translation changed |
|
|
cygnus6960
Translation changed |
|
|
cygnus6960
Translation changed |
|
|
cygnus6960
Translation changed |
|
|
cygnus6960
Translation changed |
|
|
cygnus6960
Translation changed |
|
|
cygnus6960
Translation changed |
|
|
cygnus6960
Translation changed |
|
* 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.
리포지토리 상단에 CD를 복사합니다cd to the top of the repo* 병합된 트리의 **내용**으로 사이드 브랜치 `XXX`를 만듭니다.
* 이 사이드 브랜치 `XXX`를 FreeBSD의 `메인` 브랜치와 병합하고 최신 상태로 업데이트합니다.
** 최악의 경우 병합 충돌이 발생하면 이를 해결해야 하지만, 이런 경우는 매우 드물 것입니다.
** 충돌을 해결하고 필요한 경우 여러 커밋을 1로 축소합니다(충돌이 없으면 축소할 필요가 없습니다)
* 체크 아웃 `메인`
* 브랜치 `YYY`를 생성한다(문제가 발생하면 쉽게 풀 수 있다)
* 하위 트리 병합을 다시 수행한다
* 하위 트리 병합으로 인한 충돌을 해결하는 대신 그 위에 있는 XXX의 내용을 체크 아웃합니다.
** 뒤의 `.`는 리포지토리의 최상위 레벨에 있는 것과 마찬가지로 중요합니다.
** 브랜치를 XXX로 전환하는 대신 리포지토리 위에 XXX의 내용을 스플래트한다
* 이전 커밋 메시지와 함께 결과를 커밋한다(이 예제에서는 XXX 브랜치에 병합이 하나만 있다고 가정한다).
* 브랜치가 동일한지 확인한다.
* 검토가 필요하다고 생각되면 다른 사람에게 확인을 요청하는 등 필요한 모든 검토를 수행하세요.
* 커밋을 푸시하고, 다시 '경쟁에서 졌다'면 다음 단계를 다시 실행하세요(레시피는 아래 참조)
* 커밋이 업스트림에 올라가면 브랜치를 삭제한다. 브랜치는 버려야 한다
* 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.