diff options
| author | Michel Etienne | 2014-09-29 12:01:54 +0200 |
|---|---|---|
| committer | Michel Etienne | 2014-09-29 12:01:54 +0200 |
| commit | 0bec84696e517a4e3ddfe15c28aeb132bca8740b (patch) | |
| tree | eb3b9d82a4b05e577af5e89838582a7383260ba3 /config | |
| parent | 640413ba2aa89d859a4ca3725427065d2b07e760 (diff) | |
| download | chouette-core-0bec84696e517a4e3ddfe15c28aeb132bca8740b.tar.bz2 | |
add translations
Diffstat (limited to 'config')
| -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 ?" |