summaryrefslogtreecommitdiff
path: root/config/locales
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-30 21:03:48 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-30 21:03:48 +0100
commitf04aa92778dca7f71ca656235885095b13dd3535 (patch)
treeb0ac9cf3dfecbbdb0209c1204054adcac861f001 /config/locales
parentf3c3e77eaa2b82567f02601b6f66177208674181 (diff)
parent508871c01cbf02bf6d8d7056c2d5a70e4d67eebf (diff)
Merge branch 'develop'5.0.2
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/views/phones/de.yml1
-rw-r--r--config/locales/views/phones/en.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/views/phones/de.yml b/config/locales/views/phones/de.yml
index dafe279..814267c 100644
--- a/config/locales/views/phones/de.yml
+++ b/config/locales/views/phones/de.yml
@@ -34,6 +34,7 @@ de:
http_password: 'http password'
nightly_reboot: 'Nachts automatischer Reboot'
fallback_sip_account_id: 'Fallback SIP Account'
+ manual: 'Handbuch'
actions:
confirm: 'Sind Sie sicher, dass Sie diese Telefon aus Gemeinschaft entfernen möchten?'
destroy: 'Löschen'
diff --git a/config/locales/views/phones/en.yml b/config/locales/views/phones/en.yml
index ecd5a91..15e212e 100644
--- a/config/locales/views/phones/en.yml
+++ b/config/locales/views/phones/en.yml
@@ -34,6 +34,7 @@ en:
nightly_reboot: 'Nightly reboot'
provisioning_key_active: 'Provisioning key active'
fallback_sip_account_id: 'Fallback SIP Account'
+ manual: 'Manual'
actions:
confirm: 'Are you sure you want to delete this phone?'
destroy: 'Delete phone'