From ca8989616c7f2edb5b8b4fb04c7a58feef24ad49 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 23 Jan 2013 12:52:23 +0100 Subject: Add tooltips. --- config/locales/views/phones/de.yml | 4 +++- config/locales/views/phones/en.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'config/locales/views/phones') diff --git a/config/locales/views/phones/de.yml b/config/locales/views/phones/de.yml index 814267c..4aa0ae6 100644 --- a/config/locales/views/phones/de.yml +++ b/config/locales/views/phones/de.yml @@ -80,4 +80,6 @@ de: button: 'Absenden' sip_accounts: title: 'Auf dem Telefon eingetragene SIP-Konten' - connect_to_sip_account: 'Neues SIP-Konto auf das Telefon eintragen' \ No newline at end of file + connect_to_sip_account: 'Neues SIP-Konto auf das Telefon eintragen' + tool_tips: + hot_desk: 'Mit aktivierter Hot Desk Fähigkeit können sich User der Anlage an einem Telefon ein- und ausloggen.' diff --git a/config/locales/views/phones/en.yml b/config/locales/views/phones/en.yml index 15e212e..46b0bcb 100644 --- a/config/locales/views/phones/en.yml +++ b/config/locales/views/phones/en.yml @@ -80,4 +80,6 @@ en: button: 'Submit' sip_accounts: title: 'Listing of connected SIP accounts' - connect_to_sip_account: 'Connect to an existing SIP account' \ No newline at end of file + connect_to_sip_account: 'Connect to an existing SIP account' + tool_tips: + hot_desk: 'Hot desk triggers the ability for a user to login and out of a given phone.' -- cgit v1.2.3 From e84e82032813b7acd71f8073d00f57e1cd65eb7c Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 23 Jan 2013 17:36:33 +0100 Subject: Fixed I18n bug. --- config/locales/views/phones/de.yml | 8 ++++---- config/locales/views/phones/en.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'config/locales/views/phones') diff --git a/config/locales/views/phones/de.yml b/config/locales/views/phones/de.yml index 4aa0ae6..59313b1 100644 --- a/config/locales/views/phones/de.yml +++ b/config/locales/views/phones/de.yml @@ -17,7 +17,7 @@ de: nightly_reboot: 'Nachts automatischer Reboot' provisioning_key_active: 'Provisioning Schlüssel aktiv' actions: - confirm: 'Sind Sie sicher, dass Sie diese Telefon aus Gemeinschaft entfernen möchten?' + confirm_destroy: 'Sind Sie sicher, dass Sie diese Telefon aus Gemeinschaft entfernen möchten?' destroy: 'Löschen' edit: 'Bearbeiten' show: 'Anzeigen' @@ -36,7 +36,7 @@ de: fallback_sip_account_id: 'Fallback SIP Account' manual: 'Handbuch' actions: - confirm: 'Sind Sie sicher, dass Sie diese Telefon aus Gemeinschaft entfernen möchten?' + confirm_destroy: 'Sind Sie sicher, dass Sie diese Telefon aus Gemeinschaft entfernen möchten?' destroy: 'Löschen' edit: 'Bearbeiten' view_all: 'Alle Telefone anzeigen' @@ -79,7 +79,7 @@ de: hint: '' button: 'Absenden' sip_accounts: - title: 'Auf dem Telefon eingetragene SIP-Konten' - connect_to_sip_account: 'Neues SIP-Konto auf das Telefon eintragen' + title: 'Verknüpfte SIP-Accounts' + connect_to_sip_account: 'SIP-Account mit dem Telefon verknüpfen' tool_tips: hot_desk: 'Mit aktivierter Hot Desk Fähigkeit können sich User der Anlage an einem Telefon ein- und ausloggen.' diff --git a/config/locales/views/phones/en.yml b/config/locales/views/phones/en.yml index 46b0bcb..9574443 100644 --- a/config/locales/views/phones/en.yml +++ b/config/locales/views/phones/en.yml @@ -16,7 +16,7 @@ en: http_password: 'http password' nightly_reboot: 'Nightly reboot' actions: - confirm: 'Are you sure you want to delete this phone?' + confirm_destroy: 'Are you sure you want to delete this phone?' destroy: 'Delete' edit: 'Edit' show: 'View' @@ -36,7 +36,7 @@ en: fallback_sip_account_id: 'Fallback SIP Account' manual: 'Manual' actions: - confirm: 'Are you sure you want to delete this phone?' + confirm_destroy: 'Are you sure you want to delete this phone?' destroy: 'Delete phone' edit: 'Edit phone' view_all: 'View all phones' -- cgit v1.2.3 From d22a57f659fdb0f2c9ecf751d1e41a81430b289e Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Thu, 24 Jan 2013 12:52:37 +0100 Subject: Bugfixed a wrong key in I18n files. --- config/locales/views/phones/de.yml | 2 +- config/locales/views/phones/en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'config/locales/views/phones') diff --git a/config/locales/views/phones/de.yml b/config/locales/views/phones/de.yml index 59313b1..af2804a 100644 --- a/config/locales/views/phones/de.yml +++ b/config/locales/views/phones/de.yml @@ -77,7 +77,7 @@ de: fallback_sip_account_id: label: 'Fallback SIP Account' hint: '' - button: 'Absenden' + submit: 'Absenden' sip_accounts: title: 'Verknüpfte SIP-Accounts' connect_to_sip_account: 'SIP-Account mit dem Telefon verknüpfen' diff --git a/config/locales/views/phones/en.yml b/config/locales/views/phones/en.yml index 9574443..306537f 100644 --- a/config/locales/views/phones/en.yml +++ b/config/locales/views/phones/en.yml @@ -77,7 +77,7 @@ en: fallback_sip_account_id: label: 'Fallback SIP Account' hint: '' - button: 'Submit' + submit: 'Submit' sip_accounts: title: 'Listing of connected SIP accounts' connect_to_sip_account: 'Connect to an existing SIP account' -- cgit v1.2.3 From d7777f71e78ae173e26af39c7c65243b4604d6e8 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 26 Jan 2013 21:01:23 +0100 Subject: Added a tooltip. --- config/locales/views/phones/de.yml | 1 + config/locales/views/phones/en.yml | 1 + 2 files changed, 2 insertions(+) (limited to 'config/locales/views/phones') diff --git a/config/locales/views/phones/de.yml b/config/locales/views/phones/de.yml index af2804a..b45bb59 100644 --- a/config/locales/views/phones/de.yml +++ b/config/locales/views/phones/de.yml @@ -83,3 +83,4 @@ de: connect_to_sip_account: 'SIP-Account mit dem Telefon verknüpfen' tool_tips: hot_desk: 'Mit aktivierter Hot Desk Fähigkeit können sich User der Anlage an einem Telefon ein- und ausloggen.' + missing_ip_address: 'Das Telefon hat sich bis jetzt noch nicht bei Gemeinschaft gemeldet. Vielleicht müssen Sie das Telefon manuell rebooten.' diff --git a/config/locales/views/phones/en.yml b/config/locales/views/phones/en.yml index 306537f..bac3e68 100644 --- a/config/locales/views/phones/en.yml +++ b/config/locales/views/phones/en.yml @@ -83,3 +83,4 @@ en: connect_to_sip_account: 'Connect to an existing SIP account' tool_tips: hot_desk: 'Hot desk triggers the ability for a user to login and out of a given phone.' + missing_ip_address: "The phone hasn't contacted this system yet. Maybe you need to reboot the phone." -- cgit v1.2.3 From f227929c14cc4edb1c646094f793894d47e2bdb3 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 26 Jan 2013 22:32:34 +0100 Subject: Wording --- config/locales/views/phones/de.yml | 6 +++--- config/locales/views/phones/en.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'config/locales/views/phones') diff --git a/config/locales/views/phones/de.yml b/config/locales/views/phones/de.yml index b45bb59..19fab87 100644 --- a/config/locales/views/phones/de.yml +++ b/config/locales/views/phones/de.yml @@ -8,7 +8,7 @@ de: index: page_title: 'Telefone' mac_address: 'MAC-Adresse' - phone_model_id: 'Telefonmodell' + phone_model_id: 'Modell' hot_deskable: 'Hot-Desk fähig' ip_address: 'IP-Adresse' last_ip_address: 'Letzte IP-Adresse' @@ -26,7 +26,7 @@ de: show: page_title: 'Telefon anzeigen' mac_address: 'MAC-Adresse' - phone_model_id: 'Telefonmodell' + phone_model_id: 'Modell' hot_deskable: 'Hot-Desk fähig' ip_address: 'IP-Adresse' last_ip_address: 'Letzte IP-Adresse' @@ -51,7 +51,7 @@ de: label: 'MAC-Adresse' hint: '' phone_model_id: - label: 'Telefonmodell' + label: 'Modell' hint: '' hot_deskable: label: 'Hot-Desk fähig' diff --git a/config/locales/views/phones/en.yml b/config/locales/views/phones/en.yml index bac3e68..eb05229 100644 --- a/config/locales/views/phones/en.yml +++ b/config/locales/views/phones/en.yml @@ -8,7 +8,7 @@ en: index: page_title: 'Phones' mac_address: 'Mac address' - phone_model_id: 'Phone model' + phone_model_id: 'Model' hot_deskable: 'Hot-deskable' ip_address: 'IP address' last_ip_address: 'Last IP address' @@ -25,7 +25,7 @@ en: show: page_title: 'Show phone' mac_address: 'Mac address' - phone_model_id: 'Phone model' + phone_model_id: 'Model' hot_deskable: 'Hot-deskable' ip_address: 'IP address' last_ip_address: 'Last IP address' @@ -51,7 +51,7 @@ en: label: 'Mac address' hint: '' phone_model_id: - label: 'Phone model' + label: 'Model' hint: '' hot_deskable: label: 'Hot-deskable' -- cgit v1.2.3 From 5e83f10c186d403a7dfe1d35afd1b64a5935a8ec Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 26 Jan 2013 22:44:11 +0100 Subject: Display the user and password for the phone's WebGUI. --- config/locales/views/phones/de.yml | 4 ++-- config/locales/views/phones/en.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'config/locales/views/phones') diff --git a/config/locales/views/phones/de.yml b/config/locales/views/phones/de.yml index 19fab87..8fe6ba8 100644 --- a/config/locales/views/phones/de.yml +++ b/config/locales/views/phones/de.yml @@ -12,8 +12,8 @@ de: hot_deskable: 'Hot-Desk fähig' ip_address: 'IP-Adresse' last_ip_address: 'Letzte IP-Adresse' - http_user: 'http user' - http_password: 'http password' + http_user: 'Phone WebGUI Username' + http_password: 'Phone WebGUI Passwort' nightly_reboot: 'Nachts automatischer Reboot' provisioning_key_active: 'Provisioning Schlüssel aktiv' actions: diff --git a/config/locales/views/phones/en.yml b/config/locales/views/phones/en.yml index eb05229..1f39f04 100644 --- a/config/locales/views/phones/en.yml +++ b/config/locales/views/phones/en.yml @@ -12,8 +12,8 @@ en: hot_deskable: 'Hot-deskable' ip_address: 'IP address' last_ip_address: 'Last IP address' - http_user: 'http user' - http_password: 'http password' + http_user: 'Phone WebGUI username' + http_password: 'Phone WebGUI password' nightly_reboot: 'Nightly reboot' actions: confirm_destroy: 'Are you sure you want to delete this phone?' -- cgit v1.2.3 From f5a09733ae0b6f77211eea03ab161e0c9122465b Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 27 Jan 2013 11:12:46 +0100 Subject: Wording --- config/locales/views/phones/de.yml | 8 ++++---- config/locales/views/phones/en.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'config/locales/views/phones') diff --git a/config/locales/views/phones/de.yml b/config/locales/views/phones/de.yml index 8fe6ba8..373db13 100644 --- a/config/locales/views/phones/de.yml +++ b/config/locales/views/phones/de.yml @@ -30,8 +30,8 @@ de: hot_deskable: 'Hot-Desk fähig' ip_address: 'IP-Adresse' last_ip_address: 'Letzte IP-Adresse' - http_user: 'http user' - http_password: 'http password' + http_user: 'Phone WebGUI Username' + http_password: 'Phone WebGUI Passwort' nightly_reboot: 'Nachts automatischer Reboot' fallback_sip_account_id: 'Fallback SIP Account' manual: 'Handbuch' @@ -66,10 +66,10 @@ de: label: 'Letzte IP-Adresse' hint: '' http_user: - label: 'http user' + label: 'Phone WebGUI Username' hint: '' http_password: - label: 'http password' + label: 'Phone WebGUI Passwort' hint: '' provisioning_key_active: label: 'Provisioning Schlüssel aktiv' diff --git a/config/locales/views/phones/en.yml b/config/locales/views/phones/en.yml index 1f39f04..87a6160 100644 --- a/config/locales/views/phones/en.yml +++ b/config/locales/views/phones/en.yml @@ -29,8 +29,8 @@ en: hot_deskable: 'Hot-deskable' ip_address: 'IP address' last_ip_address: 'Last IP address' - http_user: 'http user' - http_password: 'http password' + http_user: 'Phone WebGUI username' + http_password: 'Phone WebGUI password' nightly_reboot: 'Nightly reboot' provisioning_key_active: 'Provisioning key active' fallback_sip_account_id: 'Fallback SIP Account' -- cgit v1.2.3