{"action":"created","issue":{"url":"https://api.github.com/repos/Alanaktion/phproject/issues/203","repository_url":"https://api.github.com/repos/Alanaktion/phproject","labels_url":"https://api.github.com/repos/Alanaktion/phproject/issues/203/labels{/name}","comments_url":"https://api.github.com/repos/Alanaktion/phproject/issues/203/comments","events_url":"https://api.github.com/repos/Alanaktion/phproject/issues/203/events","html_url":"https://github.com/Alanaktion/phproject/pull/203","id":155286029,"number":203,"title":"added several missing translation dependencies and updated dict/en an…","user":{"login":"BerChill","id":18327444,"avatar_url":"https://avatars.githubusercontent.com/u/18327444?v=3","gravatar_id":"","url":"https://api.github.com/users/BerChill","html_url":"https://github.com/BerChill","followers_url":"https://api.github.com/users/BerChill/followers","following_url":"https://api.github.com/users/BerChill/following{/other_user}","gists_url":"https://api.github.com/users/BerChill/gists{/gist_id}","starred_url":"https://api.github.com/users/BerChill/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/BerChill/subscriptions","organizations_url":"https://api.github.com/users/BerChill/orgs","repos_url":"https://api.github.com/users/BerChill/repos","events_url":"https://api.github.com/users/BerChill/events{/privacy}","received_events_url":"https://api.github.com/users/BerChill/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":3,"created_at":"2016-05-17T15:15:15Z","updated_at":"2016-05-18T15:46:10Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/Alanaktion/phproject/pulls/203","html_url":"https://github.com/Alanaktion/phproject/pull/203","diff_url":"https://github.com/Alanaktion/phproject/pull/203.diff","patch_url":"https://github.com/Alanaktion/phproject/pull/203.patch"},"body":"…d dict/de accordingly\r\n\r\nNOTE: My changes should be reviewed thoroughly since they are based on a possibly faulty version of master as described in #202 . I just noticed this after working on it otherwise I would have waited for a fixed version of master. But the testing I did suggests that no additional errors have been introduced by my changes."},"comment":{"url":"https://api.github.com/repos/Alanaktion/phproject/issues/comments/220069346","html_url":"https://github.com/Alanaktion/phproject/pull/203#issuecomment-220069346","issue_url":"https://api.github.com/repos/Alanaktion/phproject/issues/203","id":220069346,"user":{"login":"Alanaktion","id":236490,"avatar_url":"https://avatars.githubusercontent.com/u/236490?v=3","gravatar_id":"","url":"https://api.github.com/users/Alanaktion","html_url":"https://github.com/Alanaktion","followers_url":"https://api.github.com/users/Alanaktion/followers","following_url":"https://api.github.com/users/Alanaktion/following{/other_user}","gists_url":"https://api.github.com/users/Alanaktion/gists{/gist_id}","starred_url":"https://api.github.com/users/Alanaktion/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Alanaktion/subscriptions","organizations_url":"https://api.github.com/users/Alanaktion/orgs","repos_url":"https://api.github.com/users/Alanaktion/repos","events_url":"https://api.github.com/users/Alanaktion/events{/privacy}","received_events_url":"https://api.github.com/users/Alanaktion/received_events","type":"User","site_admin":false},"created_at":"2016-05-18T15:46:10Z","updated_at":"2016-05-18T15:46:10Z","body":"It still looks a bit off. You may have had a merge conflict at some point that was resolved incorrectly, causing your current code to replace the changes in the upstream code. This can be resolved by checking out the upstream master and re-making your changes to that code, since your commit history already has the conflict.\r\nIf you'd prefer, I can fix the issues in the merge directly myself. No big deal either way :smile: "}}