diff options
author | James Lopez <james@jameslopez.es> | 2018-03-12 11:45:13 +0100 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2018-03-12 11:45:13 +0100 |
commit | 7f3e6473ca8e25ee7b860cb6ed6416fc1c98f8b2 (patch) | |
tree | dd6dbdc0eeb84d6ab3f125d7bd6a6a112ce74c7b | |
parent | 2e3a964a3b45c38716711f2b03de9b6a9d2cfd52 (diff) | |
parent | a648e950f4a586468b2f8214139c901c3636297f (diff) | |
download | gitlab-ce-7f3e6473ca8e25ee7b860cb6ed6416fc1c98f8b2.tar.gz |
Merge branch '10-6-stable' into 10-6-stable-frozen10-6-stable-frozen
# Conflicts:
# locale/gitlab.pot
-rw-r--r-- | locale/gitlab.pot | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 3f05e878cc8..4b187312c06 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -222,6 +222,9 @@ msgstr "" msgid "Alternatively, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to import." msgstr "" +msgid "Alternatively, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to import." +msgstr "" + msgid "An error occurred previewing the blob" msgstr "" @@ -611,6 +614,9 @@ msgstr "" msgid "Choose which repositories you want to import." msgstr "" +msgid "Choose which repositories you want to import." +msgstr "" + msgid "CiStatusLabel|canceled" msgstr "" @@ -1289,6 +1295,9 @@ msgstr "" msgid "Done" msgstr "" +msgid "Done" +msgstr "" + msgid "Download" msgstr "" @@ -1442,6 +1451,9 @@ msgstr "" msgid "Failed" msgstr "" +msgid "Failed" +msgstr "" + msgid "Failed Jobs" msgstr "" @@ -1510,6 +1522,9 @@ msgstr "" msgid "From %{provider_title}" msgstr "" +msgid "From %{provider_title}" +msgstr "" + msgid "From issue creation until deploy to production" msgstr "" @@ -1668,6 +1683,12 @@ msgstr "" msgid "Import all repositories" msgstr "" +msgid "Import" +msgstr "" + +msgid "Import all repositories" +msgstr "" + msgid "Import in progress" msgstr "" @@ -1835,6 +1856,9 @@ msgstr "" msgid "List your GitHub repositories" msgstr "" +msgid "Loading the GitLab IDE..." +msgstr "" + msgid "Lock" msgstr "" @@ -2882,6 +2906,12 @@ msgstr "" msgid "Status" msgstr "" +msgid "Started" +msgstr "" + +msgid "Status" +msgstr "" + msgid "Stopped" msgstr "" @@ -3308,6 +3338,15 @@ msgstr "" msgid "To import GitHub repositories, you first need to authorize GitLab to access the list of your GitHub repositories:" msgstr "" +msgid "To GitLab" +msgstr "" + +msgid "To import GitHub repositories, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to import." +msgstr "" + +msgid "To import GitHub repositories, you first need to authorize GitLab to access the list of your GitHub repositories:" +msgstr "" + msgid "To import an SVN repository, check out %{svn_link}." msgstr "" @@ -3638,6 +3677,9 @@ msgstr "" msgid "connecting" msgstr "" +msgid "connecting" +msgstr "" + msgid "day" msgid_plural "days" msgstr[0] "" |