Fix mistake in form labels for Caller-Id-In-From

innotelinc · Mar 10, 2020 · 50f66a0 · 50f66a0
1 parent 0e487d5
commit 50f66a0
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 17 deletions.
diff --git a/database/archive/astpp-upgrade-4.0-mysql8.sql b/database/archive/astpp-upgrade-4.0-mysql8.sql
@@ -1424,7 +1424,7 @@ INSERT INTO `translations` (`id`, `module_name`, `en_En`) VALUES
 (382, 'Gateways', 'Gateways'),
 (385, 'Proxy', 'Proxy'),
 (386, 'Register', 'Register'),
-(387, 'Caller-Id-In-Form', 'Caller-Id-In-Form'),
+(387, 'Caller-Id-In-From', 'Caller-Id-In-From'),
 (388, 'Trunks', 'Trunks'),
 (390, 'Gateway Name', 'Gateway Name'),
 (391, 'Failover  GW Name #1', 'Failover  GW Name #1'),

diff --git a/database/astpp-4.0.1.sql b/database/astpp-4.0.1.sql
@@ -245,7 +245,7 @@ INSERT INTO `translations` (`id`, `module_name`, `en_En`) VALUES
 (75, 'Caller IP', 'Caller IP'),
 (76, 'Caller Name', 'Caller Name'),
 (77, 'Caller Number', 'Caller Number'),
-(78, 'Caller-Id-In-Form', 'Caller-Id-In-Form'),
+(78, 'Caller-Id-In-From', 'Caller-Id-In-From'),
 (79, 'Calling Card', 'Calling Card'),
 (80, 'Calls', 'Calls'),
 (81, 'Calls Breakdown', 'Calls Breakdown'),

diff --git a/database/astpp-4.0.sql b/database/astpp-4.0.sql
@@ -2579,7 +2579,7 @@ INSERT INTO `translations` (`id`, `module_name`, `en_En`) VALUES
 (75, 'Caller IP', 'Caller IP'),
 (76, 'Caller Name', 'Caller Name'),
 (77, 'Caller Number', 'Caller Number'),
-(78, 'Caller-Id-In-Form', 'Caller-Id-In-Form'),
+(78, 'Caller-Id-In-From', 'Caller-Id-In-From'),
 (79, 'Calling Card', 'Calling Card'),
 (80, 'Calls', 'Calls'),
 (81, 'Calls Breakdown', 'Calls Breakdown'),

diff --git a/doc/Modules/Carriers/create_gateway.rst b/doc/Modules/Carriers/create_gateway.rst
@@ -23,7 +23,7 @@ Create Gateway
 
  Register	          	    True / False
 
- Caller-Id-In-Form	        True / False
+ Caller-Id-In-From	        True / False
 
  Status          		    Active / Inactive 
 

diff --git a/web_interface/astpp/addons/Community/language_chinese/web_interface/astpp/language/zh_CN.csv b/web_interface/astpp/addons/Community/language_chinese/web_interface/astpp/language/zh_CN.csv
@@ -76,7 +76,7 @@ Caller IDs,来电显示
 Caller IP,来电IP
 Caller Name,来电者姓名
 Caller Number,来电号码
-Caller-Id-In-Form,呼叫者ID-状态正佳
+Caller-Id-In-From,呼叫者ID-状态正佳
 Calling Card,电话卡
 Calls,呼叫
 Calls Breakdown,呼叫故障

diff --git a/web_interface/astpp/addons/Community/language_demo/web_interface/astpp/language/demo.csv b/web_interface/astpp/addons/Community/language_demo/web_interface/astpp/language/demo.csv
@@ -77,7 +77,7 @@ Caller IDs,
 Caller IP,
 Caller Name,
 Caller Number,
-Caller-Id-In-Form,
+Caller-Id-In-From,
 Calling Card,
 Calls,
 Calls Breakdown,

diff --git a/web_interface/astpp/addons/Community/language_french/web_interface/astpp/language/fr_FR.csv b/web_interface/astpp/addons/Community/language_french/web_interface/astpp/language/fr_FR.csv
@@ -77,7 +77,7 @@ Caller IDs,Identification de l'appelant
 Caller IP,IP de l'appelant
 Caller Name,Nom de l'appelant
 Caller Number,Numéro de l'appelant
-Caller-Id-In-Form,Caller-Id-In-Form
+Caller-Id-In-From,Caller-Id-In-From
 Calling Card,Carte téléphonique
 Calls,Appels
 Calls Breakdown,Répartition des appels

diff --git a/web_interface/astpp/addons/Community/language_german/web_interface/astpp/language/de_DE.csv b/web_interface/astpp/addons/Community/language_german/web_interface/astpp/language/de_DE.csv
@@ -76,7 +76,7 @@ Caller IDs,Anrufer-IDs
 Caller IP,Anrufer-IP
 Caller Name,Name des Anrufers
 Caller Number,Anrufernummer
-Caller-Id-In-Form,Anrufer-ID-In-Formular
+Caller-Id-In-From,Anrufer-ID-In-Formular
 Calling Card,Visitenkarte
 Calls,Anrufe
 Calls Breakdown,Aufschlüsselung der Anrufe

diff --git a/web_interface/astpp/addons/Community/language_greek/web_interface/astpp/language/el_GR.csv b/web_interface/astpp/addons/Community/language_greek/web_interface/astpp/language/el_GR.csv
@@ -76,7 +76,7 @@ Caller IDs,Αναγνωριστικά καλούντος
 Caller IP,IP καλούντος
 Caller Name,Όνομα καλούντος
 Caller Number,Αριθμός κλήσης
-Caller-Id-In-Form,Caller-Id-In-Form
+Caller-Id-In-From,Caller-Id-In-From
 Calling Card,Τηλεφωνική κάρτα
 Calls,Κλήσεις
 Calls Breakdown,Αναλυτική κλήση

diff --git a/web_interface/astpp/addons/Community/language_italian/web_interface/astpp/language/it_IT.csv b/web_interface/astpp/addons/Community/language_italian/web_interface/astpp/language/it_IT.csv
@@ -76,7 +76,7 @@ Caller IDs,ID chiamante
 Caller IP,IP chiamante
 Caller Name,Nome del chiamante
 Caller Number,Numero del chiamante
-Caller-Id-In-Form,Caller-ID-In-Form
+Caller-Id-In-From,Caller-Id-In-From
 Calling Card,Biglietto da visita
 Calls,chiamate
 Calls Breakdown,Ripartizione delle chiamate

diff --git a/...interface/astpp/addons/Community/language_japanese/web_interface/astpp/language/ja_JP.csv b/...interface/astpp/addons/Community/language_japanese/web_interface/astpp/language/ja_JP.csv
@@ -76,7 +76,7 @@ Caller IDs,発信者番号
 Caller IP,発信者IP
 Caller Name,発信者名
 Caller Number,発信者番号
-Caller-Id-In-Form,発信者IDの形式
+Caller-Id-In-From,発信者IDの形式
 Calling Card,テレフォンカード
 Calls,電話
 Calls Breakdown,電話の内訳

diff --git a/...terface/astpp/addons/Community/language_portuguese/web_interface/astpp/language/pt_BR.csv b/...terface/astpp/addons/Community/language_portuguese/web_interface/astpp/language/pt_BR.csv
@@ -77,7 +77,7 @@ Caller IDs,Identificadores de chamadas
 Caller IP,IP do chamador
 Caller Name,Nome do chamador
 Caller Number,Número do chamador
-Caller-Id-In-Form,Caller-Id-In-Form
+Caller-Id-In-From,Caller-Id-In-From
 Calling Card,Cartão telefônico
 Calls,Chamadas
 Calls Breakdown,Repartição de chamadas

diff --git a/...interface/astpp/addons/Community/language_romanian/web_interface/astpp/language/ro_RO.csv b/...interface/astpp/addons/Community/language_romanian/web_interface/astpp/language/ro_RO.csv
@@ -76,7 +76,7 @@ Caller IDs,Coduri de apelare
 Caller IP,IP apelant
 Caller Name,Nume apelant
 Caller Number,Numărul apelantului
-Caller-Id-In-Form,Caller-ID-In-Form
+Caller-Id-In-From,Caller-Id-In-From
 Calling Card,Cartea de apelare
 Calls,apeluri
 Calls Breakdown,Defalcarea apelurilor

diff --git a/web_interface/astpp/addons/Community/language_russian/web_interface/astpp/language/ru_RU.csv b/web_interface/astpp/addons/Community/language_russian/web_interface/astpp/language/ru_RU.csv
@@ -77,7 +77,7 @@ Caller IDs,Идентификаторы абонентов
 Caller IP,Вызывающий IP
 Caller Name,Имя звонящего
 Caller Number,Номер звонящего
-Caller-Id-In-Form,Caller-ID-In-Form
+Caller-Id-In-From,Caller-Id-In-From
 Calling Card,Визитная карточка
 Calls,Вызовы
 Calls Breakdown,Calls Breakdown

diff --git a/web_interface/astpp/addons/Community/language_spanish/web_interface/astpp/language/es_ES.csv b/web_interface/astpp/addons/Community/language_spanish/web_interface/astpp/language/es_ES.csv
@@ -77,7 +77,7 @@ Caller IDs,IDs
 Caller IP,IP persona que llama
 Caller Name,Nombre de la persona que llama
 Caller Number,Número de llamadas
-Caller-Id-In-Form,Caller-ID-A-Form
+Caller-Id-In-From,Caller-ID-A-Form
 Calling Card,Tarjeta de llamada
 Calls,llamadas
 Calls Breakdown,Las llamadas Desglose

diff --git a/web_interface/astpp/application/modules/freeswitch/libraries/freeswitch_form.php b/web_interface/astpp/application/modules/freeswitch/libraries/freeswitch_form.php
@@ -1478,7 +1478,7 @@ function get_gateway_form_fields()
                 'set_sip_config_option'
             ),
             array(
-                gettext('Caller-Id-In-Form'),
+                gettext('Caller-Id-In-From'),
                 array(
                     'name' => 'caller-id-in-from',
                     'class' => 'add_settings'
@@ -1761,7 +1761,7 @@ function build_fsgateway_list_for_admin()
                 "center"
             ),
             array(
-                gettext("Caller-Id-In-Form"),
+                gettext("Caller-Id-In-From"),
                 "100",
                 "caller-id-in-from",
                 "caller-id-in-from",