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
11a86807
Commit
11a86807
authored
Aug 30, 2018
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflicts in local/gitlab.pot
parent
68d3119c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
locale/gitlab.pot
locale/gitlab.pot
+2
-3
No files found.
locale/gitlab.pot
View file @
11a86807
...
...
@@ -8500,7 +8500,6 @@ msgstr ""
msgid "importing"
msgstr ""
<<<<<<< HEAD
msgid "instance completed"
msgid_plural "instances completed"
msgstr[0] ""
...
...
@@ -8513,9 +8512,9 @@ msgid "is invalid because there is upstream lock"
msgstr ""
msgid "is not a valid X509 certificate."
=======
msgstr ""
msgid "issue boards"
>>>>>>> upstream/master
msgstr ""
msgid "latest version"
...
...
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