aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorLuc Donnet2017-09-07 16:28:32 +0200
committerLuc Donnet2017-09-07 16:28:32 +0200
commit99aff9c3e63fb15b555806847bc14fbf56eeef2a (patch)
tree339ca9b884504c19cecc0956c629614ace926901 /config
parent8b5a3e68c37a9331f47608faaa6903a01c390861 (diff)
parent01b0d19c329810a083153efbf040911e4079f6ef (diff)
downloadchouette-core-99aff9c3e63fb15b555806847bc14fbf56eeef2a.tar.bz2
Merge branch 'master' of github.com:AF83/stif-boiv
Diffstat (limited to 'config')
-rw-r--r--config/locales/calendars.en.yml1
-rw-r--r--config/locales/calendars.fr.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/calendars.en.yml b/config/locales/calendars.en.yml
index cb1ede4c7..42e26e995 100644
--- a/config/locales/calendars.en.yml
+++ b/config/locales/calendars.en.yml
@@ -64,6 +64,7 @@ en:
date_ranges: Date ranges
dates: Dates
shared: Shared
+ organisation: Organisation
errors:
models:
calendar:
diff --git a/config/locales/calendars.fr.yml b/config/locales/calendars.fr.yml
index 1b403c3f2..63f6465d9 100644
--- a/config/locales/calendars.fr.yml
+++ b/config/locales/calendars.fr.yml
@@ -64,6 +64,7 @@ fr:
date_ranges: Intervalles de dates
dates: Dates
shared: Partagé
+ organisation: Organisation
errors:
models:
calendar: