diff --git a/freeswitch_click2dial/freeswitch_click2dial.py b/freeswitch_click2dial/freeswitch_click2dial.py
index 1265139..6dd0d54 100644
--- a/freeswitch_click2dial/freeswitch_click2dial.py
+++ b/freeswitch_click2dial/freeswitch_click2dial.py
@@ -33,7 +33,7 @@ _logger = logging.getLogger(__name__)
 
 
 class freeswitch_server(orm.Model):
-    '''FreeSWITCH server object, stores the parameters of the FreeSWITCH IPBXs'''
+    '''FreeSWITCH server object, stores the parameters of the FreeSWITCH Servers'''
     _name = "freeswitch.server"
     _description = "FreeSWITCH Servers"
     _columns = {
@@ -299,10 +299,6 @@ class res_users(orm.Model):
         'callerid': fields.char(
             'Caller ID', size=50,
             help="Caller ID used for the calls initiated by this user."),
-        # You'd probably think: FreeSWITCH should reuse the callerID of sip.conf!
-        # But it cannot, cf
-        # http://lists.digium.com/pipermail/freeswitch-users/
-        # 2012-January/269787.html
         'cdraccount': fields.char(
             'CDR Account', size=50,
             help="Call Detail Record (CDR) account used for billing this "
@@ -310,12 +306,14 @@ class res_users(orm.Model):
         'freeswitch_chan_type': fields.selection([
             ('user', 'SIP'),
             ('FreeTDM', 'FreeTDM'),
-            ('Skinny', 'Skinny'),
-            ('MGCP', 'MGCP'),
-            ('mISDN', 'mISDN'),
-            ('H323', 'H323'),
-            ('SCCP', 'SCCP'),
-            ('Local', 'Local'),
+            ('skinny', 'Skinny'),
+            ('h323', 'H323'),
+            ('dingaling', 'XMPP/JINGLE'),
+            ('gsmopen','GSM SMS/Voice'),
+            ('skypeopen', 'SkypeOpen'),
+            ('Khomp', 'Khomp'),
+            ('opal','Opal Multi-protocol'),
+            ('portaudio','Portaudio'),
             ], 'FreeSWITCH Channel Type',
             help="FreeSWITCH channel type, as used in the FreeSWITCH dialplan. "
             "If the user has a regular IP phone, the channel type is 'SIP'."),
diff --git a/freeswitch_click2dial/freeswitch_click2dial_demo.xml b/freeswitch_click2dial/freeswitch_click2dial_demo.xml
index 225439a..543a307 100644
--- a/freeswitch_click2dial/freeswitch_click2dial_demo.xml
+++ b/freeswitch_click2dial/freeswitch_click2dial_demo.xml
@@ -10,9 +10,9 @@
 <openerp>
     <data noupdate="1">
         <record id="demo_fs_server" model="freeswitch.server">
-            <field name="name">Akretion FreeSWITCH IPBX</field>
+            <field name="name">Akretion FreeSWITCH Server</field>
             <field name="ip_address">freeswitch.akretion.com</field>
-            <field name="login">click2dial</field>
+            <field name="port">8021</field>
             <field name="password">mypassword</field>
             <field name="context">from-internal</field>
             <field name="alert_info">info=&lt;Bellcore-dr5&gt;</field>
diff --git a/freeswitch_click2dial/i18n/bg.po b/freeswitch_click2dial/i18n/bg.po
index 70913eb..cf88899 100644
--- a/freeswitch_click2dial/i18n/bg.po
+++ b/freeswitch_click2dial/i18n/bg.po
@@ -22,11 +22,6 @@ msgstr ""
 msgid "Event Socket password"
 msgstr ""
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "SIP"
-msgstr ""
-
 #. module: freeswitch_click2dial
 #: field:freeswitch.server,international_prefix:0
 msgid "International prefix"
@@ -37,11 +32,6 @@ msgstr ""
 msgid "IPv4 address or DNS name of the FreeSWITCH server."
 msgstr ""
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "mISDN"
-msgstr ""
-
 #. module: freeswitch_click2dial
 #: constraint:ir.model:0
 msgid ""
@@ -81,11 +71,6 @@ msgstr ""
 msgid "Invalid model name in the action definition."
 msgstr "Невалидно име на модел при задаване на действие"
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "DAHDI"
-msgstr ""
-
 #. module: freeswitch_click2dial
 #: field:res.users,callerid:0
 msgid "Caller ID"
@@ -148,11 +133,6 @@ msgid ""
 "outgoing calls, leave empty."
 msgstr ""
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "Zap"
-msgstr ""
-
 #. module: freeswitch_click2dial
 #: help:freeswitch.server,context:0
 msgid ""
@@ -165,39 +145,64 @@ msgstr ""
 msgid "Caller ID used for the calls initiated by this user."
 msgstr ""
 
+#. module: freeswitch_click2dial
+#: model:ir.module.module,shortdesc:freeswitch_click2dial.module_meta_information
+msgid "FreeSWITCH Click2dial"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: help:res.company,freeswitch_server_ids:0
+msgid "List of FreeSWITCH servers."
+msgstr ""
+
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
-msgid "IAX2"
+msgid "SIP"
 msgstr ""
 
 #. module: freeswitch_click2dial
-#: view:res.company:0
-msgid "IPBX"
+#: selection:res.users,freeswitch_chan_type:0
+msgid "FreeTDM"
 msgstr ""
 
 #. module: freeswitch_click2dial
-#: model:ir.module.module,shortdesc:freeswitch_click2dial.module_meta_information
-msgid "FreeSWITCH Click2dial"
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Skinny"
 msgstr ""
 
 #. module: freeswitch_click2dial
-#: help:res.company,freeswitch_server_ids:0
-msgid "List of FreeSWITCH servers."
+#: selection:res.users,freeswitch_chan_type:0
+msgid "H323"
 msgstr ""
 
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
-msgid "MGCP"
+msgid "XMPP/JINGLE"
 msgstr ""
 
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
-msgid "Skinny"
+msgid "GSM SMS/Voice"
 msgstr ""
 
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
-msgid "FreeTDM"
+msgid "SkypeOpen"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Khomp"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Opal Multi-protocol"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Portaudio"
 msgstr ""
 
 #. module: freeswitch_click2dial
@@ -285,11 +290,6 @@ msgstr ""
 msgid "Only use digits for 'international prefix'"
 msgstr ""
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "H323"
-msgstr ""
-
 #. module: freeswitch_click2dial
 #: field:freeswitch.server,national_prefix:0
 msgid "National prefix"
diff --git a/freeswitch_click2dial/i18n/de.po b/freeswitch_click2dial/i18n/de.po
index 212f4bf..b95a9f5 100644
--- a/freeswitch_click2dial/i18n/de.po
+++ b/freeswitch_click2dial/i18n/de.po
@@ -193,11 +193,6 @@ msgstr "Verbindungstest scheiterte!"
 msgid "Connection Test Successfull!"
 msgstr "Verbindungstest erfolgreich!"
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "DAHDI"
-msgstr "DAHDI"
-
 #. module: freeswitch_click2dial
 #: field:freeswitch.server,context:0
 msgid "Dialplan Context"
@@ -240,22 +235,12 @@ msgstr "Fehler:"
 msgid "Fail"
 msgstr "Gescheitert"
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "H323"
-msgstr "H323"
-
 #. module: freeswitch_click2dial
 #: code:addons/freeswitch_click2dial/freeswitch_click2dial.py:256
 #, python-format
 msgid "Here is the error message: %s"
 msgstr "Dies ist die Fehlermeldung: %s"
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "IAX2"
-msgstr "IAX2"
-
 #. module: freeswitch_click2dial
 #: help:freeswitch.server,ip_address:0
 msgid "IP address or DNS name of the FreeSWITCH server."
@@ -268,16 +253,6 @@ msgstr "IP-Addresse oder DNS des FreeSWITCH-Servers."
 msgid "Internal Number"
 msgstr "Interne Rufnummer"
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "Local"
-msgstr "Lokal"
-
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "MGCP"
-msgstr "MGCP"
-
 #. module: freeswitch_click2dial
 #: code:addons/freeswitch_click2dial/freeswitch_click2dial.py:433
 #, python-format
@@ -440,16 +415,6 @@ msgstr ""
 "dieses Anwenders, so ist telefon1 der Ressourcenname dieses Anwenders. Bei "
 "SIP-Telefonen wird häufig die Rufummer als Ressourcenname eingesetzt."
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "SCCP"
-msgstr "SCCP"
-
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "SIP"
-msgstr "SIP"
-
 #. module: freeswitch_click2dial
 #: view:freeswitch.server:0
 msgid "Server Name"
@@ -492,10 +457,55 @@ msgstr ""
 "diesen z. B. verwenden, um einen gesonderten Klingelton (leise!) bei "
 "Klicken-zum-Wählen zu erhalten oder Auto-Abheben einzuschalten."
 
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "SIP"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "FreeTDM"
+msgstr ""
+
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
 msgid "Skinny"
-msgstr "Schlank"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "H323"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "XMPP/JINGLE"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "GSM SMS/Voice"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "SkypeOpen"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Khomp"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Opal Multi-protocol"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Portaudio"
+msgstr ""
 
 #. module: freeswitch_click2dial
 #: view:res.users:0
@@ -597,16 +607,6 @@ msgstr ""
 "Sie müssen einen TCP-Port zwischen 1 und 65535 beim FreeSWITCH-Server '%s' "
 "setzen"
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "Zap"
-msgstr "Zap"
-
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "mISDN"
-msgstr "mISDN"
-
 #. module: freeswitch_click2dial
 #: model:ir.model,name:freeswitch_click2dial.model_phone_common
 msgid "phone.common"
diff --git a/freeswitch_click2dial/i18n/es.po b/freeswitch_click2dial/i18n/es.po
index 089b201..a402c62 100644
--- a/freeswitch_click2dial/i18n/es.po
+++ b/freeswitch_click2dial/i18n/es.po
@@ -22,10 +22,6 @@ msgstr ""
 msgid "Event Socket password"
 msgstr "Contraseña Event Socket"
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "SIP"
-msgstr "SIP"
 
 #. module: freeswitch_click2dial
 #: field:freeswitch.server,international_prefix:0
@@ -37,11 +33,6 @@ msgstr "Prefijo internacional"
 msgid "IPv4 address or DNS name of the FreeSWITCH server."
 msgstr "Dirección IPv4 o nombre DNS del servidor FreeSWITCH."
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "mISDN"
-msgstr "mISDN"
-
 #. module: freeswitch_click2dial
 #: constraint:ir.model:0
 msgid ""
@@ -83,11 +74,6 @@ msgstr "Servidores FreeSWITCH"
 msgid "Invalid model name in the action definition."
 msgstr "Nombre del modelo inválido en la definición de acción."
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "DAHDI"
-msgstr "DAHDI"
-
 #. module: freeswitch_click2dial
 #: field:res.users,callerid:0
 msgid "Caller ID"
@@ -163,11 +149,6 @@ msgstr ""
 "Prefijo que marcar para realizar llamadas. Si usted no usa un prefijo para "
 "realizar llamadas, dejar en blanco."
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "Zap"
-msgstr "Zap"
-
 #. module: freeswitch_click2dial
 #: help:freeswitch.server,context:0
 msgid ""
@@ -182,16 +163,6 @@ msgstr ""
 msgid "Caller ID used for the calls initiated by this user."
 msgstr "ID llamada que utiliza para las llamadas iniciadas por este usuario."
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "IAX2"
-msgstr "IAX2"
-
-#. module: freeswitch_click2dial
-#: view:res.company:0
-msgid "IPBX"
-msgstr "IPBX"
-
 #. module: freeswitch_click2dial
 #: model:ir.module.module,shortdesc:freeswitch_click2dial.module_meta_information
 msgid "FreeSWITCH Click2dial"
@@ -204,8 +175,13 @@ msgstr "Lista de servidores de FreeSWITCH."
 
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
-msgid "MGCP"
-msgstr "MGCP"
+msgid "SIP"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "FreeTDM"
+msgstr ""
 
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
@@ -214,7 +190,37 @@ msgstr ""
 
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
-msgid "FreeTDM"
+msgid "H323"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "XMPP/JINGLE"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "GSM SMS/Voice"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "SkypeOpen"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Khomp"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Opal Multi-protocol"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Portaudio"
 msgstr ""
 
 #. module: freeswitch_click2dial
@@ -313,11 +319,6 @@ msgstr ""
 msgid "Only use digits for 'international prefix'"
 msgstr "Sólo utilizar dígitos para el \"prefijo internacional\""
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "H323"
-msgstr "H323"
-
 #. module: freeswitch_click2dial
 #: field:freeswitch.server,national_prefix:0
 msgid "National prefix"
diff --git a/freeswitch_click2dial/i18n/fr.po b/freeswitch_click2dial/i18n/fr.po
index 2f1d0df..91e78d8 100644
--- a/freeswitch_click2dial/i18n/fr.po
+++ b/freeswitch_click2dial/i18n/fr.po
@@ -172,8 +172,53 @@ msgstr "Test de connexion réussi !"
 
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
-msgid "DAHDI"
-msgstr "DAHDI"
+msgid "SIP"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "FreeTDM"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Skinny"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "H323"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "XMPP/JINGLE"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "GSM SMS/Voice"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "SkypeOpen"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Khomp"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Opal Multi-protocol"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Portaudio"
+msgstr ""
 
 #. module: freeswitch_click2dial
 #: field:freeswitch.server,context:0
@@ -217,22 +262,12 @@ msgstr "Erreur :"
 msgid "Fail"
 msgstr "Fail"
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "H323"
-msgstr "H323"
-
 #. module: freeswitch_click2dial
 #: code:addons/freeswitch_click2dial/freeswitch_click2dial.py:256
 #, python-format
 msgid "Here is the error message: %s"
 msgstr "Voilà le message d'erreur : %s"
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "IAX2"
-msgstr "IAX2"
-
 #. module: freeswitch_click2dial
 #: help:freeswitch.server,ip_address:0
 msgid "IP address or DNS name of the FreeSWITCH server."
@@ -245,16 +280,6 @@ msgstr "Adresse IP ou DNS du serveur FreeSWITCH."
 msgid "Internal Number"
 msgstr "Numéro interne"
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "Local"
-msgstr "Local"
-
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "MGCP"
-msgstr "MGCP"
-
 #. module: freeswitch_click2dial
 #: code:addons/freeswitch_click2dial/freeswitch_click2dial.py:433
 #, python-format
@@ -392,16 +417,6 @@ msgstr "Nom de la ressource"
 msgid "Resource name for the channel type selected. For example, if you use 'Dial(SIP/phone1)' in your FreeSWITCH dialplan to ring the SIP phone of this user, then the resource name for this user is 'phone1'.  For a SIP phone, the phone number is often used as resource name, but not always."
 msgstr "Resource name for the channel type selected. For example, if you use 'Dial(SIP/phone1)' in your FreeSWITCH dialplan to ring the SIP phone of this user, then the resource name for this user is 'phone1'.  For a SIP phone, the phone number is often used as resource name, but not always."
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "SCCP"
-msgstr "SCCP"
-
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "SIP"
-msgstr "SIP"
-
 #. module: freeswitch_click2dial
 #: view:freeswitch.server:0
 msgid "Server Name"
@@ -422,16 +437,6 @@ msgstr "Set a user-specific 'Variable' field in the FreeSWITCH Event Socket 'ori
 msgid "Set a user-specific Alert-Info header in SIP request to user's IP Phone for the click2dial feature. If empty, the Alert-Info header will not be added. You can use it to have a special ring tone for click2dial (a silent one !) or to activate auto-answer for example."
 msgstr "Set a user-specific Alert-Info header in SIP request to user's IP Phone for the click2dial feature. If empty, the Alert-Info header will not be added. You can use it to have a special ring tone for click2dial (a silent one !) or to activate auto-answer for example."
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "Skinny"
-msgstr "Skinny"
-
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "FreeTDM"
-msgstr ""
-
 #. module: freeswitch_click2dial
 #: view:res.users:0
 msgid "Standard FreeSWITCH Parameters"
@@ -518,16 +523,6 @@ msgstr "Vous devez indiquer une valeur comprise entre 1 et 120 secondes pour le
 msgid "You should set a TCP port between 1 and 65535 for the FreeSWITCH server '%s'"
 msgstr "Vous devez mettre un port TCP entre 1 et 65535 pour le serveur FreeSWITCH '%s'"
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "Zap"
-msgstr "Zap"
-
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "mISDN"
-msgstr "mISDN"
-
 #. module: freeswitch_click2dial
 #: model:ir.model,name:freeswitch_click2dial.model_phone_common
 msgid "phone.common"
diff --git a/freeswitch_click2dial/i18n/freeswitch_click2dial.pot b/freeswitch_click2dial/i18n/freeswitch_click2dial.pot
index 8b76408..71ea5a6 100644
--- a/freeswitch_click2dial/i18n/freeswitch_click2dial.pot
+++ b/freeswitch_click2dial/i18n/freeswitch_click2dial.pot
@@ -168,11 +168,6 @@ msgstr ""
 msgid "Connection Test Successfull!"
 msgstr ""
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "DAHDI"
-msgstr ""
-
 #. module: freeswitch_click2dial
 #: field:freeswitch.server,context:0
 msgid "Dialplan Context"
@@ -215,22 +210,12 @@ msgstr ""
 msgid "Fail"
 msgstr ""
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "H323"
-msgstr ""
-
 #. module: freeswitch_click2dial
 #: code:addons/freeswitch_click2dial/freeswitch_click2dial.py:256
 #, python-format
 msgid "Here is the error message: %s"
 msgstr ""
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "IAX2"
-msgstr ""
-
 #. module: freeswitch_click2dial
 #: help:freeswitch.server,ip_address:0
 msgid "IP address or DNS name of the FreeSWITCH server."
@@ -243,16 +228,6 @@ msgstr ""
 msgid "Internal Number"
 msgstr ""
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "Local"
-msgstr ""
-
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "MGCP"
-msgstr ""
-
 #. module: freeswitch_click2dial
 #: code:addons/freeswitch_click2dial/freeswitch_click2dial.py:433
 #, python-format
@@ -391,42 +366,73 @@ msgstr ""
 
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
-msgid "SCCP"
+msgid "SIP"
 msgstr ""
 
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
-msgid "SIP"
+msgid "FreeTDM"
 msgstr ""
 
 #. module: freeswitch_click2dial
-#: view:freeswitch.server:0
-msgid "Server Name"
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Skinny"
 msgstr ""
 
 #. module: freeswitch_click2dial
-#: help:freeswitch.server,alert_info:0
-msgid "Set Alert-Info header in SIP request to user's IP Phone for the click2dial feature. If empty, the Alert-Info header will not be added. You can use it to have a special ring tone for click2dial (a silent one !) or to activate auto-answer for example."
+#: selection:res.users,freeswitch_chan_type:0
+msgid "H323"
 msgstr ""
 
 #. module: freeswitch_click2dial
-#: help:res.users,variable:0
-msgid "Set a user-specific 'Variable' field in the FreeSWITCH Event Socket 'originate' request for the click2dial feature. If you want to have several variable headers, separate them with '|'."
+#: selection:res.users,freeswitch_chan_type:0
+msgid "XMPP/JINGLE"
 msgstr ""
 
 #. module: freeswitch_click2dial
-#: help:res.users,alert_info:0
-msgid "Set a user-specific Alert-Info header in SIP request to user's IP Phone for the click2dial feature. If empty, the Alert-Info header will not be added. You can use it to have a special ring tone for click2dial (a silent one !) or to activate auto-answer for example."
+#: selection:res.users,freeswitch_chan_type:0
+msgid "GSM SMS/Voice"
 msgstr ""
 
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
-msgid "Skinny"
+msgid "SkypeOpen"
 msgstr ""
 
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
-msgid "FreeTDM"
+msgid "Khomp"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Opal Multi-protocol"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Portaudio"
+msgstr ""
+
+
+#. module: freeswitch_click2dial
+#: view:freeswitch.server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: help:freeswitch.server,alert_info:0
+msgid "Set Alert-Info header in SIP request to user's IP Phone for the click2dial feature. If empty, the Alert-Info header will not be added. You can use it to have a special ring tone for click2dial (a silent one !) or to activate auto-answer for example."
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: help:res.users,variable:0
+msgid "Set a user-specific 'Variable' field in the FreeSWITCH Event Socket 'originate' request for the click2dial feature. If you want to have several variable headers, separate them with '|'."
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: help:res.users,alert_info:0
+msgid "Set a user-specific Alert-Info header in SIP request to user's IP Phone for the click2dial feature. If empty, the Alert-Info header will not be added. You can use it to have a special ring tone for click2dial (a silent one !) or to activate auto-answer for example."
 msgstr ""
 
 #. module: freeswitch_click2dial
@@ -515,16 +521,6 @@ msgstr ""
 msgid "You should set a TCP port between 1 and 65535 for the FreeSWITCH server '%s'"
 msgstr ""
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "Zap"
-msgstr ""
-
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "mISDN"
-msgstr ""
-
 #. module: freeswitch_click2dial
 #: model:ir.model,name:freeswitch_click2dial.model_phone_common
 msgid "phone.common"
diff --git a/freeswitch_click2dial/i18n/hr.po b/freeswitch_click2dial/i18n/hr.po
index d58b1bd..481ed3d 100644
--- a/freeswitch_click2dial/i18n/hr.po
+++ b/freeswitch_click2dial/i18n/hr.po
@@ -22,11 +22,6 @@ msgstr ""
 msgid "Event Socket password"
 msgstr ""
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "SIP"
-msgstr ""
-
 #. module: freeswitch_click2dial
 #: field:freeswitch.server,international_prefix:0
 msgid "International prefix"
@@ -37,11 +32,6 @@ msgstr ""
 msgid "IPv4 address or DNS name of the FreeSWITCH server."
 msgstr ""
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "mISDN"
-msgstr ""
-
 #. module: freeswitch_click2dial
 #: constraint:ir.model:0
 msgid ""
@@ -80,11 +70,6 @@ msgstr ""
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "DAHDI"
-msgstr ""
-
 #. module: freeswitch_click2dial
 #: field:res.users,callerid:0
 msgid "Caller ID"
@@ -147,11 +132,6 @@ msgid ""
 "outgoing calls, leave empty."
 msgstr ""
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "Zap"
-msgstr ""
-
 #. module: freeswitch_click2dial
 #: help:freeswitch.server,context:0
 msgid ""
@@ -164,39 +144,64 @@ msgstr ""
 msgid "Caller ID used for the calls initiated by this user."
 msgstr ""
 
+#. module: freeswitch_click2dial
+#: model:ir.module.module,shortdesc:freeswitch_click2dial.module_meta_information
+msgid "FreeSWITCH Click2dial"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: help:res.company,freeswitch_server_ids:0
+msgid "List of FreeSWITCH servers."
+msgstr ""
+
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
-msgid "IAX2"
+msgid "SIP"
 msgstr ""
 
 #. module: freeswitch_click2dial
-#: view:res.company:0
-msgid "IPBX"
+#: selection:res.users,freeswitch_chan_type:0
+msgid "FreeTDM"
 msgstr ""
 
 #. module: freeswitch_click2dial
-#: model:ir.module.module,shortdesc:freeswitch_click2dial.module_meta_information
-msgid "FreeSWITCH Click2dial"
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Skinny"
 msgstr ""
 
 #. module: freeswitch_click2dial
-#: help:res.company,freeswitch_server_ids:0
-msgid "List of FreeSWITCH servers."
+#: selection:res.users,freeswitch_chan_type:0
+msgid "H323"
 msgstr ""
 
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
-msgid "MGCP"
+msgid "XMPP/JINGLE"
 msgstr ""
 
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
-msgid "Skinny"
+msgid "GSM SMS/Voice"
 msgstr ""
 
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
-msgid "FreeTDM"
+msgid "SkypeOpen"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Khomp"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Opal Multi-protocol"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Portaudio"
 msgstr ""
 
 #. module: freeswitch_click2dial
@@ -284,11 +289,6 @@ msgstr ""
 msgid "Only use digits for 'international prefix'"
 msgstr ""
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "H323"
-msgstr ""
-
 #. module: freeswitch_click2dial
 #: field:freeswitch.server,national_prefix:0
 msgid "National prefix"
diff --git a/freeswitch_click2dial/i18n/pt_BR.po b/freeswitch_click2dial/i18n/pt_BR.po
index fb4ff2e..6c2c20f 100644
--- a/freeswitch_click2dial/i18n/pt_BR.po
+++ b/freeswitch_click2dial/i18n/pt_BR.po
@@ -22,11 +22,6 @@ msgstr ""
 msgid "Event Socket password"
 msgstr "Senha Event Socket"
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "SIP"
-msgstr "SIP"
-
 #. module: freeswitch_click2dial
 #: field:freeswitch.server,international_prefix:0
 msgid "International prefix"
@@ -37,11 +32,6 @@ msgstr "Prefixo Internacional"
 msgid "IPv4 address or DNS name of the FreeSWITCH server."
 msgstr "Endereço IPv4 ou o nome DNS do servidor FreeSWITCH."
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "mISDN"
-msgstr "mISDN"
-
 #. module: freeswitch_click2dial
 #: constraint:ir.model:0
 msgid ""
@@ -81,12 +71,6 @@ msgstr "Servidores FreeSWITCH"
 msgid "Invalid model name in the action definition."
 msgstr "Nome do modelo Inválido na definição da ação"
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "DAHDI"
-msgstr "DAHDI"
-
-
 #. module: freeswitch_click2dial
 #: field:res.users,callerid:0
 msgid "Caller ID"
@@ -158,11 +142,6 @@ msgstr ""
 "Prefixo para fazer chamadas de saída. Se você não usar um prefixo para fazer "
 "chamadas de saída, deixe vazio."
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "Zap"
-msgstr "Zap"
-
 #. module: freeswitch_click2dial
 #: help:freeswitch.server,context:0
 msgid ""
@@ -175,16 +154,6 @@ msgstr ""
 msgid "Caller ID used for the calls initiated by this user."
 msgstr "ID de Chamada utilizado para as chamadas iniciadas por esse usuário."
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "IAX2"
-msgstr "IAX2"
-
-#. module: freeswitch_click2dial
-#: view:res.company:0
-msgid "IPBX"
-msgstr "IPBX"
-
 #. module: freeswitch_click2dial
 #: model:ir.module.module,shortdesc:freeswitch_click2dial.module_meta_information
 msgid "FreeSWITCH Click2dial"
@@ -197,17 +166,52 @@ msgstr "Lista de Servidores FreeSWITCH"
 
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
-msgid "MGCP"
-msgstr "MGCP"
+msgid "SIP"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "FreeTDM"
+msgstr ""
 
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
 msgid "Skinny"
-msgstr "Skinny"
+msgstr ""
 
 #. module: freeswitch_click2dial
 #: selection:res.users,freeswitch_chan_type:0
-msgid "FreeTDM"
+msgid "H323"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "XMPP/JINGLE"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "GSM SMS/Voice"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "SkypeOpen"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Khomp"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Opal Multi-protocol"
+msgstr ""
+
+#. module: freeswitch_click2dial
+#: selection:res.users,freeswitch_chan_type:0
+msgid "Portaudio"
 msgstr ""
 
 #. module: freeswitch_click2dial
@@ -295,10 +299,6 @@ msgstr ""
 msgid "Only use digits for 'international prefix'"
 msgstr ""
 
-#. module: freeswitch_click2dial
-#: selection:res.users,freeswitch_chan_type:0
-msgid "H323"
-msgstr ""
 
 #. module: freeswitch_click2dial
 #: field:freeswitch.server,national_prefix:0