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=16
{ "count": 1190, "next": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/units/?format=api&page=17", "previous": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/units/?format=api&page=15", "results": [ { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "`main` and `stable/⋯` branches open" ], "previous_source": "", "target": [ "`main` and `stable/⋯` branches open" ], "id_hash": 6588910481996812851, "content_hash": 6588910481996812851, "location": "documentation/content/en/articles/committers-guide/_index.adoc:467", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 150, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 5, "source_unit": "https://translate-dev.freebsd.org/api/units/1575080/?format=api", "priority": 100, "id": 1575080, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=db70832c80449233", "url": "https://translate-dev.freebsd.org/api/units/1575080/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.618832Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "`releng/⋯` branches, each of which is frozen when a release is tagged." ], "previous_source": "", "target": [ "`releng/⋯` branches, each of which is frozen when a release is tagged." ], "id_hash": -4622261247217832720, "content_hash": -4622261247217832720, "location": "documentation/content/en/articles/committers-guide/_index.adoc:468", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 151, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 12, "source_unit": "https://translate-dev.freebsd.org/api/units/1575082/?format=api", "priority": 100, "id": 1575082, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=3fda6de2ac86ecf0", "url": "https://translate-dev.freebsd.org/api/units/1575082/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.622060Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Examples:" ], "previous_source": "", "target": [ "Examples:" ], "id_hash": -1799263350484142152, "content_hash": -1799263350484142152, "location": "documentation/content/en/articles/committers-guide/_index.adoc:470", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 152, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 1, "source_unit": "https://translate-dev.freebsd.org/api/units/1575084/?format=api", "priority": 100, "id": 1575084, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=6707bb84010377b8", "url": "https://translate-dev.freebsd.org/api/units/1575084/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.625233Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "tag https://cgit.freebsd.org/src/tag/?h=release/13.1.0[release/13.1.0] on the https://cgit.freebsd.org/src/log/?h=releng/13.1[releng/13.1] branch" ], "previous_source": "", "target": [ "tag https://cgit.freebsd.org/src/tag/?h=release/13.1.0[release/13.1.0] on the https://cgit.freebsd.org/src/log/?h=releng/13.1[releng/13.1] branch" ], "id_hash": -6706521854903648573, "content_hash": -6706521854903648573, "location": "documentation/content/en/articles/committers-guide/_index.adoc:472", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 153, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 6, "source_unit": "https://translate-dev.freebsd.org/api/units/1575086/?format=api", "priority": 100, "id": 1575086, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=22eda5e7d812fec3", "url": "https://translate-dev.freebsd.org/api/units/1575086/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.628495Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "tag https://cgit.freebsd.org/src/tag/?h=release/13.2.0[release/13.2.0] on the https://cgit.freebsd.org/src/log/?h=releng/13.2[releng/13.2] branch." ], "previous_source": "", "target": [ "tag https://cgit.freebsd.org/src/tag/?h=release/13.2.0[release/13.2.0] on the https://cgit.freebsd.org/src/log/?h=releng/13.2[releng/13.2] branch." ], "id_hash": -1589949243504196043, "content_hash": -1589949243504196043, "location": "documentation/content/en/articles/committers-guide/_index.adoc:473", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 154, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 6, "source_unit": "https://translate-dev.freebsd.org/api/units/1575088/?format=api", "priority": 100, "id": 1575088, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=69ef5d9642080635", "url": "https://translate-dev.freebsd.org/api/units/1575088/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.631697Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git clone -o freebsd $URL -b branch [<directory>]\n" ], "previous_source": "", "target": [ "% git clone -o freebsd $URL -b branch [<directory>]\n" ], "id_hash": 1098512914541104427, "content_hash": 1098512914541104427, "location": "documentation/content/en/articles/committers-guide/_index.adoc:488", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 160, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 9, "source_unit": "https://translate-dev.freebsd.org/api/units/1575090/?format=api", "priority": 100, "id": 1575090, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=8f3eb3acf466cd2b", "url": "https://translate-dev.freebsd.org/api/units/1575090/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.638464Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "will create a deep clone. `branch` should be one of the branches listed in the previous section. If no `branch` is given: the default (`main`) will be used. If no `<directory>` is given: the name of the new directory will match the name of the repo ([.filename]#doc#, [.filename]#ports# or [.filename]#src#)." ], "previous_source": "", "target": [ "will create a deep clone. `branch` should be one of the branches listed in the previous section. If no `branch` is given: the default (`main`) will be used. If no `<directory>` is given: the name of the new directory will match the name of the repo ([.filename]#doc#, [.filename]#ports# or [.filename]#src#)." ], "id_hash": -2775496151042227983, "content_hash": -2775496151042227983, "location": "documentation/content/en/articles/committers-guide/_index.adoc:493", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 161, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 50, "source_unit": "https://translate-dev.freebsd.org/api/units/1575092/?format=api", "priority": 100, "id": 1575092, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=597b74f4b1aa00f1", "url": "https://translate-dev.freebsd.org/api/units/1575092/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.641705Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "This clones the repository, but only has the most recent version in the repository. The rest of the history is not downloaded. Should you change your mind later, you can do `git fetch --unshallow` to get the old history." ], "previous_source": "", "target": [ "This clones the repository, but only has the most recent version in the repository. The rest of the history is not downloaded. Should you change your mind later, you can do `git fetch --unshallow` to get the old history." ], "id_hash": 225359537874678062, "content_hash": 225359537874678062, "location": "documentation/content/en/articles/committers-guide/_index.adoc:514", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 166, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 39, "source_unit": "https://translate-dev.freebsd.org/api/units/1575094/?format=api", "priority": 100, "id": 1575094, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=8320a34e41c4312e", "url": "https://translate-dev.freebsd.org/api/units/1575094/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.648163Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "will update the tree. In Git, a 'fast forward' merge is one that only needs to set a new branch pointer and doesn't need to re-create the commits. By always doing a fast forward merge/pull, you'll ensure that you have an exact copy of the FreeBSD tree. This will be important if you want to maintain local patches." ], "previous_source": "", "target": [ "will update the tree. In Git, a 'fast forward' merge is one that only needs to set a new branch pointer and doesn't need to re-create the commits. By always doing a fast forward merge/pull, you'll ensure that you have an exact copy of the FreeBSD tree. This will be important if you want to maintain local patches." ], "id_hash": 4242548082652448446, "content_hash": 4242548082652448446, "location": "documentation/content/en/articles/committers-guide/_index.adoc:550", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 176, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 58, "source_unit": "https://translate-dev.freebsd.org/api/units/1575096/?format=api", "priority": 100, "id": 1575096, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=bae08f00d10386be", "url": "https://translate-dev.freebsd.org/api/units/1575096/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.657374Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "See below for how to manage local changes. The simplest is to use `--autostash` on the `git pull` command, but more sophisticated options are available." ], "previous_source": "", "target": [ "See below for how to manage local changes. The simplest is to use `--autostash` on the `git pull` command, but more sophisticated options are available." ], "id_hash": -1620289034675610110, "content_hash": -1620289034675610110, "location": "documentation/content/en/articles/committers-guide/_index.adoc:553", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 177, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 25, "source_unit": "https://translate-dev.freebsd.org/api/units/1575098/?format=api", "priority": 100, "id": 1575098, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=698393b526b31e02", "url": "https://translate-dev.freebsd.org/api/units/1575098/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.660784Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "In Git, `git checkout` checks out both branches and specific versions. Git's versions are the long hashes rather than a sequential number." ], "previous_source": "", "target": [ "In Git, `git checkout` checks out both branches and specific versions. Git's versions are the long hashes rather than a sequential number." ], "id_hash": 8008430018878744227, "content_hash": 8008430018878744227, "location": "documentation/content/en/articles/committers-guide/_index.adoc:558", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 179, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 22, "source_unit": "https://translate-dev.freebsd.org/api/units/1575100/?format=api", "priority": 100, "id": 1575100, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=ef23a8abf3d7a6a3", "url": "https://translate-dev.freebsd.org/api/units/1575100/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.664832Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Git makes bisecting changes easy with a powerful `git bisect` command. Here's a brief outline of how to use it. For more information, you can view https://www.metaltoad.com/blog/beginners-guide-git-bisect-process-elimination or https://git-scm.com/docs/git-bisect for more details. The man git-bisect page is good at describing what can go wrong, what to do when versions won't build, when you want to use terms other than 'good' and 'bad', etc, none of which will be covered here." ], "previous_source": "", "target": [ "Git makes bisecting changes easy with a powerful `git bisect` command. Here's a brief outline of how to use it. For more information, you can view https://www.metaltoad.com/blog/beginners-guide-git-bisect-process-elimination or https://git-scm.com/docs/git-bisect for more details. The man git-bisect page is good at describing what can go wrong, what to do when versions won't build, when you want to use terms other than 'good' and 'bad', etc, none of which will be covered here." ], "id_hash": 7920106985608961762, "content_hash": 7920106985608961762, "location": "documentation/content/en/articles/committers-guide/_index.adoc:594", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 191, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 70, "source_unit": "https://translate-dev.freebsd.org/api/units/1575102/?format=api", "priority": 100, "id": 1575102, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=ede9df57444fdee2", "url": "https://translate-dev.freebsd.org/api/units/1575102/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.675144Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "`git bisect start --first-parent` will start the bisection process. Next, you need to tell a range to go through. `git bisect good XXXXXX` will tell it the working version and `git bisect bad XXXXX` will tell it the bad version. The bad version will almost always be HEAD (a special tag for what you have checked out). The good version will be the last one you checked out. The `--first-parent` argument is necessary so that subsequent `git bisect` commands do not try to check out a vendor branch which lacks the full FreeBSD source tree." ], "previous_source": "", "target": [ "`git bisect start --first-parent` will start the bisection process. Next, you need to tell a range to go through. `git bisect good XXXXXX` will tell it the working version and `git bisect bad XXXXX` will tell it the bad version. The bad version will almost always be HEAD (a special tag for what you have checked out). The good version will be the last one you checked out. The `--first-parent` argument is necessary so that subsequent `git bisect` commands do not try to check out a vendor branch which lacks the full FreeBSD source tree." ], "id_hash": -7272327386111755590, "content_hash": -7272327386111755590, "location": "documentation/content/en/articles/committers-guide/_index.adoc:601", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 192, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 95, "source_unit": "https://translate-dev.freebsd.org/api/units/1575104/?format=api", "priority": 100, "id": 1575104, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=1b1380c5d476baba", "url": "https://translate-dev.freebsd.org/api/units/1575104/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.678698Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "If you want to know the last version you checked out, you should use `git reflog`:" ], "previous_source": "", "target": [ "If you want to know the last version you checked out, you should use `git reflog`:" ], "id_hash": -5741333834290569686, "content_hash": -5741333834290569686, "location": "documentation/content/en/articles/committers-guide/_index.adoc:605", "context": "", "note": "type: delimited block = 4", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 193, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 16, "source_unit": "https://translate-dev.freebsd.org/api/units/1575106/?format=api", "priority": 100, "id": 1575106, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=3052af4bee2dde2a", "url": "https://translate-dev.freebsd.org/api/units/1575106/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.682220Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "You would then build/install that version. If it's good you'd type `git bisect good` otherwise `git bisect bad`. If the version doesn't compile, type `git bisect skip`. You will get a similar message to the above after each step. When you are done, report the bad version to the developer (or fix the bug yourself and send a patch). `git bisect reset` will end the process and return you back to where you started (usually tip of `main`). Again, the git-bisect manual (linked above) is a good resource for when things go wrong or for unusual cases." ], "previous_source": "", "target": [ "You would then build/install that version. If it's good you'd type `git bisect good` otherwise `git bisect bad`. If the version doesn't compile, type `git bisect skip`. You will get a similar message to the above after each step. When you are done, report the bad version to the developer (or fix the bug yourself and send a patch). `git bisect reset` will end the process and return you back to where you started (usually tip of `main`). Again, the git-bisect manual (linked above) is a good resource for when things go wrong or for unusual cases." ], "id_hash": 5879981209592785557, "content_hash": 5879981209592785557, "location": "documentation/content/en/articles/committers-guide/_index.adoc:634", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 198, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 97, "source_unit": "https://translate-dev.freebsd.org/api/units/1575110/?format=api", "priority": 100, "id": 1575110, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=d199e3c1b3bfea95", "url": "https://translate-dev.freebsd.org/api/units/1575110/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.691317Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "The simplest way to keep local changes (especially trivial ones) is to use `git stash`. In its simplest form, you use `git stash` to record the changes (which pushes them onto the stash stack). Most people use this to save changes before updating the tree as described above. They then use `git stash apply` to re-apply them to the tree. The stash is a stack of changes that can be examined with `git stash list`. The git-stash man page (https://git-scm.com/docs/git-stash) has all the details." ], "previous_source": "", "target": [ "The simplest way to keep local changes (especially trivial ones) is to use `git stash`. In its simplest form, you use `git stash` to record the changes (which pushes them onto the stash stack). Most people use this to save changes before updating the tree as described above. They then use `git stash apply` to re-apply them to the tree. The stash is a stack of changes that can be examined with `git stash list`. The git-stash man page (https://git-scm.com/docs/git-stash) has all the details." ], "id_hash": -4659768266657337467, "content_hash": -4659768266657337467, "location": "documentation/content/en/articles/committers-guide/_index.adoc:741", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 228, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 84, "source_unit": "https://translate-dev.freebsd.org/api/units/1575114/?format=api", "priority": 100, "id": 1575114, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=3f552d7332406f85", "url": "https://translate-dev.freebsd.org/api/units/1575114/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.716020Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "This method is suitable when you have tiny tweaks to the tree. When you have anything non trivial, you'll likely be better off keeping a local branch and rebasing. Stashing is also integrated with the `git pull` command: just add `--autostash` to the command line." ], "previous_source": "", "target": [ "This method is suitable when you have tiny tweaks to the tree. When you have anything non trivial, you'll likely be better off keeping a local branch and rebasing. Stashing is also integrated with the `git pull` command: just add `--autostash` to the command line." ], "id_hash": 5119266414605705324, "content_hash": 5119266414605705324, "location": "documentation/content/en/articles/committers-guide/_index.adoc:745", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 229, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 45, "source_unit": "https://translate-dev.freebsd.org/api/units/1575116/?format=api", "priority": 100, "id": 1575116, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=c70b49ae5929206c", "url": "https://translate-dev.freebsd.org/api/units/1575116/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.719544Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "In addition to merging, Git supports the concept of 'rebasing' which avoids these issues. The `git rebase` command replays all the commits of a branch at a newer location on the parent branch. We will cover the most common scenarios that arise using it." ], "previous_source": "", "target": [ "In addition to merging, Git supports the concept of 'rebasing' which avoids these issues. The `git rebase` command replays all the commits of a branch at a newer location on the parent branch. We will cover the most common scenarios that arise using it." ], "id_hash": 8392070069449539916, "content_hash": 8392070069449539916, "location": "documentation/content/en/articles/committers-guide/_index.adoc:757", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 232, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 44, "source_unit": "https://translate-dev.freebsd.org/api/units/1575118/?format=api", "priority": 100, "id": 1575118, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=f4769f43dbba414c", "url": "https://translate-dev.freebsd.org/api/units/1575118/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.724462Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "The commit will pop you into an editor to describe what you've done. Once you enter that, you have your own **local** branch in the Git repo. Build and install it like you normally would, following the directions in the handbook. Git differs from other version control systems in that you have to tell it explicitly which files to commit. I have opted to do it on the commit command line, but you can also do it with `git add` which many of the more in depth tutorials cover." ], "previous_source": "", "target": [ "The commit will pop you into an editor to describe what you've done. Once you enter that, you have your own **local** branch in the Git repo. Build and install it like you normally would, following the directions in the handbook. Git differs from other version control systems in that you have to tell it explicitly which files to commit. I have opted to do it on the commit command line, but you can also do it with `git add` which many of the more in depth tutorials cover." ], "id_hash": -4650936068212391332, "content_hash": -4650936068212391332, "location": "documentation/content/en/articles/committers-guide/_index.adoc:793", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 236, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 89, "source_unit": "https://translate-dev.freebsd.org/api/units/1575120/?format=api", "priority": 100, "id": 1575120, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=3f748e49a526025c", "url": "https://translate-dev.freebsd.org/api/units/1575120/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.730037Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Vendor imports are the only thing in the tree that creates a merge commit in the `main` branch. Cherry picking merge commits into stable/XX presents an additional difficulty because there are two parents for a merge commit. Generally, you'll want the first parent's diff since that's the diff to `main` (though there may be some exceptions)." ], "previous_source": "", "target": [ "Vendor imports are the only thing in the tree that creates a merge commit in the `main` branch. Cherry picking merge commits into stable/XX presents an additional difficulty because there are two parents for a merge commit. Generally, you'll want the first parent's diff since that's the diff to `main` (though there may be some exceptions)." ], "id_hash": -259262130114820811, "content_hash": -259262130114820811, "location": "documentation/content/en/articles/committers-guide/_index.adoc:988", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 287, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 56, "source_unit": "https://translate-dev.freebsd.org/api/units/1575128/?format=api", "priority": 100, "id": 1575128, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=7c66ea775ecb8535", "url": "https://translate-dev.freebsd.org/api/units/1575128/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.774075Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Git provides some built-in support for this via the `git cherry` and `git log --cherry` commands. These commands compare the raw diffs of commits (but not other metadata such as log messages) to determine if two commits are identical. This works well when each commit from `main` is landed as a single commit to a stable branch, but it falls over if multiple commits from `main` are squashed together as a single commit to a stable branch. The project makes extensive use of `git cherry-pick -x` with all lines preserved to work around these difficulties and is working on automated tooling to take advantage of this." ], "previous_source": "", "target": [ "Git provides some built-in support for this via the `git cherry` and `git log --cherry` commands. These commands compare the raw diffs of commits (but not other metadata such as log messages) to determine if two commits are identical. This works well when each commit from `main` is landed as a single commit to a stable branch, but it falls over if multiple commits from `main` are squashed together as a single commit to a stable branch. The project makes extensive use of `git cherry-pick -x` with all lines preserved to work around these difficulties and is working on automated tooling to take advantage of this." ], "id_hash": -4277578124434503516, "content_hash": -4277578124434503516, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1044", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 309, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 106, "source_unit": "https://translate-dev.freebsd.org/api/units/1575136/?format=api", "priority": 100, "id": 1575136, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=44a2fd5c021988a4", "url": "https://translate-dev.freebsd.org/api/units/1575136/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.932918Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Historical practice has varied, though some of the variance is by field. For example, MFCs that are relevant to a PR generally include the PR field in the MFC so that MFC commits are included in the bug tracker's audit trail. Other fields are less clear. For example, Phabricator shows the diff of the last commit tagged to a review, so including Phabricator URLs replaces the main commit with the landed commits. The list of reviewers is also not clear. If a reviewer has approved a change to `main`, does that mean they have approved the MFC commit? Is that true if it's identical code only, or with merely trivial rework? It's clearly not true for more extensive reworks. Even for identical code what if the commit doesn't conflict but introduces an ABI change? A reviewer may have ok'd a commit for `main` due to the ABI breakage but may not approve of merging the same commit as-is. One will have to use one's best judgment until clear guidelines can be agreed upon." ], "previous_source": "", "target": [ "Historical practice has varied, though some of the variance is by field. For example, MFCs that are relevant to a PR generally include the PR field in the MFC so that MFC commits are included in the bug tracker's audit trail. Other fields are less clear. For example, Phabricator shows the diff of the last commit tagged to a review, so including Phabricator URLs replaces the main commit with the landed commits. The list of reviewers is also not clear. If a reviewer has approved a change to `main`, does that mean they have approved the MFC commit? Is that true if it's identical code only, or with merely trivial rework? It's clearly not true for more extensive reworks. Even for identical code what if the commit doesn't conflict but introduces an ABI change? A reviewer may have ok'd a commit for `main` due to the ABI breakage but may not approve of merging the same commit as-is. One will have to use one's best judgment until clear guidelines can be agreed upon." ], "id_hash": -5947244495957883788, "content_hash": -5947244495957883788, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1067", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 317, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 173, "source_unit": "https://translate-dev.freebsd.org/api/units/1575138/?format=api", "priority": 100, "id": 1575138, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=2d7724a40a088474", "url": "https://translate-dev.freebsd.org/api/units/1575138/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.942172Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "The following steps should be taken to easily recreate the merge commit as if `git rebase --merge-commits` worked properly:" ], "previous_source": "", "target": [ "The following steps should be taken to easily recreate the merge commit as if `git rebase --merge-commits` worked properly:" ], "id_hash": -5295159372272388832, "content_hash": -5295159372272388832, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1223", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 353, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 19, "source_unit": "https://translate-dev.freebsd.org/api/units/1575140/?format=api", "priority": 100, "id": 1575140, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=3683d09b1a9fb520", "url": "https://translate-dev.freebsd.org/api/units/1575140/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:58.966480Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "If you are used to `git pull`, we strongly recommend using the `--ff-only` option, and further setting it as the default option. Alternatively, `git pull --rebase` is useful if you have changes staged in the `main` branch." ], "previous_source": "", "target": [ "If you are used to `git pull`, we strongly recommend using the `--ff-only` option, and further setting it as the default option. Alternatively, `git pull --rebase` is useful if you have changes staged in the `main` branch." ], "id_hash": -5445445591117388231, "content_hash": -5445445591117388231, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1415", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 418, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 37, "source_unit": "https://translate-dev.freebsd.org/api/units/1575150/?format=api", "priority": 100, "id": 1575150, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=346de41609bb2639", "url": "https://translate-dev.freebsd.org/api/units/1575150/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:59.009140Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Ooops! I committed to `main`, instead of another branch." ], "previous_source": "", "target": [ "Ooops! I committed to `main`, instead of another branch." ], "id_hash": -4916110327269196190, "content_hash": -4916110327269196190, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1601", "context": "", "note": "type: Title =====", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 467, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 9, "source_unit": "https://translate-dev.freebsd.org/api/units/1575156/?format=api", "priority": 100, "id": 1575156, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=3bc677b43a7d7e62", "url": "https://translate-dev.freebsd.org/api/units/1575156/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:59.050074Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "**Q:** From time to time, I goof up and mistakenly commit to the `main` branch. What do I do?\n" ], "previous_source": "", "target": [ "**Q:** From time to time, I goof up and mistakenly commit to the `main` branch. What do I do?\n" ], "id_hash": 1332545988159928372, "content_hash": 1332545988159928372, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1604", "context": "", "note": "type: Plain text", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 468, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 19, "source_unit": "https://translate-dev.freebsd.org/api/units/1575158/?format=api", "priority": 100, "id": 1575158, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=927e27841f24f834", "url": "https://translate-dev.freebsd.org/api/units/1575158/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:59.053361Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "**A:** The same technique above also works if you are wanting to 'land' parts of the branch you are working on into `main` before the rest of the branch is ready (say you noticed an unrelated typo, or fixed an incidental bug).\nYou can cherry pick those changes into `main`, then push to the parent repository.\nOnce you've done that, cleanup couldn't be simpler: just `git rebase -i`.\nGit will notice you've done this and skip the common changes automatically (even if you had to change the commit message or tweak the commit slightly).\nThere's no need to switch back to wilma to adjust it: just rebase!\n" ], "previous_source": "", "target": [ "**A:** The same technique above also works if you are wanting to 'land' parts of the branch you are working on into `main` before the rest of the branch is ready (say you noticed an unrelated typo, or fixed an incidental bug).\nYou can cherry pick those changes into `main`, then push to the parent repository.\nOnce you've done that, cleanup couldn't be simpler: just `git rebase -i`.\nGit will notice you've done this and skip the common changes automatically (even if you had to change the commit message or tweak the commit slightly).\nThere's no need to switch back to wilma to adjust it: just rebase!\n" ], "id_hash": -8472470026146359719, "content_hash": -8472470026146359719, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1655", "context": "", "note": "type: Plain text", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 480, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 107, "source_unit": "https://translate-dev.freebsd.org/api/units/1575160/?format=api", "priority": 100, "id": 1575160, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=0a6bbd667966d659", "url": "https://translate-dev.freebsd.org/api/units/1575160/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:59.063018Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "**Q:** I was on autopilot and did a `git pull` for my development tree and that created a merge commit on `main`.\nHow do I recover?\n" ], "previous_source": "", "target": [ "**Q:** I was on autopilot and did a `git pull` for my development tree and that created a merge commit on `main`.\nHow do I recover?\n" ], "id_hash": -3403984098569047984, "content_hash": -3403984098569047984, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1758", "context": "", "note": "type: Plain text", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 499, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 26, "source_unit": "https://translate-dev.freebsd.org/api/units/1575164/?format=api", "priority": 100, "id": 1575164, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=50c29e7f57b6b050", "url": "https://translate-dev.freebsd.org/api/units/1575164/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:59.082984Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "One of the keys to good software development on a project as large as FreeBSD is the ability to collaborate with others before you push your changes to the tree. The FreeBSD project's Git repositories do not, yet, allow user-created branches to be pushed to the repository, and therefore if you wish to share your changes with others you must use another mechanism, such as a hosted GitLab or GitHub, to share changes in a user-generated branch." ], "previous_source": "", "target": [ "One of the keys to good software development on a project as large as FreeBSD is the ability to collaborate with others before you push your changes to the tree. The FreeBSD project's Git repositories do not, yet, allow user-created branches to be pushed to the repository, and therefore if you wish to share your changes with others you must use another mechanism, such as a hosted GitLab or GitHub, to share changes in a user-generated branch." ], "id_hash": -1548074897499003332, "content_hash": -1548074897499003332, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1971", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 559, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 77, "source_unit": "https://translate-dev.freebsd.org/api/units/1575170/?format=api", "priority": 100, "id": 1575170, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=6a84221530df663c", "url": "https://translate-dev.freebsd.org/api/units/1575170/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:59.147906Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "The following instructions show how to set up a user-generated branch, based on the FreeBSD `main` branch, and push it to GitHub." ], "previous_source": "", "target": [ "The following instructions show how to set up a user-generated branch, based on the FreeBSD `main` branch, and push it to GitHub." ], "id_hash": -1287389396845552016, "content_hash": -1287389396845552016, "location": "documentation/content/en/articles/committers-guide/_index.adoc:1973", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 560, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 22, "source_unit": "https://translate-dev.freebsd.org/api/units/1575172/?format=api", "priority": 100, "id": 1575172, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=6e22462a196a9e70", "url": "https://translate-dev.freebsd.org/api/units/1575172/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:59.151431Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Code review is one way to increase the quality of software. The following guidelines apply to commits to the `main` (-CURRENT) branch of the `src` repository. Other branches and the `ports` and `docs` trees have their own review policies, but these guidelines generally apply to commits requiring review:" ], "previous_source": "", "target": [ "Code review is one way to increase the quality of software. The following guidelines apply to commits to the `main` (-CURRENT) branch of the `src` repository. Other branches and the `ports` and `docs` trees have their own review policies, but these guidelines generally apply to commits requiring review:" ], "id_hash": -3165072719277178907, "content_hash": -3165072719277178907, "location": "documentation/content/en/articles/committers-guide/_index.adoc:2419", "context": "", "note": "type: delimited block = 4", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 684, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 48, "source_unit": "https://translate-dev.freebsd.org/api/units/1575174/?format=api", "priority": 100, "id": 1575174, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=541367218f343fe5", "url": "https://translate-dev.freebsd.org/api/units/1575174/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:59.313486Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "The FreeBSD project discourages completely new licenses and variations on the standard licenses. New licenses require the approval of {core-email} to reside in the `src` repository. The more different licenses that are used in the tree, the more problems that this causes to those wishing to utilize this code, typically from unintended consequences from a poorly worded license." ], "previous_source": "", "target": [ "The FreeBSD project discourages completely new licenses and variations on the standard licenses. New licenses require the approval of {core-email} to reside in the `src` repository. The more different licenses that are used in the tree, the more problems that this causes to those wishing to utilize this code, typically from unintended consequences from a poorly worded license." ], "id_hash": 6845991843546518782, "content_hash": 6845991843546518782, "location": "documentation/content/en/articles/committers-guide/_index.adoc:2847", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 823, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 58, "source_unit": "https://translate-dev.freebsd.org/api/units/1575176/?format=api", "priority": 100, "id": 1575176, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=df01d94f61cfd4fe", "url": "https://translate-dev.freebsd.org/api/units/1575176/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:59.396234Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "where `$HASH` is the hash of the commit you want to copy over to the quarterly branch. The `-x` parameter ensures the hash `$HASH` of the `main` branch is included in the new commit message of the quarterly branch." ], "previous_source": "", "target": [ "where `$HASH` is the hash of the commit you want to copy over to the quarterly branch. The `-x` parameter ensures the hash `$HASH` of the `main` branch is included in the new commit message of the quarterly branch." ], "id_hash": -8262270661447102084, "content_hash": -8262270661447102084, "location": "documentation/content/en/articles/committers-guide/_index.adoc:3678", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 1110, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 39, "source_unit": "https://translate-dev.freebsd.org/api/units/1575178/?format=api", "priority": 100, "id": 1575178, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=0d56849bda50517c", "url": "https://translate-dev.freebsd.org/api/units/1575178/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:59.583256Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Gandi offers an E-rate discount to all FreeBSD developers. To streamline the process of getting the discount first set up a Gandi account, fill in the billing information and select the currency. Then send an mail to mailto:non-profit@gandi.net[non-profit@gandi.net] using your `@freebsd.org` mail address, and indicate your Gandi handle." ], "previous_source": "", "target": [ "Gandi offers an E-rate discount to all FreeBSD developers. To streamline the process of getting the discount first set up a Gandi account, fill in the billing information and select the currency. Then send an mail to mailto:non-profit@gandi.net[non-profit@gandi.net] using your `@freebsd.org` mail address, and indicate your Gandi handle." ], "id_hash": -4466387618834497993, "content_hash": -4466387618834497993, "location": "documentation/content/en/articles/committers-guide/_index.adoc:3862", "context": "", "note": "type: delimited block = 4", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 1187, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 48, "source_unit": "https://translate-dev.freebsd.org/api/units/1575180/?format=api", "priority": 100, "id": 1575180, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=4204341fe62abe37", "url": "https://translate-dev.freebsd.org/api/units/1575180/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-05-21T18:26:59.632623Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "`Submitted by:` +\n(deprecated)" ], "previous_source": "", "target": [ "`Submitted by:` +\n(deprecated)" ], "id_hash": 1260596724174323999, "content_hash": 1260596724174323999, "location": "documentation/content/en/articles/committers-guide/_index.adoc:2592", "context": "", "note": "type: Table", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 754, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 4, "source_unit": "https://translate-dev.freebsd.org/api/units/1578101/?format=api", "priority": 100, "id": 1578101, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=917e8a0aad6e811f", "url": "https://translate-dev.freebsd.org/api/units/1578101/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-06-20T00:20:30.733922Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "The name and e-mail address of the person or people that approved the change; for developers, just the username on the FreeBSD cluster.\n\nThere are several cases where approval is customary:\n\n* while a new committer is under mentorship\n* commits to an area of the tree covered by the LOCKS file (src)\n* during a release cycle\n* committing to a repo where you do not hold a commit bit (e.g. src committer committing to docs)\n* committing to a port maintained by someone else\n\nWhile under mentorship, get mentor approval before the commit. Enter the mentor's username in this field, and note that they are a mentor:\n\n[source,shell]\n....\nApproved by: username-of-mentor (mentor)\n....\n\nIf a team approved these commits then include the team name followed by the username of the approver in parentheses. For example:\n\n[source,shell]\n....\nApproved by: re (username)\n...." ], "previous_source": "", "target": [ "The name and e-mail address of the person or people that approved the change; for developers, just the username on the FreeBSD cluster.\n\nThere are several cases where approval is customary:\n\n* while a new committer is under mentorship\n* commits to an area of the tree covered by the LOCKS file (src)\n* during a release cycle\n* committing to a repo where you do not hold a commit bit (e.g. src committer committing to docs)\n* committing to a port maintained by someone else\n\nWhile under mentorship, get mentor approval before the commit. Enter the mentor's username in this field, and note that they are a mentor:\n\n[source,shell]\n....\nApproved by: username-of-mentor (mentor)\n....\n\nIf a team approved these commits then include the team name followed by the username of the approver in parentheses. For example:\n\n[source,shell]\n....\nApproved by: re (username)\n...." ], "id_hash": -878609069990362064, "content_hash": -878609069990362064, "location": "documentation/content/en/articles/committers-guide/_index.adoc:2644", "context": "", "note": "type: Table", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 763, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 145, "source_unit": "https://translate-dev.freebsd.org/api/units/1582467/?format=api", "priority": 100, "id": 1582467, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=73ce8db4b6c9c430", "url": "https://translate-dev.freebsd.org/api/units/1582467/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-07-15T20:20:24.213152Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "Install [.filename]#security/gnupg#. Enter these lines in [.filename]#~/.gnupg/gpg.conf# to set minimum acceptable defaults for signing and new key preferences (see the link:https://www.gnupg.org/documentation/manuals/gnupg/GPG-Options.html[GnuPG options documentation] for more details):" ], "previous_source": "", "target": [ "Install [.filename]#security/gnupg#. Enter these lines in [.filename]#~/.gnupg/gpg.conf# to set minimum acceptable defaults for signing and new key preferences (see the link:https://www.gnupg.org/documentation/manuals/gnupg/GPG-Options.html[GnuPG options documentation] for more details):" ], "id_hash": 5057383344831876010, "content_hash": 5057383344831876010, "location": "documentation/content/en/articles/committers-guide/_index.adoc:129", "context": "", "note": "type: delimited block = 4", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 41, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 26, "source_unit": "https://translate-dev.freebsd.org/api/units/1589459/?format=api", "priority": 100, "id": 1589459, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=c62f6f5b61ae4baa", "url": "https://translate-dev.freebsd.org/api/units/1589459/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-09-09T21:28:24.510069Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "# Sorted list of preferred algorithms for signing (strongest to weakest).\npersonal-digest-preferences SHA512 SHA384 SHA256 SHA224\n# Default preferences for new keys\ndefault-preference-list SHA512 SHA384 SHA256 SHA224 AES256 CAMELLIA256 AES192 CAMELLIA192 AES CAMELLIA128 CAST5 BZIP2 ZLIB ZIP Uncompressed\n" ], "previous_source": "", "target": [ "# Sorted list of preferred algorithms for signing (strongest to weakest).\npersonal-digest-preferences SHA512 SHA384 SHA256 SHA224\n# Default preferences for new keys\ndefault-preference-list SHA512 SHA384 SHA256 SHA224 AES256 CAMELLIA256 AES192 CAMELLIA192 AES CAMELLIA128 CAST5 BZIP2 ZLIB ZIP Uncompressed\n" ], "id_hash": -319978286768932861, "content_hash": -319978286768932861, "location": "documentation/content/en/articles/committers-guide/_index.adoc:136", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 42, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 38, "source_unit": "https://translate-dev.freebsd.org/api/units/1589461/?format=api", "priority": 100, "id": 1589461, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=7b8f3571894cb803", "url": "https://translate-dev.freebsd.org/api/units/1589461/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-09-09T21:28:24.515353Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "In the examples below, replace `${repo}` with the name of the desired FreeBSD repository: `doc`, `ports`, or `src`." ], "previous_source": "", "target": [ "In the examples below, replace `${repo}` with the name of the desired FreeBSD repository: `doc`, `ports`, or `src`." ], "id_hash": -8842418578516721837, "content_hash": -8842418578516721837, "location": "documentation/content/en/articles/committers-guide/_index.adoc:343", "context": "", "note": "type: delimited block = 4", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 113, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 18, "source_unit": "https://translate-dev.freebsd.org/api/units/1589463/?format=api", "priority": 100, "id": 1589463, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=05496b26e8323f53", "url": "https://translate-dev.freebsd.org/api/units/1589463/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-09-09T21:28:24.562560Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "For doc repository:" ], "previous_source": "", "target": [ "For doc repository:" ], "id_hash": 7236083125095759041, "content_hash": 7236083125095759041, "location": "documentation/content/en/articles/committers-guide/_index.adoc:395", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 127, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 3, "source_unit": "https://translate-dev.freebsd.org/api/units/1589465/?format=api", "priority": 100, "id": 1589465, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=e46bbb438c87fcc1", "url": "https://translate-dev.freebsd.org/api/units/1589465/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-09-09T21:28:24.574148Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% cd .git/hooks\n% ln -s ../../.hooks/prepare-commit-msg\n" ], "previous_source": "", "target": [ "% cd .git/hooks\n% ln -s ../../.hooks/prepare-commit-msg\n" ], "id_hash": 370875903746586810, "content_hash": 370875903746586810, "location": "documentation/content/en/articles/committers-guide/_index.adoc:400", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 128, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 7, "source_unit": "https://translate-dev.freebsd.org/api/units/1589467/?format=api", "priority": 100, "id": 1589467, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=85259dab629138ba", "url": "https://translate-dev.freebsd.org/api/units/1589467/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-09-09T21:28:24.577399Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "For ports repository:" ], "previous_source": "", "target": [ "For ports repository:" ], "id_hash": 406052062629449700, "content_hash": 406052062629449700, "location": "documentation/content/en/articles/committers-guide/_index.adoc:403", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 129, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 3, "source_unit": "https://translate-dev.freebsd.org/api/units/1589469/?format=api", "priority": 100, "id": 1589469, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=85a296331957cfe4", "url": "https://translate-dev.freebsd.org/api/units/1589469/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-09-09T21:28:24.580567Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% git config --add core.hooksPath .hooks\n" ], "previous_source": "", "target": [ "% git config --add core.hooksPath .hooks\n" ], "id_hash": 1230081455158119465, "content_hash": 1230081455158119465, "location": "documentation/content/en/articles/committers-guide/_index.adoc:407", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 130, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 6, "source_unit": "https://translate-dev.freebsd.org/api/units/1589471/?format=api", "priority": 100, "id": 1589471, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=91122090f37ecc29", "url": "https://translate-dev.freebsd.org/api/units/1589471/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-09-09T21:28:24.583691Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "For src repository:" ], "previous_source": "", "target": [ "For src repository:" ], "id_hash": 3952908404725637683, "content_hash": 3952908404725637683, "location": "documentation/content/en/articles/committers-guide/_index.adoc:410", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 131, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 3, "source_unit": "https://translate-dev.freebsd.org/api/units/1589473/?format=api", "priority": 100, "id": 1589473, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=b6db8d402d53e233", "url": "https://translate-dev.freebsd.org/api/units/1589473/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-09-09T21:28:24.586799Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "% cd .git/hooks\n% ln -s ../../tools/tools/git/hooks/prepare-commit-msg\n" ], "previous_source": "", "target": [ "% cd .git/hooks\n% ln -s ../../tools/tools/git/hooks/prepare-commit-msg\n" ], "id_hash": 2429840727617281181, "content_hash": 2429840727617281181, "location": "documentation/content/en/articles/committers-guide/_index.adoc:415", "context": "", "note": "type: delimited block . 4", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 132, "has_suggestion": false, "has_comment": false, "has_failing_check": true, "num_words": 7, "source_unit": "https://translate-dev.freebsd.org/api/units/1589475/?format=api", "priority": 100, "id": 1589475, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=a1b8874496679c9d", "url": "https://translate-dev.freebsd.org/api/units/1589475/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-09-09T21:28:24.589892Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "For pushing, specify the full refspec:" ], "previous_source": "", "target": [ "For pushing, specify the full refspec:" ], "id_hash": 3238200508391492270, "content_hash": 3238200508391492270, "location": "documentation/content/en/articles/committers-guide/_index.adoc:441", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 140, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 6, "source_unit": "https://translate-dev.freebsd.org/api/units/1589477/?format=api", "priority": 100, "id": 1589477, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=acf06634a62a0aae", "url": "https://translate-dev.freebsd.org/api/units/1589477/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-09-09T21:28:24.597462Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "This section addresses tracking local changes. If you have no local changes you can skip this section." ], "previous_source": "", "target": [ "This section addresses tracking local changes. If you have no local changes you can skip this section." ], "id_hash": -1145215682622599530, "content_hash": -1145215682622599530, "location": "documentation/content/en/articles/committers-guide/_index.adoc:727", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 225, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 17, "source_unit": "https://translate-dev.freebsd.org/api/units/1589479/?format=api", "priority": 100, "id": 1589479, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=701b60677e12ce96", "url": "https://translate-dev.freebsd.org/api/units/1589479/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-09-09T21:28:24.654435Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "`Co-authored-by:`" ], "previous_source": "", "target": [ "`Co-authored-by:`" ], "id_hash": 5539567506357052368, "content_hash": 5539567506357052368, "location": "documentation/content/en/articles/committers-guide/_index.adoc:2682", "context": "", "note": "type: Table", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 788, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 1, "source_unit": "https://translate-dev.freebsd.org/api/units/1589481/?format=api", "priority": 100, "id": 1589481, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=cce07f4c11b563d0", "url": "https://translate-dev.freebsd.org/api/units/1589481/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-09-09T21:28:25.052694Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "The name and email address of an additional author of the commit.\nGitHub has a detailed description of the Co-authored-by trailer at https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors." ], "previous_source": "", "target": [ "The name and email address of an additional author of the commit.\nGitHub has a detailed description of the Co-authored-by trailer at https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors." ], "id_hash": -4553554446789359679, "content_hash": -4553554446789359679, "location": "documentation/content/en/articles/committers-guide/_index.adoc:2685", "context": "", "note": "type: Table", "flags": "no-wrap", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 789, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 23, "source_unit": "https://translate-dev.freebsd.org/api/units/1589483/?format=api", "priority": 100, "id": 1589483, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=40ce865b3db847c1", "url": "https://translate-dev.freebsd.org/api/units/1589483/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-09-09T21:28:25.056166Z" }, { "translation": "https://translate-dev.freebsd.org/api/translations/documentation/articlescommitters-guide_index/en/?format=api", "source": [ "The FreeBSD Project utilizes Bugzilla for tracking bugs and change requests. If you commit a fix or suggestion found in the PR database, be sure to close the PR. It is also considered nice if you take time to close any other PRs associated with your commits." ], "previous_source": "", "target": [ "The FreeBSD Project utilizes Bugzilla for tracking bugs and change requests. If you commit a fix or suggestion found in the PR database, be sure to close the PR. It is also considered nice if you take time to close any other PRs associated with your commits." ], "id_hash": -4619021777207759936, "content_hash": -4619021777207759936, "location": "documentation/content/en/articles/committers-guide/_index.adoc:2966", "context": "", "note": "type: Plain text", "flags": "", "labels": [], "state": 100, "fuzzy": false, "translated": true, "approved": false, "position": 861, "has_suggestion": false, "has_comment": false, "has_failing_check": false, "num_words": 47, "source_unit": "https://translate-dev.freebsd.org/api/units/1589485/?format=api", "priority": 100, "id": 1589485, "web_url": "https://translate-dev.freebsd.org/translate/documentation/articlescommitters-guide_index/en/?checksum=3fe5f02a8fbcebc0", "url": "https://translate-dev.freebsd.org/api/units/1589485/?format=api", "explanation": "", "extra_flags": "", "pending": false, "timestamp": "2023-09-09T21:28:25.109010Z" } ] }