Commit ec17589c authored by Bob Van Landuyt's avatar Bob Van Landuyt

Resolve translation files using their CE

parent 04c02b85
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
No preview for this file type
This diff is collapsed.
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2017-06-12 09:42+0200\n"
"PO-Revision-Date: 2017-04-12 22:36-0500\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: English\n"
"Language: en\n"
......@@ -17,11 +17,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"\n"
<<<<<<< HEAD
msgid "About auto deploy"
msgstr ""
=======
msgid "%{commit_author_link} committed %{commit_timeago}"
msgstr ""
......@@ -31,7 +26,6 @@ msgstr ""
msgid "Active"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Activity"
msgstr ""
......@@ -56,12 +50,9 @@ msgstr ""
msgid "Are you sure you want to delete this pipeline schedule?"
msgstr ""
<<<<<<< HEAD
=======
msgid "Attach a file by drag &amp; drop or %{upload_link}"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Branch"
msgid_plural "Branches"
msgstr[0] ""
......@@ -73,12 +64,9 @@ msgstr ""
msgid "Branches"
msgstr ""
<<<<<<< HEAD
=======
msgid "Browse files"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "ByAuthor|by"
msgstr ""
......@@ -88,8 +76,6 @@ msgstr ""
msgid "Cancel"
msgstr ""
<<<<<<< HEAD
=======
msgid "ChangeTypeActionLabel|Pick into branch"
msgstr ""
......@@ -102,22 +88,18 @@ msgstr ""
msgid "ChangeTypeAction|Revert"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Changelog"
msgstr ""
msgid "Charts"
msgstr ""
<<<<<<< HEAD
=======
msgid "Cherry-pick this commit"
msgstr ""
msgid "Cherry-pick this merge request"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "CiStatusLabel|canceled"
msgstr ""
......@@ -177,15 +159,12 @@ msgid_plural "Commits"
msgstr[0] ""
msgstr[1] ""
<<<<<<< HEAD
=======
msgid "Commit message"
msgstr ""
msgid "CommitBoxTitle|Commit"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "CommitMessage|Add %{file_name}"
msgstr ""
......@@ -195,12 +174,9 @@ msgstr ""
msgid "Commits|History"
msgstr ""
<<<<<<< HEAD
=======
msgid "Committed by"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Compare"
msgstr ""
......@@ -228,14 +204,6 @@ msgstr ""
msgid "Create merge request"
msgstr ""
<<<<<<< HEAD
msgid "CreateNewFork|Fork"
msgstr ""
msgid "Cron Timezone"
msgstr ""
=======
msgid "Create new..."
msgstr ""
......@@ -251,7 +219,6 @@ msgstr ""
msgid "Cron syntax"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Custom notification events"
msgstr ""
......@@ -305,12 +272,9 @@ msgstr ""
msgid "Don't show again"
msgstr ""
<<<<<<< HEAD
=======
msgid "Download"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Download tar"
msgstr ""
......@@ -326,15 +290,12 @@ msgstr ""
msgid "DownloadArtifacts|Download"
msgstr ""
<<<<<<< HEAD
=======
msgid "DownloadCommit|Email Patches"
msgstr ""
msgid "DownloadCommit|Plain Diff"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "DownloadSource|Download"
msgstr ""
......@@ -362,16 +323,6 @@ msgstr ""
msgid "Files"
msgstr ""
<<<<<<< HEAD
msgid "Filter"
=======
msgid "Find by path"
msgstr ""
msgid "Find file"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgstr ""
msgid "Find by path"
msgstr ""
......@@ -384,19 +335,12 @@ msgstr ""
msgid "FirstPushedBy|pushed by"
msgstr ""
<<<<<<< HEAD
msgid "ForkedFromProjectPath|Forked from"
msgstr ""
msgid "Forks"
=======
msgid "Fork"
msgid_plural "Forks"
msgstr[0] ""
msgstr[1] ""
msgid "ForkedFromProjectPath|Forked from"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgstr ""
msgid "From issue creation until deploy to production"
......@@ -446,15 +390,12 @@ msgstr ""
msgid "Last commit"
msgstr ""
<<<<<<< HEAD
=======
msgid "Learn more in the"
msgstr ""
msgid "Learn more in the|pipeline schedules documentation"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Leave group"
msgstr ""
......@@ -495,12 +436,9 @@ msgstr ""
msgid "New merge request"
msgstr ""
<<<<<<< HEAD
=======
msgid "New schedule"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "New snippet"
msgstr ""
......@@ -573,12 +511,9 @@ msgstr ""
msgid "NotificationLevel|Watch"
msgstr ""
<<<<<<< HEAD
=======
msgid "OfSearchInADropdown|Filter"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "OpenedNDaysAgo|Opened"
msgstr ""
......@@ -627,8 +562,6 @@ msgstr ""
msgid "PipelineSchedules|Target"
msgstr ""
<<<<<<< HEAD
=======
msgid "PipelineSheduleIntervalPattern|Custom"
msgstr ""
......@@ -638,7 +571,6 @@ msgstr ""
msgid "Pipeline|with stages"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Project '%{project_name}' queued for deletion."
msgstr ""
......@@ -729,27 +661,21 @@ msgstr ""
msgid "Request Access"
msgstr ""
<<<<<<< HEAD
=======
msgid "Revert this commit"
msgstr ""
msgid "Revert this merge request"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Save pipeline schedule"
msgstr ""
msgid "Schedule a new pipeline"
msgstr ""
<<<<<<< HEAD
=======
msgid "Scheduling Pipelines"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Search branches and tags"
msgstr ""
......@@ -788,15 +714,12 @@ msgstr ""
msgid "StarProject|Star"
msgstr ""
<<<<<<< HEAD
=======
msgid "Start a %{new_merge_request} with these changes"
msgstr ""
msgid "Start a <strong>new merge request</strong> with these changes"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Switch branch/tag"
msgstr ""
......@@ -1052,11 +975,7 @@ msgid ""
"Are you ABSOLUTELY sure?"
msgstr ""
<<<<<<< HEAD
msgid "You are going to remove the fork relationship to source project %{forked_from_project}. Are you ABSOLUTELY sure?"
=======
msgid "You are going to remove the fork relationship to source project %{forked_from_project}. Are you ABSOLUTELY sure?"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgstr ""
msgid "You are going to transfer %{project_name_with_namespace} to another owner. Are you ABSOLUTELY sure?"
......@@ -1065,12 +984,9 @@ msgstr ""
msgid "You can only add files when you are on a branch"
msgstr ""
<<<<<<< HEAD
=======
msgid "You have reached your project limit"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "You must sign in to star a project"
msgstr ""
......@@ -1101,21 +1017,11 @@ msgstr ""
msgid "Your name"
msgstr ""
<<<<<<< HEAD
msgid "committed"
msgstr ""
=======
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "day"
msgid_plural "days"
msgstr[0] ""
msgstr[1] ""
<<<<<<< HEAD
msgid "notification emails"
msgstr ""
=======
msgid "new merge request"
msgstr ""
......@@ -1126,4 +1032,3 @@ msgid "parent"
msgid_plural "parents"
msgstr[0] ""
msgstr[1] ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
......@@ -53,9 +53,6 @@ msgstr "¿Estás seguro que deseas eliminar esta programación del pipeline?"
msgid "Attach a file by drag &amp; drop or %{upload_link}"
msgstr "Adjunte un archivo arrastrando &amp; soltando o %{upload_link}"
msgid "Are you sure you want to delete this pipeline schedule?"
msgstr ""
msgid "Branch"
msgid_plural "Branches"
msgstr[0] "Rama"
......@@ -77,9 +74,6 @@ msgid "CI configuration"
msgstr "Configuración de CI"
msgid "Cancel"
<<<<<<< HEAD
msgstr ""
=======
msgstr "Cancelar"
msgid "ChangeTypeActionLabel|Pick into branch"
......@@ -93,7 +87,6 @@ msgstr "Cherry-pick"
msgid "ChangeTypeAction|Revert"
msgstr "Revertir"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Changelog"
msgstr "Changelog"
......@@ -217,10 +210,6 @@ msgstr "Crear nuevo..."
msgid "CreateNewFork|Fork"
msgstr "Bifurcar"
<<<<<<< HEAD
msgid "Cron Timezone"
msgstr ""
=======
msgid "CreateTag|Tag"
msgstr "Etiqueta"
......@@ -229,7 +218,6 @@ msgstr "Zona horaria del Cron"
msgid "Cron syntax"
msgstr "Sintaxis de Cron"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Custom notification events"
msgstr "Eventos de notificaciones personalizadas"
......@@ -264,16 +252,11 @@ msgstr "Puesta en escena"
msgid "CycleAnalyticsStage|Test"
msgstr "Pruebas"
<<<<<<< HEAD
msgid "Delete"
msgstr ""
=======
msgid "Define a custom pattern with cron syntax"
msgstr "Definir un patrón personalizado con la sintaxis de cron"
msgid "Delete"
msgstr "Eliminar"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Deploy"
msgid_plural "Deploys"
......@@ -281,11 +264,7 @@ msgstr[0] "Despliegue"
msgstr[1] "Despliegues"
msgid "Description"
<<<<<<< HEAD
msgstr ""
=======
msgstr "Descripción"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Directory name"
msgstr "Nombre del directorio"
......@@ -321,18 +300,6 @@ msgid "DownloadSource|Download"
msgstr "Descargar"
msgid "Edit"
<<<<<<< HEAD
msgstr ""
msgid "Edit Pipeline Schedule %{id}"
msgstr ""
msgid "Failed to change the owner"
msgstr ""
msgid "Failed to remove the pipeline schedule"
msgstr ""
=======
msgstr "Editar"
msgid "Edit Pipeline Schedule %{id}"
......@@ -352,14 +319,10 @@ msgstr "Error al cambiar el propietario"
msgid "Failed to remove the pipeline schedule"
msgstr "Error al eliminar la programación del pipeline"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Files"
msgstr "Archivos"
msgid "Filter"
msgstr ""
msgid "Find by path"
msgstr "Buscar por ruta"
......@@ -402,11 +365,7 @@ msgid "Import repository"
msgstr "Importar repositorio"
msgid "Interval Pattern"
<<<<<<< HEAD
msgstr ""
=======
msgstr "Patrón de intervalo"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Introducing Cycle Analytics"
msgstr "Introducción a Cycle Analytics"
......@@ -423,11 +382,7 @@ msgstr[0] "Último %d día"
msgstr[1] "Últimos %d días"
msgid "Last Pipeline"
<<<<<<< HEAD
msgstr ""
=======
msgstr "Último Pipeline"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Last Update"
msgstr "Última actualización"
......@@ -464,11 +419,7 @@ msgstr[0] "Nueva incidencia"
msgstr[1] "Nuevas incidencias"
msgid "New Pipeline Schedule"
<<<<<<< HEAD
msgstr ""
=======
msgstr "Nueva Programación del Pipeline"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "New branch"
msgstr "Nueva rama"
......@@ -498,11 +449,7 @@ msgid "No repository"
msgstr "No hay repositorio"
msgid "No schedules"
<<<<<<< HEAD
msgstr ""
=======
msgstr "No hay programaciones"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Not available"
msgstr "No disponible"
......@@ -570,10 +517,6 @@ msgstr "Filtrar"
msgid "OpenedNDaysAgo|Opened"
msgstr "Abierto"
<<<<<<< HEAD
msgid "Owner"
msgstr ""
=======
msgid "Options"
msgstr "Opciones"
......@@ -582,45 +525,11 @@ msgstr "Propietario"
msgid "Pipeline"
msgstr "Pipeline"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Pipeline Health"
msgstr "Estado del Pipeline"
msgid "Pipeline Schedule"
<<<<<<< HEAD
msgstr ""
msgid "Pipeline Schedules"
msgstr ""
msgid "PipelineSchedules|Activated"
msgstr ""
msgid "PipelineSchedules|Active"
msgstr ""
msgid "PipelineSchedules|All"
msgstr ""
msgid "PipelineSchedules|Inactive"
msgstr ""
msgid "PipelineSchedules|Next Run"
msgstr ""
msgid "PipelineSchedules|None"
msgstr ""
msgid "PipelineSchedules|Provide a short description for this pipeline"
msgstr ""
msgid "PipelineSchedules|Take ownership"
msgstr ""
msgid "PipelineSchedules|Target"
msgstr ""
=======
msgstr "Programación del Pipeline"
msgid "Pipeline Schedules"
......@@ -661,7 +570,6 @@ msgstr "con etapa"
msgid "Pipeline|with stages"
msgstr "con etapas"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Project '%{project_name}' queued for deletion."
msgstr "Proyecto ‘%{project_name}’ en cola para eliminación."
......@@ -753,13 +661,6 @@ msgstr "Eliminar proyecto"
msgid "Request Access"
msgstr "Solicitar acceso"
<<<<<<< HEAD
msgid "Save pipeline schedule"
msgstr ""
msgid "Schedule a new pipeline"
msgstr ""
=======
msgid "Revert this commit"
msgstr "Revertir este cambio"
......@@ -774,7 +675,6 @@ msgstr "Programar un nuevo pipeline"
msgid "Scheduling Pipelines"
msgstr "Programación de Pipelines"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Search branches and tags"
msgstr "Buscar ramas y etiquetas"
......@@ -783,17 +683,10 @@ msgid "Select Archive Format"
msgstr "Seleccionar formato de archivo"
msgid "Select a timezone"
<<<<<<< HEAD
msgstr ""
msgid "Select target branch"
msgstr ""
=======
msgstr "Selecciona una zona horaria"
msgid "Select target branch"
msgstr "Selecciona una rama de destino"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Set a password on your account to pull or push via %{protocol}"
msgstr "Establezca una contraseña en su cuenta para actualizar o enviar a través de %{protocol}"
......@@ -836,11 +729,7 @@ msgid "Tags"
msgstr "Etiquetas"
msgid "Target Branch"
<<<<<<< HEAD
msgstr ""
=======
msgstr "Rama de destino"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request."
msgstr "La etapa de desarrollo muestra el tiempo desde el primer cambio hasta la creación de la solicitud de fusión. Los datos serán automáticamente incorporados aquí una vez creada tu primera solicitud de fusión."
......
......@@ -8,13 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-06-12 09:35+0200\n"
"PO-Revision-Date: 2017-06-12 09:35+0200\n"
=======
"POT-Creation-Date: 2017-06-15 21:59-0500\n"
"PO-Revision-Date: 2017-06-15 21:59-0500\n"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
......@@ -23,11 +18,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
<<<<<<< HEAD
msgid "About auto deploy"
msgstr ""
=======
msgid "%{commit_author_link} committed %{commit_timeago}"
msgstr ""
......@@ -37,7 +27,6 @@ msgstr ""
msgid "Active"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Activity"
msgstr ""
......@@ -62,12 +51,9 @@ msgstr ""
msgid "Are you sure you want to delete this pipeline schedule?"
msgstr ""
<<<<<<< HEAD
=======
msgid "Attach a file by drag &amp; drop or %{upload_link}"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Branch"
msgid_plural "Branches"
msgstr[0] ""
......@@ -79,12 +65,9 @@ msgstr ""
msgid "Branches"
msgstr ""
<<<<<<< HEAD
=======
msgid "Browse files"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "ByAuthor|by"
msgstr ""
......@@ -94,8 +77,6 @@ msgstr ""
msgid "Cancel"
msgstr ""
<<<<<<< HEAD
=======
msgid "ChangeTypeActionLabel|Pick into branch"
msgstr ""
......@@ -108,22 +89,18 @@ msgstr ""
msgid "ChangeTypeAction|Revert"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Changelog"
msgstr ""
msgid "Charts"
msgstr ""
<<<<<<< HEAD
=======
msgid "Cherry-pick this commit"
msgstr ""
msgid "Cherry-pick this merge request"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "CiStatusLabel|canceled"
msgstr ""
......@@ -183,15 +160,12 @@ msgid_plural "Commits"
msgstr[0] ""
msgstr[1] ""
<<<<<<< HEAD
=======
msgid "Commit message"
msgstr ""
msgid "CommitBoxTitle|Commit"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "CommitMessage|Add %{file_name}"
msgstr ""
......@@ -201,12 +175,9 @@ msgstr ""
msgid "Commits|History"
msgstr ""
<<<<<<< HEAD
=======
msgid "Committed by"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Compare"
msgstr ""
......@@ -234,14 +205,6 @@ msgstr ""
msgid "Create merge request"
msgstr ""
<<<<<<< HEAD
msgid "CreateNewFork|Fork"
msgstr ""
msgid "Cron Timezone"
msgstr ""
=======
msgid "Create new..."
msgstr ""
......@@ -257,7 +220,6 @@ msgstr ""
msgid "Cron syntax"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Custom notification events"
msgstr ""
......@@ -311,12 +273,9 @@ msgstr ""
msgid "Don't show again"
msgstr ""
<<<<<<< HEAD
=======
msgid "Download"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Download tar"
msgstr ""
......@@ -332,15 +291,12 @@ msgstr ""
msgid "DownloadArtifacts|Download"
msgstr ""
<<<<<<< HEAD
=======
msgid "DownloadCommit|Email Patches"
msgstr ""
msgid "DownloadCommit|Plain Diff"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "DownloadSource|Download"
msgstr ""
......@@ -368,16 +324,6 @@ msgstr ""
msgid "Files"
msgstr ""
<<<<<<< HEAD
msgid "Filter"
=======
msgid "Find by path"
msgstr ""
msgid "Find file"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgstr ""
msgid "Find by path"
msgstr ""
......@@ -390,19 +336,12 @@ msgstr ""
msgid "FirstPushedBy|pushed by"
msgstr ""
<<<<<<< HEAD
msgid "ForkedFromProjectPath|Forked from"
msgstr ""
msgid "Forks"
=======
msgid "Fork"
msgid_plural "Forks"
msgstr[0] ""
msgstr[1] ""
msgid "ForkedFromProjectPath|Forked from"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgstr ""
msgid "From issue creation until deploy to production"
......@@ -452,15 +391,12 @@ msgstr ""
msgid "Last commit"
msgstr ""
<<<<<<< HEAD
=======
msgid "Learn more in the"
msgstr ""
msgid "Learn more in the|pipeline schedules documentation"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Leave group"
msgstr ""
......@@ -501,12 +437,9 @@ msgstr ""
msgid "New merge request"
msgstr ""
<<<<<<< HEAD
=======
msgid "New schedule"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "New snippet"
msgstr ""
......@@ -579,12 +512,9 @@ msgstr ""
msgid "NotificationLevel|Watch"
msgstr ""
<<<<<<< HEAD
=======
msgid "OfSearchInADropdown|Filter"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "OpenedNDaysAgo|Opened"
msgstr ""
......@@ -633,8 +563,6 @@ msgstr ""
msgid "PipelineSchedules|Target"
msgstr ""
<<<<<<< HEAD
=======
msgid "PipelineSheduleIntervalPattern|Custom"
msgstr ""
......@@ -644,7 +572,6 @@ msgstr ""
msgid "Pipeline|with stages"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Project '%{project_name}' queued for deletion."
msgstr ""
......@@ -735,27 +662,21 @@ msgstr ""
msgid "Request Access"
msgstr ""
<<<<<<< HEAD
=======
msgid "Revert this commit"
msgstr ""
msgid "Revert this merge request"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Save pipeline schedule"
msgstr ""
msgid "Schedule a new pipeline"
msgstr ""
<<<<<<< HEAD
=======
msgid "Scheduling Pipelines"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Search branches and tags"
msgstr ""
......@@ -794,12 +715,9 @@ msgstr ""
msgid "StarProject|Star"
msgstr ""
<<<<<<< HEAD
=======
msgid "Start a %{new_merge_request} with these changes"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "Switch branch/tag"
msgstr ""
......@@ -1055,11 +973,7 @@ msgid ""
"Are you ABSOLUTELY sure?"
msgstr ""
<<<<<<< HEAD
msgid "You are going to remove the fork relationship to source project %{forked_from_project}. Are you ABSOLUTELY sure?"
=======
msgid "You are going to remove the fork relationship to source project %{forked_from_project}. Are you ABSOLUTELY sure?"
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgstr ""
msgid "You are going to transfer %{project_name_with_namespace} to another owner. Are you ABSOLUTELY sure?"
......@@ -1068,12 +982,9 @@ msgstr ""
msgid "You can only add files when you are on a branch"
msgstr ""
<<<<<<< HEAD
=======
msgid "You have reached your project limit"
msgstr ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "You must sign in to star a project"
msgstr ""
......@@ -1104,21 +1015,11 @@ msgstr ""
msgid "Your name"
msgstr ""
<<<<<<< HEAD
msgid "committed"
msgstr ""
=======
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
msgid "day"
msgid_plural "days"
msgstr[0] ""
msgstr[1] ""
<<<<<<< HEAD
msgid "notification emails"
msgstr ""
=======
msgid "new merge request"
msgstr ""
......@@ -1129,4 +1030,3 @@ msgid "parent"
msgid_plural "parents"
msgstr[0] ""
msgstr[1] ""
>>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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