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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
c807a799
Commit
c807a799
authored
Feb 07, 2018
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a note about merge conflicts in `gitlab.pot`
parent
3f3b84e0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
doc/development/i18n/externalization.md
doc/development/i18n/externalization.md
+3
-0
No files found.
doc/development/i18n/externalization.md
View file @
c807a799
...
@@ -124,6 +124,9 @@ strings and remove any strings that aren't used anymore. You should check this
...
@@ -124,6 +124,9 @@ 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
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.
If there are merge conflicts in the
`gitlab.pot`
file, you can delete the file
and regenerate it using the same command. Confirm that you are not deleting any strings accidentally by looking over the diff.
The command also updates the translation files for each language:
`locale/*/gitlab.po`
The command also updates the translation files for each language:
`locale/*/gitlab.po`
These changes can be discarded, the languange files will be updated by Crowdin
These changes can be discarded, the languange files will be updated by Crowdin
automatically.
automatically.
...
...
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