{"action":"closed","number":20,"pull_request":{"url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/pulls/20","id":284961363,"node_id":"MDExOlB1bGxSZXF1ZXN0Mjg0OTYxMzYz","html_url":"https://github.com/javascript-tutorial/pt.javascript.info/pull/20","diff_url":"https://github.com/javascript-tutorial/pt.javascript.info/pull/20.diff","patch_url":"https://github.com/javascript-tutorial/pt.javascript.info/pull/20.patch","issue_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/issues/20","number":20,"state":"closed","locked":false,"title":"Sync with upstream @ a0266c57","user":{"login":"javascript-translate-bot","id":49596073,"node_id":"MDQ6VXNlcjQ5NTk2MDcz","avatar_url":"https://avatars2.githubusercontent.com/u/49596073?v=4","gravatar_id":"","url":"https://api.github.com/users/javascript-translate-bot","html_url":"https://github.com/javascript-translate-bot","followers_url":"https://api.github.com/users/javascript-translate-bot/followers","following_url":"https://api.github.com/users/javascript-translate-bot/following{/other_user}","gists_url":"https://api.github.com/users/javascript-translate-bot/gists{/gist_id}","starred_url":"https://api.github.com/users/javascript-translate-bot/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/javascript-translate-bot/subscriptions","organizations_url":"https://api.github.com/users/javascript-translate-bot/orgs","repos_url":"https://api.github.com/users/javascript-translate-bot/repos","events_url":"https://api.github.com/users/javascript-translate-bot/events{/privacy}","received_events_url":"https://api.github.com/users/javascript-translate-bot/received_events","type":"User","site_admin":false},"body":"\nThis PR was automatically generated to merge changes from [en.javascript.info](https://github.com/javascript-tutorial/en.javascript.info/commits/master) at a0266c57\n\n**Conflicted files in this PR have labels \">>>...\" with both sides of conflict. If you merge this PR, you'll need to examine the listed files and resolve conflicts.**\n\nAlternatively, you can close this PR and merge conflicting changes manually.\n\n\nThe following files have conflicts and may need updates of the translations:\n\n- [ ] [1-js/01-getting-started/1-intro/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/01-getting-started/1-intro/article.md)\n- [ ] [1-js/02-first-steps/01-hello-world/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/01-hello-world/article.md)\n- [ ] [1-js/02-first-steps/04-variables/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/04-variables/article.md)\n- [ ] [1-js/02-first-steps/05-types/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/05-types/article.md)\n- [ ] [1-js/05-data-types/01-primitives-methods/1-string-new-property/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/01-primitives-methods/1-string-new-property/solution.md)\n- [ ] [1-js/05-data-types/01-primitives-methods/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/01-primitives-methods/article.md)\n- [ ] [README.md](/javascript-tutorial/en.javascript.info/commits/master/README.md)\n\n\n\n\nTo merge changes manually (instead of merging this PR): \n1. Add remote upstream that links to the English version (only needs to be done once)\n    - `git add remote upstream https://github.com/javascript-tutorial/en.javascript.info` \n2. Commit all current work locally and `git checkout master`\n3. Pull the recent changes from the English version:\n    - `git pull upstream master`\n4. Deal with the conflicts. If a conflict touches a few lines, then just fix it. Otherwise, following commands can help:\n    - Checkout your (translated) version of a file/folder at the given path (removes all upstream changes):\n        - `git checkout --ours <path>`\n    - See the diff, what changed in the upstream file since branches diverged: \n        - `git diff --word-diff master...upstream/master <path>` (please note: three dots in the command)\n    - Then you can examine the changes in upstream and add them manually\n5. When conflicts resolved, commit them and `git push origin master`\n\nPlease ignore changes in README.md (git checkout --ours README.md && git commit -m ignore README.md).\n\n\nThis PR will be closed and replaced with a new one in a few days. \n\n","created_at":"2019-06-04T12:57:27Z","updated_at":"2019-06-10T05:02:16Z","closed_at":"2019-06-10T05:02:16Z","merged_at":null,"merge_commit_sha":"8011c39b90ffdc0d4abfd35d60a908f7d196e6be","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[{"name":"translate-pt","id":3248900,"node_id":"MDQ6VGVhbTMyNDg5MDA=","slug":"translate-pt","description":"Discuss the translation of Javascript Tutorial into Portuguese.","privacy":"closed","url":"https://api.github.com/teams/3248900","html_url":"https://github.com/orgs/javascript-tutorial/teams/translate-pt","members_url":"https://api.github.com/teams/3248900/members{/member}","repositories_url":"https://api.github.com/teams/3248900/repos","permission":"pull"}],"labels":[{"id":1383121510,"node_id":"MDU6TGFiZWwxMzgzMTIxNTEw","url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/labels/review%20needed","name":"review needed","color":"b72d32","default":false}],"milestone":null,"commits_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/pulls/20/commits","review_comments_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/pulls/20/comments","review_comment_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/pulls/comments{/number}","comments_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/issues/20/comments","statuses_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/statuses/c6293451187a8227079ed30a01d360a76158fbe7","head":{"label":"javascript-tutorial:sync-a0266c57","ref":"sync-a0266c57","sha":"c6293451187a8227079ed30a01d360a76158fbe7","user":{"login":"javascript-tutorial","id":49552305,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ5NTUyMzA1","avatar_url":"https://avatars1.githubusercontent.com/u/49552305?v=4","gravatar_id":"","url":"https://api.github.com/users/javascript-tutorial","html_url":"https://github.com/javascript-tutorial","followers_url":"https://api.github.com/users/javascript-tutorial/followers","following_url":"https://api.github.com/users/javascript-tutorial/following{/other_user}","gists_url":"https://api.github.com/users/javascript-tutorial/gists{/gist_id}","starred_url":"https://api.github.com/users/javascript-tutorial/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/javascript-tutorial/subscriptions","organizations_url":"https://api.github.com/users/javascript-tutorial/orgs","repos_url":"https://api.github.com/users/javascript-tutorial/repos","events_url":"https://api.github.com/users/javascript-tutorial/events{/privacy}","received_events_url":"https://api.github.com/users/javascript-tutorial/received_events","type":"Organization","site_admin":false},"repo":{"id":183094873,"node_id":"MDEwOlJlcG9zaXRvcnkxODMwOTQ4NzM=","name":"pt.javascript.info","full_name":"javascript-tutorial/pt.javascript.info","private":false,"owner":{"login":"javascript-tutorial","id":49552305,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ5NTUyMzA1","avatar_url":"https://avatars1.githubusercontent.com/u/49552305?v=4","gravatar_id":"","url":"https://api.github.com/users/javascript-tutorial","html_url":"https://github.com/javascript-tutorial","followers_url":"https://api.github.com/users/javascript-tutorial/followers","following_url":"https://api.github.com/users/javascript-tutorial/following{/other_user}","gists_url":"https://api.github.com/users/javascript-tutorial/gists{/gist_id}","starred_url":"https://api.github.com/users/javascript-tutorial/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/javascript-tutorial/subscriptions","organizations_url":"https://api.github.com/users/javascript-tutorial/orgs","repos_url":"https://api.github.com/users/javascript-tutorial/repos","events_url":"https://api.github.com/users/javascript-tutorial/events{/privacy}","received_events_url":"https://api.github.com/users/javascript-tutorial/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/javascript-tutorial/pt.javascript.info","description":"Modern JavaScript Tutorial in Portuguese","fork":false,"url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info","forks_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/forks","keys_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/keys{/key_id}","collaborators_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/teams","hooks_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/hooks","issue_events_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/issues/events{/number}","events_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/events","assignees_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/assignees{/user}","branches_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/branches{/branch}","tags_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/tags","blobs_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/git/refs{/sha}","trees_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/git/trees{/sha}","statuses_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/statuses/{sha}","languages_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/languages","stargazers_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/stargazers","contributors_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/contributors","subscribers_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/subscribers","subscription_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/subscription","commits_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/commits{/sha}","git_commits_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/git/commits{/sha}","comments_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/comments{/number}","issue_comment_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/issues/comments{/number}","contents_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/contents/{+path}","compare_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/compare/{base}...{head}","merges_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/merges","archive_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/downloads","issues_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/issues{/number}","pulls_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/pulls{/number}","milestones_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/milestones{/number}","notifications_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/labels{/name}","releases_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/releases{/id}","deployments_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/deployments","created_at":"2019-04-23T20:56:56Z","updated_at":"2019-06-04T08:56:57Z","pushed_at":"2019-06-10T05:02:15Z","git_url":"git://github.com/javascript-tutorial/pt.javascript.info.git","ssh_url":"git@github.com:javascript-tutorial/pt.javascript.info.git","clone_url":"https://github.com/javascript-tutorial/pt.javascript.info.git","svn_url":"https://github.com/javascript-tutorial/pt.javascript.info","homepage":"https://javascript.info","size":493802,"stargazers_count":6,"watchers_count":6,"language":"HTML","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":8,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":4,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":8,"open_issues":4,"watchers":6,"default_branch":"master"}},"base":{"label":"javascript-tutorial:master","ref":"master","sha":"d3077bde3fb68ee6bb99b5fe9c327afdf53db73f","user":{"login":"javascript-tutorial","id":49552305,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ5NTUyMzA1","avatar_url":"https://avatars1.githubusercontent.com/u/49552305?v=4","gravatar_id":"","url":"https://api.github.com/users/javascript-tutorial","html_url":"https://github.com/javascript-tutorial","followers_url":"https://api.github.com/users/javascript-tutorial/followers","following_url":"https://api.github.com/users/javascript-tutorial/following{/other_user}","gists_url":"https://api.github.com/users/javascript-tutorial/gists{/gist_id}","starred_url":"https://api.github.com/users/javascript-tutorial/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/javascript-tutorial/subscriptions","organizations_url":"https://api.github.com/users/javascript-tutorial/orgs","repos_url":"https://api.github.com/users/javascript-tutorial/repos","events_url":"https://api.github.com/users/javascript-tutorial/events{/privacy}","received_events_url":"https://api.github.com/users/javascript-tutorial/received_events","type":"Organization","site_admin":false},"repo":{"id":183094873,"node_id":"MDEwOlJlcG9zaXRvcnkxODMwOTQ4NzM=","name":"pt.javascript.info","full_name":"javascript-tutorial/pt.javascript.info","private":false,"owner":{"login":"javascript-tutorial","id":49552305,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQ5NTUyMzA1","avatar_url":"https://avatars1.githubusercontent.com/u/49552305?v=4","gravatar_id":"","url":"https://api.github.com/users/javascript-tutorial","html_url":"https://github.com/javascript-tutorial","followers_url":"https://api.github.com/users/javascript-tutorial/followers","following_url":"https://api.github.com/users/javascript-tutorial/following{/other_user}","gists_url":"https://api.github.com/users/javascript-tutorial/gists{/gist_id}","starred_url":"https://api.github.com/users/javascript-tutorial/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/javascript-tutorial/subscriptions","organizations_url":"https://api.github.com/users/javascript-tutorial/orgs","repos_url":"https://api.github.com/users/javascript-tutorial/repos","events_url":"https://api.github.com/users/javascript-tutorial/events{/privacy}","received_events_url":"https://api.github.com/users/javascript-tutorial/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/javascript-tutorial/pt.javascript.info","description":"Modern JavaScript Tutorial in Portuguese","fork":false,"url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info","forks_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/forks","keys_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/keys{/key_id}","collaborators_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/teams","hooks_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/hooks","issue_events_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/issues/events{/number}","events_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/events","assignees_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/assignees{/user}","branches_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/branches{/branch}","tags_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/tags","blobs_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/git/refs{/sha}","trees_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/git/trees{/sha}","statuses_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/statuses/{sha}","languages_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/languages","stargazers_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/stargazers","contributors_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/contributors","subscribers_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/subscribers","subscription_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/subscription","commits_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/commits{/sha}","git_commits_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/git/commits{/sha}","comments_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/comments{/number}","issue_comment_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/issues/comments{/number}","contents_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/contents/{+path}","compare_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/compare/{base}...{head}","merges_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/merges","archive_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/downloads","issues_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/issues{/number}","pulls_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/pulls{/number}","milestones_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/milestones{/number}","notifications_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/labels{/name}","releases_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/releases{/id}","deployments_url":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/deployments","created_at":"2019-04-23T20:56:56Z","updated_at":"2019-06-04T08:56:57Z","pushed_at":"2019-06-10T05:02:15Z","git_url":"git://github.com/javascript-tutorial/pt.javascript.info.git","ssh_url":"git@github.com:javascript-tutorial/pt.javascript.info.git","clone_url":"https://github.com/javascript-tutorial/pt.javascript.info.git","svn_url":"https://github.com/javascript-tutorial/pt.javascript.info","homepage":"https://javascript.info","size":493802,"stargazers_count":6,"watchers_count":6,"language":"HTML","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":8,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":4,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":8,"open_issues":4,"watchers":6,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/pulls/20"},"html":{"href":"https://github.com/javascript-tutorial/pt.javascript.info/pull/20"},"issue":{"href":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/issues/20"},"comments":{"href":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/issues/20/comments"},"review_comments":{"href":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/pulls/20/comments"},"review_comment":{"href":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/pulls/20/commits"},"statuses":{"href":"https://api.github.com/repos/javascript-tutorial/pt.javascript.info/statuses/c6293451187a8227079ed30a01d360a76158fbe7"}},"author_association":"NONE","merged":false,"mergeable":true,"rebaseable":false,"mergeable_state":"unstable","merged_by":null,"comments":1,"review_comments":0,"maintainer_can_modify":false,"commits":215,"additions":856,"deletions":714,"changed_files":141}}
{"actor":{"display_login":"javascript-translate-bot"}}