diff options
author | spag <spag@golwen.net> | 2012-12-29 17:42:35 +0100 |
---|---|---|
committer | spag <spag@golwen.net> | 2012-12-29 17:42:35 +0100 |
commit | 5cf46b6467679ea0367cc0c00787f6f1c86560e4 (patch) | |
tree | b3f314d1ba574e328f1ce5a27aeadb6ae32980d5 /config | |
parent | 929e7a391f139ed827e9bd3bea339789a82de6d4 (diff) | |
parent | 8d20201910b1915cffa495e6474d50f9c8e8331d (diff) |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/gemeinschaft_parameters.rb | 2 | ||||
-rw-r--r-- | config/locales/views/phones/de.yml | 1 | ||||
-rw-r--r-- | config/locales/views/phones/en.yml | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/config/initializers/gemeinschaft_parameters.rb b/config/initializers/gemeinschaft_parameters.rb index fbe9c56..ffb8fee 100644 --- a/config/initializers/gemeinschaft_parameters.rb +++ b/config/initializers/gemeinschaft_parameters.rb @@ -1,6 +1,6 @@ # Use this file to set generic parameters for Gemeinschaft -GEMEINSCHAFT_VERSION = '5.0' +GEMEINSCHAFT_VERSION = '5.0.1' SUPER_TENANT_NAME = 'Super-Tenant' # System defaults diff --git a/config/locales/views/phones/de.yml b/config/locales/views/phones/de.yml index 2b655bd..dafe279 100644 --- a/config/locales/views/phones/de.yml +++ b/config/locales/views/phones/de.yml @@ -42,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: diff --git a/config/locales/views/phones/en.yml b/config/locales/views/phones/en.yml index a441e34..ecd5a91 100644 --- a/config/locales/views/phones/en.yml +++ b/config/locales/views/phones/en.yml @@ -42,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: |