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/manufacturers | |
| parent | 39aa7132ceed3d4beab3a9b828e571bbfc67c07e (diff) | |
| parent | 600574759573e48da9f5f82d4ff8a863b6830c95 (diff) | |
Merge branch 'develop'5.1-beta2
Diffstat (limited to 'config/locales/views/manufacturers')
| -rw-r--r-- | config/locales/views/manufacturers/de.yml | 6 | ||||
| -rw-r--r-- | config/locales/views/manufacturers/en.yml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/config/locales/views/manufacturers/de.yml b/config/locales/views/manufacturers/de.yml index 6620e22..2608743 100644 --- a/config/locales/views/manufacturers/de.yml +++ b/config/locales/views/manufacturers/de.yml @@ -13,7 +13,7 @@ de: phone_models: 'Telefonmodelle' state: 'Status' actions: - confirm: 'Sind Sie sicher, dass Sie diesen Hersteller löschen möchten?' + confirm_destroy: 'Sind Sie sicher, dass Sie diesen Hersteller löschen möchten?' destroy: 'Löschen' edit: 'Bearbeiten' show: 'Anzeigen' @@ -25,7 +25,7 @@ de: homepage_url: 'Homepage URL' state: 'Status' actions: - confirm: 'Sind Sie sicher, dass Sie diesen Hersteller löschen möchten?' + confirm_destroy: 'Sind Sie sicher, dass Sie diesen Hersteller löschen möchten?' destroy: 'Löschen' edit: 'Bearbeiten' view_all: 'Alle anzeigen' @@ -46,4 +46,4 @@ de: state: label: 'Status' hint: '' - button: 'Absenden'
\ No newline at end of file + submit: 'Absenden'
\ No newline at end of file diff --git a/config/locales/views/manufacturers/en.yml b/config/locales/views/manufacturers/en.yml index f4804cf..dccdf1b 100644 --- a/config/locales/views/manufacturers/en.yml +++ b/config/locales/views/manufacturers/en.yml @@ -13,7 +13,7 @@ en: phone_models: 'Phone models' state: 'State' actions: - confirm: 'Are you sure you want to delete this manufacturer?' + confirm_destroy: 'Are you sure you want to delete this manufacturer?' destroy: 'Delete' edit: 'Edit' show: 'View' @@ -25,7 +25,7 @@ en: homepage_url: 'Homepage URL' state: 'State' actions: - confirm: 'Are you sure you want to delete this manufacturer?' + confirm_destroy: 'Are you sure you want to delete this manufacturer?' destroy: 'Delete' edit: 'Edit' view_all: 'View All' @@ -46,4 +46,4 @@ en: state: label: 'State' hint: '' - button: 'Submit'
\ No newline at end of file + submit: 'Submit'
\ No newline at end of file |