summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-28 11:09:39 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-28 11:09:39 +0100
commitbcdd0a3584f23438257619ee4081949c1e653c91 (patch)
tree3dbdf93b00b39ab77ff520fe68f05847d59e46bb /config
parentcdde455a50df5de70ee3d84ce66733e8769db05f (diff)
parent553115fd50ef3c35d961fa98abfd593386da5c94 (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'config')
-rw-r--r--config/locales/views/call_routes/de.yml6
-rw-r--r--config/locales/views/call_routes/en.yml6
-rw-r--r--config/locales/views/sip_accounts/de.yml1
-rw-r--r--config/locales/views/sip_accounts/en.yml1
4 files changed, 6 insertions, 8 deletions
diff --git a/config/locales/views/call_routes/de.yml b/config/locales/views/call_routes/de.yml
index 260b869..a8d6f4b 100644
--- a/config/locales/views/call_routes/de.yml
+++ b/config/locales/views/call_routes/de.yml
@@ -9,8 +9,7 @@ de:
page_title: 'Liste aller Call Routen'
routing_table: 'Routing Table'
name: 'Name'
- endpoint_type: 'Endpoint type'
- endpoint_id: 'Endpoint'
+ endpoint: 'Endpoint'
position: 'Position'
actions:
confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Call Route'
@@ -23,8 +22,7 @@ de:
page_title: 'Call Route bearbeiten'
routing_table: 'Routing Table'
name: 'Name'
- endpoint_type: 'Endpoint type'
- endpoint_id: 'Endpoint'
+ endpoint: 'Endpoint'
position: 'Position'
actions:
confirm_destroy: 'Sind Sie sicher, dass die dieses Element löschen möchten?'
diff --git a/config/locales/views/call_routes/en.yml b/config/locales/views/call_routes/en.yml
index 25e4c51..8596474 100644
--- a/config/locales/views/call_routes/en.yml
+++ b/config/locales/views/call_routes/en.yml
@@ -9,8 +9,7 @@ en:
page_title: 'Listing Call route'
table: 'Table'
name: 'Name'
- endpoint_type: 'Endpoint type'
- endpoint_id: 'Endpoint'
+ endpoint: 'Endpoint'
position: 'Position'
actions:
confirm_destroy: 'Are you sure you want to delete this Call route?'
@@ -23,8 +22,7 @@ en:
page_title: 'Show Call route'
table: 'Table'
name: 'Name'
- endpoint_type: 'Endpoint type'
- endpoint_id: 'Endpoint'
+ endpoint: 'Endpoint'
position: 'Position'
actions:
confirm_destroy: 'Are you sure you want to delete this element?'
diff --git a/config/locales/views/sip_accounts/de.yml b/config/locales/views/sip_accounts/de.yml
index e711137..2820336 100644
--- a/config/locales/views/sip_accounts/de.yml
+++ b/config/locales/views/sip_accounts/de.yml
@@ -40,6 +40,7 @@ de:
callforward_rules_act_per_sip_account: 'Rufweiterleitungen gelten für das gesamte SIP-Account'
registration: 'Registrierung'
expires: 'Läuft ab'
+ user_agent: 'User Agent'
actions:
confirm_destroy: 'Sind Sie sicher, dass Sie diesen SIP-Account löschen möchten?'
destroy: 'Löschen'
diff --git a/config/locales/views/sip_accounts/en.yml b/config/locales/views/sip_accounts/en.yml
index 99d14b5..aa934e9 100644
--- a/config/locales/views/sip_accounts/en.yml
+++ b/config/locales/views/sip_accounts/en.yml
@@ -40,6 +40,7 @@ en:
callforward_rules_act_per_sip_account: 'Callforwards work for the whole sip account'
registration: 'Registration'
expires: 'Expires'
+ user_agent: 'User Agent'
actions:
confirm_destroy: 'Are you sure you want to delete this SIP account?'
destroy: 'Delete'