diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-07 11:37:03 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-07 11:37:03 +0100 |
| commit | 11f186a118285fbc87a536af26730780a9ad01f5 (patch) | |
| tree | fe6363b036f60f238916d070b3d0cb0625dd53c8 /config/locales | |
| parent | 2b94b16ee1201d15b3b9d66e142df311141a47db (diff) | |
| parent | 3e19646f46c772e10ed3d7a45e8c974ab23f625b (diff) | |
Merge branch 'develop'5.1.1
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/navigation.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/views/fax_documents/de.yml | 1 | ||||
| -rw-r--r-- | config/locales/views/fax_documents/en.yml | 1 | ||||
| -rw-r--r-- | config/locales/views/phone_book_entries/de.yml | 2 | ||||
| -rw-r--r-- | config/locales/views/phone_book_entries/en.yml | 2 |
5 files changed, 5 insertions, 3 deletions
diff --git a/config/locales/navigation.en.yml b/config/locales/navigation.en.yml index 82e901b..015b783 100644 --- a/config/locales/navigation.en.yml +++ b/config/locales/navigation.en.yml @@ -1,3 +1,3 @@ en: navigation: - admin_docu: 'Admin-Docu'
\ No newline at end of file + admin_docu: 'Admin-Doc' diff --git a/config/locales/views/fax_documents/de.yml b/config/locales/views/fax_documents/de.yml index da59833..236c031 100644 --- a/config/locales/views/fax_documents/de.yml +++ b/config/locales/views/fax_documents/de.yml @@ -5,6 +5,7 @@ de: successfuly_created: 'Eine neues Fax-Dokument wurde erstellt.' successfuly_updated: 'Das Fax-Dokument wurde aktualisiert.' successfuly_destroyed: 'Das Fax-Dokument wurde gelöscht.' + tiff_not_created: 'Konnte nicht konvertiert werden.' states: queued_for_sending: 'In der Warteschleife zum Versand' sending: 'Wird aktuell versendet' diff --git a/config/locales/views/fax_documents/en.yml b/config/locales/views/fax_documents/en.yml index ff5f8f8..0606e81 100644 --- a/config/locales/views/fax_documents/en.yml +++ b/config/locales/views/fax_documents/en.yml @@ -5,6 +5,7 @@ en: successfuly_created: 'Successfully created fax.' successfuly_updated: 'Successfully updated fax.' successfuly_destroyed: 'Successfully destroyed fax.' + tiff_not_created: 'Could not be converted.' states: queued_for_sending: 'Queued for sending' sending: 'Currently sending' diff --git a/config/locales/views/phone_book_entries/de.yml b/config/locales/views/phone_book_entries/de.yml index bdd0d67..839df3b 100644 --- a/config/locales/views/phone_book_entries/de.yml +++ b/config/locales/views/phone_book_entries/de.yml @@ -67,7 +67,7 @@ de: xing_account: 'Xing Konto' linkedin_account: 'LinkedIn Konto' mobileme_account: 'iCloud Konto' - manage_phone_number: 'Telefonnummern verwalten.' + manage_phone_numbers: 'Telefonnummern verwalten.' actions: confirm_destroy: 'Sind Sie sicher, dass Sie diesen Telefonbucheintrag löschen möchten?' destroy: 'Löschen' diff --git a/config/locales/views/phone_book_entries/en.yml b/config/locales/views/phone_book_entries/en.yml index abfbbb2..e733d85 100644 --- a/config/locales/views/phone_book_entries/en.yml +++ b/config/locales/views/phone_book_entries/en.yml @@ -67,7 +67,7 @@ en: xing_account: 'Xing account' linkedin_account: 'LinkedIn account' mobileme_account: 'iCloud account' - manage_phone_number: 'Manage phone number.' + manage_phone_numbers: 'Manage phone numbers.' actions: confirm_destroy: 'Are you sure you want to delete this phone book entry?' destroy: 'Delete phone book entry' |