diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-16 16:16:35 +0000 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-06-16 19:00:27 -0500 |
| commit | 2a7deae183a73c24bea135d75956918815a655fb (patch) | |
| tree | facc4ee1fb1b0538b77837eddcea66ac391b8434 /config/locales/es.yml | |
| parent | 999926075d82552f630d4e9d8b1128f5f2e131af (diff) | |
| download | gitlab-ce-2a7deae183a73c24bea135d75956918815a655fb.tar.gz | |
Merge branch 'bvl-missing-translations' into 'master'9-3-stable-rc3-i18n
Missing translations for the project & repository pages.
Closes #33420
See merge request !12052
Conflicts:
app/assets/javascripts/locale/en/app.js
app/assets/javascripts/locale/es/app.js
app/views/projects/pipeline_schedules/_form.html.haml
locale/en/gitlab.po
locale/es/gitlab.po
locale/gitlab.pot
Diffstat (limited to 'config/locales/es.yml')
| -rw-r--r-- | config/locales/es.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/es.yml b/config/locales/es.yml index 0f9dc39535d..c830d21ea50 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -249,4 +249,5 @@ es: default: "%A, %d de %B de %Y %H:%M:%S %z" long: "%d de %B de %Y %H:%M" short: "%d de %b %H:%M" + timeago_tooltip: "%d de %B de %Y %H:%M" pm: pm |