summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@gitlab.com>2017-06-15 13:34:36 +0200
committerBob Van Landuyt <bob@gitlab.com>2017-06-15 14:47:05 +0200
commit459998276560dc6b77c11768cbd2d22bae7426a2 (patch)
treeb9d471c514a885c5a6591796063060914290e1de /locale
parent1924e5005d64bb333550b20ddb33b94e7e9d8f00 (diff)
downloadgitlab-ce-459998276560dc6b77c11768cbd2d22bae7426a2.tar.gz
Remove HTML from translation key
Diffstat (limited to 'locale')
-rw-r--r--locale/es/gitlab.po18
-rw-r--r--locale/gitlab.pot20
2 files changed, 19 insertions, 19 deletions
diff --git a/locale/es/gitlab.po b/locale/es/gitlab.po
index a53edcf40f1..455122b522b 100644
--- a/locale/es/gitlab.po
+++ b/locale/es/gitlab.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-06-15 12:10+0200\n"
+"PO-Revision-Date: 2017-06-15 13:28+0200\n"
"Language-Team: Spanish\n"
"Language: es\n"
"MIME-Version: 1.0\n"
@@ -85,12 +85,6 @@ msgstr "Revertir en la rama"
msgid "ChangeTypeAction|Cherry-pick"
msgstr "Cherry-pick"
-msgid "ChangeType|commit"
-msgstr "cambio"
-
-msgid "ChangeType|merge request"
-msgstr "solicitud de fusión"
-
msgid "Changelog"
msgstr "Changelog"
@@ -100,7 +94,7 @@ msgstr "Gráficos"
msgid "Cherry-pick this commit"
msgstr "Escoger este cambio"
-msgid "Cherry-pick this merge-request"
+msgid "Cherry-pick this merge request"
msgstr "Escoger esta solicitud de fusión"
msgid "CiStatusLabel|canceled"
@@ -658,7 +652,7 @@ msgstr "Solicitar acceso"
msgid "Revert this commit"
msgstr "Revertir este cambio"
-msgid "Revert this merge-request"
+msgid "Revert this merge request"
msgstr "Revertir esta solicitud de fusión"
msgid "Save pipeline schedule"
@@ -708,6 +702,9 @@ msgstr "Código fuente"
msgid "StarProject|Star"
msgstr "Destacar"
+msgid "Start a %{new_merge_request} with these changes"
+msgstr "Iniciar una %{new_merge_request} con estos cambios"
+
msgid "Start a <strong>new merge request</strong> with these changes"
msgstr "Iniciar una <strong>nueva solicitud de fusión</strong> con estos cambios"
@@ -1013,6 +1010,9 @@ msgid_plural "days"
msgstr[0] "día"
msgstr[1] "días"
+msgid "new merge request"
+msgstr "nueva solicitud de fusión"
+
msgid "notification emails"
msgstr "correos electrónicos de notificación"
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 5d728a7eabf..df225f5aac8 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-15 12:04+0200\n"
-"PO-Revision-Date: 2017-06-15 12:04+0200\n"
+"POT-Creation-Date: 2017-06-15 12:35+0200\n"
+"PO-Revision-Date: 2017-06-15 12:35+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -86,12 +86,6 @@ msgstr ""
msgid "ChangeTypeAction|Cherry-pick"
msgstr ""
-msgid "ChangeType|commit"
-msgstr ""
-
-msgid "ChangeType|merge request"
-msgstr ""
-
msgid "Changelog"
msgstr ""
@@ -101,7 +95,7 @@ msgstr ""
msgid "Cherry-pick this commit"
msgstr ""
-msgid "Cherry-pick this merge-request"
+msgid "Cherry-pick this merge request"
msgstr ""
msgid "CiStatusLabel|canceled"
@@ -659,7 +653,7 @@ msgstr ""
msgid "Revert this commit"
msgstr ""
-msgid "Revert this merge-request"
+msgid "Revert this merge request"
msgstr ""
msgid "Save pipeline schedule"
@@ -709,6 +703,9 @@ msgstr ""
msgid "StarProject|Star"
msgstr ""
+msgid "Start a %{new_merge_request} with these changes"
+msgstr ""
+
msgid "Start a <strong>new merge request</strong> with these changes"
msgstr ""
@@ -1011,6 +1008,9 @@ msgid_plural "days"
msgstr[0] ""
msgstr[1] ""
+msgid "new merge request"
+msgstr ""
+
msgid "notification emails"
msgstr ""