Skip to content

G
gitlab-ce
Commit 70771e43 authored by André Luís's avatar André Luís
Browse files
Options

Resolve locale/gitlab.pot

parent 5e412e2c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
locale/gitlab.pot
View file @ 70771e43
...@@ -404,14 +404,13 @@ msgstr "" ...@@ -404,14 +404,13 @@ msgstr ""
msgid "Add Readme" msgid "Add Readme"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "Add additional text to appear in all email communications. %{character_limit} character limit" msgid "Add additional text to appear in all email communications. %{character_limit} character limit"
msgstr "" msgstr ""
msgid "Add comment now" msgid "Add comment now"
======= msgstr ""
msgid "Add a table" msgid "Add a table"
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "Add license" msgid "Add license"
......
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