Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-22 08:46:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into new-gui

Browse source 
Conflicts:
	Gemfile.lock
This commit is contained in:
Dan Rice 2014-04-02 13:26:17 -04:00
commit fdd4c267b3
39 changed files with 2824 additions and 1022 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/locales/en.yml
View file

@ -630,13 +630,15 @@ en:
- December
third: third
every_n: every %{n}
on_day_n: on day %{n}
every_n_days: every %{n} days
every_n_months: every %{n} months
every_day: every day
on_day_n: on day %{n}
second: second
every_xth_day_of_every_n_months: every %{x} %{day} of every %{n_months}
from: from
weekly: weekly
last: last
every_day: every day
the_xth_day_of_month: the %{x} %{day} of %{month}
times: for %{number} times
on_work_days: on work days