Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
9fc9cd03
Commit
9fc9cd03
authored
Jun 09, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'locales_fix' into 'master'
Locales fix See merge request !12018
parents
7f584edb
46a578b4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
0 deletions
+39
-0
config/locales/de.yml
config/locales/de.yml
+37
-0
config/locales/es.yml
config/locales/es.yml
+2
-0
No files found.
config/locales/de.yml
View file @
9fc9cd03
...
...
@@ -62,6 +62,43 @@ de:
-
:month
-
:year
datetime
:
# used in a custom scope that has been created to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32747
time_ago_in_words
:
half_a_minute
:
vor einer halben Minute
less_than_x_seconds
:
one
:
vor weniger als einer Sekunde
other
:
"
vor
weniger
als
%{count}
Sekunden"
x_seconds
:
one
:
vor einer Sekunde
other
:
"
vor
%{count}
Sekunden"
less_than_x_minutes
:
one
:
vor weniger als einer Minute
other
:
vor weniger als %{count} Minuten
x_minutes
:
one
:
vor einer Minute
other
:
"
vor
%{count}
Minuten"
about_x_hours
:
one
:
vor etwa einer Stunde
other
:
"
vor
etwa
%{count}
Stunden"
x_days
:
one
:
vor einem Tag
other
:
"
vor
%{count}
Tagen"
about_x_months
:
one
:
vor etwa einem Monat
other
:
"
vor
etwa
%{count}
Monaten"
x_months
:
one
:
vor einem Monat
other
:
"
vor
%{count}
Monaten"
about_x_years
:
one
:
vor etwa einem Jahr
other
:
"
vor
etwa
%{count}
Jahren"
over_x_years
:
one
:
vor mehr als einem Jahr
other
:
"
vor
mehr
als
%{count}
Jahren"
almost_x_years
:
one
:
vor fast einem Jahr
other
:
"
vor
fast
%{count}
Jahren"
# Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
distance_in_words
:
about_x_hours
:
one
:
etwa eine Stunde
...
...
config/locales/es.yml
View file @
9fc9cd03
...
...
@@ -61,6 +61,7 @@ es:
-
:month
-
:year
datetime
:
# used in a custom scope that has been created to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32747
time_ago_in_words
:
half_a_minute
:
"
hace
medio
minuto"
less_than_x_seconds
:
...
...
@@ -96,6 +97,7 @@ es:
almost_x_years
:
one
:
"
hace
casi
1
año"
other
:
"
hace
casi
%{count}
años"
# Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
distance_in_words
:
about_x_hours
:
one
:
alrededor de 1 hora
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment