diff options
| author | Mario "Kuroir" Ricalde <kuroir@gmail.com> | 2013-03-05 11:01:01 -0600 |
|---|---|---|
| committer | Mario "Kuroir" Ricalde <kuroir@gmail.com> | 2013-03-05 11:01:01 -0600 |
| commit | 4fcdd330139921b6fa5d4f9d15fb5f91775b27af (patch) | |
| tree | 62e82c385c9a804a8f32da6f276881ff8c21fc90 /config/locales | |
| parent | 2b94b16ee1201d15b3b9d66e142df311141a47db (diff) | |
| parent | a865b1f9506b900ed8643c01d94c86268e907720 (diff) | |
Merge remote-tracking branch 'origin/develop' into develop
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/navigation.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/views/phone_book_entries/de.yml | 2 | ||||
| -rw-r--r-- | config/locales/views/phone_book_entries/en.yml | 2 |
3 files changed, 3 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/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' |