diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-25 06:06:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-25 06:06:21 +0300 |
| commit | 7bb7a8d529fd1155a35a2e9e9cdddd7953f3776d (patch) | |
| tree | e0cedf3ea8732ab14cd918242279619c3c7d7072 /doc | |
| parent | 504ab1e32cbd3a529fe61f6c9a30823febce796c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/development/i18n/externalization.md | 13 | ||||
| -rw-r--r-- | doc/user/clusters/applications.md | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/doc/development/i18n/externalization.md b/doc/development/i18n/externalization.md index a97719fe901..ff75ba8c73b 100644 --- a/doc/development/i18n/externalization.md +++ b/doc/development/i18n/externalization.md @@ -313,17 +313,22 @@ Developer documentation][mdn]. ## Updating the PO files with the new content -Now that the new content is marked for translation, we need to update the PO -files with the following command: +Now that the new content is marked for translation, we need to update +`locale/gitlab.pot` files with the following command: ```sh bin/rake gettext:regenerate ``` -This command will update the `locale/gitlab.pot` file with the newly externalized +This command will update `locale/gitlab.pot` file with the newly externalized strings and remove any strings that aren't used anymore. You should check this file in. Once the changes are on master, they will be picked up by -[Crowdin](http://translate.gitlab.com) and be presented for translation. +[Crowdin](http://translate.gitlab.com) and be presented for +translation. + +We don't need to check in any changes to the +`locale/[language]/gitlab.po` files. Those will be updated in a [when +translations from Crowdin are merged](merging_translations.md). If there are merge conflicts in the `gitlab.pot` file, you can delete the file and regenerate it using the same command. diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md index 3da6424170f..3218a18d8f8 100644 --- a/doc/user/clusters/applications.md +++ b/doc/user/clusters/applications.md @@ -293,7 +293,7 @@ The applications below can be uninstalled. | ----------- | -------------- | ----- | | Cert-Manager | 12.2+ | The associated private key will be deleted and cannot be restored. Deployed applications will continue to use HTTPS, but certificates will not be renewed. Before uninstalling, you may wish to [back up your configuration](https://docs.cert-manager.io/en/latest/tasks/backup-restore-crds.html) or [revoke your certificates](https://letsencrypt.org/docs/revoking/) | | GitLab Runner | 12.2+ | Any running pipelines will be canceled. | -| Helm | 12.2+ | The associated Tiller pod will be deleted and cannot be restored. | +| Helm | 12.2+ | The associated Tiller pod, the `gitlab-managed-apps` namespace, and all of its resources will be deleted and cannot be restored. | | Ingress | 12.1+ | The associated load balancer and IP will be deleted and cannot be restored. Furthermore, it can only be uninstalled if JupyterHub is not installed. | | JupyterHub | 12.1+ | All data not committed to GitLab will be deleted and cannot be restored. | | Knative | 12.1+ | The associated IP will be deleted and cannot be restored. | |