Skip to content

G
gitlab-ce
Commit b116c1ef authored by Olivier Gonzalez's avatar Olivier Gonzalez
Browse files
Options

Fix CE to EE merge conflict on gitlab.pot

parent 3cea4698
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 8 deletions
locale/gitlab.pot
View file @ b116c1ef
...@@ -8,13 +8,8 @@ msgid "" ...@@ -8,13 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gitlab 1.0.0\n" "Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2018-06-13 10:31-0400\n"
"PO-Revision-Date: 2018-06-13 10:31-0400\n"
=======
"POT-Creation-Date: 2018-06-13 14:05+0200\n" "POT-Creation-Date: 2018-06-13 14:05+0200\n"
"PO-Revision-Date: 2018-06-13 14:05+0200\n" "PO-Revision-Date: 2018-06-13 14:05+0200\n"
>>>>>>> upstream/master
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n" "Language: \n"
...@@ -2621,17 +2616,16 @@ msgstr "" ...@@ -2621,17 +2616,16 @@ msgstr ""
msgid "GeoNodes|Does not match the primary storage configuration" msgid "GeoNodes|Does not match the primary storage configuration"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "GeoNodes|Failed" msgid "GeoNodes|Failed"
msgstr "" msgstr ""
msgid "GeoNodes|Full" msgid "GeoNodes|Full"
======= msgstr ""
msgid "Gitaly Servers" msgid "Gitaly Servers"
msgstr "" msgstr ""
msgid "Gitaly|Address" msgid "Gitaly|Address"
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "GeoNodes|GitLab version" msgid "GeoNodes|GitLab version"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7