Translation components API.

See the Weblate's Web API documentation for detailed description of the API.

GET /api/translations/documentation/articlescommitters-guide_index/en/units/?format=api&page=19
HTTP 200 OK
Allow: GET, POST, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "count": 1190,
    "next": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/units/?format=api&page=20",
    "previous": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/units/?format=api&page=18",
    "results": [
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "This chapter follows the convention that the `freebsd` origin is the origin name for the official FreeBSD Git repository.  If you use a different convention, replace `freebsd` with the name you use instead in the examples below."
            ],
            "previous_source": "",
            "target": [
                "This chapter follows the convention that the `freebsd` origin is the origin name for the official FreeBSD Git repository.  If you use a different convention, replace `freebsd` with the name you use instead in the examples below."
            ],
            "id_hash": 8139063866021460822,
            "content_hash": 8139063866021460822,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1093",
            "context": "",
            "note": "type: delimited block = 4",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 326,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 37,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819526/?format=api",
            "priority": 100,
            "id": 1819526,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=f0f3c376aa6d3b56",
            "url": "https://translate-dev.freebsd.org/api/units/1819526/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.383660Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "% git worktree add ../mtree vendor/NetBSD/mtree\n"
            ],
            "previous_source": "",
            "target": [
                "% git worktree add ../mtree vendor/NetBSD/mtree\n"
            ],
            "id_hash": -293396947433574847,
            "content_hash": -293396947433574847,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1108",
            "context": "",
            "note": "type: delimited block . 4",
            "flags": "no-wrap",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 330,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 6,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819528/?format=api",
            "priority": 100,
            "id": 1819528,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=7beda507e209ae41",
            "url": "https://translate-dev.freebsd.org/api/units/1819528/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.388733Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "It is critical to verify that the source code you are importing comes from a trustworthy source. Many open-source projects use cryptographic signatures to sign code changes, git tags, and/or source code tarballs. Always verify these signatures, and use isolation mechanisms like jails, chroot, in combination with a dedicated, non-privileged user account that is different from the one you regularly use (see the Updating the FreeBSD source tree section below for more details), until you are confident that the source code you are importing looks safe. Following the upstream development and occasionally reviewing the upstream code changes can greatly help in improving code quality and benefit everyone involved. It is also a good idea to examine the git diff results before importing them into the vendor area."
            ],
            "previous_source": "",
            "target": [
                "It is critical to verify that the source code you are importing comes from a trustworthy source. Many open-source projects use cryptographic signatures to sign code changes, git tags, and/or source code tarballs. Always verify these signatures, and use isolation mechanisms like jails, chroot, in combination with a dedicated, non-privileged user account that is different from the one you regularly use (see the Updating the FreeBSD source tree section below for more details), until you are confident that the source code you are importing looks safe. Following the upstream development and occasionally reviewing the upstream code changes can greatly help in improving code quality and benefit everyone involved. It is also a good idea to examine the git diff results before importing them into the vendor area."
            ],
            "id_hash": -3237369325047995003,
            "content_hash": -3237369325047995003,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1144",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 335,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 127,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819530/?format=api",
            "priority": 100,
            "id": 1819530,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=53128dc04dc4a585",
            "url": "https://translate-dev.freebsd.org/api/units/1819530/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.394380Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "Always run the `git diff` and `git status` commands and examine the results carefully. When in doubt, it is useful to do a `git annotate` on the vendor branch or the upstream git repository to see who and why a change was made."
            ],
            "previous_source": "",
            "target": [
                "Always run the `git diff` and `git status` commands and examine the results carefully. When in doubt, it is useful to do a `git annotate` on the vendor branch or the upstream git repository to see who and why a change was made."
            ],
            "id_hash": 3111179691810840846,
            "content_hash": 3111179691810840846,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1148",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 336,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 43,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819532/?format=api",
            "priority": 100,
            "id": 1819532,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=ab2d21722acb610e",
            "url": "https://translate-dev.freebsd.org/api/units/1819532/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.398013Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "In the example above we used `-m` to illustrate, but you should compose a proper message in an editor (using a commit message template)."
            ],
            "previous_source": "",
            "target": [
                "In the example above we used `-m` to illustrate, but you should compose a proper message in an editor (using a commit message template)."
            ],
            "id_hash": -5965802432131093369,
            "content_hash": -5965802432131093369,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1151",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 337,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 24,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819534/?format=api",
            "priority": 100,
            "id": 1819534,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=2d35364bd0aa2c87",
            "url": "https://translate-dev.freebsd.org/api/units/1819534/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.401257Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "It is also important to create an annotated tag using `git tag -a`, otherwise the push will be rejected.  Only annotated tags are allowed to be pushed.  The annotated tag gives you a chance to enter a commit message.  Enter the version you are importing, along with any salient new features or fixes in that version."
            ],
            "previous_source": "",
            "target": [
                "It is also important to create an annotated tag using `git tag -a`, otherwise the push will be rejected.  Only annotated tags are allowed to be pushed.  The annotated tag gives you a chance to enter a commit message.  Enter the version you are importing, along with any salient new features or fixes in that version."
            ],
            "id_hash": 1635789406257455893,
            "content_hash": 1635789406257455893,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1156",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 338,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 56,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819536/?format=api",
            "priority": 100,
            "id": 1819536,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=96b37dcc5752a315",
            "url": "https://translate-dev.freebsd.org/api/units/1819536/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.404464Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "% git push --follow-tags freebsd vendor/NetBSD/mtree\n"
            ],
            "previous_source": "",
            "target": [
                "% git push --follow-tags freebsd vendor/NetBSD/mtree\n"
            ],
            "id_hash": 3846593730598057741,
            "content_hash": 3846593730598057741,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1164",
            "context": "",
            "note": "type: delimited block . 4",
            "flags": "no-wrap",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 341,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 6,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819538/?format=api",
            "priority": 100,
            "id": 1819538,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=b561d89e2b8ab70d",
            "url": "https://translate-dev.freebsd.org/api/units/1819538/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.408902Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "`--follow-tags` tells `git push` to also push tags associated with the locally committed revision."
            ],
            "previous_source": "",
            "target": [
                "`--follow-tags` tells `git push` to also push tags associated with the locally committed revision."
            ],
            "id_hash": 7344108045007846006,
            "content_hash": 7344108045007846006,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1167",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 342,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 14,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819540/?format=api",
            "priority": 100,
            "id": 1819540,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=e5eb835b2ec7fa76",
            "url": "https://translate-dev.freebsd.org/api/units/1819540/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.412000Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "% cd ../src\n% git subtree merge -P contrib/mtree vendor/NetBSD/mtree\n"
            ],
            "previous_source": "",
            "target": [
                "% cd ../src\n% git subtree merge -P contrib/mtree vendor/NetBSD/mtree\n"
            ],
            "id_hash": 1982121055091817761,
            "content_hash": 1982121055091817761,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1183",
            "context": "",
            "note": "type: delimited block . 4",
            "flags": "no-wrap",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 346,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 10,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819542/?format=api",
            "priority": 100,
            "id": 1819542,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=9b81e8990e91fd21",
            "url": "https://translate-dev.freebsd.org/api/units/1819542/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.416977Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "This would generate a subtree merge commit of `contrib/mtree` against the local `vendor/NetBSD/mtree` branch.  Examine the diff from the merge result and the contents of the upstream branch. If the merge reduced our local changes to more trivial difference like blank line or indenting changes, try amending the local changes to reduce diff against upstream, or try to contribute the remaining changes back to the upstream project.  If there were conflicts, you would need to fix them before committing.  Include details about the changes being merged in the merge commit message."
            ],
            "previous_source": "",
            "target": [
                "This would generate a subtree merge commit of `contrib/mtree` against the local `vendor/NetBSD/mtree` branch.  Examine the diff from the merge result and the contents of the upstream branch. If the merge reduced our local changes to more trivial difference like blank line or indenting changes, try amending the local changes to reduce diff against upstream, or try to contribute the remaining changes back to the upstream project.  If there were conflicts, you would need to fix them before committing.  Include details about the changes being merged in the merge commit message."
            ],
            "id_hash": -9015242595043084000,
            "content_hash": -9015242595043084000,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1193",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 347,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 91,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819544/?format=api",
            "priority": 100,
            "id": 1819544,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=02e36c9fe67c7920",
            "url": "https://translate-dev.freebsd.org/api/units/1819544/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.420078Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "Some open-source software includes a `configure` script that generates files used to define how the code is built; usually, these generated files like `config.h` should be updated as part of the import process. When doing this, always keep in mind that these scripts are executable code running under the current user's credentials. This process should always be run in an isolated environment, ideally inside a jail that does not have network access, and with an unprivileged account; or, at minimum, a dedicated account that is different from the user account you normally use for everyday purposes or for pushing to the FreeBSD source code repository. This minimizes the risk of encountering bugs that can cause data loss or, in worse cases, maliciously planted code. Using an isolated jail also prevents the configure scripts from detecting locally installed software packages, which may lead to unexpected results."
            ],
            "previous_source": "",
            "target": [
                "Some open-source software includes a `configure` script that generates files used to define how the code is built; usually, these generated files like `config.h` should be updated as part of the import process. When doing this, always keep in mind that these scripts are executable code running under the current user's credentials. This process should always be run in an isolated environment, ideally inside a jail that does not have network access, and with an unprivileged account; or, at minimum, a dedicated account that is different from the user account you normally use for everyday purposes or for pushing to the FreeBSD source code repository. This minimizes the risk of encountering bugs that can cause data loss or, in worse cases, maliciously planted code. Using an isolated jail also prevents the configure scripts from detecting locally installed software packages, which may lead to unexpected results."
            ],
            "id_hash": -674225462417100676,
            "content_hash": -674225462417100676,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1207",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 348,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 145,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819546/?format=api",
            "priority": 100,
            "id": 1819546,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=76a4ab839e1af07c",
            "url": "https://translate-dev.freebsd.org/api/units/1819546/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.423548Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "When testing your changes, run them in a chroot or jailed environment, or even within a virtual machine first, especially for kernel or library modifications. This approach helps prevent adverse interactions with your working environment. It can be particularly beneficial for changes to libraries that many base system components use, among others."
            ],
            "previous_source": "",
            "target": [
                "When testing your changes, run them in a chroot or jailed environment, or even within a virtual machine first, especially for kernel or library modifications. This approach helps prevent adverse interactions with your working environment. It can be particularly beneficial for changes to libraries that many base system components use, among others."
            ],
            "id_hash": 4468186487954367212,
            "content_hash": 4468186487954367212,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1214",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 349,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 52,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819548/?format=api",
            "priority": 100,
            "id": 1819548,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=be022feff4b862ec",
            "url": "https://translate-dev.freebsd.org/api/units/1819548/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.427418Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "cd to the top of the repo"
            ],
            "previous_source": "",
            "target": [
                "cd to the top of the repo"
            ],
            "id_hash": 8483394083235612961,
            "content_hash": 8483394083235612961,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1225",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 354,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": false,
            "num_words": 7,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819550/?format=api",
            "priority": 100,
            "id": 1819550,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=f5bb11f8c4e8c921",
            "url": "https://translate-dev.freebsd.org/api/units/1819550/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.433139Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "Create a side branch `XXX` with the **contents** of the merged tree."
            ],
            "previous_source": "",
            "target": [
                "Create a side branch `XXX` with the **contents** of the merged tree."
            ],
            "id_hash": -1627701048319584221,
            "content_hash": -1627701048319584221,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1226",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 355,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 12,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819552/?format=api",
            "priority": 100,
            "id": 1819552,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=69693e853e615823",
            "url": "https://translate-dev.freebsd.org/api/units/1819552/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.436179Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "Update this side branch `XXX` to be merged and up-to-date with FreeBSD's `main` branch."
            ],
            "previous_source": "",
            "target": [
                "Update this side branch `XXX` to be merged and up-to-date with FreeBSD's `main` branch."
            ],
            "id_hash": 7774000790126329197,
            "content_hash": 7774000790126329197,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1227",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 356,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": false,
            "num_words": 14,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819554/?format=api",
            "priority": 100,
            "id": 1819554,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=ebe2cc87bb15fd6d",
            "url": "https://translate-dev.freebsd.org/api/units/1819554/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.439240Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "In the worst case scenario, you would still have to resolve merge conflicts, if there was any, but this should be really rare."
            ],
            "previous_source": "",
            "target": [
                "In the worst case scenario, you would still have to resolve merge conflicts, if there was any, but this should be really rare."
            ],
            "id_hash": -1182446356636018524,
            "content_hash": -1182446356636018524,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1228",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 357,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": false,
            "num_words": 23,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819556/?format=api",
            "priority": 100,
            "id": 1819556,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=6f971b4db2c158a4",
            "url": "https://translate-dev.freebsd.org/api/units/1819556/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.442289Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "Resolve conflicts, and collapse multiple commits down to 1 if need be (without conflicts, there's no collapse needed)"
            ],
            "previous_source": "",
            "target": [
                "Resolve conflicts, and collapse multiple commits down to 1 if need be (without conflicts, there's no collapse needed)"
            ],
            "id_hash": -1542873442794110761,
            "content_hash": -1542873442794110761,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1229",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 358,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": false,
            "num_words": 18,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819558/?format=api",
            "priority": 100,
            "id": 1819558,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=6a969cc73cdf80d7",
            "url": "https://translate-dev.freebsd.org/api/units/1819558/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.445357Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "checkout `main`"
            ],
            "previous_source": "",
            "target": [
                "checkout `main`"
            ],
            "id_hash": -929770766018598199,
            "content_hash": -929770766018598199,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1230",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 359,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": false,
            "num_words": 2,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819560/?format=api",
            "priority": 100,
            "id": 1819560,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=7318ca6a18eb2ac9",
            "url": "https://translate-dev.freebsd.org/api/units/1819560/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.448464Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "create a branch `YYY` (allows for easier unwinding if things go wrong)"
            ],
            "previous_source": "",
            "target": [
                "create a branch `YYY` (allows for easier unwinding if things go wrong)"
            ],
            "id_hash": 2760829620742006155,
            "content_hash": 2760829620742006155,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1231",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 360,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": false,
            "num_words": 12,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819562/?format=api",
            "priority": 100,
            "id": 1819562,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=a6506fe99db4258b",
            "url": "https://translate-dev.freebsd.org/api/units/1819562/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.451468Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "Re-do the subtree merge"
            ],
            "previous_source": "",
            "target": [
                "Re-do the subtree merge"
            ],
            "id_hash": 7672844497168554658,
            "content_hash": 7672844497168554658,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1232",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 361,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": false,
            "num_words": 4,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819564/?format=api",
            "priority": 100,
            "id": 1819564,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=ea7b6b6aee8adaa2",
            "url": "https://translate-dev.freebsd.org/api/units/1819564/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.454597Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "Instead of resolving any conflicts from the subtree merge, checkout the contents of XXX on top of it."
            ],
            "previous_source": "",
            "target": [
                "Instead of resolving any conflicts from the subtree merge, checkout the contents of XXX on top of it."
            ],
            "id_hash": -1544079550244874287,
            "content_hash": -1544079550244874287,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1233",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 362,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": false,
            "num_words": 18,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819566/?format=api",
            "priority": 100,
            "id": 1819566,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=6a9253d476b597d1",
            "url": "https://translate-dev.freebsd.org/api/units/1819566/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.457599Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "The trailing `.` is important, as is being at the top level of the repo."
            ],
            "previous_source": "",
            "target": [
                "The trailing `.` is important, as is being at the top level of the repo."
            ],
            "id_hash": -8202776462027537270,
            "content_hash": -8202776462027537270,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1234",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 363,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": false,
            "num_words": 15,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819568/?format=api",
            "priority": 100,
            "id": 1819568,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=0e29e24498e9c48a",
            "url": "https://translate-dev.freebsd.org/api/units/1819568/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.460732Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "Rather than switching branches to XXX, it splats the contents of XXX on top of the repo"
            ],
            "previous_source": "",
            "target": [
                "Rather than switching branches to XXX, it splats the contents of XXX on top of the repo"
            ],
            "id_hash": -4428397822778610192,
            "content_hash": -4428397822778610192,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1235",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 364,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": false,
            "num_words": 17,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819570/?format=api",
            "priority": 100,
            "id": 1819570,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=428b2ba4912aedf0",
            "url": "https://translate-dev.freebsd.org/api/units/1819570/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.463783Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "Commit the results with the prior commit message (the example assumes there's only one merge on the XXX branch)."
            ],
            "previous_source": "",
            "target": [
                "Commit the results with the prior commit message (the example assumes there's only one merge on the XXX branch)."
            ],
            "id_hash": 9043050980892807891,
            "content_hash": 9043050980892807891,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1236",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 365,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": false,
            "num_words": 19,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819572/?format=api",
            "priority": 100,
            "id": 1819572,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=fd7f5ef479dd12d3",
            "url": "https://translate-dev.freebsd.org/api/units/1819572/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.466875Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "Make sure the branches are the same."
            ],
            "previous_source": "",
            "target": [
                "Make sure the branches are the same."
            ],
            "id_hash": 7967839055151863324,
            "content_hash": 7967839055151863324,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1237",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 366,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": false,
            "num_words": 7,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819574/?format=api",
            "priority": 100,
            "id": 1819574,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=ee937367bdcf961c",
            "url": "https://translate-dev.freebsd.org/api/units/1819574/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.469961Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "Do whatever review you need, including having others check it out if you think that's needed."
            ],
            "previous_source": "",
            "target": [
                "Do whatever review you need, including having others check it out if you think that's needed."
            ],
            "id_hash": -5624359237927462064,
            "content_hash": -5624359237927462064,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1238",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 367,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": false,
            "num_words": 16,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819576/?format=api",
            "priority": 100,
            "id": 1819576,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=31f243127e259b50",
            "url": "https://translate-dev.freebsd.org/api/units/1819576/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.472955Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "Push the commit, if you 'lost the race' again, just redo these steps again (see below for a recipe)"
            ],
            "previous_source": "",
            "target": [
                "Push the commit, if you 'lost the race' again, just redo these steps again (see below for a recipe)"
            ],
            "id_hash": -337231544594669146,
            "content_hash": -337231544594669146,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1239",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 368,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": false,
            "num_words": 19,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819578/?format=api",
            "priority": 100,
            "id": 1819578,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=7b51e9b26960e1a6",
            "url": "https://translate-dev.freebsd.org/api/units/1819578/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.476035Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "Delete the branches once the commit is upstream. They are throw-a-way."
            ],
            "previous_source": "",
            "target": [
                "Delete the branches once the commit is upstream. They are throw-a-way."
            ],
            "id_hash": 3040769595003689219,
            "content_hash": 3040769595003689219,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1240",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 369,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": false,
            "num_words": 11,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819580/?format=api",
            "priority": 100,
            "id": 1819580,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=aa32fbd60200d903",
            "url": "https://translate-dev.freebsd.org/api/units/1819580/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.479190Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "The commands one would use, following the above example of mtree, would be like so (the `#` starts a comment to help link commands to descriptions above):"
            ],
            "previous_source": "",
            "target": [
                "The commands one would use, following the above example of mtree, would be like so (the `#` starts a comment to help link commands to descriptions above):"
            ],
            "id_hash": -6658339399586031549,
            "content_hash": -6658339399586031549,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1242",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 370,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 27,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819582/?format=api",
            "priority": 100,
            "id": 1819582,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=2398d397edafd843",
            "url": "https://translate-dev.freebsd.org/api/units/1819582/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.482359Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "Note: if things go wrong with the commit, you can reset the `YYY` branch by reissuing the checkout command that created it with -B to start over:"
            ],
            "previous_source": "",
            "target": [
                "Note: if things go wrong with the commit, you can reset the `YYY` branch by reissuing the checkout command that created it with -B to start over:"
            ],
            "id_hash": 4038517692259672146,
            "content_hash": 4038517692259672146,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1258",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 372,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 27,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819584/?format=api",
            "priority": 100,
            "id": 1819584,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=b80bb271b244a052",
            "url": "https://translate-dev.freebsd.org/api/units/1819584/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.486462Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "% git checkout -B YYY freebsd/main # Create new throw-away YYY branch if starting over is just going to be easier\n"
            ],
            "previous_source": "",
            "target": [
                "% git checkout -B YYY freebsd/main # Create new throw-away YYY branch if starting over is just going to be easier\n"
            ],
            "id_hash": -3622876774573030867,
            "content_hash": -3622876774573030867,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1261",
            "context": "",
            "note": "type: delimited block . 4",
            "flags": "no-wrap",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 373,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 21,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819586/?format=api",
            "priority": 100,
            "id": 1819586,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=4db8f4c4b28fc22d",
            "url": "https://translate-dev.freebsd.org/api/units/1819586/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.489661Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "% git push freebsd YYY:main\t# put the commit on upstream's 'main' branch\n% git branch -D XXX\t\t# Throw away the throw-a-way branches.\n% git branch -D YYY\n"
            ],
            "previous_source": "",
            "target": [
                "% git push freebsd YYY:main\t# put the commit on upstream's 'main' branch\n% git branch -D XXX\t\t# Throw away the throw-a-way branches.\n% git branch -D YYY\n"
            ],
            "id_hash": -2504646402599846100,
            "content_hash": -2504646402599846100,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1276",
            "context": "",
            "note": "type: delimited block . 4",
            "flags": "no-wrap",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 377,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 29,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819588/?format=api",
            "priority": 100,
            "id": 1819588,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=5d3db55df5137f2c",
            "url": "https://translate-dev.freebsd.org/api/units/1819588/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.494882Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "Note: I used `XXX` and `YYY` to make it obvious they are terrible names and should not leave your machine.  If you use such names for other work, then you'll need to pick different names, or risk losing the other work.  There is nothing magic about these names.  Upstream will not allow you to push them, but never the less, please pay attention to the exact commands above.  Some commands use syntax that differs only slightly from typical uses and that different behavior is critical to this recipe working."
            ],
            "previous_source": "",
            "target": [
                "Note: I used `XXX` and `YYY` to make it obvious they are terrible names and should not leave your machine.  If you use such names for other work, then you'll need to pick different names, or risk losing the other work.  There is nothing magic about these names.  Upstream will not allow you to push them, but never the less, please pay attention to the exact commands above.  Some commands use syntax that differs only slightly from typical uses and that different behavior is critical to this recipe working."
            ],
            "id_hash": 2834530931972067349,
            "content_hash": 2834530931972067349,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1283",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 378,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 89,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819590/?format=api",
            "priority": 100,
            "id": 1819590,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=a75646dd590d5015",
            "url": "https://translate-dev.freebsd.org/api/units/1819590/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.498074Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "% git checkout -B XXX YYY\t# recreate that throw-away-branch XXX and switch to it\n% git merge freebsd/main\t# Merge the changes and resolve conflicts\n% git checkout -B YYY freebsd/main # Recreate new throw-away YYY branch for redo\n% git subtree merge -P contrib/mtree vendor/NetBSD/mtree # Redo subtree merge\n% git checkout XXX .\t\t# XXX branch has the conflict resolution\n% git commit -c XXX~1\t\t# -c reuses the commit message from commit before rebase\n"
            ],
            "previous_source": "",
            "target": [
                "% git checkout -B XXX YYY\t# recreate that throw-away-branch XXX and switch to it\n% git merge freebsd/main\t# Merge the changes and resolve conflicts\n% git checkout -B YYY freebsd/main # Recreate new throw-away YYY branch for redo\n% git subtree merge -P contrib/mtree vendor/NetBSD/mtree # Redo subtree merge\n% git checkout XXX .\t\t# XXX branch has the conflict resolution\n% git commit -c XXX~1\t\t# -c reuses the commit message from commit before rebase\n"
            ],
            "id_hash": 373746999077774584,
            "content_hash": 373746999077774584,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1297",
            "context": "",
            "note": "type: delimited block . 4",
            "flags": "no-wrap",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 381,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 78,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819592/?format=api",
            "priority": 100,
            "id": 1819592,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=852fd0ea5be624f8",
            "url": "https://translate-dev.freebsd.org/api/units/1819592/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.502844Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "Then go check it out as above and push as above when ready."
            ],
            "previous_source": "",
            "target": [
                "Then go check it out as above and push as above when ready."
            ],
            "id_hash": -4796849914450099223,
            "content_hash": -4796849914450099223,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1300",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 382,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 13,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819594/?format=api",
            "priority": 100,
            "id": 1819594,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=3d6e2a6ae856c3e9",
            "url": "https://translate-dev.freebsd.org/api/units/1819594/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.506201Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "% cd /some/where\n% mkdir glorbnitz\n% cd glorbnitz\n% git init\n% git checkout -b vendor/glorbnitz\n"
            ],
            "previous_source": "",
            "target": [
                "% cd /some/where\n% mkdir glorbnitz\n% cd glorbnitz\n% git init\n% git checkout -b vendor/glorbnitz\n"
            ],
            "id_hash": -6766212552809709324,
            "content_hash": -6766212552809709324,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1318",
            "context": "",
            "note": "type: delimited block . 4",
            "flags": "no-wrap",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 386,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 17,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819596/?format=api",
            "priority": 100,
            "id": 1819596,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=221995883afd00f4",
            "url": "https://translate-dev.freebsd.org/api/units/1819596/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.511364Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "At this point, you have a new repo, where all new commits will go on the `vendor/glorbnitz` branch."
            ],
            "previous_source": "",
            "target": [
                "At this point, you have a new repo, where all new commits will go on the `vendor/glorbnitz` branch."
            ],
            "id_hash": -6220122497428598466,
            "content_hash": -6220122497428598466,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1321",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 387,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 18,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819598/?format=api",
            "priority": 100,
            "id": 1819598,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=29adaf8b515a513e",
            "url": "https://translate-dev.freebsd.org/api/units/1819598/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.514523Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "Git experts can also do this right in their FreeBSD clone, using `git checkout --orphan vendor/glorbnitz` if they are more comfortable with that."
            ],
            "previous_source": "",
            "target": [
                "Git experts can also do this right in their FreeBSD clone, using `git checkout --orphan vendor/glorbnitz` if they are more comfortable with that."
            ],
            "id_hash": 710211832090564280,
            "content_hash": 710211832090564280,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1323",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 388,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 23,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819600/?format=api",
            "priority": 100,
            "id": 1819600,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=89db2de5ff0996b8",
            "url": "https://translate-dev.freebsd.org/api/units/1819600/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.517691Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "% cp -r ~/glorbnitz/* .\n% git add *\n"
            ],
            "previous_source": "",
            "target": [
                "% cp -r ~/glorbnitz/* .\n% git add *\n"
            ],
            "id_hash": 1255411724132721336,
            "content_hash": 1255411724132721336,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1333",
            "context": "",
            "note": "type: delimited block . 4",
            "flags": "no-wrap",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 391,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 9,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819602/?format=api",
            "priority": 100,
            "id": 1819602,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=916c1e4fc7caa2b8",
            "url": "https://translate-dev.freebsd.org/api/units/1819602/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.522113Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "At this point, you should have a pristine copy of glorbnitz ready to commit."
            ],
            "previous_source": "",
            "target": [
                "At this point, you should have a pristine copy of glorbnitz ready to commit."
            ],
            "id_hash": 880881035383523849,
            "content_hash": 880881035383523849,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1336",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 392,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 14,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819604/?format=api",
            "priority": 100,
            "id": 1819604,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=8c3984a27369ca09",
            "url": "https://translate-dev.freebsd.org/api/units/1819604/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.525160Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "% git commit -m \"Import GlorbNitz frobnosticator revision 3.1415\"\n"
            ],
            "previous_source": "",
            "target": [
                "% git commit -m \"Import GlorbNitz frobnosticator revision 3.1415\"\n"
            ],
            "id_hash": 6536664180212053040,
            "content_hash": 6536664180212053040,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1340",
            "context": "",
            "note": "type: delimited block . 4",
            "flags": "no-wrap",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 393,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 9,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819606/?format=api",
            "priority": 100,
            "id": 1819606,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=dab6e5706d8f3430",
            "url": "https://translate-dev.freebsd.org/api/units/1819606/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.528255Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "As above, I used `-m` for simplicity, but you should likely create a commit message that explains what a Glorb is and why you'd use a Nitz to get it.  Not everybody will know so, for your actual commit, you should follow the crossref:committers-guide[commit-log-message,commit log message] section instead of emulating the brief style used here."
            ],
            "previous_source": "",
            "target": [
                "As above, I used `-m` for simplicity, but you should likely create a commit message that explains what a Glorb is and why you'd use a Nitz to get it.  Not everybody will know so, for your actual commit, you should follow the crossref:committers-guide[commit-log-message,commit log message] section instead of emulating the brief style used here."
            ],
            "id_hash": 7505147838360662956,
            "content_hash": 7505147838360662956,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1345",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 394,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 55,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819608/?format=api",
            "priority": 100,
            "id": 1819608,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=e827a431ec4733ac",
            "url": "https://translate-dev.freebsd.org/api/units/1819608/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.531366Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "% cd /path/to/freebsd/repo/src\n% git remote add glorbnitz /some/where/glorbnitz\n% git fetch glorbnitz vendor/glorbnitz\n"
            ],
            "previous_source": "",
            "target": [
                "% cd /path/to/freebsd/repo/src\n% git remote add glorbnitz /some/where/glorbnitz\n% git fetch glorbnitz vendor/glorbnitz\n"
            ],
            "id_hash": 5348944218527266124,
            "content_hash": 5348944218527266124,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1355",
            "context": "",
            "note": "type: delimited block . 4",
            "flags": "no-wrap",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 397,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 14,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819610/?format=api",
            "priority": 100,
            "id": 1819610,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=ca3b446d44b2754c",
            "url": "https://translate-dev.freebsd.org/api/units/1819610/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.535909Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "Note the vendor/glorbnitz branch is in the repo. At this point the `/some/where/glorbnitz` can be deleted, if you like.  It was only a means to an end."
            ],
            "previous_source": "",
            "target": [
                "Note the vendor/glorbnitz branch is in the repo. At this point the `/some/where/glorbnitz` can be deleted, if you like.  It was only a means to an end."
            ],
            "id_hash": -8323952366797118677,
            "content_hash": -8323952366797118677,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1359",
            "context": "",
            "note": " perhaps the real treasure was the friends it made along the way...\ntype: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 398,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 27,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819612/?format=api",
            "priority": 100,
            "id": 1819612,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=0c7b616cb1c9232b",
            "url": "https://translate-dev.freebsd.org/api/units/1819612/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.539085Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "% git worktree add ../glorbnitz vendor/glorbnitz\n% cd ../glorbnitz\n% git tag --annotate vendor/glorbnitz/3.1415\n# Make sure the commit is good with \"git show\"\n% git push --follow-tags freebsd vendor/glorbnitz\n"
            ],
            "previous_source": "",
            "target": [
                "% git worktree add ../glorbnitz vendor/glorbnitz\n% cd ../glorbnitz\n% git tag --annotate vendor/glorbnitz/3.1415\n# Make sure the commit is good with \"git show\"\n% git push --follow-tags freebsd vendor/glorbnitz\n"
            ],
            "id_hash": 1402369185572524189,
            "content_hash": 1402369185572524189,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1372",
            "context": "",
            "note": "type: delimited block . 4",
            "flags": "no-wrap",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 401,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 30,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819614/?format=api",
            "priority": 100,
            "id": 1819614,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=937637581e01109d",
            "url": "https://translate-dev.freebsd.org/api/units/1819614/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.543549Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "By 'good' we mean:"
            ],
            "previous_source": "",
            "target": [
                "By 'good' we mean:"
            ],
            "id_hash": 7370557041860842744,
            "content_hash": 7370557041860842744,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1375",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 402,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": true,
            "num_words": 4,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819616/?format=api",
            "priority": 100,
            "id": 1819616,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=e6497a9424de94f8",
            "url": "https://translate-dev.freebsd.org/api/units/1819616/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.546826Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "All the right files are present"
            ],
            "previous_source": "",
            "target": [
                "All the right files are present"
            ],
            "id_hash": 235893738927692119,
            "content_hash": 235893738927692119,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1377",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 403,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": false,
            "num_words": 6,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819618/?format=api",
            "priority": 100,
            "id": 1819618,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=8346101b11861957",
            "url": "https://translate-dev.freebsd.org/api/units/1819618/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.549921Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "None of the wrong files are present"
            ],
            "previous_source": "",
            "target": [
                "None of the wrong files are present"
            ],
            "id_hash": -2247804733606215070,
            "content_hash": -2247804733606215070,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1378",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 404,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": false,
            "num_words": 7,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819620/?format=api",
            "priority": 100,
            "id": 1819620,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=60ce318110f5c262",
            "url": "https://translate-dev.freebsd.org/api/units/1819620/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.553038Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "The vendor branch points at something sensible"
            ],
            "previous_source": "",
            "target": [
                "The vendor branch points at something sensible"
            ],
            "id_hash": -624362943814264513,
            "content_hash": -624362943814264513,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1379",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 405,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": false,
            "num_words": 7,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819622/?format=api",
            "priority": 100,
            "id": 1819622,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=7755d135eb08993f",
            "url": "https://translate-dev.freebsd.org/api/units/1819622/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.556151Z"
        },
        {
            "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api",
            "source": [
                "The tag looks good, and is annotated"
            ],
            "previous_source": "",
            "target": [
                "The tag looks good, and is annotated"
            ],
            "id_hash": 9029547759138194578,
            "content_hash": 9029547759138194578,
            "location": "documentation/content/en/articles/committers-guide/_index.adoc:1380",
            "context": "",
            "note": "type: Plain text",
            "flags": "",
            "labels": [],
            "state": 100,
            "fuzzy": false,
            "translated": true,
            "approved": false,
            "position": 406,
            "has_suggestion": false,
            "has_comment": false,
            "has_failing_check": false,
            "num_words": 7,
            "source_unit": "https://translate-dev.freebsd.org/api/units/1819624/?format=api",
            "priority": 100,
            "id": 1819624,
            "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=fd4f65d8a9db4492",
            "url": "https://translate-dev.freebsd.org/api/units/1819624/?format=api",
            "explanation": "",
            "extra_flags": "",
            "pending": false,
            "timestamp": "2025-08-17T20:19:15.559258Z"
        }
    ]
}