diff options
| author | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-23 18:03:06 +0100 |
|---|---|---|
| committer | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-23 18:03:06 +0100 |
| commit | 398d5706752a583ff8bc3ec9101fc75b507bbb89 (patch) | |
| tree | a31b27b4cd1a2e05e64199814ca0ab92eb177a62 /config/locales/views/conferences/en.yml | |
| parent | e5db9179c75b6b6176e4f5b67ff94a10122ecfbd (diff) | |
| parent | 4cad2a069fcead88579373a285a0516a3d500c43 (diff) | |
Merge branch 'develop' of https://github.com/amooma/GS5 into develop
Diffstat (limited to 'config/locales/views/conferences/en.yml')
| -rw-r--r-- | config/locales/views/conferences/en.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/views/conferences/en.yml b/config/locales/views/conferences/en.yml index 7967123..ac42fd6 100644 --- a/config/locales/views/conferences/en.yml +++ b/config/locales/views/conferences/en.yml @@ -21,7 +21,7 @@ en: announce_new_member_by_name: 'Announce entering' announce_left_member_by_name: 'Announce leaving' actions: - confirm: 'Are you sure you want to delete this conference?' + confirm_destroy: 'Are you sure you want to delete this conference?' destroy: 'Delete' edit: 'Edit' show: 'View' @@ -39,7 +39,7 @@ en: announce_new_member_by_name: 'Announce new member' announce_left_member_by_name: 'Announce left member' actions: - confirm: 'Are you sure you want to delete this conference?' + confirm_destroy: 'Are you sure you want to delete this conference?' destroy: 'Delete' edit: 'Edit' view_all: 'View all conferences' |