summaryrefslogtreecommitdiff
path: root/config/locales/views/conference_invitees
diff options
context:
space:
mode:
authorspag <spag@golwen.net>2013-01-24 15:37:24 +0100
committerspag <spag@golwen.net>2013-01-24 15:37:24 +0100
commit99270421d02b3ac77bf111bbde62a2ef80f8e114 (patch)
tree6ddb8328729e53dcc7a605040cd7aece622d0e5a /config/locales/views/conference_invitees
parent5f5ea1d06686ec5cd31cf8b9db177191fa7e66fd (diff)
parent2d6ebf19e5cea45dd714f92a64b1b81e1200a811 (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'config/locales/views/conference_invitees')
-rw-r--r--config/locales/views/conference_invitees/de.yml2
-rw-r--r--config/locales/views/conference_invitees/en.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/views/conference_invitees/de.yml b/config/locales/views/conference_invitees/de.yml
index c5c6460..6a26c24 100644
--- a/config/locales/views/conference_invitees/de.yml
+++ b/config/locales/views/conference_invitees/de.yml
@@ -52,4 +52,4 @@ de:
moderator:
label: 'Moderator'
hint: ''
- button: 'Absenden' \ No newline at end of file
+ submit: 'Absenden' \ No newline at end of file
diff --git a/config/locales/views/conference_invitees/en.yml b/config/locales/views/conference_invitees/en.yml
index c321e02..80077c5 100644
--- a/config/locales/views/conference_invitees/en.yml
+++ b/config/locales/views/conference_invitees/en.yml
@@ -51,4 +51,4 @@ en:
moderator:
label: 'Moderator'
hint: ''
- button: 'Submit' \ No newline at end of file
+ submit: 'Submit' \ No newline at end of file