Units
Translation components API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/translations/documentation/articlescommitters-guide_index/id/units/?format=api&page=4
https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/units/?format=api&page=5", "previous": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/units/?format=api&page=3", "results": [ { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Bisecting" ], "previous_source": "", "target": [ "" ], "id_hash": -964529038360861340, "content_hash": -964529038360861340, "location": "documentation/content/en/articles/committers-guide/_index.adoc:585", "context": "", "note": "type: Title ====", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 190, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 1, "source_unit": "https://translate-dev.freebsd.org/api/units/613150/?format=api", "priority": 100, "id": 1392767, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=729d4df32cf3a564", "url": "https://translate-dev.freebsd.org/api/units/1392767/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.264025Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Sometimes, things go wrong. The last version worked, but the one you just updated to does not. A developer may ask you to bisect the problem to track down which commit caused the regression." ], "previous_source": "", "target": [ "" ], "id_hash": -6630095792620203724, "content_hash": -6630095792620203724, "location": "documentation/content/en/articles/committers-guide/_index.adoc:589", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 191, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 34, "source_unit": "https://translate-dev.freebsd.org/api/units/613152/?format=api", "priority": 100, "id": 1392768, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=23fd2b011e0f9134", "url": "https://translate-dev.freebsd.org/api/units/1392768/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.267294Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "5ef0bd68b515 (HEAD -> main, freebsd/main, freebsd/HEAD) HEAD@{0}: pull --ff-only: Fast-forward\na8163e165c5b (upstream/main) HEAD@{1}: checkout: moving from b6fb97efb682994f59b21fe4efb3fcfc0e5b9eeb to main\n...\n" ], "previous_source": "", "target": [ "" ], "id_hash": 2548068554675586389, "content_hash": 2548068554675586389, "location": "documentation/content/en/articles/committers-guide/_index.adoc:610", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 195, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 20, "source_unit": "https://translate-dev.freebsd.org/api/units/1179144/?format=api", "priority": 100, "id": 1392772, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=a35c8ed9a8c80555", "url": "https://translate-dev.freebsd.org/api/units/1392772/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.301492Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Set the 'good' version first, then set the bad (though the order doesn't matter). When you set the bad version, it will give you some statistics on the process:" ], "previous_source": "", "target": [ "" ], "id_hash": 3951603581926751416, "content_hash": 3951603581926751416, "location": "documentation/content/en/articles/committers-guide/_index.adoc:618", "context": "", "note": "type: delimited block = 4", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 197, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 29, "source_unit": "https://translate-dev.freebsd.org/api/units/613164/?format=api", "priority": 100, "id": 1392774, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=b6d6ea8571e7bcb8", "url": "https://translate-dev.freebsd.org/api/units/1392774/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.313522Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "% git bisect start --first-parent\n% git bisect good a8163e165c5b\n% git bisect bad HEAD\nBisecting: 1722 revisions left to test after this (roughly 11 steps)\n[c427b3158fd8225f6afc09e7e6f62326f9e4de7e] Fixup r361997 by balancing parens. Duh.\n" ], "previous_source": "", "target": [ "" ], "id_hash": -8205338325301190626, "content_hash": -8205338325301190626, "location": "documentation/content/en/articles/committers-guide/_index.adoc:625", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 198, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 33, "source_unit": "https://translate-dev.freebsd.org/api/units/1255540/?format=api", "priority": 100, "id": 1392775, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=0e20c8445286201e", "url": "https://translate-dev.freebsd.org/api/units/1392775/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.317855Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Signing the commits, tags, and pushes, with GnuPG" ], "previous_source": "", "target": [ "" ], "id_hash": -262817924026175174, "content_hash": -262817924026175174, "location": "documentation/content/en/articles/committers-guide/_index.adoc:636", "context": "", "note": "type: Title ====", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 200, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 8, "source_unit": "https://translate-dev.freebsd.org/api/units/1179148/?format=api", "priority": 100, "id": 1392777, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=7c5a487d95d0713a", "url": "https://translate-dev.freebsd.org/api/units/1392777/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.326252Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Git knows how to sign commits, tags, and pushes. When you sign a Git commit or a tag, you can prove that the code you submitted came from you and wasn't altered while you were transferring it. You also can prove that you submitted the code and not someone else." ], "previous_source": "", "target": [ "" ], "id_hash": -1075628874189948487, "content_hash": -1075628874189948487, "location": "documentation/content/en/articles/committers-guide/_index.adoc:641", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 201, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 50, "source_unit": "https://translate-dev.freebsd.org/api/units/1179150/?format=api", "priority": 100, "id": 1392778, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=7112993ce3c139b9", "url": "https://translate-dev.freebsd.org/api/units/1392778/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.331349Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "A more in-depth documentation on signing commits and tags can be found in the https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work[Git Tools - Signing Your Work] chapter of the Git's book." ], "previous_source": "", "target": [ "" ], "id_hash": 7581329384972105097, "content_hash": 7581329384972105097, "location": "documentation/content/en/articles/committers-guide/_index.adoc:643", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 202, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 25, "source_unit": "https://translate-dev.freebsd.org/api/units/1179152/?format=api", "priority": 100, "id": 1392779, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=e9364ae8747e3589", "url": "https://translate-dev.freebsd.org/api/units/1392779/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.335518Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "The rationale behind signing pushes can be found in the https://github.com/git/git/commit/a85b377d0419a9dfaca8af2320cc33b051cbed04[commit that introduced the feature]." ], "previous_source": "", "target": [ "" ], "id_hash": 7655289610918555888, "content_hash": 7655289610918555888, "location": "documentation/content/en/articles/committers-guide/_index.adoc:645", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 203, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 15, "source_unit": "https://translate-dev.freebsd.org/api/units/1179154/?format=api", "priority": 100, "id": 1392780, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=ea3d0d577789f0f0", "url": "https://translate-dev.freebsd.org/api/units/1392780/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.339730Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "The best way is to simply tell Git you always want to sign commits, tags, and pushes. You can do this by setting a few configuration variables:" ], "previous_source": "", "target": [ "" ], "id_hash": 3250337453829784053, "content_hash": 3250337453829784053, "location": "documentation/content/en/articles/committers-guide/_index.adoc:648", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 204, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 27, "source_unit": "https://translate-dev.freebsd.org/api/units/1179156/?format=api", "priority": 100, "id": 1392781, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=ad1b84b177ac01f5", "url": "https://translate-dev.freebsd.org/api/units/1392781/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.343545Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "To avoid possible collisions, make sure you give a long key id to Git. You can get the long id with: `gpg --list-secret-keys --keyid-format LONG`." ], "previous_source": "", "target": [ "" ], "id_hash": -3872211648825937050, "content_hash": -3872211648825937050, "location": "documentation/content/en/articles/committers-guide/_index.adoc:663", "context": "", "note": " push.gpgSign should probably be set to `yes` once we enable it, or be set with --global, so that it is enabled for all repositories.\ntype: delimited block = 6", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 206, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 25, "source_unit": "https://translate-dev.freebsd.org/api/units/1179160/?format=api", "priority": 100, "id": 1392783, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=4a4324057099b366", "url": "https://translate-dev.freebsd.org/api/units/1392783/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.350589Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "To use specific subkeys, and not have GnuPG to resolve the subkey to a primary key, attach `!` to the key. For example, to encrypt for the subkey `DEADBEEF`, use `DEADBEEF!`." ], "previous_source": "", "target": [ "" ], "id_hash": 5798895344248402574, "content_hash": 5798895344248402574, "location": "documentation/content/en/articles/committers-guide/_index.adoc:669", "context": "", "note": "type: delimited block = 6", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 207, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 31, "source_unit": "https://translate-dev.freebsd.org/api/units/1179162/?format=api", "priority": 100, "id": 1392784, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=d079d0977b97b28e", "url": "https://translate-dev.freebsd.org/api/units/1392784/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.354473Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Verifying signatures" ], "previous_source": "", "target": [ "" ], "id_hash": 7319209414140565655, "content_hash": 7319209414140565655, "location": "documentation/content/en/articles/committers-guide/_index.adoc:671", "context": "", "note": "type: Title =====", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 208, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 2, "source_unit": "https://translate-dev.freebsd.org/api/units/1179164/?format=api", "priority": 100, "id": 1392785, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=e5930e2eee8b1897", "url": "https://translate-dev.freebsd.org/api/units/1392785/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.365140Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Commit signatures can be verified by running either `git verify-commit <commit hash>`, or `git log --show-signature`." ], "previous_source": "", "target": [ "" ], "id_hash": -7239795448907792035, "content_hash": -7239795448907792035, "location": "documentation/content/en/articles/committers-guide/_index.adoc:674", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 209, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 16, "source_unit": "https://translate-dev.freebsd.org/api/units/1179166/?format=api", "priority": 100, "id": 1392786, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=1b871465b55c815d", "url": "https://translate-dev.freebsd.org/api/units/1392786/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.368503Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Ports Considerations" ], "previous_source": "", "target": [ "" ], "id_hash": 8701667235552143027, "content_hash": 8701667235552143027, "location": "documentation/content/en/articles/committers-guide/_index.adoc:685", "context": "", "note": "\n\nCommented out for now until we decide what to do.\nGit pushes are a bit different, they live in a special ref in the repository.\nTODO: write how to verify them\ntype: Title ====", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 211, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 2, "source_unit": "https://translate-dev.freebsd.org/api/units/613170/?format=api", "priority": 100, "id": 1392788, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=f8c2883f50bda6b3", "url": "https://translate-dev.freebsd.org/api/units/1392788/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.380904Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "The ports tree operates the same way. The branch names are different and the repositories are in different locations." ], "previous_source": "", "target": [ "" ], "id_hash": 4348523877922164773, "content_hash": 4348523877922164773, "location": "documentation/content/en/articles/committers-guide/_index.adoc:688", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 212, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 19, "source_unit": "https://translate-dev.freebsd.org/api/units/1179170/?format=api", "priority": 100, "id": 1392789, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=bc590f6d70dad025", "url": "https://translate-dev.freebsd.org/api/units/1392789/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.418640Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "The cgit repository web interface for use with web browsers is at https://cgit.FreeBSD.org/ports/ . The production Git repository is at https://git.FreeBSD.org/ports.git and at ssh://anongit@git.FreeBSD.org/ports.git (or anongit@git.FreeBSD.org:ports.git)." ], "previous_source": "", "target": [ "" ], "id_hash": -2964241978469464277, "content_hash": -2964241978469464277, "location": "documentation/content/en/articles/committers-guide/_index.adoc:691", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 213, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 26, "source_unit": "https://translate-dev.freebsd.org/api/units/1179172/?format=api", "priority": 100, "id": 1392790, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=56dce5a03506c72b", "url": "https://translate-dev.freebsd.org/api/units/1392790/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.422651Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Commit message formats" ], "previous_source": "", "target": [ "" ], "id_hash": -1571082514350975253, "content_hash": -1571082514350975253, "location": "documentation/content/en/articles/committers-guide/_index.adoc:697", "context": "", "note": "type: Title =====", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 215, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 3, "source_unit": "https://translate-dev.freebsd.org/api/units/1179176/?format=api", "priority": 100, "id": 1392792, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=6a3264c6f34856eb", "url": "https://translate-dev.freebsd.org/api/units/1392792/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.433886Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "A hook is available in the ports repository to help you write up your commit messages in https://cgit.freebsd.org/ports/tree/.hooks/prepare-commit-msg[.hooks/prepare-commit-message]. It can be enabled by running ``git config --add core.hooksPath .hooks``." ], "previous_source": "", "target": [ "" ], "id_hash": -2073138040169320410, "content_hash": -2073138040169320410, "location": "documentation/content/en/articles/committers-guide/_index.adoc:701", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 216, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 29, "source_unit": "https://translate-dev.freebsd.org/api/units/1179178/?format=api", "priority": 100, "id": 1392793, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=633abbefb95bb026", "url": "https://translate-dev.freebsd.org/api/units/1392793/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.437534Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "The main point being that a commit message should be formatted in the following way:" ], "previous_source": "", "target": [ "" ], "id_hash": 1386339819879660097, "content_hash": 1386339819879660097, "location": "documentation/content/en/articles/committers-guide/_index.adoc:703", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 217, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 15, "source_unit": "https://translate-dev.freebsd.org/api/units/1179180/?format=api", "priority": 100, "id": 1392794, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=933d44b895e7fa41", "url": "https://translate-dev.freebsd.org/api/units/1392794/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.441244Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "category/port: Summary.\n" ], "previous_source": "", "target": [ "" ], "id_hash": -1806305594806293992, "content_hash": -1806305594806293992, "location": "documentation/content/en/articles/committers-guide/_index.adoc:706", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 218, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 2, "source_unit": "https://translate-dev.freebsd.org/api/units/1179182/?format=api", "priority": 100, "id": 1392795, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=66eeb6a1b9c52a18", "url": "https://translate-dev.freebsd.org/api/units/1392795/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.445013Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Description of why the changes where made.\n" ], "previous_source": "", "target": [ "" ], "id_hash": 5614196011775520052, "content_hash": 5614196011775520052, "location": "documentation/content/en/articles/committers-guide/_index.adoc:708", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 219, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 7, "source_unit": "https://translate-dev.freebsd.org/api/units/1179184/?format=api", "priority": 100, "id": 1392796, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=cde9a187054b6d34", "url": "https://translate-dev.freebsd.org/api/units/1392796/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.450174Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "PR:\t 12345\n" ], "previous_source": "", "target": [ "" ], "id_hash": -3394737903912628350, "content_hash": -3394737903912628350, "location": "documentation/content/en/articles/committers-guide/_index.adoc:710", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 220, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 2, "source_unit": "https://translate-dev.freebsd.org/api/units/1179186/?format=api", "priority": 100, "id": 1392797, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=50e377dccbbbcf82", "url": "https://translate-dev.freebsd.org/api/units/1392797/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.454100Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "The first line is the subject of the commit, it contains what port was changed, and a summary of the commit. It should contain 50 characters or less." ], "previous_source": "", "target": [ "" ], "id_hash": 5716993973880305715, "content_hash": 5716993973880305715, "location": "documentation/content/en/articles/committers-guide/_index.adoc:716", "context": "", "note": "type: delimited block = 4", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 221, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 28, "source_unit": "https://translate-dev.freebsd.org/api/units/1179188/?format=api", "priority": 100, "id": 1392798, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=cf56d7bab42f3833", "url": "https://translate-dev.freebsd.org/api/units/1392798/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.457280Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "A blank line should separate it from the rest of the commit message." ], "previous_source": "", "target": [ "" ], "id_hash": 5673525127792592139, "content_hash": 5673525127792592139, "location": "documentation/content/en/articles/committers-guide/_index.adoc:718", "context": "", "note": "type: delimited block = 4", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 222, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 13, "source_unit": "https://translate-dev.freebsd.org/api/units/1179190/?format=api", "priority": 100, "id": 1392799, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=cebc690b4a54850b", "url": "https://translate-dev.freebsd.org/api/units/1392799/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.460981Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "The rest of the commit message should be wrapped at the 72 characters boundary." ], "previous_source": "", "target": [ "" ], "id_hash": 428285888630139463, "content_hash": 428285888630139463, "location": "documentation/content/en/articles/committers-guide/_index.adoc:720", "context": "", "note": "type: delimited block = 4", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 223, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 14, "source_unit": "https://translate-dev.freebsd.org/api/units/1179192/?format=api", "priority": 100, "id": 1392800, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=85f193bf1e1caa47", "url": "https://translate-dev.freebsd.org/api/units/1392800/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.464435Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Another blank line should be added if there are any metadata fields, so that they are easily distinguishable from the commit message." ], "previous_source": "", "target": [ "" ], "id_hash": -6756637698033281182, "content_hash": -6756637698033281182, "location": "documentation/content/en/articles/committers-guide/_index.adoc:722", "context": "", "note": "type: delimited block = 4", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 224, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 22, "source_unit": "https://translate-dev.freebsd.org/api/units/1179194/?format=api", "priority": 100, "id": 1392801, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=223b99cfd4b69762", "url": "https://translate-dev.freebsd.org/api/units/1392801/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.467672Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Managing Local Changes" ], "previous_source": "", "target": [ "" ], "id_hash": 8086443475834158491, "content_hash": 8086443475834158491, "location": "documentation/content/en/articles/committers-guide/_index.adoc:724", "context": "", "note": "type: Title ====", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 225, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 3, "source_unit": "https://translate-dev.freebsd.org/api/units/613180/?format=api", "priority": 100, "id": 1392802, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=f038d17f595ebd9b", "url": "https://translate-dev.freebsd.org/api/units/1392802/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.470910Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "One item that is important for all of them: all changes are local until pushed. Unlike Subversion, Git uses a distributed model. For users, for most things, there is very little difference. However, if you have local changes, you can use the same tool to manage them as you use to pull in changes from FreeBSD. All changes that you have not pushed are local and can easily be modified (git rebase, discussed below does this)." ], "previous_source": "", "target": [ "" ], "id_hash": -7281364330395745892, "content_hash": -7281364330395745892, "location": "documentation/content/en/articles/committers-guide/_index.adoc:733", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 227, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 76, "source_unit": "https://translate-dev.freebsd.org/api/units/1179196/?format=api", "priority": 100, "id": 1392804, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=1af365b8468fc19c", "url": "https://translate-dev.freebsd.org/api/units/1392804/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.477791Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Keeping local changes" ], "previous_source": "", "target": [ "" ], "id_hash": 4759355191581463851, "content_hash": 4759355191581463851, "location": "documentation/content/en/articles/committers-guide/_index.adoc:734", "context": "", "note": "type: Title =====", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 228, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 3, "source_unit": "https://translate-dev.freebsd.org/api/units/613186/?format=api", "priority": 100, "id": 1392805, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=c20ca054a21fd52b", "url": "https://translate-dev.freebsd.org/api/units/1392805/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.481242Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Keeping a local branch" ], "previous_source": "", "target": [ "" ], "id_hash": -5452635518921482145, "content_hash": -5452635518921482145, "location": "documentation/content/en/articles/committers-guide/_index.adoc:746", "context": "", "note": "type: Title =====", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 231, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 4, "source_unit": "https://translate-dev.freebsd.org/api/units/613192/?format=api", "priority": 100, "id": 1392808, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=345458e28501e05f", "url": "https://translate-dev.freebsd.org/api/units/1392808/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.490654Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "It is much easier to keep a local branch with Git than Subversion. In Subversion you need to merge the commit, and resolve the conflicts. This is manageable, but can lead to a convoluted history that's hard to upstream should that ever be necessary, or hard to replicate if you need to do so. Git also allows one to merge, along with the same problems. That's one way to manage the branch, but it's the least flexible." ], "previous_source": "", "target": [ "" ], "id_hash": 127404754486963149, "content_hash": 127404754486963149, "location": "documentation/content/en/articles/committers-guide/_index.adoc:753", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 232, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 77, "source_unit": "https://translate-dev.freebsd.org/api/units/1179200/?format=api", "priority": 100, "id": 1392809, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=81c4a1f2fde42bcd", "url": "https://translate-dev.freebsd.org/api/units/1392809/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.499435Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "====== Create a branch" ], "previous_source": "", "target": [ "" ], "id_hash": 3195327805499121733, "content_hash": 3195327805499121733, "location": "documentation/content/en/articles/committers-guide/_index.adoc:759", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 234, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 4, "source_unit": "https://translate-dev.freebsd.org/api/units/613198/?format=api", "priority": 100, "id": 1392811, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=ac5815b5a3b42045", "url": "https://translate-dev.freebsd.org/api/units/1392811/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.507704Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Let's say you want to make a change to FreeBSD's ls command to never, ever do color. There are many reasons to do this, but this example will use that as a baseline. The FreeBSD ls command changes from time to time, and you'll need to cope with those changes. Fortunately, with Git rebase it usually is automatic." ], "previous_source": "", "target": [ "" ], "id_hash": 260239437870541737, "content_hash": 260239437870541737, "location": "documentation/content/en/articles/committers-guide/_index.adoc:764", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 235, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 58, "source_unit": "https://translate-dev.freebsd.org/api/units/1179204/?format=api", "priority": 100, "id": 1392812, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=839c8e63d2d22ba9", "url": "https://translate-dev.freebsd.org/api/units/1392812/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.512605Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "% cd src\n% git checkout main\n% git checkout -b no-color-ls\n% cd bin/ls\n% vi ls.c # hack the changes in\n% git diff # check the changes\ndiff --git a/bin/ls/ls.c b/bin/ls/ls.c\nindex 7378268867ef..cfc3f4342531 100644\n--- a/bin/ls/ls.c\n+++ b/bin/ls/ls.c\n@@ -66,6 +66,7 @@ __FBSDID(\"$FreeBSD$\");\n #include <stdlib.h>\n #include <string.h>\n #include <unistd.h>\n+#undef COLORLS\n #ifdef COLORLS\n #include <termcap.h>\n #include <signal.h>\n% # these look good, make the commit...\n% git commit ls.c\n" ], "previous_source": "", "target": [ "" ], "id_hash": -9026675791670305409, "content_hash": -9026675791670305409, "location": "documentation/content/en/articles/committers-guide/_index.adoc:786", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 236, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 72, "source_unit": "https://translate-dev.freebsd.org/api/units/613202/?format=api", "priority": 100, "id": 1392813, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=02bace315edf9d7f", "url": "https://translate-dev.freebsd.org/api/units/1392813/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.520894Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "% git checkout main\n% git pull --ff-only\n% git rebase -i main no-color-ls\n" ], "previous_source": "", "target": [ "" ], "id_hash": 843259815563550274, "content_hash": 843259815563550274, "location": "documentation/content/en/articles/committers-guide/_index.adoc:806", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 240, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 14, "source_unit": "https://translate-dev.freebsd.org/api/units/1248876/?format=api", "priority": 100, "id": 1392816, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=8bb3dc55a006de42", "url": "https://translate-dev.freebsd.org/api/units/1392816/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.535930Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "This will bring up an editor that lists all the commits in it. For this example, do not change it at all. This is typically what you are doing while updating the baseline (though you also use the Git rebase command to curate the commits you have in the branch)." ], "previous_source": "", "target": [ "" ], "id_hash": -3986874349838022221, "content_hash": -3986874349838022221, "location": "documentation/content/en/articles/committers-guide/_index.adoc:811", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 241, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 50, "source_unit": "https://translate-dev.freebsd.org/api/units/1179210/?format=api", "priority": 100, "id": 1392817, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=48abc6e6f5c9c9b3", "url": "https://translate-dev.freebsd.org/api/units/1392817/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.539615Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Once you are done with the above, you have to move the commits to ls.c forward from the old version of FreeBSD to the newer one." ], "previous_source": "", "target": [ "" ], "id_hash": 8316002150294093872, "content_hash": 8316002150294093872, "location": "documentation/content/en/articles/committers-guide/_index.adoc:813", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 242, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 26, "source_unit": "https://translate-dev.freebsd.org/api/units/613212/?format=api", "priority": 100, "id": 1392818, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=f3685fe547aa0030", "url": "https://translate-dev.freebsd.org/api/units/1392818/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.543641Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Let's say the includes changes upstream in a radical shift to terminfo as well as a name change for the option. When you updated, you might see something like this:" ], "previous_source": "", "target": [ "" ], "id_hash": -2648757196996258916, "content_hash": -2648757196996258916, "location": "documentation/content/en/articles/committers-guide/_index.adoc:823", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 244, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 30, "source_unit": "https://translate-dev.freebsd.org/api/units/613216/?format=api", "priority": 100, "id": 1392820, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=5b3db95cf0c7539c", "url": "https://translate-dev.freebsd.org/api/units/1392820/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.559044Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Auto-merging bin/ls/ls.c\nCONFLICT (content): Merge conflict in bin/ls/ls.c\nerror: could not apply 646e0f9cda11... no color ls\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 646e0f9cda11... no color ls\n" ], "previous_source": "", "target": [ "" ], "id_hash": 2287055414442590163, "content_hash": 2287055414442590163, "location": "documentation/content/en/articles/committers-guide/_index.adoc:833", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 245, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 65, "source_unit": "https://translate-dev.freebsd.org/api/units/613218/?format=api", "priority": 100, "id": 1392821, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=9fbd40c8377bffd3", "url": "https://translate-dev.freebsd.org/api/units/1392821/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.563294Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "which looks scary. If you bring up an editor, you will see it is a typical 3-way merge conflict resolution that you may be familiar with from other source code systems (the rest of ls.c has been omitted):" ], "previous_source": "", "target": [ "" ], "id_hash": 5103875699569008836, "content_hash": 5103875699569008836, "location": "documentation/content/en/articles/committers-guide/_index.adoc:836", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 246, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 38, "source_unit": "https://translate-dev.freebsd.org/api/units/613220/?format=api", "priority": 100, "id": 1392822, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=c6d49be8428f20c4", "url": "https://translate-dev.freebsd.org/api/units/1392822/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.567629Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Switching to a Different FreeBSD Branch" ], "previous_source": "", "target": [ "" ], "id_hash": 3957717420778734937, "content_hash": 3957717420778734937, "location": "documentation/content/en/articles/committers-guide/_index.adoc:874", "context": "", "note": "type: Title =====", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 255, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 6, "source_unit": "https://translate-dev.freebsd.org/api/units/613238/?format=api", "priority": 100, "id": 1392831, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=b6eca3067ae44559", "url": "https://translate-dev.freebsd.org/api/units/1392831/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.627955Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "% git checkout no-color-ls\n% git checkout -b no-color-ls-stable-12 # create another name for this branch\n% git rebase -i stable/12 no-color-ls --onto main\n" ], "previous_source": "", "target": [ "" ], "id_hash": 6286422754205545931, "content_hash": 6286422754205545931, "location": "documentation/content/en/articles/committers-guide/_index.adoc:891", "context": "", "note": "type: Plain text", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 259, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 24, "source_unit": "https://translate-dev.freebsd.org/api/units/613246/?format=api", "priority": 100, "id": 1392835, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=d73ddc30245ab5cb", "url": "https://translate-dev.freebsd.org/api/units/1392835/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.647223Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "MFC (Merge From Current) Procedures" ], "previous_source": "", "target": [ "" ], "id_hash": 9158176182729290539, "content_hash": 9158176182729290539, "location": "documentation/content/en/articles/committers-guide/_index.adoc:900", "context": "", "note": "type: Title ===", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 262, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 5, "source_unit": "https://translate-dev.freebsd.org/api/units/613282/?format=api", "priority": 100, "id": 1392853, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=ff1860b75205b32b", "url": "https://translate-dev.freebsd.org/api/units/1392853/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.760585Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Summary" ], "previous_source": "", "target": [ "" ], "id_hash": 2221687475558153744, "content_hash": 2221687475558153744, "location": "documentation/content/en/articles/committers-guide/_index.adoc:901", "context": "", "note": "type: Title ====", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 263, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 1, "source_unit": "https://translate-dev.freebsd.org/api/units/613284/?format=api", "priority": 100, "id": 1392854, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=9ed504fcee93fe10", "url": "https://translate-dev.freebsd.org/api/units/1392854/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.799258Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "MFC workflow can be summarized as `git cherry-pick -x` plus `git commit --amend` to adjust the commit message. For multiple commits, use `git rebase -i` to squash them together and edit the commit message." ], "previous_source": "", "target": [ "" ], "id_hash": 7864204319307268373, "content_hash": 7864204319307268373, "location": "documentation/content/en/articles/committers-guide/_index.adoc:905", "context": "", "note": "type: delimited block . 4", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 264, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 34, "source_unit": "https://translate-dev.freebsd.org/api/units/1179218/?format=api", "priority": 100, "id": 1392855, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=ed2344297d670115", "url": "https://translate-dev.freebsd.org/api/units/1392855/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.811319Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Single commit MFC" ], "previous_source": "", "target": [ "" ], "id_hash": -3548314707372383312, "content_hash": -3548314707372383312, "location": "documentation/content/en/articles/committers-guide/_index.adoc:906", "context": "", "note": "type: Title ====", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 265, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 3, "source_unit": "https://translate-dev.freebsd.org/api/units/613288/?format=api", "priority": 100, "id": 1392856, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=4ec1da92cbc663b0", "url": "https://translate-dev.freebsd.org/api/units/1392856/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.817378Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "MFC to RELENG branch" ], "previous_source": "", "target": [ "" ], "id_hash": 2546146946029219422, "content_hash": 2546146946029219422, "location": "documentation/content/en/articles/committers-guide/_index.adoc:928", "context": "", "note": "type: Title ====", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 273, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 4, "source_unit": "https://translate-dev.freebsd.org/api/units/613300/?format=api", "priority": 100, "id": 1392862, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=a355bb2848046e5e", "url": "https://translate-dev.freebsd.org/api/units/1392862/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.852648Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "MFCs to branches that require approval require a bit more care. The process is the same for either a typical merge or an exceptional direct commit." ], "previous_source": "", "target": [ "" ], "id_hash": -774172711638886591, "content_hash": -774172711638886591, "location": "documentation/content/en/articles/committers-guide/_index.adoc:932", "context": "", "note": "type: delimited block . 4", "flags": "", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 274, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 26, "source_unit": "https://translate-dev.freebsd.org/api/units/613302/?format=api", "priority": 100, "id": 1392863, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=754196053ff69741", "url": "https://translate-dev.freebsd.org/api/units/1392863/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.856577Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/id/?format=api", "source": [ "Multiple commit MFC" ], "previous_source": "", "target": [ "" ], "id_hash": 44610446012095767, "content_hash": 44610446012095767, "location": "documentation/content/en/articles/committers-guide/_index.adoc:946", "context": "", "note": "type: Title ====", "flags": "no-wrap", "labels": [], "state": 0, "fuzzy": false, "translated": false, "approved": false, "position": 278, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 3, "source_unit": "https://translate-dev.freebsd.org/api/units/613316/?format=api", "priority": 100, "id": 1392870, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/id/?checksum=809e7cf6dbd29d17", "url": "https://translate-dev.freebsd.org/api/units/1392870/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2022-03-09T17:36:31.879637Z" } ] }{ "count": 1091, "next": "