summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-26 16:18:06 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-26 16:18:06 +0100
commitab2bf212ed91b1e9359f026ef8775de2238a49be (patch)
tree564867b6d12e5cc4ca03d37cf64ea381d3eba967 /config
parent36919fb419a40688daa97e36734f579488cb56e2 (diff)
parentdf0bc9db9cdbf9bfbc92a5f1f00e57fc0e7d7792 (diff)
Merge branch 'search' into develop
Diffstat (limited to 'config')
-rw-r--r--config/locales/views/phone_book_entries/de.yml2
-rw-r--r--config/locales/views/phone_books/de.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/views/phone_book_entries/de.yml b/config/locales/views/phone_book_entries/de.yml
index 2c77aa5..bdd0d67 100644
--- a/config/locales/views/phone_book_entries/de.yml
+++ b/config/locales/views/phone_book_entries/de.yml
@@ -6,7 +6,7 @@ de:
successfuly_updated: 'Der Telefonbucheintrag "%{resource}" wurde aktualisiert.'
successfuly_destroyed: 'Der Telefonbucheintrag wurde gelöscht.'
index:
- page_title: 'Anzahl Telefonbucheinträge'
+ page_title: 'Telefonbucheinträge'
phone_book_id: 'Telefonbuch'
first_name: 'Vorname'
middle_name: 'Zweiter Vorname'
diff --git a/config/locales/views/phone_books/de.yml b/config/locales/views/phone_books/de.yml
index fa93945..c7ba5c7 100644
--- a/config/locales/views/phone_books/de.yml
+++ b/config/locales/views/phone_books/de.yml
@@ -5,7 +5,7 @@ de:
name: 'Firmentelefonbuch'
description: 'Ein für alle Benutzer von %{resource} lesbares Telefonbuch.'
private_phone_book:
- name: 'Privates Telefonbuch von %{resource}'
+ name: 'Privates Telefonbuch'
description: 'Ein privates Telefonbuch.'
controller:
successfuly_created: 'Ein neues Telefonbuch wurde erstellt.'