diff options
| author | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-28 14:17:52 +0100 |
|---|---|---|
| committer | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-28 14:17:52 +0100 |
| commit | 8aa7de2636dcd22781b623d5c9270f5ecf8b85c2 (patch) | |
| tree | 1bb5dc36fb28c96ad9be9a2357d380c2c24ee31e /config/locales/views/conferences | |
| parent | 39aa7132ceed3d4beab3a9b828e571bbfc67c07e (diff) | |
| parent | 600574759573e48da9f5f82d4ff8a863b6830c95 (diff) | |
Merge branch 'develop'5.1-beta2
Diffstat (limited to 'config/locales/views/conferences')
| -rw-r--r-- | config/locales/views/conferences/de.yml | 6 | ||||
| -rw-r--r-- | config/locales/views/conferences/en.yml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/config/locales/views/conferences/de.yml b/config/locales/views/conferences/de.yml index cf3c080..ba0869c 100644 --- a/config/locales/views/conferences/de.yml +++ b/config/locales/views/conferences/de.yml @@ -21,7 +21,7 @@ de: announce_new_member_by_name: 'Betreten ankündigen' announce_left_member_by_name: 'Verlassen ankündigen' actions: - confirm: 'Sind Sie sicher, dass Sie diese Telefonkonferenz löschen möchten?' + confirm_destroy: 'Sind Sie sicher, dass Sie diese Telefonkonferenz löschen möchten?' destroy: 'Löschen' edit: 'Bearbeiten' show: 'Anzeigen' @@ -39,7 +39,7 @@ de: announce_new_member_by_name: 'Neue Teilnehmer werden angekündigt' announce_left_member_by_name: 'Die Konferenz verlassende Teilnehmer werden angekündigt' actions: - confirm: 'Sind Sie sicher, dass Sie diese Telefonkonferenz löschen möchten?' + confirm_destroy: 'Sind Sie sicher, dass Sie diese Telefonkonferenz löschen möchten?' destroy: 'Löschen' edit: 'Bearbeiten' view_all: 'Alle Telefonkonferenzen anzeigen' @@ -78,4 +78,4 @@ de: announce_left_member_by_name: label: 'Die Konferenz verlassende Teilnehmer werden angekündigt' hint: '' - button: 'Absenden'
\ No newline at end of file + submit: 'Absenden'
\ No newline at end of file diff --git a/config/locales/views/conferences/en.yml b/config/locales/views/conferences/en.yml index 7967123..e11e9cb 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' @@ -78,4 +78,4 @@ en: announce_left_member_by_name: label: 'Announce the leaving of a member' hint: '' - button: 'Submit'
\ No newline at end of file + submit: 'Submit'
\ No newline at end of file |