summaryrefslogtreecommitdiff
path: root/config/locales/views/users
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/users
parent5f5ea1d06686ec5cd31cf8b9db177191fa7e66fd (diff)
parent2d6ebf19e5cea45dd714f92a64b1b81e1200a811 (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'config/locales/views/users')
-rw-r--r--config/locales/views/users/de.yml4
-rw-r--r--config/locales/views/users/en.yml2
2 files changed, 3 insertions, 3 deletions
diff --git a/config/locales/views/users/de.yml b/config/locales/views/users/de.yml
index 20fa4e0..7cdaf68 100644
--- a/config/locales/views/users/de.yml
+++ b/config/locales/views/users/de.yml
@@ -24,7 +24,7 @@ de:
destroy: 'Löschen'
edit: 'Bearbeiten'
show: 'Anzeigen'
- create: 'Neue anlegen'
+ create: 'Neu anlegen'
create_for: 'Neuen User für %{resource} anlegen'
show:
page_title: 'User anzeigen'
@@ -92,4 +92,4 @@ de:
send_voicemail_as_email_attachment:
label: 'Sprachnachrichten per E-Mail verschicken'
hint: ''
- button: 'Absenden' \ No newline at end of file
+ submit: 'Absenden' \ No newline at end of file
diff --git a/config/locales/views/users/en.yml b/config/locales/views/users/en.yml
index 121c925..29bae82 100644
--- a/config/locales/views/users/en.yml
+++ b/config/locales/views/users/en.yml
@@ -92,4 +92,4 @@ en:
send_voicemail_as_email_attachment:
label: 'Send voicemails as e-mail attachments'
hint: ''
- button: 'Submit' \ No newline at end of file
+ submit: 'Submit' \ No newline at end of file