Skip to content

G
gitlab-ce
Commit ec17589c authored by Bob Van Landuyt's avatar Bob Van Landuyt
Browse files
Options

Resolve translation files using their CE

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