Merge master into i18n branch #1454

2019-11-02T07:06:22Z

djoate commented

2019-11-02 07:06:22 +00:00

(Migrated from github.com)

Related to issue https://github.com/privacytoolsIO/privacytools.io/issues/1106 and PR https://github.com/privacytoolsIO/privacytools.io/pull/1105.

The i18n branch has not received any merges from master since August. As there have been plenty of string changes, this PR aims to keep the i18n branch up-to-date. (GitHub says that the i18n branch is currently 101 commits behind master.) Edits from maintainers are welcome.

Merge conflicts have been resolved, mostly in favor of the strings that are currently on the website. _i18n/en.yml has been edited to update it, but _i18n/pl.yml has not been modified.

Some new keys in _i18n/en.yml have been added or edited. For example, https://www.privacytools.io/index.html#resources used to list Keybase as a resource and it had corresponding keys. It was replaced by Open Wireless Movement, so the appropriate change to the corresponding key was made.

The content of the site should look more or less identical to the site that is currently served via the master branch (i.e., what https://www.privacytools.io is serving right now), though there has been a few fixes for typos.

Related to issue https://github.com/privacytoolsIO/privacytools.io/issues/1106 and PR https://github.com/privacytoolsIO/privacytools.io/pull/1105. The i18n branch has not received any merges from master since August. As there have been plenty of string changes, this PR aims to keep the i18n branch up-to-date. (GitHub says that the i18n branch is currently 101 commits behind master.) Edits from maintainers are welcome. Merge conflicts have been resolved, mostly in favor of the strings that are currently on the website. `_i18n/en.yml` has been edited to update it, but `_i18n/pl.yml` has not been modified. Some new keys in `_i18n/en.yml` have been added or edited. For example, https://www.privacytools.io/index.html#resources used to list Keybase as a resource and it had corresponding keys. It was replaced by Open Wireless Movement, so the appropriate change to the corresponding key was made. The content of the site should look more or less identical to the site that is currently served via the master branch (i.e., what https://www.privacytools.io is serving right now), though there has been a few fixes for typos.

👍 1 ❤️ 1

privacytoolsIO (Migrated from github.com) reviewed

2019-11-02 07:06:22 +00:00

jonah reviewed

2019-11-02 07:06:22 +00:00

This repo is archived. You cannot comment on pull requests.

1 Participants

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: privacyguides/privacytools.io#1454