summaryrefslogtreecommitdiff
path: root/config/locales/views
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-28 20:27:04 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-28 20:27:04 +0100
commitf3c3e77eaa2b82567f02601b6f66177208674181 (patch)
tree1946390f7f697e80fcdab4164ad620d507b6a1fe /config/locales/views
parent3e76142566ad8f55a64a88fe5c19e7d0ec7c11c0 (diff)
parent8d20201910b1915cffa495e6474d50f9c8e8331d (diff)
Merge branch 'develop'5.0.1
Diffstat (limited to 'config/locales/views')
-rw-r--r--config/locales/views/call_histories/de.yml1
-rw-r--r--config/locales/views/call_histories/en.yml2
-rw-r--r--config/locales/views/phones/de.yml5
-rw-r--r--config/locales/views/phones/en.yml5
4 files changed, 12 insertions, 1 deletions
diff --git a/config/locales/views/call_histories/de.yml b/config/locales/views/call_histories/de.yml
index 3f0459d..6c99aee 100644
--- a/config/locales/views/call_histories/de.yml
+++ b/config/locales/views/call_histories/de.yml
@@ -64,3 +64,4 @@ de:
NO_USER_RESPONSE: 'Keine Antwort'
NOANSWER: 'Keine Antwort'
USER_NOT_REGISTERED: 'Offline'
+ USER_BUSY: 'Besetzt'
diff --git a/config/locales/views/call_histories/en.yml b/config/locales/views/call_histories/en.yml
index 5adf453..839c912 100644
--- a/config/locales/views/call_histories/en.yml
+++ b/config/locales/views/call_histories/en.yml
@@ -64,4 +64,4 @@ en:
NO_USER_RESPONSE: 'No user response'
NOANSWER: 'No answer'
USER_NOT_REGISTERED: 'Offline'
- \ No newline at end of file
+ USER_BUSY: 'Busy'
diff --git a/config/locales/views/phones/de.yml b/config/locales/views/phones/de.yml
index 3a0adea..dafe279 100644
--- a/config/locales/views/phones/de.yml
+++ b/config/locales/views/phones/de.yml
@@ -33,6 +33,7 @@ de:
http_user: 'http user'
http_password: 'http password'
nightly_reboot: 'Nachts automatischer Reboot'
+ fallback_sip_account_id: 'Fallback SIP Account'
actions:
confirm: 'Sind Sie sicher, dass Sie diese Telefon aus Gemeinschaft entfernen möchten?'
destroy: 'Löschen'
@@ -41,6 +42,7 @@ de:
new:
page_title: 'Neues Telefon'
actions:
+ you_need_to_have_at_least_one_available_fallback_sip_account_for_hotdesking: 'Sie benötigen mindestens einen nicht benutzen und hotdeskfähigen SIP-Account, damit die Option für Hotdesking in diesem Formular angezeigt wird. '
edit:
page_title: 'Telefondaten bearbeiten'
form:
@@ -71,6 +73,9 @@ de:
provisioning_key_active:
label: 'Provisioning Schlüssel aktiv'
hint: ''
+ fallback_sip_account_id:
+ label: 'Fallback SIP Account'
+ hint: ''
button: 'Absenden'
sip_accounts:
title: 'Auf dem Telefon eingetragene SIP-Konten'
diff --git a/config/locales/views/phones/en.yml b/config/locales/views/phones/en.yml
index afcf9b5..ecd5a91 100644
--- a/config/locales/views/phones/en.yml
+++ b/config/locales/views/phones/en.yml
@@ -33,6 +33,7 @@ en:
http_password: 'http password'
nightly_reboot: 'Nightly reboot'
provisioning_key_active: 'Provisioning key active'
+ fallback_sip_account_id: 'Fallback SIP Account'
actions:
confirm: 'Are you sure you want to delete this phone?'
destroy: 'Delete phone'
@@ -41,6 +42,7 @@ en:
new:
page_title: 'New phone'
actions:
+ you_need_to_have_at_least_one_available_fallback_sip_account_for_hotdesking: 'You need to have at least one unconnected SIP account to see a hotdesking option in this form. '
edit:
page_title: 'Editing Phone'
form:
@@ -71,6 +73,9 @@ en:
provisioning_key_active:
label: 'Provisioning key active'
hint: ''
+ fallback_sip_account_id:
+ label: 'Fallback SIP Account'
+ hint: ''
button: 'Submit'
sip_accounts:
title: 'Listing of connected SIP accounts'