diff options
| author | Luc Donnet | 2014-09-29 14:23:55 +0200 |
|---|---|---|
| committer | Luc Donnet | 2014-09-29 14:23:55 +0200 |
| commit | 4d41ec50fb76a1e9ebcaaf6daebe84ff79c87b92 (patch) | |
| tree | 9eb4b7eea03489745ad71b622b4f62fcdca46ddd | |
| parent | 800b997e532868061450835a191f5063d7160a2b (diff) | |
| parent | e1e1a7b88244c901d9d965f707895aeedc66f8b3 (diff) | |
| download | chouette-core-4d41ec50fb76a1e9ebcaaf6daebe84ff79c87b92.tar.bz2 | |
Merge branch 'sismo' of github.com:afimb/chouette2 into sismo
| -rw-r--r-- | config/locales/time_table_combinations.yml | 7 | ||||
| -rw-r--r-- | config/locales/time_tables.yml | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/config/locales/time_table_combinations.yml b/config/locales/time_table_combinations.yml index ff15f33e2..a544b0115 100644 --- a/config/locales/time_table_combinations.yml +++ b/config/locales/time_table_combinations.yml @@ -6,10 +6,12 @@ en: union: "merge" intersection: "intersect" disjunction: "disjoin" + combine_form: + time_tables: "Time table to combine with" activemodel: attributes: time_table_combination: - combined_id: "Time table to combine with" + combined_id: "Time table id" operation: "operation" fr: time_table_combinations: @@ -19,10 +21,11 @@ fr: union: "ajouter les dates" intersection: "conserver les dates communes" disjunction: "soustraire les dates" + combine_form: + time_tables: "Calendrier à combiner" activemodel: attributes: time_table_combination: - combined_name: "Calendrier à combiner" combined_id: "Id Calendrier" operation: "opération" diff --git a/config/locales/time_tables.yml b/config/locales/time_tables.yml index c4307d707..85b990716 100644 --- a/config/locales/time_tables.yml +++ b/config/locales/time_tables.yml @@ -12,6 +12,7 @@ en: edit: "Edit this timetable" destroy: "Remove this timetable" duplicate: "Duplicate this timetable" + combine: "Combine with another timetable" destroy_confirm: "Are you sure you want destroy this timetable ?" destroy_date_confirm: "Are you sure you want destroy this date ?" destroy_period_confirm: "Are you sure you want destroy this period ?" |