Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
fc2a35b0
Commit
fc2a35b0
authored
Sep 03, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve locale/gitlab.pot
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
cd766d23
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
16 deletions
+11
-16
locale/gitlab.pot
locale/gitlab.pot
+11
-16
No files found.
locale/gitlab.pot
View file @
fc2a35b0
...
@@ -3691,7 +3691,6 @@ msgstr ""
...
@@ -3691,7 +3691,6 @@ msgstr ""
msgid "Group: %{group_name}"
msgid "Group: %{group_name}"
msgstr ""
msgstr ""
<<<<<<< HEAD
msgid "GroupRoadmap|From %{dateWord}"
msgid "GroupRoadmap|From %{dateWord}"
msgstr ""
msgstr ""
...
@@ -3726,7 +3725,8 @@ msgid "GroupRoadmap|To widen your search, change or remove filters. In the weeks
...
@@ -3726,7 +3725,8 @@ msgid "GroupRoadmap|To widen your search, change or remove filters. In the weeks
msgstr ""
msgstr ""
msgid "GroupRoadmap|Until %{dateWord}"
msgid "GroupRoadmap|Until %{dateWord}"
=======
msgstr ""
msgid "GroupSettings|Badges"
msgid "GroupSettings|Badges"
msgstr ""
msgstr ""
...
@@ -3734,7 +3734,6 @@ msgid "GroupSettings|Customize your group badges."
...
@@ -3734,7 +3734,6 @@ msgid "GroupSettings|Customize your group badges."
msgstr ""
msgstr ""
msgid "GroupSettings|Learn more about badges."
msgid "GroupSettings|Learn more about badges."
>>>>>>> upstream/master
msgstr ""
msgstr ""
msgid "GroupSettings|Prevent sharing a project within %{group} with other groups"
msgid "GroupSettings|Prevent sharing a project within %{group} with other groups"
...
@@ -5705,15 +5704,24 @@ msgstr ""
...
@@ -5705,15 +5704,24 @@ msgstr ""
msgid "ProjectPage|Project ID: %{project_id}"
msgid "ProjectPage|Project ID: %{project_id}"
msgstr ""
msgstr ""
msgid "ProjectSettings|Badges"
msgstr ""
msgid "ProjectSettings|Contact an admin to change this setting."
msgid "ProjectSettings|Contact an admin to change this setting."
msgstr ""
msgstr ""
msgid "ProjectSettings|Customize your project badges."
msgstr ""
msgid "ProjectSettings|Failed to protect the tag"
msgid "ProjectSettings|Failed to protect the tag"
msgstr ""
msgstr ""
msgid "ProjectSettings|Failed to update tag!"
msgid "ProjectSettings|Failed to update tag!"
msgstr ""
msgstr ""
msgid "ProjectSettings|Learn more about badges."
msgstr ""
msgid "ProjectSettings|Only signed commits can be pushed to this repository."
msgid "ProjectSettings|Only signed commits can be pushed to this repository."
msgstr ""
msgstr ""
...
@@ -5759,20 +5767,7 @@ msgstr ""
...
@@ -5759,20 +5767,7 @@ msgstr ""
msgid "PrometheusAlerts|Add alert"
msgid "PrometheusAlerts|Add alert"
msgstr ""
msgstr ""
<<<<<<< HEAD
msgid "PrometheusAlerts|Alert set"
msgid "PrometheusAlerts|Alert set"
=======
msgid "ProjectSettings|Badges"
msgstr ""
msgid "ProjectSettings|Customize your project badges."
msgstr ""
msgid "ProjectSettings|Learn more about badges."
msgstr ""
msgid "Projects"
>>>>>>> upstream/master
msgstr ""
msgstr ""
msgid "PrometheusAlerts|Edit alert"
msgid "PrometheusAlerts|Edit alert"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment