{"action":"created","issue":{"url":"https://api.github.com/repos/gramps-project/gramps/issues/635","repository_url":"https://api.github.com/repos/gramps-project/gramps","labels_url":"https://api.github.com/repos/gramps-project/gramps/issues/635/labels{/name}","comments_url":"https://api.github.com/repos/gramps-project/gramps/issues/635/comments","events_url":"https://api.github.com/repos/gramps-project/gramps/issues/635/events","html_url":"https://github.com/gramps-project/gramps/pull/635","id":341007773,"node_id":"MDExOlB1bGxSZXF1ZXN0MjAxMjgyMzM1","number":635,"title":"Merge Gramps50 with Master","user":{"login":"prculley","id":18122203,"node_id":"MDQ6VXNlcjE4MTIyMjAz","avatar_url":"https://avatars2.githubusercontent.com/u/18122203?v=4","gravatar_id":"","url":"https://api.github.com/users/prculley","html_url":"https://github.com/prculley","followers_url":"https://api.github.com/users/prculley/followers","following_url":"https://api.github.com/users/prculley/following{/other_user}","gists_url":"https://api.github.com/users/prculley/gists{/gist_id}","starred_url":"https://api.github.com/users/prculley/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/prculley/subscriptions","organizations_url":"https://api.github.com/users/prculley/orgs","repos_url":"https://api.github.com/users/prculley/repos","events_url":"https://api.github.com/users/prculley/events{/privacy}","received_events_url":"https://api.github.com/users/prculley/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":5,"created_at":"2018-07-13T12:53:11Z","updated_at":"2018-07-15T01:03:16Z","closed_at":"2018-07-14T13:13:28Z","author_association":"CONTRIBUTOR","pull_request":{"url":"https://api.github.com/repos/gramps-project/gramps/pulls/635","html_url":"https://github.com/gramps-project/gramps/pull/635","diff_url":"https://github.com/gramps-project/gramps/pull/635.diff","patch_url":"https://github.com/gramps-project/gramps/pull/635.patch"},"body":"As the title says.  During the merge, I encountered several thousand conflicts with the PO files, and saw that some of the automatic merge steps in the po files were not being done properly.  It seems that some po files had been updated on both master and grampss50 branches, other master branch files appeared to be even older than the original 'base' of the merge.\r\n\r\nSo I decided to use a slightly different process there.  I initially just completed the merge, just selecting everything from gramps50 for po files, and a careful conflict resolution for everything else, and then used the gettext msgcat utility to merge the po files from Gramps50 and original master branch (before merge).  The msgcat properly merges po files, not losing ANY strings, so there might be a few extras when complete, though these will be ignored during the next template merge.  Except for the nn.po, I let the msgcat use the gramps50 version of strings that were translated differently in both (nn.po was clearly just recently redone on master, but not on gramps50).\r\nThe results of this were added as a last commit."},"comment":{"url":"https://api.github.com/repos/gramps-project/gramps/issues/comments/405059956","html_url":"https://github.com/gramps-project/gramps/pull/635#issuecomment-405059956","issue_url":"https://api.github.com/repos/gramps-project/gramps/issues/635","id":405059956,"node_id":"MDEyOklzc3VlQ29tbWVudDQwNTA1OTk1Ng==","user":{"login":"Nick-Hall","id":9042510,"node_id":"MDQ6VXNlcjkwNDI1MTA=","avatar_url":"https://avatars1.githubusercontent.com/u/9042510?v=4","gravatar_id":"","url":"https://api.github.com/users/Nick-Hall","html_url":"https://github.com/Nick-Hall","followers_url":"https://api.github.com/users/Nick-Hall/followers","following_url":"https://api.github.com/users/Nick-Hall/following{/other_user}","gists_url":"https://api.github.com/users/Nick-Hall/gists{/gist_id}","starred_url":"https://api.github.com/users/Nick-Hall/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Nick-Hall/subscriptions","organizations_url":"https://api.github.com/users/Nick-Hall/orgs","repos_url":"https://api.github.com/users/Nick-Hall/repos","events_url":"https://api.github.com/users/Nick-Hall/events{/privacy}","received_events_url":"https://api.github.com/users/Nick-Hall/received_events","type":"User","site_admin":false},"created_at":"2018-07-15T01:03:16Z","updated_at":"2018-07-15T01:03:16Z","author_association":"MEMBER","body":"> Because the one translator did his work in master, we are missing a few translations (recent string changes around 'dbapi' vs. 'sqlite' for example). I also have not considered trying to backport or redo his translation to gramps50; the release will end up with a pretty old version as it is.\r\n\r\nOnly one.  I was concerned there may be more.\r\n\r\nIt should be easy to use `msgmerge` to merge the po file from _master_ into the pot file from _gramps50_.\r\n\r\nWe just need to make it clear to the translators which branch to use.  Many of them are non-technical."}}
{"actor":{"display_login":"Nick-Hall"}}