Units
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=18
{ "count": 1190, "next": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/units/?format=api&page=19", "previous": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/units/?format=api&page=17", "results": [ { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "which looks scary." ], "previous_source": "", "target": [ "which looks scary." ], "id_hash": -4493484606514625247, "content_hash": -4493484606514625247, "location": "documentation/content/en/articles/committers-guide/_index.adoc:835", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 245, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 3, "source_unit": "https://translate-dev.freebsd.org/api/units/1819426/?format=api", "priority": 100, "id": 1819426, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=41a3ef8ed1028521", "url": "https://translate-dev.freebsd.org/api/units/1819426/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.189182Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "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": [ "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):" ], "id_hash": 5076524045929372423, "content_hash": 5076524045929372423, "location": "documentation/content/en/articles/committers-guide/_index.adoc:837", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 246, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 35, "source_unit": "https://translate-dev.freebsd.org/api/units/1819428/?format=api", "priority": 100, "id": 1819428, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=c6736fb923595b07", "url": "https://translate-dev.freebsd.org/api/units/1819428/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.197812Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "The new code is first, and your code is second." ], "previous_source": "", "target": [ "The new code is first, and your code is second." ], "id_hash": -6635256726454835464, "content_hash": -6635256726454835464, "location": "documentation/content/en/articles/committers-guide/_index.adoc:850", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 248, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 10, "source_unit": "https://translate-dev.freebsd.org/api/units/1819430/?format=api", "priority": 100, "id": 1819430, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=23ead529922366f8", "url": "https://translate-dev.freebsd.org/api/units/1819430/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.203981Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "The right fix here is to just add a #undef COLORLS_NEW before #ifdef and then delete the old changes:" ], "previous_source": "", "target": [ "The right fix here is to just add a #undef COLORLS_NEW before #ifdef and then delete the old changes:" ], "id_hash": -1905256795832308458, "content_hash": -1905256795832308458, "location": "documentation/content/en/articles/committers-guide/_index.adoc:852", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 249, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 19, "source_unit": "https://translate-dev.freebsd.org/api/units/1819432/?format=api", "priority": 100, "id": 1819432, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=658f2b09e6842d16", "url": "https://translate-dev.freebsd.org/api/units/1819432/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.207060Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "#undef COLORLS_NEW\n#ifdef COLORLS_NEW\n#include <terminfo.h>\n" ], "previous_source": "", "target": [ "#undef COLORLS_NEW\n#ifdef COLORLS_NEW\n#include <terminfo.h>\n" ], "id_hash": -498683777606338164, "content_hash": -498683777606338164, "location": "documentation/content/en/articles/committers-guide/_index.adoc:857", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 250, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 6, "source_unit": "https://translate-dev.freebsd.org/api/units/1819434/?format=api", "priority": 100, "id": 1819434, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=791451bf1486398c", "url": "https://translate-dev.freebsd.org/api/units/1819434/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.210254Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "save the file." ], "previous_source": "", "target": [ "save the file." ], "id_hash": 5108938556987281874, "content_hash": 5108938556987281874, "location": "documentation/content/en/articles/committers-guide/_index.adoc:859", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 251, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 3, "source_unit": "https://translate-dev.freebsd.org/api/units/1819436/?format=api", "priority": 100, "id": 1819436, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=c6e6988c9c8611d2", "url": "https://translate-dev.freebsd.org/api/units/1819436/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.213345Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "The rebase was interrupted, so you have to complete it:" ], "previous_source": "", "target": [ "The rebase was interrupted, so you have to complete it:" ], "id_hash": -3027940627480347883, "content_hash": -3027940627480347883, "location": "documentation/content/en/articles/committers-guide/_index.adoc:861", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 252, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 10, "source_unit": "https://translate-dev.freebsd.org/api/units/1819438/?format=api", "priority": 100, "id": 1819438, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=55fa980ac20f7b15", "url": "https://translate-dev.freebsd.org/api/units/1819438/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.216351Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git add ls.c\n% git rebase --continue\n" ], "previous_source": "", "target": [ "% git add ls.c\n% git rebase --continue\n" ], "id_hash": 7156715722829060067, "content_hash": 7156715722829060067, "location": "documentation/content/en/articles/committers-guide/_index.adoc:865", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 253, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 8, "source_unit": "https://translate-dev.freebsd.org/api/units/1819440/?format=api", "priority": 100, "id": 1819440, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=e351c30831add7e3", "url": "https://translate-dev.freebsd.org/api/units/1819440/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.219406Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "which tells Git that ls.c has been fixed and to continue the rebase operation. Since there was a conflict, you will get kicked into the editor to update the commit message if necessary. If the commit message is still accurate, just exit the editor." ], "previous_source": "", "target": [ "which tells Git that ls.c has been fixed and to continue the rebase operation. Since there was a conflict, you will get kicked into the editor to update the commit message if necessary. If the commit message is still accurate, just exit the editor." ], "id_hash": 4671568515001434408, "content_hash": 4671568515001434408, "location": "documentation/content/en/articles/committers-guide/_index.adoc:870", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 254, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 44, "source_unit": "https://translate-dev.freebsd.org/api/units/1819442/?format=api", "priority": 100, "id": 1819442, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=c0d4bed0388f4128", "url": "https://translate-dev.freebsd.org/api/units/1819442/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.222446Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "If you get stuck during the rebase, do not panic. git rebase --abort will take you back to a clean slate. It is important, though, to start with an unmodified tree. An aside: The above mentioned `git reflog` comes in handy here, as it will have a list of all the (intermediate) commits that you can view or inspect or cherry-pick." ], "previous_source": "", "target": [ "If you get stuck during the rebase, do not panic. git rebase --abort will take you back to a clean slate. It is important, though, to start with an unmodified tree. An aside: The above mentioned `git reflog` comes in handy here, as it will have a list of all the (intermediate) commits that you can view or inspect or cherry-pick." ], "id_hash": -3895747838411029100, "content_hash": -3895747838411029100, "location": "documentation/content/en/articles/committers-guide/_index.adoc:875", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 255, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 61, "source_unit": "https://translate-dev.freebsd.org/api/units/1819444/?format=api", "priority": 100, "id": 1819444, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=49ef85fb4503c594", "url": "https://translate-dev.freebsd.org/api/units/1819444/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.225652Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "For more on this topic, https://www.freecodecamp.org/news/the-ultimate-guide-to-git-merge-and-git-rebase/ provides a rather extensive treatment. It is a good resource for issues that arise occasionally but are too obscure for this guide." ], "previous_source": "", "target": [ "For more on this topic, https://www.freecodecamp.org/news/the-ultimate-guide-to-git-merge-and-git-rebase/ provides a rather extensive treatment. It is a good resource for issues that arise occasionally but are too obscure for this guide." ], "id_hash": 4820263761690223488, "content_hash": 4820263761690223488, "location": "documentation/content/en/articles/committers-guide/_index.adoc:878", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 256, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 28, "source_unit": "https://translate-dev.freebsd.org/api/units/1819446/?format=api", "priority": 100, "id": 1819446, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=c2e5045a373be380", "url": "https://translate-dev.freebsd.org/api/units/1819446/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.229074Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "If you wish to shift from stable/12 to the current branch. If you have a deep clone, the following will suffice:" ], "previous_source": "", "target": [ "If you wish to shift from stable/12 to the current branch. If you have a deep clone, the following will suffice:" ], "id_hash": 6053375980169193666, "content_hash": 6053375980169193666, "location": "documentation/content/en/articles/committers-guide/_index.adoc:882", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 258, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 21, "source_unit": "https://translate-dev.freebsd.org/api/units/1819448/?format=api", "priority": 100, "id": 1819448, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=d401e961bddde8c2", "url": "https://translate-dev.freebsd.org/api/units/1819448/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.232896Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git checkout main\n% # build and install here...\n" ], "previous_source": "", "target": [ "% git checkout main\n% # build and install here...\n" ], "id_hash": -1585156899560376992, "content_hash": -1585156899560376992, "location": "documentation/content/en/articles/committers-guide/_index.adoc:886", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 259, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 10, "source_unit": "https://translate-dev.freebsd.org/api/units/1819450/?format=api", "priority": 100, "id": 1819450, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=6a006432c871b560", "url": "https://translate-dev.freebsd.org/api/units/1819450/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.235980Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "If you have a local branch, though, there are one or two caveats. First, rebase will rewrite history, so you will likely want to do something to save it. Second, jumping branches tends to cause more conflicts. If we pretend the example above was relative to stable/12, then to move to `main`, I'd suggest the following:" ], "previous_source": "", "target": [ "If you have a local branch, though, there are one or two caveats. First, rebase will rewrite history, so you will likely want to do something to save it. Second, jumping branches tends to cause more conflicts. If we pretend the example above was relative to stable/12, then to move to `main`, I'd suggest the following:" ], "id_hash": -9026260699191386999, "content_hash": -9026260699191386999, "location": "documentation/content/en/articles/committers-guide/_index.adoc:891", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 260, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 56, "source_unit": "https://translate-dev.freebsd.org/api/units/1819452/?format=api", "priority": 100, "id": 1819452, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=02bc47b79ea0dc89", "url": "https://translate-dev.freebsd.org/api/units/1819452/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.239234Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "What the above does is checkout no-color-ls. Then create a new name for it (no-color-ls-stable-12) in case you need to get back to it. Then you rebase onto the `main` branch. This will find all the commits to the current no-color-ls branch (back to where it meets up with the stable/12 branch) and then it will replay them onto the `main` branch creating a new no-color-ls branch there (which is why I had you create a place holder name)." ], "previous_source": "", "target": [ "What the above does is checkout no-color-ls. Then create a new name for it (no-color-ls-stable-12) in case you need to get back to it. Then you rebase onto the `main` branch. This will find all the commits to the current no-color-ls branch (back to where it meets up with the stable/12 branch) and then it will replay them onto the `main` branch creating a new no-color-ls branch there (which is why I had you create a place holder name)." ], "id_hash": -7102147009155028052, "content_hash": -7102147009155028052, "location": "documentation/content/en/articles/committers-guide/_index.adoc:903", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 262, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 79, "source_unit": "https://translate-dev.freebsd.org/api/units/1819454/?format=api", "priority": 100, "id": 1819454, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=1d701aec88b62bac", "url": "https://translate-dev.freebsd.org/api/units/1819454/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.243199Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git checkout stable/X\n% git cherry-pick -x $HASH --edit\n" ], "previous_source": "", "target": [ "% git checkout stable/X\n% git cherry-pick -x $HASH --edit\n" ], "id_hash": 8703061763059084161, "content_hash": 8703061763059084161, "location": "documentation/content/en/articles/committers-guide/_index.adoc:917", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 267, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 10, "source_unit": "https://translate-dev.freebsd.org/api/units/1819456/?format=api", "priority": 100, "id": 1819456, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=f8c77c900d6beb81", "url": "https://translate-dev.freebsd.org/api/units/1819456/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.248814Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "For MFC commits, for example a vendor import, you would need to specify one parent for cherry-pick purposes. Normally, that would be the \"first parent\" of the branch you are cherry-picking from, so:" ], "previous_source": "", "target": [ "For MFC commits, for example a vendor import, you would need to specify one parent for cherry-pick purposes. Normally, that would be the \"first parent\" of the branch you are cherry-picking from, so:" ], "id_hash": 5651299587702707270, "content_hash": 5651299587702707270, "location": "documentation/content/en/articles/committers-guide/_index.adoc:921", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 268, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 33, "source_unit": "https://translate-dev.freebsd.org/api/units/1819458/?format=api", "priority": 100, "id": 1819458, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=ce6d73087c54d446", "url": "https://translate-dev.freebsd.org/api/units/1819458/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.251927Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git checkout stable/X\n% git cherry-pick -x $HASH -m 1 --edit\n" ], "previous_source": "", "target": [ "% git checkout stable/X\n% git cherry-pick -x $HASH -m 1 --edit\n" ], "id_hash": 4871716419429680196, "content_hash": 4871716419429680196, "location": "documentation/content/en/articles/committers-guide/_index.adoc:926", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 269, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 12, "source_unit": "https://translate-dev.freebsd.org/api/units/1819460/?format=api", "priority": 100, "id": 1819460, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=c39bd045a28b4444", "url": "https://translate-dev.freebsd.org/api/units/1819460/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.255139Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "If things go wrong, you'll either need to abort the cherry-pick with `git cherry-pick --abort` or fix it up and do a `git cherry-pick --continue`." ], "previous_source": "", "target": [ "If things go wrong, you'll either need to abort the cherry-pick with `git cherry-pick --abort` or fix it up and do a `git cherry-pick --continue`." ], "id_hash": -4826684840760200252, "content_hash": -4826684840760200252, "location": "documentation/content/en/articles/committers-guide/_index.adoc:929", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 270, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 25, "source_unit": "https://translate-dev.freebsd.org/api/units/1819462/?format=api", "priority": 100, "id": 1819462, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=3d042bb5cfb9b3c4", "url": "https://translate-dev.freebsd.org/api/units/1819462/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.258203Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Once the cherry-pick is finished, push with `git push`. If you get an error due to losing the commit race, use `git pull --rebase` and try to push again." ], "previous_source": "", "target": [ "Once the cherry-pick is finished, push with `git push`. If you get an error due to losing the commit race, use `git pull --rebase` and try to push again." ], "id_hash": -4257045626691815848, "content_hash": -4257045626691815848, "location": "documentation/content/en/articles/committers-guide/_index.adoc:932", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 271, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 29, "source_unit": "https://translate-dev.freebsd.org/api/units/1819464/?format=api", "priority": 100, "id": 1819464, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=44ebef8eac677658", "url": "https://translate-dev.freebsd.org/api/units/1819464/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.261328Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Merge or direct commit to the appropriate `stable/X` branch first before merging to the `releng/X.Y` branch." ], "previous_source": "", "target": [ "Merge or direct commit to the appropriate `stable/X` branch first before merging to the `releng/X.Y` branch." ], "id_hash": -4136080952618591259, "content_hash": -4136080952618591259, "location": "documentation/content/en/articles/committers-guide/_index.adoc:939", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 274, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 16, "source_unit": "https://translate-dev.freebsd.org/api/units/1819466/?format=api", "priority": 100, "id": 1819466, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=4699b04998e8dbe5", "url": "https://translate-dev.freebsd.org/api/units/1819466/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.265759Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Use the hash that's in the `stable/X` branch for the MFC to `releng/X.Y` branch." ], "previous_source": "", "target": [ "Use the hash that's in the `stable/X` branch for the MFC to `releng/X.Y` branch." ], "id_hash": 4433809027120844527, "content_hash": 4433809027120844527, "location": "documentation/content/en/articles/committers-guide/_index.adoc:940", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 275, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 14, "source_unit": "https://translate-dev.freebsd.org/api/units/1819468/?format=api", "priority": 100, "id": 1819468, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=bd880dd19f754eef", "url": "https://translate-dev.freebsd.org/api/units/1819468/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.268855Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Leave both \"cherry picked from\" lines in the commit message." ], "previous_source": "", "target": [ "Leave both \"cherry picked from\" lines in the commit message." ], "id_hash": -1676348576796273633, "content_hash": -1676348576796273633, "location": "documentation/content/en/articles/committers-guide/_index.adoc:941", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 276, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 10, "source_unit": "https://translate-dev.freebsd.org/api/units/1819470/?format=api", "priority": 100, "id": 1819470, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=68bc69d9e053941f", "url": "https://translate-dev.freebsd.org/api/units/1819470/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.271925Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Be sure to add the `Approved by:` line when you are in the editor." ], "previous_source": "", "target": [ "Be sure to add the `Approved by:` line when you are in the editor." ], "id_hash": -874545025123883080, "content_hash": -874545025123883080, "location": "documentation/content/en/articles/committers-guide/_index.adoc:942", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 277, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 14, "source_unit": "https://translate-dev.freebsd.org/api/units/1819472/?format=api", "priority": 100, "id": 1819472, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=73dcfdeee567e7b8", "url": "https://translate-dev.freebsd.org/api/units/1819472/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.274962Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git checkout releng/13.0\n% git cherry-pick -x $HASH --edit\n" ], "previous_source": "", "target": [ "% git checkout releng/13.0\n% git cherry-pick -x $HASH --edit\n" ], "id_hash": 6448777364978380681, "content_hash": 6448777364978380681, "location": "documentation/content/en/articles/committers-guide/_index.adoc:947", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 278, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 10, "source_unit": "https://translate-dev.freebsd.org/api/units/1819474/?format=api", "priority": 100, "id": 1819474, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=d97ea8d8ab1daf89", "url": "https://translate-dev.freebsd.org/api/units/1819474/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.278019Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "If you forget to to add the `Approved by:` line, you can do a `git commit --amend` to edit the commit message before you push the change." ], "previous_source": "", "target": [ "If you forget to to add the `Approved by:` line, you can do a `git commit --amend` to edit the commit message before you push the change." ], "id_hash": -5725854688828451692, "content_hash": -5725854688828451692, "location": "documentation/content/en/articles/committers-guide/_index.adoc:950", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 279, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 27, "source_unit": "https://translate-dev.freebsd.org/api/units/1819476/?format=api", "priority": 100, "id": 1819476, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=3089ad7f54e01494", "url": "https://translate-dev.freebsd.org/api/units/1819476/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.281046Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git checkout -b tmp-branch stable/X\n% for h in $HASH_LIST; do git cherry-pick -x $h; done\n% git rebase -i stable/X\n# mark each of the commits after the first as 'squash'\n# Update the commit message to reflect all elements of commit, if necessary.\n# Be sure to retain the \"cherry picked from\" lines.\n% git push freebsd HEAD:stable/X\n" ], "previous_source": "", "target": [ "% git checkout -b tmp-branch stable/X\n% for h in $HASH_LIST; do git cherry-pick -x $h; done\n% git rebase -i stable/X\n# mark each of the commits after the first as 'squash'\n# Update the commit message to reflect all elements of commit, if necessary.\n# Be sure to retain the \"cherry picked from\" lines.\n% git push freebsd HEAD:stable/X\n" ], "id_hash": -7037000999304788544, "content_hash": -7037000999304788544, "location": "documentation/content/en/articles/committers-guide/_index.adoc:962", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 281, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 61, "source_unit": "https://translate-dev.freebsd.org/api/units/1819478/?format=api", "priority": 100, "id": 1819478, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=1e578cdff05e85c0", "url": "https://translate-dev.freebsd.org/api/units/1819478/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.284754Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "If the push fails due to losing the commit race, rebase and try again:" ], "previous_source": "", "target": [ "If the push fails due to losing the commit race, rebase and try again:" ], "id_hash": 8622610386879820490, "content_hash": 8622610386879820490, "location": "documentation/content/en/articles/committers-guide/_index.adoc:965", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 282, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 14, "source_unit": "https://translate-dev.freebsd.org/api/units/1819480/?format=api", "priority": 100, "id": 1819480, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=f7a9aa765a90b2ca", "url": "https://translate-dev.freebsd.org/api/units/1819480/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.288025Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git checkout stable/X\n% git pull\n% git checkout tmp-branch\n% git rebase stable/X\n% git push freebsd HEAD:stable/X\n" ], "previous_source": "", "target": [ "% git checkout stable/X\n% git pull\n% git checkout tmp-branch\n% git rebase stable/X\n% git push freebsd HEAD:stable/X\n" ], "id_hash": -808893170137173780, "content_hash": -808893170137173780, "location": "documentation/content/en/articles/committers-guide/_index.adoc:973", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 283, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 20, "source_unit": "https://translate-dev.freebsd.org/api/units/1819482/?format=api", "priority": 100, "id": 1819482, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=74c63bf28cbbf0ec", "url": "https://translate-dev.freebsd.org/api/units/1819482/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.291178Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Once the MFC is complete, you can delete the temporary branch:" ], "previous_source": "", "target": [ "Once the MFC is complete, you can delete the temporary branch:" ], "id_hash": -7660351877669202220, "content_hash": -7660351877669202220, "location": "documentation/content/en/articles/committers-guide/_index.adoc:976", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 284, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 11, "source_unit": "https://translate-dev.freebsd.org/api/units/1819484/?format=api", "priority": 100, "id": 1819484, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=15b0f68db507d6d4", "url": "https://translate-dev.freebsd.org/api/units/1819484/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.294297Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git checkout stable/X\n% git branch -d tmp-branch\n" ], "previous_source": "", "target": [ "% git checkout stable/X\n% git branch -d tmp-branch\n" ], "id_hash": -7966963566620028870, "content_hash": -7966963566620028870, "location": "documentation/content/en/articles/committers-guide/_index.adoc:981", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 285, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 9, "source_unit": "https://translate-dev.freebsd.org/api/units/1819486/?format=api", "priority": 100, "id": 1819486, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=116fa8d8d122503a", "url": "https://translate-dev.freebsd.org/api/units/1819486/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.297414Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git cherry-pick -x -m 1 $HASH\n" ], "previous_source": "", "target": [ "% git cherry-pick -x -m 1 $HASH\n" ], "id_hash": 8654869666685676360, "content_hash": 8654869666685676360, "location": "documentation/content/en/articles/committers-guide/_index.adoc:992", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 288, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 7, "source_unit": "https://translate-dev.freebsd.org/api/units/1819488/?format=api", "priority": 100, "id": 1819488, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=f81c461b3c1a6b48", "url": "https://translate-dev.freebsd.org/api/units/1819488/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.301853Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "is typically what you want. This will tell cherry-pick to apply the correct diff." ], "previous_source": "", "target": [ "is typically what you want. This will tell cherry-pick to apply the correct diff." ], "id_hash": -7249957415158214004, "content_hash": -7249957415158214004, "location": "documentation/content/en/articles/committers-guide/_index.adoc:995", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 289, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 14, "source_unit": "https://translate-dev.freebsd.org/api/units/1819490/?format=api", "priority": 100, "id": 1819490, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=1b62fa2490c9128c", "url": "https://translate-dev.freebsd.org/api/units/1819490/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.304900Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "There are some, hopefully, rare cases where it's possible that the `main` branch was merged backwards by the conversion script. Should that be the case (and we've not found any yet), you'd change the above to `-m 2` to pickup the proper parent. Just do:" ], "previous_source": "", "target": [ "There are some, hopefully, rare cases where it's possible that the `main` branch was merged backwards by the conversion script. Should that be the case (and we've not found any yet), you'd change the above to `-m 2` to pickup the proper parent. Just do:" ], "id_hash": -2341743523768577947, "content_hash": -2341743523768577947, "location": "documentation/content/en/articles/committers-guide/_index.adoc:999", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 290, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 45, "source_unit": "https://translate-dev.freebsd.org/api/units/1819492/?format=api", "priority": 100, "id": 1819492, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=5f8074ac16b3d065", "url": "https://translate-dev.freebsd.org/api/units/1819492/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.308035Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git cherry-pick --abort\n% git cherry-pick -x -m 2 $HASH\n" ], "previous_source": "", "target": [ "% git cherry-pick --abort\n% git cherry-pick -x -m 2 $HASH\n" ], "id_hash": -3029679595646770935, "content_hash": -3029679595646770935, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1003", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 291, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 11, "source_unit": "https://translate-dev.freebsd.org/api/units/1819494/?format=api", "priority": 100, "id": 1819494, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=55f46a75ae39a109", "url": "https://translate-dev.freebsd.org/api/units/1819494/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.311250Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "to do that. The `--abort` will cleanup the failed first attempt." ], "previous_source": "", "target": [ "to do that. The `--abort` will cleanup the failed first attempt." ], "id_hash": -1966119284177958741, "content_hash": -1966119284177958741, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1005", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 292, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 11, "source_unit": "https://translate-dev.freebsd.org/api/units/1819496/?format=api", "priority": 100, "id": 1819496, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=64b6f0ed908708ab", "url": "https://translate-dev.freebsd.org/api/units/1819496/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.314360Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "If you do a MFC, and it goes horribly wrong and you want to start over, then the easiest way is to use `git reset --hard` like so:" ], "previous_source": "", "target": [ "If you do a MFC, and it goes horribly wrong and you want to start over, then the easiest way is to use `git reset --hard` like so:" ], "id_hash": -7050599270139995557, "content_hash": -7050599270139995557, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1010", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 294, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 28, "source_unit": "https://translate-dev.freebsd.org/api/units/1819498/?format=api", "priority": 100, "id": 1819498, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=1e273d51c9ad5a5b", "url": "https://translate-dev.freebsd.org/api/units/1819498/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.317995Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git reset --hard freebsd/stable/12\n" ], "previous_source": "", "target": [ "% git reset --hard freebsd/stable/12\n" ], "id_hash": 8413807495390730471, "content_hash": 8413807495390730471, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1013", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 295, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 5, "source_unit": "https://translate-dev.freebsd.org/api/units/1819500/?format=api", "priority": 100, "id": 1819500, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=f4c3d956bb4898e7", "url": "https://translate-dev.freebsd.org/api/units/1819500/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.321116Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "though if you have some revs you want to keep, and others you don't, using `git rebase -i` is better." ], "previous_source": "", "target": [ "though if you have some revs you want to keep, and others you don't, using `git rebase -i` is better." ], "id_hash": 7322687826668256083, "content_hash": 7322687826668256083, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1016", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 296, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 20, "source_unit": "https://translate-dev.freebsd.org/api/units/1819502/?format=api", "priority": 100, "id": 1819502, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=e59f69c7f5a37b53", "url": "https://translate-dev.freebsd.org/api/units/1819502/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.324193Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Clearly mark direct commits distinct from commits that land a change from another branch." ], "previous_source": "", "target": [ "Clearly mark direct commits distinct from commits that land a change from another branch." ], "id_hash": -5464887277719471517, "content_hash": -5464887277719471517, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1022", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 299, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 14, "source_unit": "https://translate-dev.freebsd.org/api/units/1819504/?format=api", "priority": 100, "id": 1819504, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=3428d1f9a1faba63", "url": "https://translate-dev.freebsd.org/api/units/1819504/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.339098Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Avoid introducing known breakage into stable and releng branches." ], "previous_source": "", "target": [ "Avoid introducing known breakage into stable and releng branches." ], "id_hash": -727324394535360613, "content_hash": -727324394535360613, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1023", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 300, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 9, "source_unit": "https://translate-dev.freebsd.org/api/units/1819506/?format=api", "priority": 100, "id": 1819506, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=75e80651133e679b", "url": "https://translate-dev.freebsd.org/api/units/1819506/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.342633Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Allow developers to determine which changes have or have not been landed from one branch to another." ], "previous_source": "", "target": [ "Allow developers to determine which changes have or have not been landed from one branch to another." ], "id_hash": -4653370478970848768, "content_hash": -4653370478970848768, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1024", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 301, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 17, "source_unit": "https://translate-dev.freebsd.org/api/units/1819508/?format=api", "priority": 100, "id": 1819508, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=3f6be83438a73a00", "url": "https://translate-dev.freebsd.org/api/units/1819508/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.345685Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "With Subversion, we used the following practices to achieve these goals:" ], "previous_source": "", "target": [ "With Subversion, we used the following practices to achieve these goals:" ], "id_hash": -2787989802012194571, "content_hash": -2787989802012194571, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1026", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 302, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 11, "source_unit": "https://translate-dev.freebsd.org/api/units/1819510/?format=api", "priority": 100, "id": 1819510, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=594f120be5a6c8f5", "url": "https://translate-dev.freebsd.org/api/units/1819510/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.348796Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Using `MFC` and `MFS` tags to mark commits that merged changes from another branch." ], "previous_source": "", "target": [ "Using `MFC` and `MFS` tags to mark commits that merged changes from another branch." ], "id_hash": -3647312002158702820, "content_hash": -3647312002158702820, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1028", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 303, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 14, "source_unit": "https://translate-dev.freebsd.org/api/units/1819512/?format=api", "priority": 100, "id": 1819512, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=4d62250eee4fcf1c", "url": "https://translate-dev.freebsd.org/api/units/1819512/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.351852Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Squashing fixup commits into the main commit when merging a change." ], "previous_source": "", "target": [ "Squashing fixup commits into the main commit when merging a change." ], "id_hash": -8667213579694659032, "content_hash": -8667213579694659032, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1029", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 304, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 11, "source_unit": "https://translate-dev.freebsd.org/api/units/1819514/?format=api", "priority": 100, "id": 1819514, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=07b7df2b8ddbaa28", "url": "https://translate-dev.freebsd.org/api/units/1819514/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.354912Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Recording mergeinfo so that `svn mergeinfo --show-revs` worked." ], "previous_source": "", "target": [ "Recording mergeinfo so that `svn mergeinfo --show-revs` worked." ], "id_hash": 5078838877022530379, "content_hash": 5078838877022530379, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1030", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 305, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 8, "source_unit": "https://translate-dev.freebsd.org/api/units/1819516/?format=api", "priority": 100, "id": 1819516, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=c67ba90cc05f2b4b", "url": "https://translate-dev.freebsd.org/api/units/1819516/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.357945Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "With Git, we will need to use different strategies to achieve the same goals. This document aims to define best practices when merging source commits using Git that achieve these goals. In general, we aim to use Git's native support to achieve these goals rather than enforcing practices built on Subversion's model." ], "previous_source": "", "target": [ "With Git, we will need to use different strategies to achieve the same goals. This document aims to define best practices when merging source commits using Git that achieve these goals. In general, we aim to use Git's native support to achieve these goals rather than enforcing practices built on Subversion's model." ], "id_hash": -7305203070989460603, "content_hash": -7305203070989460603, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1034", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 306, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 52, "source_unit": "https://translate-dev.freebsd.org/api/units/1819518/?format=api", "priority": 100, "id": 1819518, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=1a9eb482f5949b85", "url": "https://translate-dev.freebsd.org/api/units/1819518/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.360961Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "One general note: due to technical differences with Git, we will not be using Git \"merge commits\" (created via `git merge`) in stable or releng branches. Instead, when this document refers to \"merge commits\", it means a commit originally made to `main` that is replicated or \"landed\" to a stable branch, or a commit from a stable branch that is replicated to a releng branch with some variation of `git cherry-pick`." ], "previous_source": "", "target": [ "One general note: due to technical differences with Git, we will not be using Git \"merge commits\" (created via `git merge`) in stable or releng branches. Instead, when this document refers to \"merge commits\", it means a commit originally made to `main` that is replicated or \"landed\" to a stable branch, or a commit from a stable branch that is replicated to a releng branch with some variation of `git cherry-pick`." ], "id_hash": 246170591770428230, "content_hash": 246170591770428230, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1037", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 307, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 71, "source_unit": "https://translate-dev.freebsd.org/api/units/1819520/?format=api", "priority": 100, "id": 1819520, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=836a92d9549fc346", "url": "https://translate-dev.freebsd.org/api/units/1819520/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.364183Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Use the `-x` flag with `git cherry-pick`. This adds a line to the commit message that includes the hash of the original commit when merging. Since it is added by Git directly, committers do not have to manually edit the commit log when merging." ], "previous_source": "", "target": [ "Use the `-x` flag with `git cherry-pick`. This adds a line to the commit message that includes the hash of the original commit when merging. Since it is added by Git directly, committers do not have to manually edit the commit log when merging." ], "id_hash": 1287467013582645378, "content_hash": 1287467013582645378, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1051", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 313, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 44, "source_unit": "https://translate-dev.freebsd.org/api/units/1819522/?format=api", "priority": 100, "id": 1819522, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=91de006d74a06882", "url": "https://translate-dev.freebsd.org/api/units/1819522/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.370502Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "When merging multiple commits, keep all the \"cherry picked from\" lines." ], "previous_source": "", "target": [ "When merging multiple commits, keep all the \"cherry picked from\" lines." ], "id_hash": -2234741478428861669, "content_hash": -2234741478428861669, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1053", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 314, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 11, "source_unit": "https://translate-dev.freebsd.org/api/units/1819524/?format=api", "priority": 100, "id": 1819524, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=60fc9a772d6a9b1b", "url": "https://translate-dev.freebsd.org/api/units/1819524/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2025-08-17T20:19:15.373687Z" } ] }