[Pkg-voip-commits] r2353 - destar/trunk/debian/patches

Thu Sep 7 20:33:20 UTC 2006

Author: alerios-guest
Date: 2006-09-07 20:33:19 +0000 (Thu, 07 Sep 2006)
New Revision: 2353

Removed:
   destar/trunk/debian/patches/09_http_server.dpatch
   destar/trunk/debian/patches/10_notexecutables.dpatch
   destar/trunk/debian/patches/20_fix_changelog.dpatch
   destar/trunk/debian/patches/30_pofiles.dpatch
   destar/trunk/debian/patches/40_zaptypo.dpatch
   destar/trunk/debian/patches/50_portbug.dpatch
Modified:
   destar/trunk/debian/patches/00list
Log:
* Updated dpatch patches. Most of them were applied upstream.


Modified: destar/trunk/debian/patches/00list
===================================================================

--- destar/trunk/debian/patches/00list	2006-09-05 19:59:04 UTC (rev 2352)
+++ destar/trunk/debian/patches/00list	2006-09-07 20:33:19 UTC (rev 2353)
@@ -1,7 +1 @@
-09_http_server.dpatch
-10_notexecutables.dpatch
-20_fix_changelog.dpatch
 no_medusa.dpatch
-30_pofiles.dpatch
-40_zaptypo.dpatch
-50_portbug.dpatch

Deleted: destar/trunk/debian/patches/09_http_server.dpatch
===================================================================
--- destar/trunk/debian/patches/09_http_server.dpatch	2006-09-05 19:59:04 UTC (rev 2352)
+++ destar/trunk/debian/patches/09_http_server.dpatch	2006-09-07 20:33:19 UTC (rev 2353)
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09_http_server.dpatch by Santiago Ruano Rincón <santiago at unicauca.edu.co>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad destar-0.0.167/medusa/http_server.py /tmp/dpep.VFWDMa/destar-0.0.167/medusa/http_server.py
---- destar-0.0.167/medusa/http_server.py	2004-08-17 08:47:38.000000000 -0500
-+++ /tmp/dpep.VFWDMa/destar-0.0.167/medusa/http_server.py	2005-07-29 00:16:48.000000000 -0500
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/python
-+#! /usr/bin/env python
- # -*- Mode: Python -*-
- #
- #       Author: Sam Rushing <rushing at nightmare.com>

Deleted: destar/trunk/debian/patches/10_notexecutables.dpatch
===================================================================
--- destar/trunk/debian/patches/10_notexecutables.dpatch	2006-09-05 19:59:04 UTC (rev 2352)
+++ destar/trunk/debian/patches/10_notexecutables.dpatch	2006-09-07 20:33:19 UTC (rev 2353)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_notexecutables.dpatch by Santiago Ruano Rincón <santiago at unicauca.edu.co>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad destar-0.2beta~/Makefile destar-0.2beta/Makefile
---- destar-0.2beta~/Makefile	2006-06-20 21:47:32.000000000 +0000
-+++ destar-0.2beta/Makefile	2006-06-20 21:54:31.000000000 +0000
-@@ -48,14 +48,16 @@
- 	install -d $(PYDIR)
- 	#cp -a *.py *.ptl misc medusa $(PYDIR)
- 	install -m 644 *.py *.ptl $(PYDIR)/
-+	install -m 755 Server.py $(PYDIR)/
-+	install -m 755 tests.py $(PYDIR)/
- 	install -d $(LOCALEDIR)
- 	cp -fa lang/* $(LOCALEDIR)
- 	install -d $(PYDIR)/misc
- 	install -m 644 misc/*.py $(PYDIR)/misc/
--	install -m 644 misc/*.py $(PYDIR)/misc/
- ifneq ($(SYS_MEDUSA),1)
- 	install -d $(PYDIR)/medusa
--	install medusa/*.py $(PYDIR)/medusa/
-+	install -m 644 medusa/*.py $(PYDIR)/medusa/
-+	install -m 755 medusa/http_server.py $(PYDIR)/medusa/
- endif
- 	install -m 755 destar $(PYDIR)/destar.py
- 	install -d $(PAGES_DIR)

Deleted: destar/trunk/debian/patches/20_fix_changelog.dpatch
===================================================================
--- destar/trunk/debian/patches/20_fix_changelog.dpatch	2006-09-05 19:59:04 UTC (rev 2352)
+++ destar/trunk/debian/patches/20_fix_changelog.dpatch	2006-09-07 20:33:19 UTC (rev 2353)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99_fix_changelog.dpatch by Santiago Ruano Rincon <santiago at unicauca.edu.co>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: patch to fix two typos in the changelog file
-
- at DPATCH@
-diff -urNad destar-0.2beta~/CHANGELOG.txt destar-0.2beta/CHANGELOG.txt
---- destar-0.2beta~/CHANGELOG.txt	2006-06-20 17:24:22.000000000 +0000
-+++ destar-0.2beta/CHANGELOG.txt	2006-06-20 17:24:57.000000000 +0000
-@@ -232,7 +232,7 @@
- 
- 2005-12-22
- *cfg_phone_queue.py: fixed bug #5885: MoH fails in calls from PSTN placed directly on queues.
--*configletx.py: is recommended to use _X. instead of _.
-+*configlets.py: is recommended to use _X. instead of _.
- 
- 2005-12-19
- *backend.py: fixed bug on CFIM/CFBS, still needs more testing.

Deleted: destar/trunk/debian/patches/30_pofiles.dpatch
===================================================================
--- destar/trunk/debian/patches/30_pofiles.dpatch	2006-09-05 19:59:04 UTC (rev 2352)
+++ destar/trunk/debian/patches/30_pofiles.dpatch	2006-09-07 20:33:19 UTC (rev 2353)
@@ -1,4237 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_pofiles.dpatch by  <root at localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad destar-0.2beta~/po/es.po destar-0.2beta/po/es.po
---- destar-0.2beta~/po/es.po	2006-06-17 12:23:57.000000000 +0000
-+++ destar-0.2beta/po/es.po	2006-06-27 05:31:28.000000000 +0000
-@@ -19,7 +19,7 @@
- #: backend.py:63 ../backend.py:63
- #, python-format
- msgid "Warning: There is no %s or %s file yet."
--msgstr "Advertencia: AÃƒÂºn no existe el archivo %s o %s."
-+msgstr "Advertencia: AÃºn no existe el archivo %s o %s."
- 
- #: backend.py:366 ../backend.py:375
- #, python-format
-@@ -46,7 +46,7 @@
- #: ../page_owner_cdr.ptl:143 ../page_owner_cdr.ptl:283
- #: ../page_stats_cdr.ptl:145 ../page_stats_cdr.ptl:285
- msgid "Duration"
--msgstr "Duracion"
-+msgstr "DuraciÃ³n"
- 
- #: cdrutils.py:45 page_admin_cdr.ptl:76 page_admin_cdr.ptl:233
- #: page_admin_cdr.ptl:235 page_admin_cdr.ptl:237 page_admin_cdr.ptl:239
-@@ -59,11 +59,11 @@
- 
- #: cfg_app_callfw.py:26 ../cfg_app_callfw.py:26
- msgid "Call forwarding"
--msgstr "Habilitar reenvÃƒÂo de llamadas"
-+msgstr "Habilitar reenvÃo de llamadas"
- 
- #: cfg_app_callfw.py:27 ../cfg_app_callfw.py:27
- msgid "Extensions to set/unset call forwarding."
--msgstr "ExtensiÃƒÂ³n para programar/desprogramar la redirecciÃƒÂ³n de llamadas."
-+msgstr "ExtensiÃ³n para programar/desprogramar la redirecciÃ³n de llamadas."
- 
- #: cfg_app_callfw.py:28 cfg_opt_music.py:28 cfg_opt_user.py:34
- #: configlets.py:419 configlets.py:600 configlets.py:658 configlets.py:798
-@@ -77,11 +77,11 @@
- 
- #: cfg_app_callfw.py:28 ../cfg_app_callfw.py:33
- msgid "Call Forwarding Unconditional"
--msgstr "ReenvÃƒÂo de llamadas incondicional"
-+msgstr "ReenvÃo de llamadas incondicional"
- 
- #: cfg_app_callfw.py:28 ../cfg_app_callfw.py:33
- msgid "Call Forwarding if Busy/Unavailable"
--msgstr "Redirigir llamadas si estÃƒÂ¡ ocupado o no disponible"
-+msgstr "Redirigir llamadas si estÃ¡ ocupado o no disponible"
- 
- #: cfg_app_callfw.py:29 ../cfg_app_callfw.py:34
- msgid "Setting preffix"
-@@ -119,12 +119,12 @@
- #: ../configlets.py:576 ../configlets.py:880 ../configlets.py:1007
- #: ../configlets.py:1028 ../page_stats_phone.ptl:65
- msgid "Extension"
--msgstr "ExtensiÃƒÂ³n"
-+msgstr "ExtensiÃ³n"
- 
- #: cfg_app_conference.py:28 cfg_app_meetme.py:28 ../cfg_app_conference.py:33
- #: ../cfg_app_meetme.py:32
- msgid "Conference number"
--msgstr "NÃƒÂºmero de Conferencia"
-+msgstr "NÃºmero de Conferencia"
- 
- #: cfg_app_directory.py:26 cfg_opt_music.py:29 ../cfg_app_directory.py:26
- #: ../cfg_opt_music.py:32
-@@ -133,7 +133,7 @@
- 
- #: cfg_app_directory.py:27 ../cfg_app_directory.py:28
- msgid "This application allows you to dial by name."
--msgstr "Esta aplicaciÃƒÂ³n le permite marcar deletreando el nombre."
-+msgstr "Esta aplicaciÃ³n le permite marcar deletreando el nombre."
- 
- #: cfg_app_dnd.py:26 ../cfg_app_dnd.py:26
- msgid "Set/Unset DND"
-@@ -141,16 +141,16 @@
- 
- #: cfg_app_dnd.py:27 ../cfg_app_dnd.py:28
- msgid "Extensions to set/unset 'Do Not Disturb'."
--msgstr "ExtensiÃƒÂ³n para programar/desprogramar 'No molestar'."
-+msgstr "ExtensiÃ³n para programar/desprogramar 'No molestar'."
- 
- #: cfg_app_dnd.py:29 ../cfg_app_dnd.py:33
- msgid "Setting extension"
--msgstr "ExtensiÃƒÂ³n para programar"
-+msgstr "ExtensiÃ³n para programar"
- 
- #: cfg_app_dnd.py:42 configlets.py:455 ../cfg_app_dnd.py:50
- #: ../configlets.py:608
- msgid "Extension already in use"
--msgstr "La extensiÃƒÂ³n ya estÃƒÂ¡ en uso"
-+msgstr "La extensiÃ³n ya estÃ¡ en uso"
- 
- #: cfg_app_echo.py:26 ../cfg_app_echo.py:26
- msgid "Echo test"
-@@ -161,8 +161,8 @@
- "The echo test immediately plays back what you speek. You can\n"
- "\t\t\t   use this to find out how much echo you have."
- msgstr ""
--"La prueba de eco reproduce inmediatamente lo que usted estÃƒÂ¡ hablando. Puede "
--"usarla para determinar la cantidad de eco que estÃƒÂ¡ experimentando."
-+"La prueba de eco reproduce inmediatamente lo que usted estÃ¡ hablando. Puede "
-+"usarla para determinar la cantidad de eco que estÃ¡ experimentando."
- 
- #: cfg_app_meetme.py:26 ../cfg_app_meetme.py:26
- msgid "Meeting room"
-@@ -170,7 +170,7 @@
- 
- #: cfg_app_meetme.py:28 ../cfg_app_meetme.py:32
- msgid "If empty, will be the same as the extension"
--msgstr "Si se omite, serÃƒÂ¡ igual al nÃƒÂºmero de la extensiÃƒÂ³n"
-+msgstr "Si se omite, serÃ¡ igual al nÃºmero de la extensiÃ³n"
- 
- #: cfg_app_meetme.py:29 ../cfg_app_meetme.py:33
- msgid "PIN"
-@@ -186,14 +186,14 @@
- #: ../cfg_trunk_zappbx.py:39 ../cfg_trunk_zappri.py:49 ../cfg_trunk_zap.py:38
- #: ../page_admin_panel.ptl:27
- msgid "Operator Panel"
--msgstr "PÃƒÂ¡nel de Operadora"
-+msgstr "PÃ¡nel de Operadora"
- 
- #: cfg_app_meetme.py:32 cfg_trunk_iax.py:48 cfg_trunk_sip.py:40
- #: cfg_trunk_zappri.py:46 cfg_trunk_zap.py:36 ../cfg_app_meetme.py:36
- #: ../cfg_trunk_iax.py:50 ../cfg_trunk_sip.py:45 ../cfg_trunk_zappbx.py:40
- #: ../cfg_trunk_zappri.py:50 ../cfg_trunk_zap.py:39
- msgid "Show this trunk in the panel"
--msgstr "Mostrar esta troncal en el pÃƒÂ¡nel de operadora"
-+msgstr "Mostrar esta troncal en el pÃ¡nel de operadora"
- 
- #: cfg_app_milliwatt.py:26 ../cfg_app_milliwatt.py:26
- msgid "Milliwatt test"
-@@ -207,16 +207,16 @@
- 
- #: cfg_app_music.py:26 ../cfg_app_music.py:26
- msgid "Listen to music-on-hold"
--msgstr "Escuchar mÃƒÂºsica en espera"
-+msgstr "Escuchar mÃºsica en espera"
- 
- #: cfg_app_music.py:27 ../cfg_app_music.py:28
- msgid "Play Play Music On Hold until you hang up."
--msgstr "Reproducir mÃƒÂºsica en espera hasta que cuelge."
-+msgstr "Reproducir mÃºsica en espera hasta que cuelge."
- 
- #: cfg_app_music.py:29 cfg_ivr_autoatt.py:34 cfg_phone_queue.py:33
- #: ../cfg_app_music.py:33 ../cfg_ivr_autoatt.py:46 ../cfg_phone_queue.py:53
- msgid "Music-on-hold class"
--msgstr "Tipo de MÃƒÂºsica en Espera"
-+msgstr "Tipo de MÃºsica en Espera"
- 
- #: cfg_app_parking.py:26 ../cfg_app_parking.py:26
- msgid "Park calls"
-@@ -224,7 +224,7 @@
- 
- #: cfg_app_parking.py:27 ../cfg_app_parking.py:28
- msgid "Call Parking extension"
--msgstr "ExtensiÃƒÂ³n para el parqueo de llamadas"
-+msgstr "ExtensiÃ³n para el parqueo de llamadas"
- 
- #: cfg_app_parking.py:29 ../cfg_app_parking.py:33
- msgid "Parking places"
-@@ -245,12 +245,12 @@
- 
- #: cfg_app_play.py:29 ../cfg_app_play.py:33
- msgid "Don't specify an extension"
--msgstr "Por favor no especifique una extensiÃƒÂ³n"
-+msgstr "Por favor no especifique una extensiÃ³n"
- 
- #: cfg_app_play.py:37 cfg_app_record.py:49 cfg_opt_loadmodule.py:39
- #: ../cfg_app_play.py:45 ../cfg_app_record.py:57 ../cfg_opt_loadmodule.py:40
- msgid "Please don't specify an extension"
--msgstr "Por favor no especifique una extensiÃƒÂ³n"
-+msgstr "Por favor no especifique una extensiÃ³n"
- 
- #: cfg_app_record.py:26 ../cfg_app_record.py:26
- msgid "Record sound"
-@@ -262,7 +262,7 @@
- "\t\t\ta second or dial '#' to stop the recording."
- msgstr ""
- "Permite grabar un arhivo de sonido. Usted puede colgar, hacer silencio por "
--"un segundo, o marcar # para detener la grabaciÃƒÂ³n."
-+"un segundo, o marcar # para detener la grabaciÃ³n."
- 
- #: cfg_app_record.py:32 ../cfg_app_record.py:36
- msgid "Sound format"
-@@ -270,7 +270,7 @@
- 
- #: cfg_app_record.py:33 ../cfg_app_record.py:37
- msgid "GSM compression"
--msgstr "CompresiÃƒÂ³n GSM"
-+msgstr "CompresiÃ³n GSM"
- 
- #: cfg_app_record.py:34 ../cfg_app_record.py:38
- msgid "PCM format 'ulaw'"
-@@ -290,7 +290,7 @@
- 
- #: cfg_app_record.py:38 ../cfg_app_record.py:42
- msgid "WAV-File with GSM 6.10 compression, mono 8000 Hz"
--msgstr "Archivo WAV con compresiÃƒÂ³n GSM 6.10, mono 8000 Hz"
-+msgstr "Archivo WAV con compresiÃ³n GSM 6.10, mono 8000 Hz"
- 
- #: cfg_app_saytime.py:26 ../cfg_app_saytime.py:26 ../cfg_app_saytime.py:27
- msgid "Say time"
-@@ -311,15 +311,15 @@
- 
- #: cfg_app_voicemail.py:26 ../cfg_app_voicemail.py:26
- msgid "Voicemail dialog"
--msgstr "DiÃƒÂ¡logo de correo de voz"
-+msgstr "DiÃ¡logo de correo de voz"
- 
- #: cfg_app_voicemail.py:27 ../cfg_app_voicemail.py:28
- msgid "Extension to enter the voicemail system."
--msgstr "ExtensiÃƒÂ³n para entrar al sistema de correo de voz."
-+msgstr "ExtensiÃ³n para entrar al sistema de correo de voz."
- 
- #: cfg_app_voicemail.py:29 ../cfg_app_voicemail.py:33
- msgid "Ask for user mailbox?"
--msgstr "Ã‚Â¿Solicitar el buzÃƒÂ³n de mensajes del usuario?"
-+msgstr "Â¿Solicitar el buzÃ³n de mensajes del usuario?"
- 
- #: cfg_dialout_normal.py:27 ../cfg_dialout_normal.py:27
- msgid "Normal dialout entry"
-@@ -327,7 +327,7 @@
- 
- #: cfg_dialout_normal.py:28 ../cfg_dialout_normal.py:29
- msgid "Used to route calls through trunks"
--msgstr "Usado para enrutar las llamadas a travÃƒÂ©s de las troncales"
-+msgstr "Usado para enrutar las llamadas a travÃ©s de las troncales"
- 
- #: cfg_dialout_normal.py:31 cfg_ivr_autoatt.py:32 cfg_ivr_raw.py:29
- #: cfg_opt_manager.py:28 cfg_opt_music.py:27 cfg_opt_oppanel.py:32
-@@ -357,15 +357,15 @@
- 
- #: cfg_dialout_normal.py:32 ../cfg_dialout_normal.py:35
- msgid "Pattern"
--msgstr "PatrÃƒÂ³n"
-+msgstr "PatrÃ³n"
- 
- #: cfg_dialout_normal.py:33 ../cfg_dialout_normal.py:38
- msgid "Maximum call time in seconds"
--msgstr "TamaÃƒÂ±o mÃƒÂ¡ximo de las llamadas en segundos"
-+msgstr "TamaÃ±o mÃ¡ximo de las llamadas en segundos"
- 
- #: cfg_dialout_normal.py:34 ../cfg_dialout_normal.py:39
- msgid "Ringing time in seconds"
--msgstr "DuraciÃƒÂ³n del timbre en segundos"
-+msgstr "DuraciÃ³n del timbre en segundos"
- 
- #: cfg_dialout_normal.py:36 ../cfg_dialout_normal.py:42
- msgid "Trunks to use for routing this dialout entry"
-@@ -379,23 +379,23 @@
- 
- #: cfg_dialout_normal.py:53
- msgid "Price for this pattern"
--msgstr "Precio para este patrÃƒÂ³n"
-+msgstr "Precio para este patrÃ³n"
- 
- #: cfg_ivr_autoatt.py:27 ../cfg_ivr_autoatt.py:27
- msgid "Auto attendant"
--msgstr "Operadora automÃƒÂ¡tica"
-+msgstr "Operadora automÃ¡tica"
- 
- #: cfg_ivr_autoatt.py:28 ../cfg_ivr_autoatt.py:29
- msgid "Basic auto-attendant."
--msgstr "Operadora automÃƒÂ¡tica bÃƒÂ¡sica"
-+msgstr "Operadora automÃ¡tica bÃ¡sica"
- 
- #: cfg_ivr_autoatt.py:33 ../cfg_ivr_autoatt.py:39
- msgid "Max. time for incoming calls in seconds"
--msgstr "MÃƒÂ¡ximo tiempo para llamadas en segundo"
-+msgstr "MÃ¡ximo tiempo para llamadas en segundo"
- 
- #: cfg_ivr_autoatt.py:33 ../cfg_ivr_autoatt.py:40
- msgid "(0 or empty means no time restriction)"
--msgstr "(0 o vacÃƒÂo significa no restricciÃƒÂ³n de tiempo)"
-+msgstr "(0 o vacÃo significa no restricciÃ³n de tiempo)"
- 
- #: cfg_ivr_autoatt.py:36 ../cfg_ivr_autoatt.py:52
- msgid "File to play in the background"
-@@ -407,11 +407,11 @@
- 
- #: cfg_ivr_autoatt.py:38 ../cfg_ivr_autoatt.py:62
- msgid "Pause between each playback"
--msgstr "Pausa entre cada reproducciÃƒÂ³n"
-+msgstr "Pausa entre cada reproducciÃ³n"
- 
- #: cfg_ivr_autoatt.py:39 ../cfg_ivr_autoatt.py:66
- msgid "Extension to ring after file playing"
--msgstr "ExtensiÃƒÂ³n a timbrar despuÃƒÂ©s de reproducir el archivo"
-+msgstr "ExtensiÃ³n a timbrar despuÃ©s de reproducir el archivo"
- 
- #: cfg_ivr_autoatt.py:41 ../cfg_ivr_autoatt.py:76
- msgid "IVR to jump on special dates"
-@@ -419,16 +419,16 @@
- 
- #: cfg_ivr_autoatt.py:43 ../cfg_ivr_autoatt.py:83
- msgid "Times string"
--msgstr "PatrÃƒÂ³n de horario"
-+msgstr "PatrÃ³n de horario"
- 
- #: cfg_ivr_autoatt.py:43 ../cfg_ivr_autoatt.py:84
- msgid "i.e. <hours>|<weekdays>|<monthdays>|<months> (comma separated)"
- msgstr ""
--"ej. <horas>|<dÃƒÂas de las semana>|<dÃƒÂas del mes>|<mes> (separados por comas)"
-+"ej. <horas>|<dÃas de las semana>|<dÃas del mes>|<mes> (separados por comas)"
- 
- #: cfg_ivr_autoatt.py:44
- msgid "Allow calling to all extensions?"
--msgstr "Ã‚Â¿Permitir llamar a todas las extensiones?"
-+msgstr "Â¿Permitir llamar a todas las extensiones?"
- 
- #: cfg_ivr_autoatt.py:61 ../cfg_ivr_autoatt.py:122
- msgid "File should be played at least one time"
-@@ -449,11 +449,11 @@
- 
- #: cfg_opt_did.py:26 ../cfg_opt_did.py:26
- msgid "Direct inward dialing (DID) number"
--msgstr "NÃƒÂºmero de DID (Direct Inward Dialing)"
-+msgstr "NÃºmero de DID (Direct Inward Dialing)"
- 
- #: cfg_opt_did.py:28
- msgid "Used to route a DID to an extension or Auto-Attendant."
--msgstr "Usado para enrutar un DID a una extensiÃƒÂ³n u operadora automÃƒÂ¡tica"
-+msgstr "Usado para enrutar un DID a una extensiÃ³n u operadora automÃ¡tica"
- 
- #: cfg_opt_did.py:31 ../cfg_opt_did.py:36
- msgid "DID"
-@@ -475,7 +475,7 @@
- #: ../cfg_trunk_iax.py:54 ../cfg_trunk_sip.py:49 ../cfg_trunk_zappbx.py:50
- #: ../cfg_trunk_zappri.py:58 ../cfg_trunk_zap.py:47
- msgid "Phone"
--msgstr "TelÃƒÂ©fono"
-+msgstr "TelÃ©fono"
- 
- #: cfg_opt_did.py:35 cfg_trunk_iax.py:52 cfg_trunk_sip.py:44
- #: cfg_trunk_zappri.py:54 cfg_trunk_zap.py:44 ../cfg_opt_did.py:48
-@@ -488,7 +488,7 @@
- #: cfg_trunk_iaxtel.py:43 ../cfg_opt_did.py:51 ../cfg_trunk_capimsn.py:35
- #: ../cfg_trunk_fwdiax.py:50 ../cfg_trunk_iaxtel.py:49
- msgid "Phone to ring"
--msgstr "TelÃƒÂ©fono a timbrar"
-+msgstr "TelÃ©fono a timbrar"
- 
- #: cfg_opt_did.py:38 cfg_trunk_iax.py:55 cfg_trunk_sip.py:47
- #: cfg_trunk_zappri.py:57 cfg_trunk_zap.py:47 ../cfg_opt_did.py:57
-@@ -505,11 +505,11 @@
- 
- #: cfg_opt_did.py:64 ../cfg_opt_did.py:93
- msgid "DID already in use for that trunk."
--msgstr "DID ya estÃƒÂ¡ en uso para esta troncal"
-+msgstr "DID ya estÃ¡ en uso para esta troncal"
- 
- #: cfg_opt_enum.py:26 ../cfg_opt_enum.py:26
- msgid "ENUM search domain"
--msgstr "Dominio de bÃƒÂºsqueda de ENUM"
-+msgstr "Dominio de bÃºsqueda de ENUM"
- 
- #: cfg_opt_enum.py:27 ../cfg_opt_enum.py:30
- msgid "Domain to search for ENUM entries"
-@@ -518,11 +518,11 @@
- #: cfg_opt_loadmodule.py:26 ../cfg_opt_loadmodule.py:26
- #: ../cfg_opt_loadmodule.py:27
- msgid "Load module"
--msgstr "Cargar MÃƒÂ³dulo"
-+msgstr "Cargar MÃ³dulo"
- 
- #: cfg_opt_loadmodule.py:27 ../cfg_opt_loadmodule.py:28
- msgid "Module to load"
--msgstr "MÃƒÂ³dulo a cargar"
-+msgstr "MÃ³dulo a cargar"
- 
- #: cfg_opt_logger.py:25 ../cfg_opt_logger.py:30
- msgid "Errors"
-@@ -538,11 +538,11 @@
- 
- #: cfg_opt_logger.py:28 ../cfg_opt_logger.py:33
- msgid "Verbose messages"
--msgstr "Mensajes de informaciÃƒÂ³n"
-+msgstr "Mensajes de informaciÃ³n"
- 
- #: cfg_opt_logger.py:29 ../cfg_opt_logger.py:34
- msgid "Debug output"
--msgstr "Salida de depuraciÃƒÂ³n"
-+msgstr "Salida de depuraciÃ³n"
- 
- #: cfg_opt_logger.py:39 ../cfg_opt_logger.py:25 ../cfg_opt_logger.py:26
- msgid "Logger options"
-@@ -554,7 +554,7 @@
- "make it more (or less) verbose:"
- msgstr ""
- "Asterisk puede emitir muchos eventos a su consola o a un archivo de "
--"registro, aquÃƒÂ usted puede manipular el nivel de detalle:"
-+"registro, aquÃ usted puede manipular el nivel de detalle:"
- 
- #: cfg_opt_logger.py:42 ../cfg_opt_logger.py:44
- msgid "Console output"
-@@ -566,7 +566,7 @@
- 
- #: cfg_opt_logger.py:54 ../cfg_opt_logger.py:56
- msgid "Log to syslog via facility"
--msgstr "Registrar en el archivo syslog a travÃƒÂ©s del recurso"
-+msgstr "Registrar en el archivo syslog a travÃ©s del recurso"
- 
- #: cfg_opt_logger.py:59 ../cfg_opt_logger.py:61
- msgid "What kind of messages to log"
-@@ -575,19 +575,19 @@
- #: cfg_opt_manager.py:27 page_config.ptl:80 ../cfg_opt_manager.py:26
- #: ../page_config.ptl:80
- msgid "Management API access"
--msgstr "Acceso del API de GestiÃƒÂ³n"
-+msgstr "Acceso del API de GestiÃ³n"
- 
- #: cfg_opt_manager.py:29 ../cfg_opt_manager.py:32
- msgid "Secret"
--msgstr "ContraseÃƒÂ±a"
-+msgstr "ContraseÃ±a"
- 
- #: cfg_opt_manager.py:30 ../cfg_opt_manager.py:33
- msgid "IP disable mask"
--msgstr "Deshabilitar mÃƒÂ¡scara IP"
-+msgstr "Deshabilitar mÃ¡scara IP"
- 
- #: cfg_opt_manager.py:31 ../cfg_opt_manager.py:34
- msgid "IP enable mask"
--msgstr "Habilitar mÃƒÂ¡scara IP"
-+msgstr "Habilitar mÃ¡scara IP"
- 
- #: cfg_opt_manager.py:32 ../cfg_opt_manager.py:35
- msgid "Read"
-@@ -599,23 +599,23 @@
- 
- #: cfg_opt_music.py:26 ../cfg_opt_music.py:26
- msgid "Background music directory"
--msgstr "Directorio de mÃƒÂºsica de fondo"
-+msgstr "Directorio de mÃºsica de fondo"
- 
- #: cfg_opt_oppanel.py:28 ../cfg_opt_oppanel.py:29
- msgid "Configure Asternic Flash Operator Panel"
--msgstr "Configurar el PÃƒÂ¡nel de Operadora Asternic"
-+msgstr "Configurar el PÃ¡nel de Operadora Asternic"
- 
- #: cfg_opt_oppanel.py:33 ../cfg_opt_oppanel.py:35
- msgid "FQDN/IP to access the panel via web"
--msgstr "Nombre de domino para acceder al pÃƒÂ¡nel via web"
-+msgstr "Nombre de domino para acceder al pÃ¡nel via web"
- 
- #: cfg_opt_oppanel.py:34 ../cfg_opt_oppanel.py:36
- msgid "Security Code"
--msgstr "CÃƒÂ³digo de seguridad"
-+msgstr "CÃ³digo de seguridad"
- 
- #: cfg_opt_oppanel.py:35 ../cfg_opt_oppanel.py:37
- msgid "Manager agent"
--msgstr "Agente de gestiÃƒÂ³n"
-+msgstr "Agente de gestiÃ³n"
- 
- #: cfg_opt_oppanel.py:37 ../cfg_opt_oppanel.py:39
- msgid "Frequency in seconds to poll for sip and iax status"
-@@ -624,19 +624,19 @@
- 
- #: cfg_opt_pickup.py:27 ../cfg_opt_pickup.py:27 ../cfg_opt_pickup.py:28
- msgid "Pickup Extension"
--msgstr "ExtensiÃƒÂ³n para toma de llamadas"
-+msgstr "ExtensiÃ³n para toma de llamadas"
- 
- #: cfg_opt_pickup.py:28 ../cfg_opt_pickup.py:29
- msgid "Extension to dial to pick-up a call in the same group."
--msgstr "ExtensiÃƒÂ³n a marcar para tomar una llamada del grupo"
-+msgstr "ExtensiÃ³n a marcar para tomar una llamada del grupo"
- 
- #: cfg_opt_rawcfg.py:26 ../cfg_opt_rawcfg.py:26
- msgid "Raw config file snippet"
--msgstr "Archivo de configuraciÃƒÂ³n original fragmentado"
-+msgstr "Archivo de configuraciÃ³n original fragmentado"
- 
- #: cfg_opt_rawcfg.py:30 ../cfg_opt_rawcfg.py:33
- msgid "Section/Context"
--msgstr "SecciÃƒÂ³n/Contexto"
-+msgstr "SecciÃ³n/Contexto"
- 
- #: cfg_opt_rtp.py:26 ../cfg_opt_rtp.py:26 ../cfg_opt_rtp.py:27
- msgid "RTP options"
-@@ -668,7 +668,7 @@
- 
- #: cfg_opt_settings.py:52 ../cfg_opt_settings.py:52
- msgid "Belgium"
--msgstr "BÃƒÂ©lgica"
-+msgstr "BÃ©lgica"
- 
- #: cfg_opt_settings.py:64 ../cfg_opt_settings.py:64
- msgid "Brazil"
-@@ -684,7 +684,7 @@
- 
- #: cfg_opt_settings.py:98 ../cfg_opt_settings.py:98
- msgid "Spain"
--msgstr "EspaÃƒÂ±a"
-+msgstr "EspaÃ±a"
- 
- #: cfg_opt_settings.py:110 ../cfg_opt_settings.py:110
- msgid "Finland"
-@@ -708,7 +708,7 @@
- 
- #: cfg_opt_settings.py:166 ../cfg_opt_settings.py:166
- msgid "Japan"
--msgstr "JapÃƒÂ³n"
-+msgstr "JapÃ³n"
- 
- #: cfg_opt_settings.py:178 ../cfg_opt_settings.py:178
- msgid "Netherlands"
-@@ -748,7 +748,7 @@
- 
- #: cfg_opt_settings.py:285 ../cfg_opt_settings.py:285
- msgid "United States / North America"
--msgstr "Estados Unidos / NorteamÃƒÂ©rica"
-+msgstr "Estados Unidos / NorteamÃ©rica"
- 
- #: cfg_opt_settings.py:296 ../cfg_opt_settings.py:296
- msgid "South Africa"
-@@ -761,13 +761,13 @@
- 
- #: cfg_opt_settings.py:317 ../cfg_opt_settings.py:320
- msgid "Country"
--msgstr "PaÃƒÂs"
-+msgstr "PaÃs"
- 
- #: cfg_opt_settings.py:318 ../cfg_opt_settings.py:321
- msgid "The country is used for generating dialtone, ringtone, busytone etc"
- msgstr ""
--"El PaÃƒÂs se utiliza para generar el tono de marcado, timbre, tono de "
--"invitaciÃƒÂ³n a marcar, etc."
-+"El PaÃs se utiliza para generar el tono de marcado, timbre, tono de "
-+"invitaciÃ³n a marcar, etc."
- 
- #: cfg_opt_settings.py:322 ../cfg_opt_settings.py:325
- msgid "language"
-@@ -775,7 +775,7 @@
- 
- #: cfg_opt_settings.py:323 ../cfg_opt_settings.py:326
- msgid "The language is used for voice prompts"
--msgstr "El lenguaje se usa para los diÃƒÂ¡logos de voz"
-+msgstr "El lenguaje se usa para los diÃ¡logos de voz"
- 
- #: cfg_opt_sip_audio.py:27 ../cfg_opt_sip_audio.py:27
- #: ../cfg_opt_sip_audio.py:28
-@@ -788,33 +788,33 @@
- 
- #: cfg_opt_sip_audio.py:30 ../cfg_opt_sip_audio.py:33
- msgid "Allow alaw codec"
--msgstr "Permitir cÃƒÂ³dec Ley A"
-+msgstr "Permitir cÃ³dec Ley A"
- 
- #: cfg_opt_sip_audio.py:31 ../cfg_opt_sip_audio.py:34
- msgid "Allow ulaw codec"
--msgstr "Permitir cÃƒÂ³dec Ley U"
-+msgstr "Permitir cÃ³dec Ley U"
- 
- #: cfg_opt_sip_audio.py:32 ../cfg_opt_sip_audio.py:35
- msgid "Allow ilbc codec"
--msgstr "Permitir cÃƒÂ³dec ilbc"
-+msgstr "Permitir cÃ³dec ilbc"
- 
- #: cfg_opt_sip_audio.py:33 ../cfg_opt_sip_audio.py:36
- msgid "Allow gsm codec"
--msgstr "Permitir cÃƒÂ³dec gsm"
-+msgstr "Permitir cÃ³dec gsm"
- 
- #: cfg_opt_sip_audio.py:34 ../cfg_opt_sip_audio.py:37
- msgid "Allow g729 codec"
--msgstr "Permitir cÃƒÂ³dec g729"
-+msgstr "Permitir cÃ³dec g729"
- 
- #: cfg_opt_sip_audio.py:35 ../cfg_opt_sip_audio.py:38
- msgid "g729 pass-thru unless license obtained"
- msgstr ""
--"SÃƒÂ³lo reenvÃƒÂo y no trascodificaciÃƒÂ³n de g729 a menos que se obtenga una "
-+"SÃ³lo reenvÃo y no trascodificaciÃ³n de g729 a menos que se obtenga una "
- "licencia"
- 
- #: cfg_opt_sip_audio.py:36 ../cfg_opt_sip_audio.py:39
- msgid "Allow g723.1 codec"
--msgstr "Permitir cÃƒÂ³dec g723.1"
-+msgstr "Permitir cÃ³dec g723.1"
- 
- #: cfg_opt_sip_audio.py:37 ../cfg_opt_sip_audio.py:40
- msgid "g723.1 pass-thru"
-@@ -822,7 +822,7 @@
- 
- #: cfg_opt_sip_audio.py:45 ../cfg_opt_sip_audio.py:48
- msgid "You should choose at least one codec"
--msgstr "Usted debe seleccionar al menos un cÃƒÂ³dec"
-+msgstr "Usted debe seleccionar al menos un cÃ³dec"
- 
- #: cfg_opt_user.py:26 page_config.ptl:68 ../cfg_opt_user.py:25
- #: ../page_config.ptl:68
-@@ -834,19 +834,19 @@
- #: ../cfg_opt_user.py:32 ../cfg_phone_epygi.py:45 ../cfg_phone_iax.py:42
- #: ../cfg_phone_mgcp.py:42 ../cfg_phone_sip.py:43 ../cfg_trunk_iax.py:43
- msgid "Password"
--msgstr "ContraseÃƒÂ±a"
-+msgstr "ContraseÃ±a"
- 
- #: cfg_opt_user.py:31 ../cfg_opt_user.py:33
- msgid "Associated IP address of PC"
--msgstr "DirecciÃƒÂ³n IP asociada al PC"
-+msgstr "DirecciÃ³n IP asociada al PC"
- 
- #: cfg_opt_user.py:31 ../cfg_opt_user.py:33
- msgid "Trusted for auto-login"
--msgstr "Confiable para inicio de sesiÃƒÂ³n automÃƒÂ¡tico"
-+msgstr "Confiable para inicio de sesiÃ³n automÃ¡tico"
- 
- #: cfg_opt_user.py:32 ../cfg_opt_user.py:34
- msgid "Associated phone"
--msgstr "TelÃƒÂ©fono Asociado"
-+msgstr "TelÃ©fono Asociado"
- 
- #: cfg_opt_user.py:35 page_user_info.ptl:49 page_user.ptl:46
- #: ../cfg_opt_user.py:38 ../page_user_info.ptl:49 ../page_user.ptl:46
-@@ -874,11 +874,11 @@
- #: ../cfg_opt_voicemail.py:27 ../cfg_phone_epygi.py:107 ../cfg_phone_iax.py:87
- #: ../cfg_phone_mgcp.py:96 ../cfg_phone_sip.py:107 ../cfg_phone_zap.py:94
- msgid "Voicemail settings"
--msgstr "ConfiguraciÃƒÂ³n de correo de voz"
-+msgstr "ConfiguraciÃ³n de correo de voz"
- 
- #: cfg_opt_voicemail.py:27 ../cfg_opt_voicemail.py:30
- msgid "Recording settings"
--msgstr "ConfiguraciÃƒÂ³n de grabaciÃƒÂ³n"
-+msgstr "ConfiguraciÃ³n de grabaciÃ³n"
- 
- #: cfg_opt_voicemail.py:28 ../cfg_opt_voicemail.py:31
- msgid "File format for voicemail messages"
-@@ -886,30 +886,30 @@
- 
- #: cfg_opt_voicemail.py:30 ../cfg_opt_voicemail.py:33
- msgid "Maximal message length (in seconds)"
--msgstr "TamaÃƒÂ±o mÃƒÂ¡ximo de los mensajes (en segundos)"
-+msgstr "TamaÃ±o mÃ¡ximo de los mensajes (en segundos)"
- 
- #: cfg_opt_voicemail.py:31 ../cfg_opt_voicemail.py:34
- msgid "Minimal message length (in seconds)"
--msgstr "TamaÃƒÂ±o mÃƒÂnimo de los mensajes (en segundos)"
-+msgstr "TamaÃ±o mÃnimo de los mensajes (en segundos)"
- 
- #: cfg_opt_voicemail.py:32 ../cfg_opt_voicemail.py:35
- msgid "Seconds of silence to end the recording"
--msgstr "Segundos de silencio para la grabaciÃƒÂ³n"
-+msgstr "Segundos de silencio para la grabaciÃ³n"
- 
- #: cfg_opt_voicemail.py:33 ../cfg_opt_voicemail.py:36
- msgid ""
- "Silence threshold (what we consider silence, the lower, the more sensitive)"
- msgstr ""
--"Umbral de silencio (lo que consideramos silencio;entre mÃƒÂ¡s bajo, mÃƒÂ¡s "
-+"Umbral de silencio (lo que consideramos silencio;entre mÃ¡s bajo, mÃ¡s "
- "sensible)"
- 
- #: cfg_opt_voicemail.py:35 ../cfg_opt_voicemail.py:38
- msgid "Playback settings"
--msgstr "ConfiguraciÃƒÂ³n de ReproducciÃƒÂ³n"
-+msgstr "ConfiguraciÃ³n de ReproducciÃ³n"
- 
- #: cfg_opt_voicemail.py:36 ../cfg_opt_voicemail.py:39
- msgid "Max number of failed login attempts"
--msgstr "MÃƒÂ¡ximo nÃƒÂºmero de intentos de inicio de sesiÃƒÂ³n"
-+msgstr "MÃ¡ximo nÃºmero de intentos de inicio de sesiÃ³n"
- 
- #: cfg_opt_voicemail.py:37 ../cfg_opt_voicemail.py:40
- msgid "Seconds to skip forward/backward"
-@@ -939,7 +939,7 @@
- #: cfg_opt_zap_phone.py:26 ../cfg_opt_zap_phone.py:26
- #: ../cfg_opt_zap_phone.py:27
- msgid "Zaptel Phone Options"
--msgstr "Opciones de telÃƒÂ©fono Zaptel"
-+msgstr "Opciones de telÃ©fono Zaptel"
- 
- #: cfg_opt_zap_phone.py:28 ../cfg_opt_zap_phone.py:31
- msgid "Use ADSI for menu phones"
-@@ -963,7 +963,7 @@
- 
- #: cfg_opt_zap_phone.py:33 ../cfg_opt_zap_phone.py:36
- msgid "Allow call forwards"
--msgstr "Habilitar reenvÃƒÂo de llamadas"
-+msgstr "Habilitar reenvÃo de llamadas"
- 
- #: cfg_opt_zap_phone.py:34 ../cfg_opt_zap_phone.py:37
- msgid "Read caller number with *69"
-@@ -971,7 +971,7 @@
- 
- #: cfg_opt_zappri.py:28 ../cfg_opt_zappri.py:28 ../cfg_opt_zappri.py:29
- msgid "Zaptel configuration for PRI"
--msgstr "ConfiguraciÃƒÂ³n de Zaptel para PRI"
-+msgstr "ConfiguraciÃ³n de Zaptel para PRI"
- 
- #: cfg_opt_zappri.py:31 ../cfg_opt_zappri.py:33
- msgid "Zaptel span"
-@@ -983,11 +983,11 @@
- 
- #: cfg_opt_zappri.py:32 ../cfg_opt_zappri.py:34
- msgid "Zaptel timing parameter"
--msgstr "ParÃƒÂ¡metro de temporizaciÃƒÂ³n de Zaptel"
-+msgstr "ParÃ¡metro de temporizaciÃ³n de Zaptel"
- 
- #: cfg_opt_zappri.py:32 ../cfg_opt_zappri.py:34
- msgid "Read zaptel documentation"
--msgstr "Lea la documentaciÃƒÂ³n de zaptel"
-+msgstr "Lea la documentaciÃ³n de zaptel"
- 
- #: cfg_opt_zappri.py:33 ../cfg_opt_zappri.py:35
- msgid "Line Build Out (dB)"
-@@ -1053,7 +1053,7 @@
- 
- #: cfg_opt_zappri.py:46 ../cfg_opt_zappri.py:48
- msgid "Coding"
--msgstr "CodificaciÃƒÂ³n"
-+msgstr "CodificaciÃ³n"
- 
- #: cfg_opt_zappri.py:47 ../cfg_opt_zappri.py:49
- msgid "AMI (T1/E1)"
-@@ -1079,7 +1079,7 @@
- 
- #: cfg_opt_zappri.py:50 ../cfg_opt_zappri.py:52
- msgid "Signaling channel"
--msgstr "Canal de seÃƒÂ±alizaciÃƒÂ³n"
-+msgstr "Canal de seÃ±alizaciÃ³n"
- 
- #: cfg_opt_zappri.py:50 ../cfg_opt_zappri.py:52
- msgid "i.e. 16"
-@@ -1100,7 +1100,7 @@
- 
- #: cfg_phone_ext.py:27 ../cfg_phone_ext.py:28
- msgid "Set an 'alias' extension to a phone"
--msgstr "Establecer una extensiÃƒÂ³n \"alias\" al telÃƒÂ©fono"
-+msgstr "Establecer una extensiÃ³n \"alias\" al telÃ©fono"
- 
- #: cfg_phone_ext.py:31 ../cfg_phone_ext.py:44
- msgid "This can be used to set operator(o) or fax(fax) extensions."
-@@ -1109,25 +1109,25 @@
- 
- #: cfg_phone_ext.py:33 ../cfg_phone_ext.py:48
- msgid "Calls to the extension"
--msgstr "Llamadas a la extensiÃƒÂ³n"
-+msgstr "Llamadas a la extensiÃ³n"
- 
- #: cfg_phone_ext.py:34 ../cfg_phone_ext.py:52
- msgid "Real phone to ring"
--msgstr "TelÃƒÂ©fono a timbrar"
-+msgstr "TelÃ©fono a timbrar"
- 
- #: cfg_phone_iax.py:27 ../cfg_phone_iax.py:27
- msgid "Normal IAX phone"
--msgstr "TelÃƒÂ©fono IAX estÃƒÂ¡ndar"
-+msgstr "TelÃ©fono IAX estÃ¡ndar"
- 
- #: cfg_phone_iax.py:31 cfg_phone_mgcp.py:29 cfg_phone_sip.py:32
- #: ../cfg_phone_iax.py:47 ../cfg_phone_mgcp.py:47 ../cfg_phone_sip.py:48
- msgid "IP address of phone"
--msgstr "DireciÃƒÂ³n IP del telÃƒÂ©fono"
-+msgstr "DireciÃ³n IP del telÃ©fono"
- 
- #: cfg_phone_iax.py:33 cfg_phone_mgcp.py:37 cfg_phone_zap.py:34
- #: ../cfg_phone_iax.py:56 ../cfg_phone_mgcp.py:76 ../cfg_phone_zap.py:63
- msgid "Allow direct dialling from outside?"
--msgstr "Ã‚Â¿Permitir llamadas directas desde el exterior?"
-+msgstr "Â¿Permitir llamadas directas desde el exterior?"
- 
- #: cfg_phone_iax.py:35 cfg_phone_mgcp.py:39 cfg_phone_sip.py:40
- #: cfg_phone_zap.py:36 ../cfg_phone_epygi.py:70 ../cfg_phone_iax.py:62
-@@ -1145,12 +1145,12 @@
- #: cfg_phone_zap.py:38 ../cfg_phone_epygi.py:80 ../cfg_phone_iax.py:72
- #: ../cfg_phone_mgcp.py:92 ../cfg_phone_sip.py:80 ../cfg_phone_zap.py:79
- msgid "Call group number"
--msgstr "NÃƒÂºmero del grupo de llamadas"
-+msgstr "NÃºmero del grupo de llamadas"
- 
- #: cfg_phone_iax.py:40 cfg_phone_sip.py:49 ../cfg_phone_epygi.py:101
- #: ../cfg_phone_iax.py:81 ../cfg_phone_sip.py:101
- msgid "Show this extension in the panel"
--msgstr "Mostrar esta extensiÃƒÂ³n en el pÃƒÂ¡nel"
-+msgstr "Mostrar esta extensiÃ³n en el pÃ¡nel"
- 
- #: cfg_phone_iax.py:43 cfg_phone_mgcp.py:44 cfg_phone_sip.py:52
- #: cfg_phone_zap.py:44 ../cfg_phone_epygi.py:112 ../cfg_phone_iax.py:91
-@@ -1162,7 +1162,7 @@
- #: cfg_phone_zap.py:45 ../cfg_phone_epygi.py:117 ../cfg_phone_iax.py:96
- #: ../cfg_phone_mgcp.py:106 ../cfg_phone_sip.py:117 ../cfg_phone_zap.py:104
- msgid "Signal waiting mail"
--msgstr "Correo de espera de seÃƒÂ±al"
-+msgstr "Correo de espera de seÃ±al"
- 
- #: cfg_phone_iax.py:45 cfg_phone_mgcp.py:46 cfg_phone_sip.py:54
- #: cfg_phone_zap.py:46 ../cfg_phone_epygi.py:122 ../cfg_phone_iax.py:101
-@@ -1178,7 +1178,7 @@
- #: cfg_phone_zap.py:48 ../cfg_phone_epygi.py:132 ../cfg_phone_iax.py:110
- #: ../cfg_phone_mgcp.py:116 ../cfg_phone_sip.py:132 ../cfg_phone_zap.py:114
- msgid "Calls from the phone"
--msgstr "Llamadas desde el telÃƒÂ©fono"
-+msgstr "Llamadas desde el telÃ©fono"
- 
- #: cfg_phone_iax.py:49 cfg_phone_sip.py:57 cfg_phone_zap.py:49
- #: ../cfg_phone_epygi.py:136 ../cfg_phone_iax.py:114 ../cfg_phone_sip.py:136
-@@ -1203,19 +1203,19 @@
- #: cfg_phone_zap.py:52 ../cfg_phone_epygi.py:149 ../cfg_phone_iax.py:127
- #: ../cfg_phone_mgcp.py:133 ../cfg_phone_sip.py:149 ../cfg_phone_zap.py:131
- msgid "Enable time restriction?"
--msgstr "Ã‚Â¿Habilitar la restricciÃƒÂ³n de tiempo?"
-+msgstr "Â¿Habilitar la restricciÃ³n de tiempo?"
- 
- #: cfg_phone_mgcp.py:26 ../cfg_phone_mgcp.py:26
- msgid "Normal MGCP phone"
--msgstr "TelÃƒÂ©fono MGCP estÃƒÂ¡ndar"
-+msgstr "TelÃ©fono MGCP estÃ¡ndar"
- 
- #: cfg_phone_mgcp.py:27 ../cfg_phone_mgcp.py:40
- msgid ""
- "If you haven't configured a name for your phone please use the IP address "
- "here."
- msgstr ""
--"Si usted no ha configurado un nombre para su telÃƒÂ©fono, por favor use la "
--"direcciÃƒÂ³n IP aquÃƒÂ."
-+"Si usted no ha configurado un nombre para su telÃ©fono, por favor use la "
-+"direcciÃ³n IP aquÃ."
- 
- #: cfg_phone_mgcp.py:33 ../cfg_phone_mgcp.py:56
- msgid "NAT"
-@@ -1223,7 +1223,7 @@
- 
- #: cfg_phone_mgcp.py:34 ../cfg_phone_mgcp.py:61
- msgid "Three way calling"
--msgstr "Llamada de tres vÃƒÂas"
-+msgstr "Llamada de tres vÃas"
- 
- #: cfg_phone_mgcp.py:35 ../cfg_phone_mgcp.py:66
- msgid "Enable Call transfer"
-@@ -1231,11 +1231,11 @@
- 
- #: cfg_phone_mgcp.py:36 ../cfg_phone_mgcp.py:71
- msgid "Enable Call forward"
--msgstr "Habilitar reenvÃƒÂo de llamadas"
-+msgstr "Habilitar reenvÃo de llamadas"
- 
- #: cfg_phone_mgcp.py:49 ../cfg_phone_mgcp.py:120
- msgid "Caller-Id-Number"
--msgstr "NÃƒÂºmero del Identificador de Llamante"
-+msgstr "NÃºmero del Identificador de Llamante"
- 
- #: cfg_phone_mgcp.py:50 ../cfg_phone_mgcp.py:124
- msgid "Caller-Id-Name"
-@@ -1247,7 +1247,7 @@
- 
- #: cfg_phone_queue.py:32 ../cfg_phone_queue.py:48 ../cfg_phone_hunt.py:35
- msgid "Timeout"
--msgstr "Tiempo lÃƒÂmite"
-+msgstr "Tiempo lÃmite"
- 
- #: cfg_phone_queue.py:35 ../cfg_phone_queue.py:59
- msgid "Strategy:"
-@@ -1264,11 +1264,11 @@
- #: cfg_phone_queue.py:38 ../cfg_phone_queue.py:63
- msgid ""
- "Least recent - ring interface which was least recently called by this queue"
--msgstr "Timbrar a la extensiÃƒÂ³n que lleve mÃƒÂ¡s tiempo sin contestar"
-+msgstr "Timbrar a la extensiÃ³n que lleve mÃ¡s tiempo sin contestar"
- 
- #: cfg_phone_queue.py:39 ../cfg_phone_queue.py:64
- msgid "Fewest calls - ring the one with fewest completed calls from this queue"
--msgstr "Timbrar a la extensiÃƒÂ³n que menos llamadas haya contestado"
-+msgstr "Timbrar a la extensiÃ³n que menos llamadas haya contestado"
- 
- #: cfg_phone_queue.py:40 ../cfg_phone_queue.py:65
- msgid "Random - ring random interface"
-@@ -1276,11 +1276,11 @@
- 
- #: cfg_phone_queue.py:41 ../cfg_phone_queue.py:66
- msgid "Round robin with memory - remember where we left off last ring pass"
--msgstr "Timbrar uno por uno, empezando donde se quedÃƒÂ³ en la ÃƒÂºltima vuelta"
-+msgstr "Timbrar uno por uno, empezando donde se quedÃ³ en la Ãºltima vuelta"
- 
- #: cfg_phone_queue.py:44 ../cfg_phone_queue.py:70 ../cfg_phone_hunt.py:36
- msgid "How long to wait before trying all the members again?"
--msgstr "Ã‚Â¿Cuanto tiempo esperar antes de intentar timbrar de nuevo?"
-+msgstr "Â¿Cuanto tiempo esperar antes de intentar timbrar de nuevo?"
- 
- #: cfg_phone_queue.py:46
- msgid "Anounces"
-@@ -1288,23 +1288,23 @@
- 
- #: cfg_phone_queue.py:47
- msgid "Anounce queue position to caller?"
--msgstr "Ã‚Â¿Anunciar la posiciÃƒÂ³n en la cola al llamante?"
-+msgstr "Â¿Anunciar la posiciÃ³n en la cola al llamante?"
- 
- #: cfg_phone_queue.py:48 ../cfg_phone_queue.py:84
- msgid ""
- "How often to announce queue position and/or estimated holdtime to caller"
- msgstr ""
--"Frecuencia de anuncio de la posiciÃƒÂ³n en la cola y el tiempo estimado de "
--"contestaciÃƒÂ³n"
-+"Frecuencia de anuncio de la posiciÃ³n en la cola y el tiempo estimado de "
-+"contestaciÃ³n"
- 
- #: cfg_phone_queue.py:49 ../cfg_phone_queue.py:89
- msgid "Include estimated hold time in position announcements?"
- msgstr ""
--"Ã‚Â¿Incluir el tiempo estimado de contestaciÃƒÂ³n en los anuncios de posiciÃƒÂ³n?"
-+"Â¿Incluir el tiempo estimado de contestaciÃ³n en los anuncios de posiciÃ³n?"
- 
- #: cfg_phone_queue.py:50 ../cfg_phone_queue.py:91
- msgid "Yes"
--msgstr "SÃƒÂ"
-+msgstr "SÃ"
- 
- #: cfg_phone_queue.py:51 ../cfg_phone_queue.py:92
- msgid "No"
-@@ -1312,7 +1312,7 @@
- 
- #: cfg_phone_queue.py:52 ../cfg_phone_queue.py:93
- msgid "Only Once"
--msgstr "SÃƒÂ³lo una vez"
-+msgstr "SÃ³lo una vez"
- 
- #: cfg_phone_queue.py:56 ../cfg_phone_queue.py:97
- msgid "Monitoring"
-@@ -1320,7 +1320,7 @@
- 
- #: cfg_phone_queue.py:57 ../cfg_phone_queue.py:102
- msgid "Monitor answered calls?"
--msgstr "Ã‚Â¿Monitorear la llamadas contestadas?"
-+msgstr "Â¿Monitorear la llamadas contestadas?"
- 
- #: cfg_phone_queue.py:58 ../cfg_phone_queue.py:106
- msgid "Monitor file format"
-@@ -1344,11 +1344,11 @@
- 
- #: cfg_phone_queue.py:64 ../cfg_phone_queue.py:115
- msgid "Otherwise it will use ${UNIQUEID}"
--msgstr "De lo contrario, se usarÃƒÂ¡ ${UNIQUEID}"
-+msgstr "De lo contrario, se usarÃ¡ ${UNIQUEID}"
- 
- #: cfg_phone_queue.py:67 ../cfg_phone_queue.py:129
- msgid "Show this queue in the panel"
--msgstr "Mostrar esta cola en el pÃƒÂ¡nel"
-+msgstr "Mostrar esta cola en el pÃ¡nel"
- 
- #: cfg_phone_queue.py:84 ../cfg_phone_queue.py:149
- msgid "You should select a frequency"
-@@ -1356,11 +1356,11 @@
- 
- #: cfg_phone_sip.py:28 ../cfg_phone_sip.py:27
- msgid "Normal SIP phone"
--msgstr "TelÃƒÂ©fono SIP estÃƒÂ¡ndar"
-+msgstr "TelÃ©fono SIP estÃ¡ndar"
- 
- #: cfg_phone_sip.py:33 ../cfg_phone_epygi.py:54 ../cfg_phone_sip.py:53
- msgid "Is the trunk behind NAT ?"
--msgstr "Ã‚Â¿EstÃƒÂ¡ la troncal tras un NAT?"
-+msgstr "Â¿EstÃ¡ la troncal tras un NAT?"
- 
- #: cfg_phone_sip.py:35 ../cfg_phone_epygi.py:63 ../cfg_phone_sip.py:62
- msgid "DTMF mode:"
-@@ -1372,7 +1372,7 @@
- 
- #: cfg_phone_sip.py:37 ../cfg_phone_epygi.py:66 ../cfg_phone_sip.py:66
- msgid "In Band (only with ulaw/alaw)"
--msgstr "En Banda (sÃƒÂ³lo con Ley U/Ley A)"
-+msgstr "En Banda (sÃ³lo con Ley U/Ley A)"
- 
- #: cfg_phone_sip.py:38 ../cfg_phone_epygi.py:67 ../cfg_phone_sip.py:67
- msgid "SIP INFO"
-@@ -1388,22 +1388,22 @@
- 
- #: cfg_phone_zap.py:27 ../cfg_phone_zap.py:27
- msgid "Normal ZAP phone"
--msgstr "TelÃƒÂ©fono ZAP normal"
-+msgstr "TelÃ©fono ZAP normal"
- 
- #: cfg_phone_zap.py:30 cfg_trunk_zap.py:30 ../cfg_phone_zap.py:43
- #: ../cfg_trunk_zappbx.py:34 ../cfg_trunk_zap.py:33
- msgid "Zaptel channel number"
--msgstr "NÃƒÂºmero del canal Zaptel"
-+msgstr "NÃºmero del canal Zaptel"
- 
- #: cfg_phone_zap.py:31 cfg_trunk_zappri.py:31 cfg_trunk_zap.py:31
- #: ../cfg_phone_zap.py:48 ../cfg_trunk_zappbx.py:35 ../cfg_trunk_zappri.py:35
- #: ../cfg_trunk_zap.py:34
- msgid "Signalling type"
--msgstr "Tipo de seÃƒÂ±alizaciÃƒÂ³n"
-+msgstr "Tipo de seÃ±alizaciÃ³n"
- 
- #: cfg_phone_zap.py:41 ../cfg_phone_zap.py:88
- msgid "Show this phone in the panel"
--msgstr "Mostrar esta extensiÃƒÂ³n en el pÃƒÂ¡nel"
-+msgstr "Mostrar esta extensiÃ³n en el pÃ¡nel"
- 
- #: cfg_trunk_capimsn.py:26 ../cfg_trunk_capimsn.py:26
- msgid "ISDN using CAPI, incoming"
-@@ -1417,7 +1417,7 @@
- #: ../cfg_trunk_capimsn.py:34 ../cfg_trunk_capi.py:37
- #: ../cfg_trunk_zaphfc.py:37
- msgid "Subscriber number"
--msgstr "NÃƒÂºmero de Suscriptor"
-+msgstr "NÃºmero de Suscriptor"
- 
- #: cfg_trunk_capimsn.py:70 ../cfg_trunk_capimsn.py:68
- msgid "MSN already assigned"
-@@ -1454,20 +1454,20 @@
- "Usted puede registrarse gratuitamente en\n"
- "\t\t\thttp://freeworlddialup.com y obtener un identificador de FWD a donde \n"
- "\t\t\tlas otras personas lo pueden contactar. Estas llamadas son gratuitas "
--"tambiÃƒÂ©n.\n"
-+"tambiÃ©n.\n"
- "\n"
- "\t\t\tCuando usted tiene una cuenta, debe habilitar el soporte IAX para FWD "
- "en \n"
- "\t\t\thttp://www.freeworlddialup.com/advanced/iax para usar esta\n"
--"\t\t\t'lÃƒÂnea telefÃƒÂ³nica'."
-+"\t\t\t'lÃnea telefÃ³nica'."
- 
- #: cfg_trunk_fwdiax.py:38 ../cfg_trunk_fwdiax.py:41
- msgid "FWD number"
--msgstr "NÃƒÂºmero de FWD"
-+msgstr "NÃºmero de FWD"
- 
- #: cfg_trunk_fwdiax.py:39 ../cfg_trunk_fwdiax.py:42
- msgid "FWD password"
--msgstr "ContraseÃƒÂ±a de FWD"
-+msgstr "ContraseÃ±a de FWD"
- 
- #: cfg_trunk_fwdiax.py:41 ../cfg_trunk_fwdiax.py:44
- msgid "Calls to FWD"
-@@ -1485,14 +1485,14 @@
- 
- #: cfg_trunk_iax.py:27 ../cfg_trunk_iax.py:27
- msgid "Standard IAX Trunk"
--msgstr "Troncal IAX estÃƒÂ¡ndar"
-+msgstr "Troncal IAX estÃ¡ndar"
- 
- #: cfg_trunk_iax.py:29 ../cfg_trunk_iax.py:29
- msgid ""
- "Used to setup an IAX trunk to another Asterisk server or an IAX termination."
- msgstr ""
- "Se usa para configurar una troncal IAX a otro servidor Asterisk o a una "
--"terminaciÃƒÂ³n IAX."
-+"terminaciÃ³n IAX."
- 
- #: cfg_trunk_iax.py:33 ../cfg_trunk_iax.py:35
- msgid "IAX host"
-@@ -1512,11 +1512,11 @@
- 
- #: cfg_trunk_iax.py:38 ../cfg_trunk_iax.py:40
- msgid "Authentication"
--msgstr "AutenticaciÃƒÂ³n"
-+msgstr "AutenticaciÃ³n"
- 
- #: cfg_trunk_iax.py:39 ../cfg_trunk_iax.py:41
- msgid "Authentication Method"
--msgstr "MÃƒÂ©todo de autenticaciÃƒÂ³n"
-+msgstr "MÃ©todo de autenticaciÃ³n"
- 
- #: cfg_trunk_iax.py:40 ../cfg_trunk_iax.py:42
- msgid "Plain text"
-@@ -1532,16 +1532,16 @@
- 
- #: cfg_trunk_iax.py:41 ../cfg_trunk_iax.py:43
- msgid "For 'Plain' or 'MD5' only"
--msgstr "SÃƒÂ³lo para \"Texto plano\" o \"RSA\""
-+msgstr "SÃ³lo para \"Texto plano\" o \"RSA\""
- 
- #: cfg_trunk_iax.py:42 ../cfg_trunk_iax.py:44
- msgid "Public key from remote server"
--msgstr "Llave pÃƒÂºblica del servidor remoto"
-+msgstr "Llave pÃºblica del servidor remoto"
- 
- #: cfg_trunk_iax.py:42 cfg_trunk_iax.py:43 ../cfg_trunk_iax.py:44
- #: ../cfg_trunk_iax.py:45
- msgid "For 'RSA' only"
--msgstr "SÃƒÂ³lo para \"RSA\""
-+msgstr "SÃ³lo para \"RSA\""
- 
- #: cfg_trunk_iax.py:43 ../cfg_trunk_iax.py:45
- msgid "Private local key"
-@@ -1549,7 +1549,7 @@
- 
- #: cfg_trunk_iax.py:45 ../cfg_trunk_iax.py:47
- msgid "Enable trunking?"
--msgstr "Ã‚Â¿Habilitar trunking?"
-+msgstr "Â¿Habilitar trunking?"
- 
- #: cfg_trunk_iax.py:50 ../cfg_trunk_iax.py:52
- msgid "Calls from IAX trunk"
-@@ -1559,7 +1559,7 @@
- #: cfg_trunk_zap.py:45 ../cfg_trunk_iax.py:55 ../cfg_trunk_sip.py:50
- #: ../cfg_trunk_zappbx.py:51 ../cfg_trunk_zappri.py:59 ../cfg_trunk_zap.py:48
- msgid "Extension to ring"
--msgstr "ExtensiÃƒÂ³n a timbrar"
-+msgstr "ExtensiÃ³n a timbrar"
- 
- #: cfg_trunk_iaxtel.py:26 ../cfg_trunk_iaxtel.py:26
- msgid "VOIP-Provider Iaxtel"
-@@ -1572,17 +1572,17 @@
- "\t\t\tpeople can call you. These calls are free of charge, too.'."
- msgstr ""
- "Usted puede registrarse gratuitamente en\n"
--"\t\t\thttp://www.iaxtel.com y obtener un nÃƒÂºmero IAX donde \n"
-+"\t\t\thttp://www.iaxtel.com y obtener un nÃºmero IAX donde \n"
- "\t\t\tlas otras personas lo pueden contactar. Estas llamadas son gratuitas "
--"tambiÃƒÂ©n."
-+"tambiÃ©n."
- 
- #: cfg_trunk_iaxtel.py:34 ../cfg_trunk_iaxtel.py:40
- msgid "IAXTEL number"
--msgstr "NÃƒÂºmero IAXTEL"
-+msgstr "NÃºmero IAXTEL"
- 
- #: cfg_trunk_iaxtel.py:35 ../cfg_trunk_iaxtel.py:41
- msgid "IAXTEL password"
--msgstr "ContraseÃƒÂ±a IAXTEL"
-+msgstr "ContraseÃ±a IAXTEL"
- 
- #: cfg_trunk_iaxtel.py:37 ../cfg_trunk_iaxtel.py:43
- msgid "Calls to IAXTEL"
-@@ -1594,7 +1594,7 @@
- 
- #: cfg_trunk_sip.py:27 ../cfg_trunk_sip.py:27
- msgid "Standard SIP Trunk"
--msgstr "Troncal SIP estÃƒÂ¡ndar"
-+msgstr "Troncal SIP estÃ¡ndar"
- 
- #: cfg_trunk_sip.py:29 ../cfg_trunk_sip.py:30
- msgid "Used to setup a SIP trunk to a SIP provider or a different SIP server."
-@@ -1608,7 +1608,7 @@
- 
- #: cfg_trunk_sip.py:34 ../cfg_trunk_sip.py:37
- msgid "SIP password"
--msgstr "ContraseÃƒÂ±a SIP"
-+msgstr "ContraseÃ±a SIP"
- 
- #: cfg_trunk_sip.py:35 ../cfg_trunk_sip.py:38
- msgid "SIP host"
-@@ -1616,11 +1616,11 @@
- 
- #: cfg_trunk_sip.py:36 ../cfg_trunk_sip.py:40
- msgid "Enable forward address type?"
--msgstr "Ã‚Â¿Permitir reenvÃƒÂo de tipo de direcciÃƒÂ³n?"
-+msgstr "Â¿Permitir reenvÃo de tipo de direcciÃ³n?"
- 
- #: cfg_trunk_sip.py:37 ../cfg_trunk_sip.py:41
- msgid "Is the trunk behind NAT?"
--msgstr "Ã‚Â¿EstÃƒÂ¡ la troncal tras un NAT?"
-+msgstr "Â¿EstÃ¡ la troncal tras un NAT?"
- 
- #: cfg_trunk_sip.py:42 cfg_trunk_zappri.py:52 cfg_trunk_zap.py:42
- #: ../cfg_trunk_sip.py:47 ../cfg_trunk_zappbx.py:48
-@@ -1637,15 +1637,15 @@
- 
- #: cfg_trunk_zaphfc.py:31 ../cfg_trunk_zaphfc.py:34
- msgid "Number of cards"
--msgstr "NÃƒÂºmero de tarjetas"
-+msgstr "NÃºmero de tarjetas"
- 
- #: cfg_trunk_zappri.py:28 ../cfg_trunk_zappri.py:28
- msgid "Standard ZAP PRI trunk"
--msgstr "Troncal ZAP PRI estÃƒÂ¡ndar"
-+msgstr "Troncal ZAP PRI estÃ¡ndar"
- 
- #: cfg_trunk_zappri.py:32 ../cfg_trunk_zappri.py:36
- msgid "PRI signalling, CPE side"
--msgstr "SeÃƒÂ±alizaciÃƒÂ³n del PRI, lado del consumidor"
-+msgstr "SeÃ±alizaciÃ³n del PRI, lado del consumidor"
- 
- #: cfg_trunk_zappri.py:32 ../cfg_trunk_zappri.py:36
- msgid "PRI signalling, Network side"
-@@ -1684,18 +1684,18 @@
- 
- #: cfg_trunk_zappri.py:86 ../cfg_trunk_zappri.py:90
- msgid "Group already in use"
--msgstr "El grupo ya estÃƒÂ¡ en uso"
-+msgstr "El grupo ya estÃ¡ en uso"
- 
- #: cfg_trunk_zap.py:27 ../cfg_trunk_zap.py:27
- msgid "Standard ZAP trunk"
--msgstr "Troncal ZAP estÃƒÂ¡ndar"
-+msgstr "Troncal ZAP estÃ¡ndar"
- 
- #: configlets.py:428 configlets.py:665 configlets.py:805 ../configlets.py:581
- #: ../configlets.py:873 ../configlets.py:874 ../configlets.py:999
- #: ../configlets.py:1021 ../configlets.py:585 ../configlets.py:888
- #: ../configlets.py:889 ../configlets.py:1013 ../configlets.py:1035
- msgid "None"
--msgstr "NingÃƒÂºno(a)"
-+msgstr "NingÃºno(a)"
- 
- #: configlets.py:465 ../configlets.py:620 ../configlets.py:624
- msgid "Name already in use"
-@@ -1704,7 +1704,7 @@
- #: configlets.py:551 configlets.py:818 ../configlets.py:716
- #: ../configlets.py:1034 ../configlets.py:720 ../configlets.py:1048
- msgid "Info"
--msgstr "InformaciÃƒÂ³n"
-+msgstr "InformaciÃ³n"
- 
- #: configlets.py:600 ../configlets.py:800 ../configlets.py:804
- msgid "Dial Command"
-@@ -1712,22 +1712,22 @@
- 
- #: configlets.py:628 ../configlets.py:828 ../configlets.py:832
- msgid "You should select a phone to ring to"
--msgstr "Usted debe seleccionar un telÃƒÂ©fono para timbrar"
-+msgstr "Usted debe seleccionar un telÃ©fono para timbrar"
- 
- #: configlets.py:693 ../configlets.py:780 ../configlets.py:784
- msgid "Password:"
--msgstr "ContraseÃƒÂ±a:"
-+msgstr "ContraseÃ±a:"
- 
- #: language.py:48 ../language.py:67
- msgid "This menu will contain all sorts of administration stuff:"
--msgstr "Este menÃƒÂº tendrÃƒÂ¡ todo tipo de funciones administrativas:"
-+msgstr "Este menÃº tendrÃ¡ todo tipo de funciones administrativas:"
- 
- #: panelutils.py:74 ../panelutils.py:74
- msgid ""
- "0,No timeout|300,5 minutes|600,10 minutes|1200,20 minutes|2400,40 minutes|"
- "3000,50 minutes"
- msgstr ""
--"0,Sin tiempo lÃƒÂmite|300,5 minutos|600,10 minutos|1200,20 minutos|2400,40 "
-+"0,Sin tiempo lÃmite|300,5 minutos|600,10 minutos|1200,20 minutos|2400,40 "
- "minutos|3000,50 minutos"
- 
- #: panelutils.py:98 ../panelutils.py:98
-@@ -1760,11 +1760,11 @@
- 
- #: ConfigHelper.ptl:93 ../ConfigHelper.ptl:95
- msgid "Add more"
--msgstr "AÃƒÂ±adir mÃƒÂ¡s"
-+msgstr "AÃ±adir mÃ¡s"
- 
- #: ConfigHelper.ptl:112 UserPage.ptl:64 ../ConfigHelper.ptl:113
- msgid "Invalid URL"
--msgstr "URL invÃƒÂ¡lida"
-+msgstr "URL invÃ¡lida"
- 
- #: ConfigHelper.ptl:118 page_config_edit.ptl:43 ../ConfigHelper.ptl:118
- #: ../page_config_edit.ptl:43
-@@ -1807,22 +1807,22 @@
- 
- #: Missing.ptl:32
- msgid "Admin"
--msgstr "AdministraciÃƒÂ³n"
-+msgstr "AdministraciÃ³n"
- 
- #: Missing.ptl:35 Options.ptl:30 page_config.ptl:26 page_config.ptl:68
- #: page_config.ptl:80 page_config.ptl:86 page_config.ptl:92
- #: ../page_config.ptl:26 ../page_config.ptl:68 ../page_config.ptl:80
- #: ../page_config.ptl:86 ../page_config.ptl:92
- msgid "Configuration"
--msgstr "ConfiguraciÃƒÂ³n"
-+msgstr "ConfiguraciÃ³n"
- 
- #: Missing.ptl:40
- msgid "Page missing"
--msgstr "PÃƒÂ¡gina no encontrada"
-+msgstr "PÃ¡gina no encontrada"
- 
- #: Missing.ptl:41
- msgid "This page is on my TODO list :-)"
--msgstr "EstÃƒÂ¡ pÃƒÂ¡gina estÃƒÂ¡ en desarrollo"
-+msgstr "EstÃ¡ pÃ¡gina estÃ¡ en desarrollo"
- 
- #: Options.ptl:30 page_config_options.ptl:26 page_config.ptl:68
- #: page_config.ptl:80 ../page_config_options.ptl:26 ../page_config.ptl:68
-@@ -1933,7 +1933,7 @@
- #: page_admin_cdr.ptl:108 ../page_owner_cdr.ptl:144 ../page_stats_cdr.ptl:146
- #: ../page_owner_cdr.ptl:145 ../page_stats_cdr.ptl:147
- msgid "Number of records to show:"
--msgstr "NÃƒÂºmero de registros a mostrar:"
-+msgstr "NÃºmero de registros a mostrar:"
- 
- #: page_admin_cdr.ptl:109
- msgid "Order by:"
-@@ -1978,7 +1978,7 @@
- 
- #: page_admin_cdr.ptl:222
- msgid "Duration_in_minutes"
--msgstr "DuraciÃƒÂ³n_en_minutos"
-+msgstr "DuraciÃ³n_en_minutos"
- 
- #: page_admin_cdr.ptl:225
- msgid "Cost_of_call"
-@@ -1998,7 +1998,7 @@
- 
- #: page_admin_cdr.ptl:240 ../StatsHelper.ptl:163
- msgid "Failed"
--msgstr "FallÃƒÂ³"
-+msgstr "FallÃ³"
- 
- #: page_admin_cdr.ptl:241
- msgid "start"
-@@ -2017,11 +2017,11 @@
- 
- #: page_admin_panel.ptl:28 ../page_admin_panel.ptl:28
- msgid "Asternic Flash Operator Panel"
--msgstr "PÃƒÂ¡nel de Operadora Flash Asternic"
-+msgstr "PÃ¡nel de Operadora Flash Asternic"
- 
- #: page_admin_panel.ptl:43 ../page_admin_panel.ptl:43
- msgid "You don't have a panel configured yet"
--msgstr "Usted no tiene un pÃƒÂ¡nel configurado en este momento."
-+msgstr "Usted no tiene un pÃ¡nel configurado en este momento."
- 
- #: page_admin_panel.ptl:47 ../page_admin_panel.ptl:47
- msgid "You have a panel configured "
-@@ -2029,7 +2029,7 @@
- 
- #: page_admin_panel.ptl:49 ../page_admin_panel.ptl:49
- msgid "here"
--msgstr "aquÃƒÂ"
-+msgstr "aquÃ"
- 
- #: page_admin_pbxstate.ptl:26 UserPage.ptl:105 ../page_admin_pbxstate.ptl:26
- msgid "PBX State"
-@@ -2045,7 +2045,7 @@
- #: ../page_user_quickdiallist.ptl:76 ../page_user_settings.ptl:105
- #: ../page_user_state.ptl:138
- msgid "Asterisk is not running!"
--msgstr "Ã‚Â¡Asterisk no estÃƒÂ¡ corriendo!"
-+msgstr "Â¡Asterisk no estÃ¡ corriendo!"
- 
- #: page_admin_pbxstate.ptl:85 page_config_reload.ptl:49
- #: page_user_settings.ptl:110 page_user_state.ptl:143 UserUI.ptl:221
-@@ -2053,19 +2053,19 @@
- #: ../page_user_quickdiallist.ptl:81 ../page_user_settings.ptl:110
- #: ../page_user_state.ptl:143
- msgid "The manager access is not working!"
--msgstr "Ã‚Â¡El acceso de gestiÃƒÂ³n no estÃƒÂ¡ funcionando!"
-+msgstr "Â¡El acceso de gestiÃ³n no estÃ¡ funcionando!"
- 
- #: page_admin.ptl:25 ../page_admin.ptl:25
- msgid "Administration"
--msgstr "AdministraciÃƒÂ³n"
-+msgstr "AdministraciÃ³n"
- 
- #: page_admin.ptl:26 ../page_owner.ptl:26
- msgid "Perform administrative actions to PBX and extensions"
--msgstr "Realizar acciones de adminstraciÃƒÂ³n a la PBX y extensiones"
-+msgstr "Realizar acciones de adminstraciÃ³n a la PBX y extensiones"
- 
- #: page_config_add.ptl:26 ../page_config_add.ptl:26
- msgid "Add a new configlet"
--msgstr "AÃƒÂ±adir un nuevo configlet"
-+msgstr "AÃ±adir un nuevo configlet"
- 
- #: page_config_applications.ptl:26 ../page_config_applications.ptl:26
- msgid "Applications"
-@@ -2077,7 +2077,7 @@
- 
- #: page_config_backup.ptl:27 ../page_admin_backup.ptl:27
- msgid "Backup a config file"
--msgstr "Hacer copia de seguridad de un archivo de configuraciÃƒÂ³n"
-+msgstr "Hacer copia de seguridad de un archivo de configuraciÃ³n"
- 
- #: page_config_backup.ptl:44 ../page_admin_backup.ptl:44
- #, python-format
-@@ -2121,19 +2121,19 @@
- #: page_config_phones.ptl:26 page_config.ptl:86 ../page_config_phones.ptl:26
- #: ../page_config.ptl:86
- msgid "Phones"
--msgstr "TelÃƒÂ©fonos"
-+msgstr "TelÃ©fonos"
- 
- #: page_config_phones.ptl:27 ../page_config_phones.ptl:27
- msgid "Phones and their settings"
--msgstr "TelÃƒÂ©fonos y sus configuraciones"
-+msgstr "TelÃ©fonos y sus configuraciones"
- 
- #: page_config.ptl:27 ../page_config.ptl:27
- msgid "Modify Asterisk configuration"
--msgstr "Modificar la configuraciÃƒÂ³n de Asterisk"
-+msgstr "Modificar la configuraciÃ³n de Asterisk"
- 
- #: page_config.ptl:42 ../page_config.ptl:42
- msgid "Configuration tips"
--msgstr "Pistas para la configuraciÃƒÂ³n"
-+msgstr "Pistas para la configuraciÃ³n"
- 
- #: page_config.ptl:66 ../page_config.ptl:66
- msgid ""
-@@ -2195,7 +2195,7 @@
- 
- #: page_config.ptl:116 ../page_config.ptl:116
- msgid "Category"
--msgstr "CategorÃƒÂa"
-+msgstr "CategorÃa"
- 
- #: page_config.ptl:132 ../page_config.ptl:132
- msgid "Other things you can configure:"
-@@ -2219,11 +2219,11 @@
- 
- #: page_config_trunks.ptl:27 ../page_config_trunks.ptl:27
- msgid "Telephone company lines and VoIP-Trunks"
--msgstr "LÃƒÂneas de la compaÃƒÂ±ÃƒÂa de telÃƒÂ©fono y troncales VoIP"
-+msgstr "LÃneas de la compaÃ±Ãa de telÃ©fono y troncales VoIP"
- 
- #: page_config_trunks.ptl:46 ../page_config_trunks.ptl:46
- msgid "You should add at least one phone to configure trunks"
--msgstr "Usted debe aÃƒÂ±adir al menos un telÃƒÂ©fono para configurar troncales"
-+msgstr "Usted debe aÃ±adir al menos un telÃ©fono para configurar troncales"
- 
- #: page_config_up.ptl:26 ../page_config_up.ptl:26
- msgid "Moves a configlet one position up"
-@@ -2235,15 +2235,15 @@
- 
- #: page_config_users.ptl:27 ../page_config_users.ptl:27
- msgid "Users and Mailboxes"
--msgstr "Usuarios y BuzÃƒÂ³nes de mensajes"
-+msgstr "Usuarios y BuzÃ³nes de mensajes"
- 
- #: page_config_viewconf.ptl:29 ../page_admin_viewconf.ptl:29
- msgid "View Configuration"
--msgstr "Mirar configuraciÃƒÂ³n"
-+msgstr "Mirar configuraciÃ³n"
- 
- #: page_config_viewconf.ptl:30 ../page_admin_viewconf.ptl:30
- msgid "Show Asterisk configuration files"
--msgstr "Mostrar los archivos de configuraciÃƒÂ³n de Asterisk"
-+msgstr "Mostrar los archivos de configuraciÃ³n de Asterisk"
- 
- #: page_config_viewconf.ptl:87 ../page_admin_viewconf.ptl:87
- msgid "Show"
-@@ -2251,7 +2251,7 @@
- 
- #: page_config_viewconf.ptl:94 ../page_admin_viewconf.ptl:94
- msgid "Asterisk configuration files"
--msgstr "Archivos de configuraciÃƒÂ³n de Asterisk"
-+msgstr "Archivos de configuraciÃ³n de Asterisk"
- 
- #: page_config_viewconf.ptl:101 ../page_admin_viewconf.ptl:101
- msgid "Nothing to Show"
-@@ -2259,11 +2259,11 @@
- 
- #: page_config_viewconf.ptl:103 ../page_admin_viewconf.ptl:103
- msgid "There is nothing configured yet."
--msgstr "No existe configuraciÃƒÂ³n en el momento"
-+msgstr "No existe configuraciÃ³n en el momento"
- 
- #: page_debug.ptl:25 ../page_debug.ptl:25
- msgid "Debug"
--msgstr "DepuraciÃƒÂ³n"
-+msgstr "DepuraciÃ³n"
- 
- #: page_debug.ptl:26 ../page_debug.ptl:26
- msgid "Various functions to debug DeStar, mostly useful for programmers"
-@@ -2279,28 +2279,28 @@
- 
- #: page_login.ptl:27 UserPage.ptl:111 ../page_login.ptl:26
- msgid "Login"
--msgstr "Inicio de SesiÃƒÂ³n"
-+msgstr "Inicio de SesiÃ³n"
- 
- #: page_login.ptl:28 ../page_login.ptl:27
- msgid "Login into DeStar"
--msgstr "Iniciar sesiÃƒÂ³n en DeStar"
-+msgstr "Iniciar sesiÃ³n en DeStar"
- 
- #: page_login.ptl:43 UserUI.ptl:154 ../page_login.ptl:42
- msgid "User or phone name/number"
--msgstr "Nombre/NÃƒÂºmero del telÃƒÂ©fono o usuario"
-+msgstr "Nombre/NÃºmero del telÃ©fono o usuario"
- 
- #: page_login.ptl:44 UserUI.ptl:155 ../page_login.ptl:43
- msgid "Password or PIN"
--msgstr "ContraseÃƒÂ±a o PIN"
-+msgstr "ContraseÃ±a o PIN"
- 
- #: page_login.ptl:56 UserUI.ptl:167 ../page_login.ptl:55
- msgid "Invalid username or password"
--msgstr "Nombre de usuario o ContraseÃƒÂ±a incorrectos"
-+msgstr "Nombre de usuario o ContraseÃ±a incorrectos"
- 
- #: page_logout.ptl:25 Templates.ptl:227 ../page_logout.ptl:25
- #: ../Templates.ptl:259 ../Templates.ptl:260
- msgid "Logout"
--msgstr "Cerrar SesiÃƒÂ³n"
-+msgstr "Cerrar SesiÃ³n"
- 
- #: page_logout.ptl:26 ../page_logout.ptl:26
- msgid "Logout and become a guest user"
-@@ -2312,7 +2312,7 @@
- 
- #: page_main.ptl:29 ../page_main.ptl:29
- msgid "DeStar main page"
--msgstr "PÃƒÂ¡gina Principal de Destar"
-+msgstr "PÃ¡gina Principal de Destar"
- 
- #: page_main.ptl:137 ../page_main.ptl:137
- msgid "Access Denied"
-@@ -2320,11 +2320,11 @@
- 
- #: page_main.ptl:139 ../page_main.ptl:139
- msgid "You don't have access to this page."
--msgstr "Usted no tiene acceso a esta ubicaciÃƒÂ³n."
-+msgstr "Usted no tiene acceso a esta ubicaciÃ³n."
- 
- #: page_user_info.ptl:26 ../page_user_info.ptl:26
- msgid "User Info"
--msgstr "InformaciÃƒÂ³n del Usuario"
-+msgstr "InformaciÃ³n del Usuario"
- 
- #: page_user_info.ptl:27 ../page_user_info.ptl:27
- msgid "Your access rights in DeStar"
-@@ -2333,7 +2333,7 @@
- #: page_user_info.ptl:43 page_user.ptl:40 UserUI.ptl:174
- #: ../page_user_info.ptl:43 ../page_user.ptl:40
- msgid "You are now logged in as user"
--msgstr "Usted ha iniciado sesiÃƒÂ³n como el usuario"
-+msgstr "Usted ha iniciado sesiÃ³n como el usuario"
- 
- #: page_user_info.ptl:48 page_user.ptl:45 ../page_user_info.ptl:48
- #: ../page_user.ptl:45
-@@ -2353,7 +2353,7 @@
- #: page_user_info.ptl:58 page_user.ptl:55 UserUI.ptl:181
- #: ../page_user_info.ptl:58 ../page_user.ptl:55
- msgid "You are not logged in."
--msgstr "Usted no ha iniciado una sesiÃƒÂ³n."
-+msgstr "Usted no ha iniciado una sesiÃ³n."
- 
- #: page_user_info.ptl:60 page_user.ptl:57 UserUI.ptl:183
- #: ../page_user_info.ptl:60 ../page_user.ptl:57
-@@ -2362,15 +2362,15 @@
- 
- #: page_user_info.ptl:64 UserUI.ptl:187 ../page_user_info.ptl:64
- msgid "access all public accessible info pages"
--msgstr "Acceder a todas las pÃƒÂ¡ginas de informaciÃƒÂ³n pÃƒÂºblicas"
-+msgstr "Acceder a todas las pÃ¡ginas de informaciÃ³n pÃºblicas"
- 
- #: page_user_info.ptl:68 UserUI.ptl:191 ../page_user_info.ptl:68
- msgid "change your personal phone settings"
--msgstr "Cambiar la configuraciÃƒÂ³n de su telÃƒÂ©fono personal"
-+msgstr "Cambiar la configuraciÃ³n de su telÃ©fono personal"
- 
- #: page_user_info.ptl:72 UserUI.ptl:195 ../page_user_info.ptl:72
- msgid "change phone settings of other people"
--msgstr "Cambiar la configuraciÃƒÂ³n de telÃƒÂ©fono de otros usuarios"
-+msgstr "Cambiar la configuraciÃ³n de telÃ©fono de otros usuarios"
- 
- #: page_user_info.ptl:76 UserUI.ptl:199 ../page_user_info.ptl:76
- msgid "configure the PBX"
-@@ -2379,11 +2379,11 @@
- #: page_user_info.ptl:80 UserUI.ptl:203 ../page_user_info.ptl:80
- msgid "access debug pages to help program DeStar"
- msgstr ""
--"acceder a pÃƒÂ¡ginas de registro o log de DeStar para ayudar con su desarrollo"
-+"acceder a pÃ¡ginas de registro o log de DeStar para ayudar con su desarrollo"
- 
- #: page_user_info.ptl:83 UserUI.ptl:206 ../page_user_info.ptl:83
- msgid "Have fun!"
--msgstr "Ã‚Â¡DiviÃƒÂ©rtase!"
-+msgstr "Â¡DiviÃ©rtase!"
- 
- #: page_user.ptl:26 ../page_user.ptl:26
- msgid "Perform tasks allowed by users"
-@@ -2391,15 +2391,15 @@
- 
- #: page_user.ptl:61 ../page_user.ptl:61
- msgid "Access all public accessible info pages"
--msgstr "Acceder a todas las pÃƒÂ¡ginas de informaciÃƒÂ³n pÃƒÂºblicas"
-+msgstr "Acceder a todas las pÃ¡ginas de informaciÃ³n pÃºblicas"
- 
- #: page_user.ptl:65 ../page_user.ptl:65
- msgid "Change your personal phone settings"
--msgstr "Cambiar la configuraciÃƒÂ³n de su telÃƒÂ©fono personal"
-+msgstr "Cambiar la configuraciÃ³n de su telÃ©fono personal"
- 
- #: page_user.ptl:69 ../page_user.ptl:69
- msgid "Change phone settings of other people"
--msgstr "Cambiar la configuraciÃƒÂ³n de telÃƒÂ©fono de otros usuarios"
-+msgstr "Cambiar la configuraciÃ³n de telÃ©fono de otros usuarios"
- 
- #: page_user.ptl:73 ../page_user.ptl:73
- msgid "Configure the PBX"
-@@ -2408,15 +2408,15 @@
- #: page_user.ptl:77 ../page_user.ptl:77
- msgid "Access debug pages to help program DeStar"
- msgstr ""
--"Acceder a pÃƒÂ¡ginas de registro o log de DeStar para ayudar con su desarrollo"
-+"Acceder a pÃ¡ginas de registro o log de DeStar para ayudar con su desarrollo"
- 
- #: page_user_settings.ptl:27 ../page_user_settings.ptl:27
- msgid "Phone Settings"
--msgstr "ConfiguraciÃƒÂ³n del telÃƒÂ©fono"
-+msgstr "ConfiguraciÃ³n del telÃ©fono"
- 
- #: page_user_settings.ptl:28 ../page_user_settings.ptl:28
- msgid "Set your phone settings"
--msgstr "Cambiar la configuraciÃƒÂ³n de su telÃƒÂ©fono personal"
-+msgstr "Cambiar la configuraciÃ³n de su telÃ©fono personal"
- 
- #: page_user_settings.ptl:56 UserUI.ptl:43 ../page_user_settings.ptl:56
- msgid "Enable 'do not disturb'"
-@@ -2424,11 +2424,11 @@
- 
- #: page_user_settings.ptl:57 UserUI.ptl:44 ../page_user_settings.ptl:57
- msgid "Immediate call forwarding to"
--msgstr "RedirecciÃƒÂ³n inmediata de llamadas a"
-+msgstr "RedirecciÃ³n inmediata de llamadas a"
- 
- #: page_user_settings.ptl:58 UserUI.ptl:46 ../page_user_settings.ptl:58
- msgid "Forward call when busy/unavailable to"
--msgstr "Si estÃƒÂ¡ ocupado/indisponible, redireccionar a"
-+msgstr "Si estÃ¡ ocupado/indisponible, redireccionar a"
- 
- #: page_user_settings.ptl:59 ../page_user_settings.ptl:59
- msgid "Seconds of incoming ring time"
-@@ -2440,21 +2440,21 @@
- 
- #: page_user_settings.ptl:64 ../page_user_settings.ptl:64
- msgid "Extension Password"
--msgstr "ContraseÃƒÂ±a de la extensiÃƒÂ³n"
-+msgstr "ContraseÃ±a de la extensiÃ³n"
- 
- #: page_user_settings.ptl:95 ../page_user_settings.ptl:95
- msgid "Could not create destar configuration file."
--msgstr "No fue posible crear el archivo de configuraciÃƒÂ³n de destar"
-+msgstr "No fue posible crear el archivo de configuraciÃ³n de destar"
- 
- #: page_user_settings.ptl:117 page_user_state.ptl:150
- #: ../page_user_quickdiallist.ptl:88 ../page_user_settings.ptl:118
- #: ../page_user_state.ptl:151
- msgid "You don't have an associated phone"
--msgstr "Usted no tiene un telÃƒÂ©fono asociado"
-+msgstr "Usted no tiene un telÃ©fono asociado"
- 
- #: page_user_state.ptl:27 ../page_user_state.ptl:27
- msgid "Phone State"
--msgstr "Estado del TelÃƒÂ©fono"
-+msgstr "Estado del TelÃ©fono"
- 
- #: page_user_state.ptl:28 ../page_user_state.ptl:28
- msgid "Status of your phone"
-@@ -2466,7 +2466,7 @@
- 
- #: page_user_state.ptl:57 UserUI.ptl:84 ../page_user_state.ptl:57
- msgid "Last updated"
--msgstr "ÃƒÅ¡ltima ActualizaciÃƒÂ³n"
-+msgstr "Ãšltima ActualizaciÃ³n"
- 
- #: page_user_state.ptl:69 UserUI.ptl:96 ../page_user_state.ptl:69
- msgid "Registration status"
-@@ -2474,11 +2474,11 @@
- 
- #: page_user_state.ptl:69 UserUI.ptl:96 ../page_user_state.ptl:69
- msgid "PeerStatus"
--msgstr "Estado del telÃƒÂ©fono"
-+msgstr "Estado del telÃ©fono"
- 
- #: page_user_state.ptl:75 UserUI.ptl:102 ../page_user_state.ptl:75
- msgid "Channel ID"
--msgstr "IdentificaciÃƒÂ³n del Canal"
-+msgstr "IdentificaciÃ³n del Canal"
- 
- #: page_user_state.ptl:75 UserUI.ptl:102 ../page_user_state.ptl:75
- msgid "Channel"
-@@ -2486,12 +2486,12 @@
- 
- #: page_user_state.ptl:81 UserUI.ptl:108 ../page_user_state.ptl:81
- msgid "Called extension"
--msgstr "ExtensiÃƒÂ³n llamada"
-+msgstr "ExtensiÃ³n llamada"
- 
- #: page_user_state.ptl:87 UserUI.ptl:114 ../page_user_state.ptl:87
- #: ../cfg_opt_music.py:33
- msgid "Application"
--msgstr "AplicaciÃƒÂ³n"
-+msgstr "AplicaciÃ³n"
- 
- #: page_user_state.ptl:100 UserUI.ptl:127 ../page_owner_cdr.ptl:140
- #: ../page_stats_cdr.ptl:142 ../page_stats_phone.ptl:46
-@@ -2526,7 +2526,7 @@
- 
- #: Templates.ptl:256 ../Templates.ptl:288 ../Templates.ptl:289
- msgid "You don't have access to this page"
--msgstr "Usted no tiene acceso a esta ubicaciÃƒÂ³n"
-+msgstr "Usted no tiene acceso a esta ubicaciÃ³n"
- 
- #: UserPage.ptl:30
- msgid "Asterisk state"
-@@ -2534,19 +2534,19 @@
- 
- #: UserPage.ptl:33
- msgid "User info"
--msgstr "InformaciÃƒÂ³n del Usuario"
-+msgstr "InformaciÃ³n del Usuario"
- 
- #: UserPage.ptl:38
- msgid "Phone state"
--msgstr "Estado del TelÃƒÂ©fono"
-+msgstr "Estado del TelÃ©fono"
- 
- #: UserPage.ptl:40 UserPage.ptl:68
- msgid "Phone settings"
--msgstr "ConfiguraciÃƒÂ³n del telÃƒÂ©fono"
-+msgstr "ConfiguraciÃ³n del telÃ©fono"
- 
- #: UserPage.ptl:74
- msgid "Phone status"
--msgstr "Estado del telÃƒÂ©fono"
-+msgstr "Estado del telÃ©fono"
- 
- #: UserPage.ptl:83
- msgid "User functions"
-@@ -2555,12 +2555,12 @@
- #: UserPage.ptl:85
- msgid "This menu will contain all sorts of phone user specific stuff:"
- msgstr ""
--"Este menÃƒÂº tendrÃƒÂ¡ todo tipo de funciones para el usuario de telÃƒÂ©fono:"
-+"Este menÃº tendrÃ¡ todo tipo de funciones para el usuario de telÃ©fono:"
- 
- #: UserPage.ptl:88
- msgid "Phone status (number of voicemails, call forwarding etc)"
- msgstr ""
--"Estado del telÃƒÂ©fono (nÃƒÂºmero de correos de voz, redirecciÃƒÂ³n de llamadas, "
-+"Estado del telÃ©fono (nÃºmero de correos de voz, redirecciÃ³n de llamadas, "
- "etc)"
- 
- #: UserPage.ptl:89
-@@ -2569,7 +2569,7 @@
- 
- #: UserPage.ptl:90
- msgid "Set CFIM (call-forwarding)"
--msgstr "Habilitar CFIM (redirecciÃƒÂ³n-de-llamadas)"
-+msgstr "Habilitar CFIM (redirecciÃ³n-de-llamadas)"
- 
- #: UserPage.ptl:91
- msgid "Set CFBS (call-forward if busy/unavailable)"
-@@ -2577,15 +2577,15 @@
- 
- #: UserPage.ptl:92
- msgid "See last n calls made"
--msgstr "Ver ÃƒÂºltimas n llamadas hechas"
-+msgstr "Ver Ãºltimas n llamadas hechas"
- 
- #: UserPage.ptl:93
- msgid "See last n calls received"
--msgstr "Ver las ÃƒÂºltimas n llamadas recibidas"
-+msgstr "Ver las Ãºltimas n llamadas recibidas"
- 
- #: UserPage.ptl:94
- msgid "Maintain personal phone directory"
--msgstr "Mantenimiento del directorio telefÃƒÂ³nico personal"
-+msgstr "Mantenimiento del directorio telefÃ³nico personal"
- 
- #: UserPage.ptl:95
- msgid "Initiate call from the web"
-@@ -2597,11 +2597,11 @@
- 
- #: UserPage.ptl:137
- msgid "Logged in"
--msgstr "SesiÃƒÂ³n iniciada"
-+msgstr "SesiÃ³n iniciada"
- 
- #: UserPage.ptl:157
- msgid "Wrong phone id"
--msgstr "Identificador de telÃƒÂ©fono incorrecto"
-+msgstr "Identificador de telÃ©fono incorrecto"
- 
- #: UserUI.ptl:45
- msgid "Seconds of ring time"
-diff -urNad destar-0.2beta~/po/fr.po destar-0.2beta/po/fr.po
---- destar-0.2beta~/po/fr.po	2006-06-17 12:23:57.000000000 +0000
-+++ destar-0.2beta/po/fr.po	2006-06-27 05:31:28.000000000 +0000
-@@ -28,15 +28,15 @@
- 
- #: cfg_app_callfw.py:26 ../cfg_app_callfw.py:26
- msgid "Call forwarding"
--msgstr "TransfÃƒÂ¨re d'appel"
-+msgstr "TransfÃ¨re d'appel"
- 
- #: cfg_app_callfw.py:27 ../cfg_app_callfw.py:27
- msgid "Extensions to set/unset call forwarding."
--msgstr "Extensions d'activation/dÃƒÂ©sactivation de transfÃƒÂ¨re d'appel"
-+msgstr "Extensions d'activation/dÃ©sactivation de transfÃ¨re d'appel"
- 
- #: cfg_app_callfw.py:28 ../cfg_app_callfw.py:28
- msgid "New extensions to set/unset call forwarding"
--msgstr "Nouvelles extensions d'activation/dÃƒÂ©sactivation de transfÃƒÂ¨re d'appel"
-+msgstr "Nouvelles extensions d'activation/dÃ©sactivation de transfÃ¨re d'appel"
- 
- #: cfg_app_callfw.py:31 cfg_opt_music.py:31 cfg_opt_user.py:36
- #: configlets.py:589 configlets.py:817 configlets.py:874 configlets.py:995
-@@ -50,28 +50,28 @@
- 
- #: cfg_app_callfw.py:31 ../cfg_app_callfw.py:33
- msgid "Call Forwarding Unconditional"
--msgstr "TransfÃƒÂ¨re d'appel inconditionnel"
-+msgstr "TransfÃ¨re d'appel inconditionnel"
- 
- #: cfg_app_callfw.py:31 ../cfg_app_callfw.py:33
- msgid "Call Forwarding if Busy/Unavailable"
--msgstr "TransfÃƒÂ¨re d'appel si OccupÃƒÂ©/Non disponible"
-+msgstr "TransfÃ¨re d'appel si OccupÃ©/Non disponible"
- 
- #: cfg_app_callfw.py:32 ../cfg_app_callfw.py:34
- msgid "Setting preffix"
--msgstr "PrÃƒÂ©fix d'activation"
-+msgstr "PrÃ©fix d'activation"
- 
- #: cfg_app_callfw.py:33 cfg_app_dnd.py:33 ../cfg_app_callfw.py:35
- #: ../cfg_app_dnd.py:34
- msgid "Unsetting extension"
--msgstr "Extension de dÃƒÂ©sactivation"
-+msgstr "Extension de dÃ©sactivation"
- 
- #: cfg_app_conference.py:26 ../cfg_app_conference.py:26
- msgid "Conference room"
--msgstr "Salle de confÃƒÂ©rence"
-+msgstr "Salle de confÃ©rence"
- 
- #: cfg_app_conference.py:27 ../cfg_app_conference.py:27
- msgid "New conference room"
--msgstr "Nouvelle salle de confÃƒÂ©rence"
-+msgstr "Nouvelle salle de confÃ©rence"
- 
- #: cfg_app_conference.py:30 cfg_app_directory.py:31 cfg_app_echo.py:32
- #: cfg_app_meetme.py:30 cfg_app_milliwatt.py:32 cfg_app_music.py:31
-@@ -101,32 +101,32 @@
- #: cfg_app_conference.py:31 cfg_app_meetme.py:31 ../cfg_app_conference.py:33
- #: ../cfg_app_meetme.py:32
- msgid "Conference number"
--msgstr "NumÃƒÂ©ro de confÃƒÂ©rence"
-+msgstr "NumÃ©ro de confÃ©rence"
- 
- #: cfg_app_directory.py:26 cfg_opt_music.py:32 ../cfg_app_directory.py:26
- #: ../cfg_opt_music.py:32
- msgid "Directory"
--msgstr "RÃƒÂ©pertoire"
-+msgstr "RÃ©pertoire"
- 
- #: cfg_app_directory.py:27 ../cfg_app_directory.py:27
- msgid "New Directory"
--msgstr "Nouveau rÃƒÂ©pertoire"
-+msgstr "Nouveau rÃ©pertoire"
- 
- #: cfg_app_directory.py:28 ../cfg_app_directory.py:28
- msgid "This application allows you to dial by name."
--msgstr "Cette application vous autorise la numÃƒÂ©rotation par nom"
-+msgstr "Cette application vous autorise la numÃ©rotation par nom"
- 
- #: cfg_app_dnd.py:26 ../cfg_app_dnd.py:26
- msgid "Set/Unset DND"
--msgstr "Active/DÃƒÂ©sactive 'Ne pas dÃƒÂ©ranger'"
-+msgstr "Active/DÃ©sactive 'Ne pas dÃ©ranger'"
- 
- #: cfg_app_dnd.py:27 ../cfg_app_dnd.py:27
- msgid "New extensions to Set/Unset Do not disturb"
--msgstr "Nouvelle extensions pour activer/dÃƒÂ©sactiver 'Ne pas dÃƒÂ©ranger'"
-+msgstr "Nouvelle extensions pour activer/dÃ©sactiver 'Ne pas dÃ©ranger'"
- 
- #: cfg_app_dnd.py:28 ../cfg_app_dnd.py:28
- msgid "Extensions to set/unset 'Do Not Disturb'."
--msgstr "Extensions pour activer/dÃƒÂ©sactiver 'Ne pas dÃƒÂ©ranger'"
-+msgstr "Extensions pour activer/dÃ©sactiver 'Ne pas dÃ©ranger'"
- 
- #: cfg_app_dnd.py:32 ../cfg_app_dnd.py:33
- msgid "Setting extension"
-@@ -135,11 +135,11 @@
- #: cfg_app_dnd.py:45 configlets.py:625 ../cfg_app_dnd.py:50
- #: ../configlets.py:608
- msgid "Extension already in use"
--msgstr "Extension dÃƒÂ©ja utilisÃƒÂ©e"
-+msgstr "Extension dÃ©ja utilisÃ©e"
- 
- #: cfg_app_echo.py:26 ../cfg_app_echo.py:26
- msgid "Echo test"
--msgstr "Test d'ÃƒÂ©cho"
-+msgstr "Test d'Ã©cho"
- 
- #: cfg_app_echo.py:27 ../cfg_app_echo.py:27
- msgid "New Echo test extension"
-@@ -150,20 +150,20 @@
- "The echo test immediately plays back what you speek. You can\n"
- "\t\t\t   use this to find out how much echo you have."
- msgstr ""
--"Le test d'ÃƒÂ©cho joue immÃƒÂ©diatement ce que vous dites. Vous pouvez\n"
--"\t\t\t   utiliser celui-ci pour ÃƒÂ©tablir votre quantitÃƒÂ© d'ÃƒÂ©cho."
-+"Le test d'Ã©cho joue immÃ©diatement ce que vous dites. Vous pouvez\n"
-+"\t\t\t   utiliser celui-ci pour Ã©tablir votre quantitÃ© d'Ã©cho."
- 
- #: cfg_app_meetme.py:26 ../cfg_app_meetme.py:26
- msgid "Meeting room"
--msgstr "Salle de rÃƒÂ©union"
-+msgstr "Salle de rÃ©union"
- 
- #: cfg_app_meetme.py:27 ../cfg_app_meetme.py:27
- msgid "New meeting room"
--msgstr "Nouvelle salle de rÃƒÂ©union"
-+msgstr "Nouvelle salle de rÃ©union"
- 
- #: cfg_app_meetme.py:31 ../cfg_app_meetme.py:32
- msgid "If empty, will be the same as the extension"
--msgstr "Si vide, sera le mÃƒÂªme que l'extension"
-+msgstr "Si vide, sera le mÃªme que l'extension"
- 
- #: cfg_app_meetme.py:32 ../cfg_app_meetme.py:33
- msgid "PIN"
-@@ -180,7 +180,7 @@
- #: ../cfg_trunk_zappbx.py:39 ../cfg_trunk_zappri.py:49 ../cfg_trunk_zap.py:38
- #: ../page_admin_panel.ptl:27
- msgid "Operator Panel"
--msgstr "Panneau de l'opÃƒÂ©rateur"
-+msgstr "Panneau de l'opÃ©rateur"
- 
- #: cfg_app_meetme.py:34 cfg_trunk_iax.py:50 cfg_trunk_sip.py:45
- #: cfg_trunk_zappbx.py:40 cfg_trunk_zappri.py:50 cfg_trunk_zap.py:39
-@@ -202,8 +202,8 @@
- "Generate a Constant 1000Hz tone at 0dbm (mu-law). Used for\n"
- "\t\t\tmeasuring."
- msgstr ""
--"GÃƒÂ©nÃƒÂ¨re un son constant de 1000Hz Ãƒ  0dbm (mu-law). UtilisÃƒÂ© pour\n"
--"\t\t\tl'ÃƒÂ©valutation."
-+"GÃ©nÃ¨re un son constant de 1000Hz Ã  0dbm (mu-law). UtilisÃ© pour\n"
-+"\t\t\tl'Ã©valutation."
- 
- #: cfg_app_music.py:26 ../cfg_app_music.py:26
- msgid "Listen to music-on-hold"
-@@ -254,16 +254,16 @@
- 
- #: cfg_app_play.py:32 ../cfg_app_play.py:33
- msgid "Don't specify an extension"
--msgstr "Ne spÃƒÂ©cifie pas une extention"
-+msgstr "Ne spÃ©cifie pas une extention"
- 
- #: cfg_app_play.py:40 cfg_app_record.py:52 cfg_opt_loadmodule.py:40
- #: ../cfg_app_play.py:45 ../cfg_app_record.py:57 ../cfg_opt_loadmodule.py:40
- msgid "Please don't specify an extension"
--msgstr "Svp ne spÃƒÂ©cifiez pas une extension"
-+msgstr "Svp ne spÃ©cifiez pas une extension"
- 
- #: cfg_app_quickdial_global.py:26 ../cfg_app_quickdial_global.py:26
- msgid "Global Quick Dial List"
--msgstr "NumÃƒÂ©rotation rapide globale"
-+msgstr "NumÃ©rotation rapide globale"
- 
- #: cfg_app_quickdial_global.py:27 ../cfg_app_quickdial_global.py:27
- msgid ""
-@@ -273,17 +273,17 @@
- "calling estension has been assigned a dialout with the quick dial lookup "
- "option activated."
- msgstr ""
--"Extensions pour ajouter/supprimer de la liste de numÃƒÂ©rotation rapid. "
--"L'extension ajoutÃƒÂ©e sera de la forme prefix+2_digits_key+*"
--"+final_destination. L'extension supprimÃƒÂ©e sera de la forme prefix"
--"+2_digits_key. La liste globale fonctionne seulement si l'extension appelÃƒÂ©e "
--"a ÃƒÂ©tÃƒÂ© assignÃƒÂ©e Ãƒ  un appel vers l'extÃƒÂ©rieur avec l'option recherche de "
--"numÃƒÂ©rotation rapide activÃƒÂ©e"
-+"Extensions pour ajouter/supprimer de la liste de numÃ©rotation rapid. "
-+"L'extension ajoutÃ©e sera de la forme prefix+2_digits_key+*"
-+"+final_destination. L'extension supprimÃ©e sera de la forme prefix"
-+"+2_digits_key. La liste globale fonctionne seulement si l'extension appelÃ©e "
-+"a Ã©tÃ© assignÃ©e Ã  un appel vers l'extÃ©rieur avec l'option recherche de "
-+"numÃ©rotation rapide activÃ©e"
- 
- #: cfg_app_quickdial_global.py:28 ../cfg_app_quickdial_global.py:28
- msgid "New extensions to add/remove from global quick dial list"
- msgstr ""
--"Nouvelle extension Ãƒ  ajouter/supprimer de la liste de numÃƒÂ©rotation rapide"
-+"Nouvelle extension Ã  ajouter/supprimer de la liste de numÃ©rotation rapide"
- 
- #: cfg_app_quickdial_global.py:32 cfg_opt_user.py:32 cfg_phone_epygi.py:40
- #: cfg_phone_iax.py:37 cfg_phone_mgcp.py:37 cfg_phone_sip.py:38
-@@ -301,17 +301,17 @@
- #: cfg_app_quickdial_global.py:33 ../cfg_app_quickdial_global.py:34
- msgid "don't use ** because it is for private quick dial list"
- msgstr ""
--"N'utilisez pas ** car c'est rÃƒÂ©servÃƒÂ© pour la liste privÃƒÂ©e de numÃƒÂ©rota "
-+"N'utilisez pas ** car c'est rÃ©servÃ© pour la liste privÃ©e de numÃ©rota "
- "rapide"
- 
- #: cfg_app_quickdial_global.py:34 cfg_app_quickdial_phone.py:33
- #: ../cfg_app_quickdial_global.py:35 ../cfg_app_quickdial_phone.py:34
- msgid "Unsetting prefix"
--msgstr "PrÃƒÂ©fix de dÃƒÂ©sactivation"
-+msgstr "PrÃ©fix de dÃ©sactivation"
- 
- #: cfg_app_quickdial_phone.py:26 ../cfg_app_quickdial_phone.py:26
- msgid "Private Quick Dial List"
--msgstr "Liste privÃƒÂ©e de numÃƒÂ©rotation rapide"
-+msgstr "Liste privÃ©e de numÃ©rotation rapide"
- 
- #: cfg_app_quickdial_phone.py:27 ../cfg_app_quickdial_phone.py:27
- msgid ""
-@@ -322,25 +322,26 @@
- "extension has an assigned dialout entry which pattern matches the final "
- "destination."
- msgstr ""
--"Extensions pour ajouter/supprimer de la liste de numÃƒÂ©rotation rapid. "
--"L'extension ajoutÃƒÂ©e sera de la forme prefix+2_digits_key+*"
--"+final_destination. L'extension supprimÃƒÂ©e sera de la forme prefix"
--"+2_digits_key. La liste personnelle de numÃƒÂ©rotation rapide fonctionne pour "
--"toutes les extensions, en numÃƒÂ©rotant **+2_digits_key et seulement si "
--"l'extension est associÃƒÂ©e Ãƒ  une entrÃƒÂ©e d'appel vers l'extÃƒÂ©rieur dont le "
-+"Extensions pour ajouter/supprimer de la liste de numÃ©rotation rapid. "
-+"L'extension ajoutÃ©e sera de la forme prefix+2_digits_key+*"
-+"+final_destination. L'extension supprimÃ©e sera de la forme prefix"
-+"+2_digits_key. La liste personnelle de numÃ©rotation rapide fonctionne pour "
-+"toutes les extensions, en numÃ©rotant **+2_digits_key et seulement si "
-+"l'extension est associÃ©e Ã  une entrÃ©e d'appel vers l'extÃ©rieur dont le "
- "pattern matche la destination finale"
- 
- #: cfg_app_quickdial_phone.py:28 ../cfg_app_quickdial_phone.py:28
- msgid "New extensions to add/remove from personal quick dial list"
- msgstr ""
- "Nouvelle extension pour ajouter/supprimer de la liste personnelle de "
--"numÃƒÂ©rotation rapide"
-+"numÃ©rotation rapide"
- 
- #: cfg_app_quickdial_phone.py:32 ../cfg_app_quickdial_phone.py:33
- msgid "don't use ** because it is for accesing the quick dial list"
- msgstr ""
--"N'utilisez pas ** car c'est rÃƒÂ©servÃƒÂ© Ãƒ  l'accÃƒÂ¨s de la liste de "
--"numÃƒÂ©rotation rapide"
-+"N'utilisez pas ** car c'est rÃ©servÃ© Ã  l'accÃ¨s de la liste de numÃ©rotation "
-+"rapide"
-+
- 
- #: cfg_app_record.py:26 ../cfg_app_record.py:26
- msgid "Record sound"
-@@ -355,9 +356,9 @@
- "Allows you to record a sound file. You can hang up, be silent for\n"
- "\t\t\ta second or dial '#' to stop the recording."
- msgstr ""
--"Vous autorise Ãƒ  enregistre un fichier de son. Vous pouvez raccrocher, ÃƒÂªtre "
-+"Vous autorise Ã  enregistre un fichier de son. Vous pouvez raccrocher, Ãªtre "
- "silentieux pour\n"
--"\t\t\tune seconde ou composer '#' pour arrÃƒÂªter l'enregistrement"
-+"\t\t\tune seconde ou composer '#' pour arrÃªter l'enregistrement"
- 
- #: cfg_app_record.py:35 ../cfg_app_record.py:36
- msgid "Sound format"
-@@ -407,31 +408,31 @@
- 
- #: cfg_app_voicemail.py:26 ../cfg_app_voicemail.py:26
- msgid "Voicemail dialog"
--msgstr "Dialogue de boite Ãƒ  message"
-+msgstr "Dialogue de boite Ã  message"
- 
- #: cfg_app_voicemail.py:27 ../cfg_app_voicemail.py:27
- msgid "New voicemail dialog"
--msgstr "Nouveau dialogue de boite Ãƒ  message"
-+msgstr "Nouveau dialogue de boite Ã  message"
- 
- #: cfg_app_voicemail.py:28 ../cfg_app_voicemail.py:28
- msgid "Extension to enter the voicemail system."
--msgstr "Extension d'entrÃƒÂ©e de boite Ãƒ  message"
-+msgstr "Extension d'entrÃ©e de boite Ã  message"
- 
- #: cfg_app_voicemail.py:32 ../cfg_app_voicemail.py:33
- msgid "Ask for user mailbox?"
--msgstr "Demande la boite Ãƒ  message de l'utilisateur"
-+msgstr "Demande la boite Ã  message de l'utilisateur"
- 
- #: cfg_dialout_normal.py:27 ../cfg_dialout_normal.py:27
- msgid "Normal dialout entry"
--msgstr "EntrÃƒÂ©e normale d'appel vers l'extÃƒÂ©rieur"
-+msgstr "EntrÃ©e normale d'appel vers l'extÃ©rieur"
- 
- #: cfg_dialout_normal.py:28 ../cfg_dialout_normal.py:28
- msgid "New normal dialout entry"
--msgstr "Nouvelle entrÃƒÂ©e normale d'appel vers l'extÃƒÂ©rieur"
-+msgstr "Nouvelle entrÃ©e normale d'appel vers l'extÃ©rieur"
- 
- #: cfg_dialout_normal.py:29 ../cfg_dialout_normal.py:29
- msgid "Used to route calls through trunks"
--msgstr "UtilisÃƒÂ© pour router les appels Ãƒ  travers les canaux"
-+msgstr "UtilisÃ© pour router les appels Ã  travers les canaux"
- 
- #: cfg_dialout_normal.py:34 cfg_ivr_autoatt.py:35 cfg_ivr_raw.py:32
- #: cfg_opt_manager.py:31 cfg_opt_music.py:30 cfg_opt_oppanel.py:34
-@@ -466,11 +467,11 @@
- 
- #: cfg_dialout_normal.py:36 ../cfg_dialout_normal.py:36
- msgid "Remove Prefix of length"
--msgstr "Supprime un prÃƒÂ©fixe de longueur"
-+msgstr "Supprime un prÃ©fixe de longueur"
- 
- #: cfg_dialout_normal.py:37 ../cfg_dialout_normal.py:37
- msgid "Add Prefix"
--msgstr "Ajoute un prÃƒÂ©fixe"
-+msgstr "Ajoute un prÃ©fixe"
- 
- #: cfg_dialout_normal.py:38 ../cfg_dialout_normal.py:38
- msgid "Maximum call time in seconds"
-@@ -482,12 +483,12 @@
- 
- #: cfg_dialout_normal.py:40 ../cfg_dialout_normal.py:40
- msgid "Search on quick dial list?"
--msgstr "Recherche dans la liste de numÃƒÂ©rotation rapide?"
-+msgstr "Recherche dans la liste de numÃ©rotation rapide?"
- 
- #: cfg_dialout_normal.py:42 ../cfg_dialout_normal.py:42
- msgid "Trunks to use for routing this dialout entry"
- msgstr ""
--"Cannaux Ãƒ  utiliser pour le routage de cette entrÃƒÂ©e d'appel extÃƒÂ©rieur"
-+"Cannaux Ã  utiliser pour le routage de cette entrÃ©e d'appel extÃ©rieur"
- 
- #: cfg_dialout_normal.py:59 cfg_ivr_autoatt.py:96 cfg_ivr_autoatt.py:99
- #: cfg_ivr_autoatt.py:102 cfg_opt_did.py:69 cfg_opt_did.py:72
-@@ -508,19 +509,19 @@
- #: ../cfg_phone_zap.py:150 ../cfg_phone_zap.py:157 ../configlets.py:419
- #: ../cfg_opt_user.py:50 ../cfg_opt_user.py:53 ../configlets.py:423
- msgid "This is a Dependency"
--msgstr "Ceci est une dÃƒÂ©pendance"
-+msgstr "Ceci est une dÃ©pendance"
- 
- #: cfg_ivr_autoatt.py:27 ../cfg_ivr_autoatt.py:27
- msgid "Auto attendant"
--msgstr "RÃƒÂ©pondeur automatique"
-+msgstr "RÃ©pondeur automatique"
- 
- #: cfg_ivr_autoatt.py:28 ../cfg_ivr_autoatt.py:28
- msgid "New auto attendant"
--msgstr "Nouveau rÃƒÂ©pondeur automatique"
-+msgstr "Nouveau rÃ©pondeur automatique"
- 
- #: cfg_ivr_autoatt.py:29 ../cfg_ivr_autoatt.py:29
- msgid "Basic auto-attendant."
--msgstr "RÃƒÂ©pondeur automatique de base"
-+msgstr "RÃ©pondeur automatique de base"
- 
- #: cfg_ivr_autoatt.py:39 ../cfg_ivr_autoatt.py:39
- msgid "Max. time for incoming calls in seconds"
-@@ -532,11 +533,11 @@
- 
- #: cfg_ivr_autoatt.py:52 ../cfg_ivr_autoatt.py:52
- msgid "File to play in the background"
--msgstr "Fichier Ãƒ  jouer en fond"
-+msgstr "Fichier Ã  jouer en fond"
- 
- #: cfg_ivr_autoatt.py:56 ../cfg_ivr_autoatt.py:56
- msgid "How many times should it be played?"
--msgstr "Combien de fois devrait-it ÃƒÂªtre jouÃƒÂ© ?"
-+msgstr "Combien de fois devrait-it Ãªtre jouÃ© ?"
- 
- #: cfg_ivr_autoatt.py:62 ../cfg_ivr_autoatt.py:62
- msgid "Pause between each playback"
-@@ -544,24 +545,24 @@
- 
- #: cfg_ivr_autoatt.py:66 ../cfg_ivr_autoatt.py:66
- msgid "Extension to ring after file playing"
--msgstr "Extension Ãƒ  appeler aprÃƒÂ¨s le jeu"
-+msgstr "Extension Ã  appeler aprÃ¨s le jeu"
- 
- #: cfg_ivr_autoatt.py:71 ../cfg_ivr_autoatt.py:71
- msgid "Digit to jump that extension directly"
--msgstr "Chiffre pour sauter directement Ãƒ  cette extension"
-+msgstr "Chiffre pour sauter directement Ã  cette extension"
- 
- #: cfg_ivr_autoatt.py:76 ../cfg_ivr_autoatt.py:76
- msgid "IVR to jump on special dates"
--msgstr "IVR Ãƒ  activer Ãƒ  des dates spÃƒÂ©cifiques"
-+msgstr "IVR Ã  activer Ã  des dates spÃ©cifiques"
- 
- #: cfg_ivr_autoatt.py:83 ../cfg_ivr_autoatt.py:83
- msgid "Times string"
--msgstr "SpÃƒÂ©cification de temps"
-+msgstr "SpÃ©cification de temps"
- 
- #: cfg_ivr_autoatt.py:84 ../cfg_ivr_autoatt.py:84
- msgid "i.e. <hours>|<weekdays>|<monthdays>|<months> (comma separated)"
- msgstr ""
--"par exemple, <heure>|<jour de la semaine>|jour du mois>|<mois> (sÃƒÂ©parÃƒÂ© par "
-+"par exemple, <heure>|<jour de la semaine>|jour du mois>|<mois> (sÃ©parÃ© par "
- "des virgule)"
- 
- #: cfg_ivr_autoatt.py:90
-@@ -570,11 +571,11 @@
- 
- #: cfg_ivr_autoatt.py:116 ../cfg_ivr_autoatt.py:122
- msgid "File should be played at least one time"
--msgstr "Les fichier devraient ÃƒÂªtre jouÃƒÂ©s au moins une fois"
-+msgstr "Les fichier devraient Ãªtre jouÃ©s au moins une fois"
- 
- #: cfg_ivr_autoatt.py:118 ../cfg_ivr_autoatt.py:124
- msgid "Please specify dates"
--msgstr "Svp spÃƒÂ©cifiez des dates"
-+msgstr "Svp spÃ©cifiez des dates"
- 
- #: cfg_ivr_raw.py:27 ../cfg_ivr_raw.py:27
- msgid "Raw IVR"
-@@ -591,19 +592,19 @@
- 
- #: cfg_opt_did.py:26 ../cfg_opt_did.py:26
- msgid "Direct inward dialing (DID) number"
--msgstr "NumÃƒÂ©ro Direct inward dialing (DID)"
-+msgstr "NumÃ©ro Direct inward dialing (DID)"
- 
- #: cfg_opt_did.py:27 ../cfg_opt_did.py:27
- msgid "New direct inward dialing (DID) number"
--msgstr "Nouveau numÃƒÂ©ro Direct inward dialing (DID)"
-+msgstr "Nouveau numÃ©ro Direct inward dialing (DID)"
- 
- #: cfg_opt_did.py:28 ../cfg_opt_did.py:28
- msgid ""
- " Used to route a DID to an extension \n"
- "\t\t\t\t\t\tor Auto-Attendant."
- msgstr ""
--" UtilisÃƒÂ© pour router un DID vers une extension \n"
--"\t\t\t\t\t\tou un rÃƒÂ©pondeur automatique."
-+" UtilisÃ© pour router un DID vers une extension \n"
-+"\t\t\t\t\t\tou un rÃ©pondeur automatique."
- 
- #: cfg_opt_did.py:35 ../cfg_opt_did.py:36
- msgid "DID"
-@@ -618,14 +619,14 @@
- #: ../cfg_opt_did.py:45 ../cfg_trunk_iax.py:53 ../cfg_trunk_sip.py:48
- #: ../cfg_trunk_zappbx.py:49 ../cfg_trunk_zappri.py:57 ../cfg_trunk_zap.py:46
- msgid "Go to"
--msgstr "Aller Ãƒ "
-+msgstr "Aller Ã "
- 
- #: cfg_opt_did.py:47 cfg_trunk_iax.py:54 cfg_trunk_sip.py:49
- #: cfg_trunk_zappbx.py:50 cfg_trunk_zappri.py:58 cfg_trunk_zap.py:47
- #: ../cfg_opt_did.py:48 ../cfg_trunk_iax.py:54 ../cfg_trunk_sip.py:49
- #: ../cfg_trunk_zappbx.py:50 ../cfg_trunk_zappri.py:58 ../cfg_trunk_zap.py:47
- msgid "Phone"
--msgstr "TÃƒÂ©lÃƒÂ©phone"
-+msgstr "TÃ©lÃ©phone"
- 
- #: cfg_opt_did.py:47 cfg_trunk_iax.py:54 cfg_trunk_sip.py:49
- #: cfg_trunk_zappbx.py:50 cfg_trunk_zappri.py:58 cfg_trunk_zap.py:47
-@@ -638,14 +639,14 @@
- #: cfg_trunk_iaxtel.py:49 ../cfg_opt_did.py:51 ../cfg_trunk_capimsn.py:35
- #: ../cfg_trunk_fwdiax.py:50 ../cfg_trunk_iaxtel.py:49
- msgid "Phone to ring"
--msgstr "TÃƒÂ©lÃƒÂ©phone Ãƒ  faire sonner"
-+msgstr "TÃ©lÃ©phone Ã  faire sonner"
- 
- #: cfg_opt_did.py:56 cfg_trunk_iax.py:57 cfg_trunk_sip.py:52
- #: cfg_trunk_zappbx.py:53 cfg_trunk_zappri.py:61 cfg_trunk_zap.py:50
- #: ../cfg_opt_did.py:57 ../cfg_trunk_iax.py:57 ../cfg_trunk_sip.py:52
- #: ../cfg_trunk_zappbx.py:53 ../cfg_trunk_zappri.py:61 ../cfg_trunk_zap.py:50
- msgid "IVR to jump to"
--msgstr "Faire aller l'IVR Ãƒ "
-+msgstr "Faire aller l'IVR Ã "
- 
- #: cfg_opt_did.py:62 cfg_trunk_iax.py:59 cfg_trunk_sip.py:54
- #: cfg_trunk_zappbx.py:55 cfg_trunk_zappri.py:63 cfg_trunk_zap.py:52
-@@ -656,7 +657,7 @@
- 
- #: cfg_opt_did.py:92 ../cfg_opt_did.py:93
- msgid "DID already in use for that trunk."
--msgstr "DID est dÃƒÂ©ja utilisÃƒÂ© pour ce canal."
-+msgstr "DID est dÃ©ja utilisÃ© pour ce canal."
- 
- #: cfg_opt_enum.py:26 ../cfg_opt_enum.py:26
- msgid "ENUM search domain"
-@@ -668,7 +669,7 @@
- 
- #: cfg_opt_enum.py:30 ../cfg_opt_enum.py:30
- msgid "Domain to search for ENUM entries"
--msgstr "Domaine Ãƒ  recherche pour des entrÃƒÂ©es ENUM"
-+msgstr "Domaine Ã  recherche pour des entrÃ©es ENUM"
- 
- #: cfg_opt_loadmodule.py:26 cfg_opt_loadmodule.py:27
- #: ../cfg_opt_loadmodule.py:26 ../cfg_opt_loadmodule.py:27
-@@ -677,7 +678,7 @@
- 
- #: cfg_opt_loadmodule.py:28 ../cfg_opt_loadmodule.py:28
- msgid "Module to load"
--msgstr "Module Ãƒ  charger"
-+msgstr "Module Ã  charger"
- 
- #: cfg_opt_logger.py:25 cfg_opt_logger.py:26 ../cfg_opt_logger.py:25
- #: ../cfg_opt_logger.py:26
-@@ -689,7 +690,7 @@
- "Asterisk can emit many events to it's console or a log file, Here you can "
- "make it more (or less) verbose:"
- msgstr ""
--"Asterisk peut ÃƒÂ©mettre beaucoups d'ÃƒÂ©vÃƒÂ©nements sur sa console ou un fichier "
-+"Asterisk peut Ã©mettre beaucoups d'Ã©vÃ©nements sur sa console ou un fichier "
- "de log, ici vous pouvez le rendre plus ou moins verbeux :"
- 
- #: cfg_opt_logger.py:30 ../cfg_opt_logger.py:30
-@@ -710,7 +711,7 @@
- 
- #: cfg_opt_logger.py:34 ../cfg_opt_logger.py:34
- msgid "Debug output"
--msgstr "Affichage de dÃƒÂ©bug"
-+msgstr "Affichage de dÃ©bug"
- 
- #: cfg_opt_logger.py:44 ../cfg_opt_logger.py:44
- msgid "Console output"
-@@ -718,11 +719,11 @@
- 
- #: cfg_opt_logger.py:50 ../cfg_opt_logger.py:50
- msgid "Output in /var/log/asterisk/messages"
--msgstr "TranfÃƒÂ©rer dans /var/log/asterisk/messages"
-+msgstr "TranfÃ©rer dans /var/log/asterisk/messages"
- 
- #: cfg_opt_logger.py:56 ../cfg_opt_logger.py:56
- msgid "Log to syslog via facility"
--msgstr "Logguer vers les syslogs via la facilitÃƒÂ©"
-+msgstr "Logguer vers les syslogs via la facilitÃ©"
- 
- #: cfg_opt_logger.py:61 ../cfg_opt_logger.py:61
- msgid "What kind of messages to log"
-@@ -731,11 +732,11 @@
- #: cfg_opt_manager.py:26 page_config.ptl:80 ../cfg_opt_manager.py:26
- #: ../page_config.ptl:80
- msgid "Management API access"
--msgstr "AccÃƒÂ¨s Ãƒ  l'API de gestion"
-+msgstr "AccÃ¨s Ã  l'API de gestion"
- 
- #: cfg_opt_manager.py:27 ../cfg_opt_manager.py:27
- msgid "New management API access"
--msgstr "Nouvel accÃƒÂ¨s Ãƒ  l'API de gestion"
-+msgstr "Nouvel accÃ¨s Ã  l'API de gestion"
- 
- #: cfg_opt_manager.py:32 ../cfg_opt_manager.py:32
- msgid "Secret"
-@@ -743,7 +744,7 @@
- 
- #: cfg_opt_manager.py:33 ../cfg_opt_manager.py:33
- msgid "IP disable mask"
--msgstr "DÃƒÂ©sactive les masques IP"
-+msgstr "DÃ©sactive les masques IP"
- 
- #: cfg_opt_manager.py:34 ../cfg_opt_manager.py:34
- msgid "IP enable mask"
-@@ -759,11 +760,11 @@
- 
- #: cfg_opt_music.py:26 ../cfg_opt_music.py:26
- msgid "Background music directory"
--msgstr "RÃƒÂ©pertoire de la musique de fond"
-+msgstr "RÃ©pertoire de la musique de fond"
- 
- #: cfg_opt_music.py:27 ../cfg_opt_music.py:27
- msgid "New background music directory"
--msgstr "Nouveau rÃƒÂ©pertoire de la musique de fond"
-+msgstr "Nouveau rÃ©pertoire de la musique de fond"
- 
- #: cfg_opt_oppanel.py:29 ../cfg_opt_oppanel.py:29
- msgid "Configure Asternic Flash Operator Panel"
-@@ -771,11 +772,11 @@
- 
- #: cfg_opt_oppanel.py:35 ../cfg_opt_oppanel.py:35
- msgid "FQDN/IP to access the panel via web"
--msgstr "FQDN/IP pour accÃƒÂ©der au panneau via le web"
-+msgstr "FQDN/IP pour accÃ©der au panneau via le web"
- 
- #: cfg_opt_oppanel.py:36 ../cfg_opt_oppanel.py:36
- msgid "Security Code"
--msgstr "Code de sÃƒÂ©curitÃƒÂ©"
-+msgstr "Code de sÃ©curitÃ©"
- 
- #: cfg_opt_oppanel.py:37 ../cfg_opt_oppanel.py:37
- msgid "Manager agent"
-@@ -783,7 +784,7 @@
- 
- #: cfg_opt_oppanel.py:39 ../cfg_opt_oppanel.py:39
- msgid "Frequency in seconds to poll for sip and iax status"
--msgstr "FrÃƒÂ©quence en seconde de verification de status de sip et de iax"
-+msgstr "FrÃ©quence en seconde de verification de status de sip et de iax"
- 
- #: cfg_opt_pickup.py:27 cfg_opt_pickup.py:28 ../cfg_opt_pickup.py:27
- #: ../cfg_opt_pickup.py:28
-@@ -792,7 +793,7 @@
- 
- #: cfg_opt_pickup.py:29 ../cfg_opt_pickup.py:29
- msgid "Extension to dial to pick-up a call in the same group."
--msgstr "Extension Ãƒ  appeler pour prendre un appel dans le mÃƒÂªme groupe"
-+msgstr "Extension Ã  appeler pour prendre un appel dans le mÃªme groupe"
- 
- #: cfg_opt_rawcfg.py:26 ../cfg_opt_rawcfg.py:26
- msgid "Raw config file snippet"
-@@ -813,7 +814,7 @@
- 
- #: cfg_opt_rtp.py:31 ../cfg_opt_rtp.py:31
- msgid "Start of RTP port area"
--msgstr "DÃƒÂ©but de l'interval de ports RTP"
-+msgstr "DÃ©but de l'interval de ports RTP"
- 
- #: cfg_opt_rtp.py:32 ../cfg_opt_rtp.py:32
- msgid "End of RTP port area"
-@@ -821,11 +822,11 @@
- 
- #: cfg_opt_rtp.py:33 ../cfg_opt_rtp.py:33
- msgid "Check UDP checksums of RTP packets"
--msgstr "VÃƒÂ©rifier les sommes de contrÃƒÂ´le des paquets RTP"
-+msgstr "VÃ©rifier les sommes de contrÃ´le des paquets RTP"
- 
- #: cfg_opt_rtp.py:46 ../cfg_opt_rtp.py:46
- msgid "must be higher than start value"
--msgstr "doit ÃƒÂªtre plus grand que la valeur de dÃƒÂ©but"
-+msgstr "doit Ãªtre plus grand que la valeur de dÃ©but"
- 
- #: cfg_opt_settings.py:25 ../cfg_opt_settings.py:25
- msgid "Austria"
-@@ -841,7 +842,7 @@
- 
- #: cfg_opt_settings.py:64 ../cfg_opt_settings.py:64
- msgid "Brazil"
--msgstr "BrÃƒÂ©zil"
-+msgstr "BrÃ©zil"
- 
- #: cfg_opt_settings.py:75 ../cfg_opt_settings.py:75
- msgid "Chile"
-@@ -865,7 +866,7 @@
- 
- #: cfg_opt_settings.py:132 ../cfg_opt_settings.py:132
- msgid "Greece"
--msgstr "GrÃƒÂ¨ce"
-+msgstr "GrÃ¨ce"
- 
- #: cfg_opt_settings.py:143 ../cfg_opt_settings.py:143
- msgid "India"
-@@ -885,11 +886,11 @@
- 
- #: cfg_opt_settings.py:189 ../cfg_opt_settings.py:189
- msgid "Norway"
--msgstr "NorvÃƒÂ¨ge"
-+msgstr "NorvÃ¨ge"
- 
- #: cfg_opt_settings.py:200 ../cfg_opt_settings.py:200
- msgid "New Zealand"
--msgstr "Nouvelle zÃƒÂ©lande"
-+msgstr "Nouvelle zÃ©lande"
- 
- #: cfg_opt_settings.py:211 ../cfg_opt_settings.py:211
- msgid "Poland"
-@@ -905,11 +906,11 @@
- 
- #: cfg_opt_settings.py:244 ../cfg_opt_settings.py:244
- msgid "Sweden"
--msgstr "SuÃƒÂ¨de"
-+msgstr "SuÃ¨de"
- 
- #: cfg_opt_settings.py:255 ../cfg_opt_settings.py:255
- msgid "Taiwan"
--msgstr "TaÃƒÂ¯wan"
-+msgstr "TaÃ¯wan"
- 
- #: cfg_opt_settings.py:267 ../cfg_opt_settings.py:267
- msgid "United Kingdom"
-@@ -917,7 +918,7 @@
- 
- #: cfg_opt_settings.py:285 ../cfg_opt_settings.py:285
- msgid "United States / North America"
--msgstr "Etats unis / AmÃƒÂ©rique du nord"
-+msgstr "Etats unis / AmÃ©rique du nord"
- 
- #: cfg_opt_settings.py:296 ../cfg_opt_settings.py:296
- msgid "South Africa"
-@@ -926,7 +927,7 @@
- #: cfg_opt_settings.py:315 cfg_opt_settings.py:316 ../cfg_opt_settings.py:315
- #: ../cfg_opt_settings.py:316
- msgid "General settings"
--msgstr "ParamÃƒÂ¨tres gÃƒÂ©nÃƒÂ©raux"
-+msgstr "ParamÃ¨tres gÃ©nÃ©raux"
- 
- #: cfg_opt_settings.py:320 ../cfg_opt_settings.py:320
- msgid "Country"
-@@ -935,7 +936,7 @@
- #: cfg_opt_settings.py:321 ../cfg_opt_settings.py:321
- msgid "The country is used for generating dialtone, ringtone, busytone etc"
- msgstr ""
--"Le pays est utilisÃƒÂ© pour gÃƒÂ©nÃƒÂ©rer les signaux d'appel, les sonneries, les "
-+"Le pays est utilisÃ© pour gÃ©nÃ©rer les signaux d'appel, les sonneries, les "
- "signaux d'occupation, etc."
- 
- #: cfg_opt_settings.py:325 ../cfg_opt_settings.py:325
-@@ -944,7 +945,7 @@
- 
- #: cfg_opt_settings.py:326 ../cfg_opt_settings.py:326
- msgid "The language is used for voice prompts"
--msgstr "Le langage est utilisÃƒÂ© pour les messages vocaux"
-+msgstr "Le langage est utilisÃ© pour les messages vocaux"
- 
- #: cfg_opt_sip_audio.py:27 cfg_opt_sip_audio.py:28 ../cfg_opt_sip_audio.py:27
- #: ../cfg_opt_sip_audio.py:28
-@@ -953,7 +954,7 @@
- 
- #: cfg_opt_sip_audio.py:32 ../cfg_opt_sip_audio.py:32
- msgid "Codecs to use"
--msgstr "Codecs Ãƒ  utiliser"
-+msgstr "Codecs Ã  utiliser"
- 
- #: cfg_opt_sip_audio.py:33 ../cfg_opt_sip_audio.py:33
- msgid "Allow alaw codec"
-@@ -977,7 +978,7 @@
- 
- #: cfg_opt_sip_audio.py:38 ../cfg_opt_sip_audio.py:38
- msgid "g729 pass-thru unless license obtained"
--msgstr "g729 passe Ãƒ  travers exceptÃƒÂ© si une license a ÃƒÂ©tÃƒÂ© acquise"
-+msgstr "g729 passe Ã  travers exceptÃ© si une license a Ã©tÃ© acquise"
- 
- #: cfg_opt_sip_audio.py:39 ../cfg_opt_sip_audio.py:39
- msgid "Allow g723.1 codec"
-@@ -985,7 +986,7 @@
- 
- #: cfg_opt_sip_audio.py:40 ../cfg_opt_sip_audio.py:40
- msgid "g723.1 pass-thru"
--msgstr "Autorise le codec g723.1 passe Ãƒ  travers"
-+msgstr "Autorise le codec g723.1 passe Ã  travers"
- 
- #: cfg_opt_sip_audio.py:48 ../cfg_opt_sip_audio.py:48
- msgid "You should choose at least one codec"
-@@ -994,11 +995,11 @@
- #: cfg_opt_sip_network.py:28 cfg_opt_sip_network.py:29
- #: ../cfg_opt_sip_network.py:28 ../cfg_opt_sip_network.py:29
- msgid "SIP Network Options"
--msgstr "Option rÃƒÂ©seau SIP"
-+msgstr "Option rÃ©seau SIP"
- 
- #: cfg_opt_sip_network.py:33 ../cfg_opt_sip_network.py:33
- msgid "Bind specific address?"
--msgstr "Lie Ãƒ  une adresse spÃƒÂ©cifique ?"
-+msgstr "Lie Ã  une adresse spÃ©cifique ?"
- 
- #: cfg_opt_sip_network.py:34 ../cfg_opt_sip_network.py:34
- msgid "Bind address"
-@@ -1010,7 +1011,7 @@
- 
- #: cfg_opt_sip_network.py:36 ../cfg_opt_sip_network.py:36
- msgid "Force external ip/internel network?"
--msgstr "Force rÃƒÂ©seau ip externe/interne"
-+msgstr "Force rÃ©seau ip externe/interne"
- 
- #: cfg_opt_sip_network.py:37 ../cfg_opt_sip_network.py:37
- msgid "External ip"
-@@ -1018,11 +1019,11 @@
- 
- #: cfg_opt_sip_network.py:38 ../cfg_opt_sip_network.py:38
- msgid "Internal network"
--msgstr "RÃƒÂ©seau interne"
-+msgstr "RÃ©seau interne"
- 
- #: cfg_opt_sip_network.py:39 ../cfg_opt_sip_network.py:39
- msgid "Netmask"
--msgstr "Masque rÃƒÂ©seau"
-+msgstr "Masque rÃ©seau"
- 
- #: cfg_opt_user.py:25 page_config.ptl:68 ../cfg_opt_user.py:25
- #: ../page_config.ptl:68
-@@ -1035,7 +1036,7 @@
- 
- #: cfg_opt_user.py:33 ../cfg_opt_user.py:33
- msgid "Associated IP address of PC"
--msgstr "IP adresse associÃƒÂ©e au PC"
-+msgstr "IP adresse associÃ©e au PC"
- 
- #: cfg_opt_user.py:33 ../cfg_opt_user.py:33
- msgid "Trusted for auto-login"
-@@ -1043,12 +1044,12 @@
- 
- #: cfg_opt_user.py:34 ../cfg_opt_user.py:34
- msgid "Associated phone"
--msgstr "TÃƒÂ©lÃƒÂ©phone associÃƒÂ©"
-+msgstr "TÃ©lÃ©phone associÃ©"
- 
- #: cfg_opt_user.py:37 page_user_info.ptl:49 page_user.ptl:46
- #: ../cfg_opt_user.py:38 ../page_user_info.ptl:49 ../page_user.ptl:46
- msgid "disabled"
--msgstr "dÃƒÂ©sactivÃƒÂ©"
-+msgstr "dÃ©sactivÃ©"
- 
- #: cfg_opt_user.py:38 page_user_info.ptl:50 page_user.ptl:25 page_user.ptl:47
- #: ../cfg_opt_user.py:39 ../page_user_info.ptl:50 ../page_user.ptl:25
-@@ -1076,15 +1077,15 @@
- #: ../cfg_phone_epygi.py:107 ../cfg_phone_iax.py:87 ../cfg_phone_mgcp.py:96
- #: ../cfg_phone_sip.py:107 ../cfg_phone_zap.py:94
- msgid "Voicemail settings"
--msgstr "ParamÃƒÂ¨tres de boite Ãƒ  message"
-+msgstr "ParamÃ¨tres de boite Ã  message"
- 
- #: cfg_opt_voicemail.py:30 ../cfg_opt_voicemail.py:30
- msgid "Recording settings"
--msgstr "ParamÃƒÂ¨tres d'enregistrement"
-+msgstr "ParamÃ¨tres d'enregistrement"
- 
- #: cfg_opt_voicemail.py:31 ../cfg_opt_voicemail.py:31
- msgid "File format for voicemail messages"
--msgstr "Format de fichier pour boite Ãƒ  message"
-+msgstr "Format de fichier pour boite Ã  message"
- 
- #: cfg_opt_voicemail.py:33 ../cfg_opt_voicemail.py:33
- msgid "Maximal message length (in seconds)"
-@@ -1096,34 +1097,34 @@
- 
- #: cfg_opt_voicemail.py:35 ../cfg_opt_voicemail.py:35
- msgid "Seconds of silence to end the recording"
--msgstr "Secondes de silence Ãƒ  la fin de l'enregistrement"
-+msgstr "Secondes de silence Ã  la fin de l'enregistrement"
- 
- #: cfg_opt_voicemail.py:36 ../cfg_opt_voicemail.py:36
- msgid ""
- "Silence threshold (what we consider silence, the lower, the more sensitive)"
- msgstr ""
--"Seuil de silence (ce que nous considÃƒÂ©rons du silence, le plus bas est le "
-+"Seuil de silence (ce que nous considÃ©rons du silence, le plus bas est le "
- "plus sensible)"
- 
- #: cfg_opt_voicemail.py:38 ../cfg_opt_voicemail.py:38
- msgid "Playback settings"
--msgstr "ParamÃƒÂ¨tres de jeu"
-+msgstr "ParamÃ¨tres de jeu"
- 
- #: cfg_opt_voicemail.py:39 ../cfg_opt_voicemail.py:39
- msgid "Max number of failed login attempts"
--msgstr "Nombre maximal de tentatives ÃƒÂ©chouÃƒÂ©es de login"
-+msgstr "Nombre maximal de tentatives Ã©chouÃ©es de login"
- 
- #: cfg_opt_voicemail.py:40 ../cfg_opt_voicemail.py:40
- msgid "Seconds to skip forward/backward"
--msgstr "Secondes Ãƒ  passer en avant/en arriÃƒÂ¨re"
-+msgstr "Secondes Ã  passer en avant/en arriÃ¨re"
- 
- #: cfg_opt_voicemail.py:42 ../cfg_opt_voicemail.py:42
- msgid "E-mail integration settings"
--msgstr "ParamÃƒÂ¨tres d'intÃƒÂ©gration e-mail"
-+msgstr "ParamÃ¨tres d'intÃ©gration e-mail"
- 
- #: cfg_opt_voicemail.py:43 ../cfg_opt_voicemail.py:43
- msgid "Activate email voicemail notifications?"
--msgstr "Activation de la notification e-mail de la boite Ãƒ  message"
-+msgstr "Activation de la notification e-mail de la boite Ã  message"
- 
- #: cfg_opt_voicemail.py:44 ../cfg_opt_voicemail.py:44
- msgid "Who the e-mail notification should appear to come from"
-@@ -1148,7 +1149,7 @@
- #: cfg_opt_voicemail.py:46 ../cfg_opt_voicemail.py:46
- msgid "[DeStar PBX]: New message from ${VM_CALLERID} in mailbox ${VM_MAILBOX}"
- msgstr ""
--"[DeStar PBX]: Nouveau message de ${VM_CALLERID} dans la boite Ãƒ  message "
-+"[DeStar PBX]: Nouveau message de ${VM_CALLERID} dans la boite Ã  message "
- "${VM_MAILBOX}"
- 
- #: cfg_opt_voicemail.py:47 ../cfg_opt_voicemail.py:47
-@@ -1162,19 +1163,19 @@
- "from ${VM_CALLERID}, on ${VM_DATE}, so you might\\n\\twant to check it when "
- "you get a chance. Thanks!\\n\\n\\t\\t\\t--Asterisk/Destar PBX."
- msgstr ""
--"Cher ${VM_NAME}:\\n\\n\\tJe vous notifie que vous avez Ãƒ  l'instant reÃƒÂ§u un "
--"messsage de longueur ${VM_DUR} (nombre ${VM_MSGNUM})\\n\\t dans la boite Ãƒ  "
--"message ${VM_MAILBOX} provenant de ${VM_CALLERID}, Ãƒ  la date du ${VM_DATE}. "
--"Vous pouvez\\n\\t l'ÃƒÂ©couter dÃƒÂ¨s Ãƒ  prÃƒÂ©sent. Merci!\\n\\n\\t\\t\\t--"
-+"Cher ${VM_NAME}:\\n\\n\\tJe vous notifie que vous avez Ã  l'instant reÃ§u un "
-+"messsage de longueur ${VM_DUR} (nombre ${VM_MSGNUM})\\n\\t dans la boite Ã  "
-+"message ${VM_MAILBOX} provenant de ${VM_CALLERID}, Ã  la date du ${VM_DATE}. "
-+"Vous pouvez\\n\\t l'Ã©couter dÃ¨s Ã  prÃ©sent. Merci!\\n\\n\\t\\t\\t--"
- "Asterisk/Destar PBX."
- 
- #: cfg_opt_voicemail.py:50 ../cfg_opt_voicemail.py:50
- msgid "Should the email contain the voicemail as an attachment?"
--msgstr "L'e-mail doit-il contenir le message vocal en piÃƒÂ¨ce jointe"
-+msgstr "L'e-mail doit-il contenir le message vocal en piÃ¨ce jointe"
- 
- #: cfg_opt_voicemail.py:51 ../cfg_opt_voicemail.py:51
- msgid "Override the default program to send e-mail"
--msgstr "SpÃƒÂ©cifieun autre programme d'envoi d'e-mail"
-+msgstr "SpÃ©cifieun autre programme d'envoi d'e-mail"
- 
- #: cfg_opt_voicemail.py:51 ../cfg_opt_voicemail.py:51
- msgid "i.e.: /usr/sbin/sendmail -t"
-@@ -1187,28 +1188,28 @@
- 
- #: cfg_opt_zap_audio.py:31 ../cfg_opt_zap_audio.py:31
- msgid "Be sloppy when detecting DTMF"
--msgstr "Etre tolÃƒÂ©rant avec la dÃƒÂ©tection des DTMF"
-+msgstr "Etre tolÃ©rant avec la dÃ©tection des DTMF"
- 
- #: cfg_opt_zap_audio.py:32 ../cfg_opt_zap_audio.py:32
- msgid "Echo cancel samples"
--msgstr "Exemples d'annulation d'ÃƒÂ©cho"
-+msgstr "Exemples d'annulation d'Ã©cho"
- 
- #: cfg_opt_zap_audio.py:34 ../cfg_opt_zap_audio.py:34
- msgid "Cancel echo even on bridged calls"
--msgstr "Annule l'ÃƒÂ©cho mÃƒÂªme lors d'appel faisant le pont"
-+msgstr "Annule l'Ã©cho mÃªme lors d'appel faisant le pont"
- 
- #: cfg_opt_zap_audio.py:35 ../cfg_opt_zap_audio.py:35
- msgid "Do early echo training"
--msgstr "Fait de l'entrainement prÃƒÂ©coce d'ÃƒÂ©cho"
-+msgstr "Fait de l'entrainement prÃ©coce d'Ã©cho"
- 
- #: cfg_opt_zap_phone.py:26 cfg_opt_zap_phone.py:27 ../cfg_opt_zap_phone.py:26
- #: ../cfg_opt_zap_phone.py:27
- msgid "Zaptel Phone Options"
--msgstr "Options tÃƒÂ©lÃƒÂ©phone Zaptel"
-+msgstr "Options tÃ©lÃ©phone Zaptel"
- 
- #: cfg_opt_zap_phone.py:31 ../cfg_opt_zap_phone.py:31
- msgid "Use ADSI for menu phones"
--msgstr "Utilise ADSI pour les menus de tÃƒÂ©lÃƒÂ©phone"
-+msgstr "Utilise ADSI pour les menus de tÃ©lÃ©phone"
- 
- #: cfg_opt_zap_phone.py:32 ../cfg_opt_zap_phone.py:32
- msgid "Signal a waiting call"
-@@ -1221,11 +1222,11 @@
- 
- #: cfg_opt_zap_phone.py:34 ../cfg_opt_zap_phone.py:34
- msgid "Suspend a call temporarily via a hook flash"
--msgstr "Supendre un appel temporairement via flash de combinÃƒÂ©"
-+msgstr "Supendre un appel temporairement via flash de combinÃ©"
- 
- #: cfg_opt_zap_phone.py:35 ../cfg_opt_zap_phone.py:35
- msgid "Allow call transfer"
--msgstr "Autorise le transfÃƒÂ¨re d'appel"
-+msgstr "Autorise le transfÃ¨re d'appel"
- 
- #: cfg_opt_zap_phone.py:36 ../cfg_opt_zap_phone.py:36
- msgid "Allow call forwards"
-@@ -1233,7 +1234,7 @@
- 
- #: cfg_opt_zap_phone.py:37 ../cfg_opt_zap_phone.py:37
- msgid "Read caller number with *69"
--msgstr "Lire le numÃƒÂ©ro de l'appelant avec *69"
-+msgstr "Lire le numÃ©ro de l'appelant avec *69"
- 
- #: cfg_opt_zappri.py:28 cfg_opt_zappri.py:29 ../cfg_opt_zappri.py:28
- #: ../cfg_opt_zappri.py:29
-@@ -1246,11 +1247,11 @@
- 
- #: cfg_opt_zappri.py:33 ../cfg_opt_zappri.py:33
- msgid "i.e. 1 if 1st card"
--msgstr "par exemple, 1 pour la 1ÃƒÂ¨re carte"
-+msgstr "par exemple, 1 pour la 1Ã¨re carte"
- 
- #: cfg_opt_zappri.py:34 ../cfg_opt_zappri.py:34
- msgid "Zaptel timing parameter"
--msgstr "ParamÃƒÂ¨tre de temporisation Zaptel"
-+msgstr "ParamÃ¨tre de temporisation Zaptel"
- 
- #: cfg_opt_zappri.py:34 ../cfg_opt_zappri.py:34
- msgid "Read zaptel documentation"
-@@ -1265,8 +1266,8 @@
- "Power level based on distance from the card to the service provider's "
- "gateway."
- msgstr ""
--"Niveau de puissance basÃƒÂ© sur la distance Ãƒ  la passerelle du fournisseurde "
--"service"
-+"Niveau de puissance basÃ© sur la distance Ã  la passerelle du fournisseur"
-+"de service"
- 
- #: cfg_opt_zappri.py:37 ../cfg_opt_zappri.py:37
- msgid "0: 0 db (CSU) / 0-133 feet (DSX-1)"
-@@ -1362,7 +1363,7 @@
- #: cfg_opt_zap_trunk.py:31 ../cfg_opt_zap_trunk.py:31
- msgid "Try to detect busy signal to detect if remove site hung up"
- msgstr ""
--"Essaie de dÃƒÂ©tecter le signal d'occupation si le site distant raccroche"
-+"Essaie de dÃ©tecter le signal d'occupation si le site distant raccroche"
- 
- #: cfg_opt_zap_trunk.py:32 ../cfg_opt_zap_trunk.py:32
- msgid "Wait how many busy signals before hanging up"
-@@ -1383,7 +1384,7 @@
- #: cfg_phone_epygi.py:49 cfg_phone_sip.py:48 ../cfg_phone_epygi.py:54
- #: ../cfg_phone_sip.py:53
- msgid "Is the trunk behind NAT ?"
--msgstr "Le canal est-il derriÃƒÂ¨re un NAT"
-+msgstr "Le canal est-il derriÃ¨re un NAT"
- 
- #: cfg_phone_epygi.py:59 cfg_phone_sip.py:58 ../cfg_phone_epygi.py:63
- #: ../cfg_phone_sip.py:62
-@@ -1424,7 +1425,7 @@
- #: ../cfg_phone_iax.py:72 ../cfg_phone_mgcp.py:92 ../cfg_phone_sip.py:80
- #: ../cfg_phone_zap.py:79
- msgid "Call group number"
--msgstr "Le numÃƒÂ©ro du groupe d'appel"
-+msgstr "Le numÃ©ro du groupe d'appel"
- 
- #: cfg_phone_epygi.py:80 cfg_phone_sip.py:80 ../cfg_phone_epygi.py:84
- #: ../cfg_phone_sip.py:84
-@@ -1446,7 +1447,7 @@
- #: ../cfg_phone_iax.py:91 ../cfg_phone_mgcp.py:101 ../cfg_phone_sip.py:112
- #: ../cfg_phone_zap.py:99
- msgid "Use voicemail"
--msgstr "Utilise la boite Ãƒ  message"
-+msgstr "Utilise la boite Ã  message"
- 
- #: cfg_phone_epygi.py:113 cfg_phone_iax.py:92 cfg_phone_mgcp.py:101
- #: cfg_phone_sip.py:113 cfg_phone_zap.py:100 ../cfg_phone_epygi.py:117
-@@ -1460,7 +1461,7 @@
- #: ../cfg_phone_iax.py:101 ../cfg_phone_mgcp.py:111 ../cfg_phone_sip.py:122
- #: ../cfg_phone_zap.py:109
- msgid "Voicemail PIN"
--msgstr "PIN de boite Ãƒ  message"
-+msgstr "PIN de boite Ã  message"
- 
- #: cfg_phone_epygi.py:123 ../cfg_phone_epygi.py:127
- msgid "E-mail"
-@@ -1471,13 +1472,13 @@
- #: ../cfg_phone_iax.py:110 ../cfg_phone_mgcp.py:116 ../cfg_phone_sip.py:132
- #: ../cfg_phone_zap.py:114
- msgid "Calls from the phone"
--msgstr "Appels Ãƒ  partir du tÃƒÂ©lÃƒÂ©phone"
-+msgstr "Appels Ã  partir du tÃ©lÃ©phone"
- 
- #: cfg_phone_epygi.py:132 cfg_phone_iax.py:110 cfg_phone_sip.py:132
- #: cfg_phone_zap.py:114 ../cfg_phone_epygi.py:136 ../cfg_phone_iax.py:114
- #: ../cfg_phone_sip.py:136 ../cfg_phone_zap.py:118
- msgid "Caller-Id Number"
--msgstr "NumÃƒÂ©ro de l'identifiant de l'appelant"
-+msgstr "NumÃ©ro de l'identifiant de l'appelant"
- 
- #: cfg_phone_epygi.py:136 cfg_phone_iax.py:114 cfg_phone_sip.py:136
- #: cfg_phone_zap.py:118 cfg_trunk_fwdiax.py:47 cfg_trunk_iaxtel.py:46
-@@ -1491,7 +1492,7 @@
- #: ../cfg_phone_iax.py:122 ../cfg_phone_mgcp.py:128 ../cfg_phone_sip.py:144
- #: ../cfg_phone_zap.py:126
- msgid "Allowed dialout-entries"
--msgstr "Autorise les entrÃƒÂ©es d'appel vers l'extÃƒÂ©rieur"
-+msgstr "Autorise les entrÃ©es d'appel vers l'extÃ©rieur"
- 
- #: cfg_phone_epygi.py:145 cfg_phone_iax.py:123 cfg_phone_mgcp.py:128
- #: cfg_phone_sip.py:145 cfg_phone_zap.py:127 ../cfg_phone_epygi.py:149
-@@ -1506,12 +1507,12 @@
- 
- #: cfg_phone_ext.py:28 ../cfg_phone_ext.py:28
- msgid "Set an 'alias' extension to a phone"
--msgstr "Active une extension 'Alias' vers un tÃƒÂ©lÃƒÂ©phone"
-+msgstr "Active une extension 'Alias' vers un tÃ©lÃ©phone"
- 
- #: cfg_phone_ext.py:39 ../cfg_phone_ext.py:44
- msgid "This can be used to set operator(o) or fax(fax) extensions."
- msgstr ""
--"Ceci peut ÃƒÂªtre utilisÃƒÂ© pour activer une extension d'opÃƒÂ©rateur(o) ou de fax"
-+"Ceci peut Ãªtre utilisÃ© pour activer une extension d'opÃ©rateur(o) ou de fax"
- "(fax)."
- 
- #: cfg_phone_ext.py:43 ../cfg_phone_ext.py:48
-@@ -1520,44 +1521,44 @@
- 
- #: cfg_phone_ext.py:47 ../cfg_phone_ext.py:52
- msgid "Real phone to ring"
--msgstr "TÃƒÂ©lÃƒÂ©phone rÃƒÂ©el Ãƒ  appeler"
-+msgstr "TÃ©lÃ©phone rÃ©el Ã  appeler"
- 
- #: cfg_phone_iax.py:27 ../cfg_phone_iax.py:27
- msgid "Normal IAX phone"
--msgstr "TÃƒÂ©lÃƒÂ©phone IAX normal"
-+msgstr "TÃ©lÃ©phone IAX normal"
- 
- #: cfg_phone_iax.py:28 ../cfg_phone_iax.py:28
- msgid "New IAX phone"
--msgstr "Nouveau tÃƒÂ©lÃƒÂ©phone IAX"
-+msgstr "Nouveau tÃ©lÃ©phone IAX"
- 
- #: cfg_phone_iax.py:42 cfg_phone_mgcp.py:42 cfg_phone_sip.py:43
- #: ../cfg_phone_iax.py:47 ../cfg_phone_mgcp.py:47 ../cfg_phone_sip.py:48
- msgid "IP address of phone"
--msgstr "Adresse IP du tÃƒÂ©lÃƒÂ©phone"
-+msgstr "Adresse IP du tÃ©lÃ©phone"
- 
- #: cfg_phone_iax.py:52 cfg_phone_mgcp.py:71 cfg_phone_zap.py:59
- #: ../cfg_phone_iax.py:56 ../cfg_phone_mgcp.py:76 ../cfg_phone_zap.py:63
- msgid "Allow direct dialling from outside?"
--msgstr "Autorise l'appel direct Ãƒ  partir de l'extÃƒÂ©rieur"
-+msgstr "Autorise l'appel direct Ã  partir de l'extÃ©rieur"
- 
- #: cfg_phone_iax.py:102 ../cfg_phone_iax.py:106
- msgid "Disable IAX transfer"
--msgstr "DÃƒÂ©sactive le tranfert IAX"
-+msgstr "DÃ©sactive le tranfert IAX"
- 
- #: cfg_phone_mgcp.py:26 ../cfg_phone_mgcp.py:26
- msgid "Normal MGCP phone"
--msgstr "TÃƒÂ©lÃƒÂ©phone MGCP normal"
-+msgstr "TÃ©lÃ©phone MGCP normal"
- 
- #: cfg_phone_mgcp.py:27 ../cfg_phone_mgcp.py:27
- msgid "New MGCP phone"
--msgstr "Nouveau tÃƒÂ©lÃƒÂ©phone MGCP"
-+msgstr "Nouveau tÃ©lÃ©phone MGCP"
- 
- #: cfg_phone_mgcp.py:35 ../cfg_phone_mgcp.py:40
- msgid ""
- "If you haven't configured a name for your phone please use the IP address "
- "here."
- msgstr ""
--"Si vous n'avez pas configurÃƒÂ© un nom pour votre tÃƒÂ©lÃƒÂ©phone, utilisez une "
-+"Si vous n'avez pas configurÃ© un nom pour votre tÃ©lÃ©phone, utilisez une "
- "adresse IP "
- 
- #: cfg_phone_mgcp.py:51 ../cfg_phone_mgcp.py:56
-@@ -1566,11 +1567,11 @@
- 
- #: cfg_phone_mgcp.py:56 ../cfg_phone_mgcp.py:61
- msgid "Three way calling"
--msgstr "Appel Ãƒ  trois"
-+msgstr "Appel Ã  trois"
- 
- #: cfg_phone_mgcp.py:61 ../cfg_phone_mgcp.py:66
- msgid "Enable Call transfer"
--msgstr "Active le transfÃƒÂ¨re d'appel"
-+msgstr "Active le transfÃ¨re d'appel"
- 
- #: cfg_phone_mgcp.py:66 ../cfg_phone_mgcp.py:71
- msgid "Enable Call forward"
-@@ -1578,7 +1579,7 @@
- 
- #: cfg_phone_mgcp.py:115 ../cfg_phone_mgcp.py:120
- msgid "Caller-Id-Number"
--msgstr "NumÃƒÂ©ro de l'identification de l'appelant"
-+msgstr "NumÃ©ro de l'identification de l'appelant"
- 
- #: cfg_phone_mgcp.py:119 ../cfg_phone_mgcp.py:124
- msgid "Caller-Id-Name"
-@@ -1603,23 +1604,23 @@
- #: cfg_phone_queue.py:56 ../cfg_phone_queue.py:61
- msgid "Ring all - ring all available channels until one answers"
- msgstr ""
--"Appelle tous - appelle tous les canaux disponibles jusqu'Ãƒ  une rÃƒÂ©ponse"
-+"Appelle tous - appelle tous les canaux disponibles jusqu'Ã  une rÃ©ponse"
- 
- #: cfg_phone_queue.py:57 ../cfg_phone_queue.py:62
- msgid "Round robin - take turns ringing each available interface"
--msgstr "Caroussel - fait sonner chaque interface disponible Ãƒ  son tour"
-+msgstr "Caroussel - fait sonner chaque interface disponible Ã  son tour"
- 
- #: cfg_phone_queue.py:58 ../cfg_phone_queue.py:63
- msgid ""
- "Least recent - ring interface which was least recently called by this queue"
- msgstr ""
--"Le moins rÃƒÂ©cent - fait sonner l'interface qui a ÃƒÂ©tÃƒÂ© le moins rÃƒÂ©cement "
--"appelÃƒÂ©e dans cette file"
-+"Le moins rÃ©cent - fait sonner l'interface qui a Ã©tÃ© le moins rÃ©cement "
-+"appelÃ©e dans cette file"
- 
- #: cfg_phone_queue.py:59 ../cfg_phone_queue.py:64
- msgid "Fewest calls - ring the one with fewest completed calls from this queue"
- msgstr ""
--"Le moins d'appels - fait sonner celle avec le moins d'appel complÃƒÂ©tÃƒÂ©s sur "
-+"Le moins d'appels - fait sonner celle avec le moins d'appel complÃ©tÃ©s sur "
- "cette file"
- 
- #: cfg_phone_queue.py:60 ../cfg_phone_queue.py:65
-@@ -1629,13 +1630,13 @@
- #: cfg_phone_queue.py:61 ../cfg_phone_queue.py:66
- msgid "Round robin with memory - remember where we left off last ring pass"
- msgstr ""
--"Caroussel avec mÃƒÂ©moire - se souvient qui a laissÃƒÂ© passer lors du dernier "
-+"Caroussel avec mÃ©moire - se souvient qui a laissÃ© passer lors du dernier "
- "passage"
- 
- #: cfg_phone_queue.py:65 ../cfg_phone_queue.py:70 ../cfg_phone_hunt.py:36
- msgid "How long to wait before trying all the members again?"
- msgstr ""
--"Combien de temps faut-il attendre avant de rÃƒÂ©essayer tous les membre de "
-+"Combien de temps faut-il attendre avant de rÃ©essayer tous les membre de "
- "nouveau ?"
- 
- #: cfg_phone_queue.py:70 ../cfg_phone_queue.py:75
-@@ -1644,18 +1645,18 @@
- 
- #: cfg_phone_queue.py:75 ../cfg_phone_queue.py:80
- msgid "Announce queue position to caller?"
--msgstr "Annonce la position dans la file Ãƒ  l'appelant ?"
-+msgstr "Annonce la position dans la file Ã  l'appelant ?"
- 
- #: cfg_phone_queue.py:79 ../cfg_phone_queue.py:84
- msgid ""
- "How often to announce queue position and/or estimated holdtime to caller"
- msgstr ""
- "Combien de fois annoncer la position dans la liste et/ou le temps d'attente "
--"estimÃƒÂ© Ãƒ  l'appelant"
-+"estimÃ© Ã  l'appelant"
- 
- #: cfg_phone_queue.py:84 ../cfg_phone_queue.py:89
- msgid "Include estimated hold time in position announcements?"
--msgstr "Inclure le temps estimÃƒÂ© d'attente dans les annonces de position"
-+msgstr "Inclure le temps estimÃ© d'attente dans les annonces de position"
- 
- #: cfg_phone_queue.py:86 ../cfg_phone_queue.py:91
- msgid "Yes"
-@@ -1675,7 +1676,7 @@
- 
- #: cfg_phone_queue.py:97 ../cfg_phone_queue.py:102
- msgid "Monitor answered calls?"
--msgstr "Surveillance des appels rÃƒÂ©pondus ?"
-+msgstr "Surveillance des appels rÃ©pondus ?"
- 
- #: cfg_phone_queue.py:101 ../cfg_phone_queue.py:106
- msgid "Monitor file format"
-@@ -1711,32 +1712,32 @@
- 
- #: cfg_phone_queue.py:157 ../cfg_phone_queue.py:149
- msgid "You should select a frequency"
--msgstr "Vous devriez sÃƒÂ©lectionner une frÃƒÂ©quence"
-+msgstr "Vous devriez sÃ©lectionner une frÃ©quence"
- 
- #: cfg_phone_sip.py:27 ../cfg_phone_sip.py:27
- msgid "Normal SIP phone"
--msgstr "TÃƒÂ©lÃƒÂ©phone SIP normal"
-+msgstr "TÃ©lÃ©phone SIP normal"
- 
- #: cfg_phone_sip.py:28 ../cfg_phone_sip.py:28
- msgid "New SIP phone"
--msgstr "Nouveau tÃƒÂ©lÃƒÂ©phone SIP normal"
-+msgstr "Nouveau tÃ©lÃ©phone SIP normal"
- 
- #: cfg_phone_sip.py:123 ../cfg_phone_sip.py:127
- msgid "Voicemail email"
--msgstr "E-mail de boite Ãƒ  message"
-+msgstr "E-mail de boite Ã  message"
- 
- #: cfg_phone_zap.py:27 ../cfg_phone_zap.py:27
- msgid "Normal ZAP phone"
--msgstr "TÃƒÂ©lÃƒÂ©phone ZAP normal"
-+msgstr "TÃ©lÃ©phone ZAP normal"
- 
- #: cfg_phone_zap.py:28 ../cfg_phone_zap.py:28
- msgid "New ZAP phone"
--msgstr "Nouveau tÃƒÂ©lÃƒÂ©phone ZAP"
-+msgstr "Nouveau tÃ©lÃ©phone ZAP"
- 
- #: cfg_phone_zap.py:38 cfg_trunk_zappbx.py:34 cfg_trunk_zap.py:33
- #: ../cfg_phone_zap.py:43 ../cfg_trunk_zappbx.py:34 ../cfg_trunk_zap.py:33
- msgid "Zaptel channel number"
--msgstr "NumÃƒÂ©ro du canal Zaptel"
-+msgstr "NumÃ©ro du canal Zaptel"
- 
- #: cfg_phone_zap.py:43 cfg_trunk_zappbx.py:35 cfg_trunk_zappri.py:35
- #: cfg_trunk_zap.py:34 ../cfg_phone_zap.py:48 ../cfg_trunk_zappbx.py:35
-@@ -1750,7 +1751,7 @@
- 
- #: cfg_phone_zap.py:84 ../cfg_phone_zap.py:88
- msgid "Show this phone in the panel"
--msgstr "Affiche ce tÃƒÂ©lÃƒÂ©phone sur le paneau"
-+msgstr "Affiche ce tÃ©lÃ©phone sur le paneau"
- 
- #: cfg_trunk_capimsn.py:26 ../cfg_trunk_capimsn.py:26
- msgid "ISDN using CAPI, incoming"
-@@ -1762,17 +1763,17 @@
- 
- #: cfg_trunk_capimsn.py:33 ../cfg_trunk_capimsn.py:33
- msgid "Calls from the ISDN network"
--msgstr "Appels du rÃƒÂ©seau ISDN"
-+msgstr "Appels du rÃ©seau ISDN"
- 
- #: cfg_trunk_capimsn.py:34 cfg_trunk_capi.py:37 cfg_trunk_zaphfc.py:37
- #: ../cfg_trunk_capimsn.py:34 ../cfg_trunk_capi.py:37
- #: ../cfg_trunk_zaphfc.py:37
- msgid "Subscriber number"
--msgstr "NumÃƒÂ©ro du souscripteur"
-+msgstr "NumÃ©ro du souscripteur"
- 
- #: cfg_trunk_capimsn.py:68 ../cfg_trunk_capimsn.py:68
- msgid "MSN already assigned"
--msgstr "MSN dÃƒÂ©ja assignÃƒÂ©"
-+msgstr "MSN dÃ©ja assignÃ©"
- 
- #: cfg_trunk_capi.py:29 ../cfg_trunk_capi.py:29
- msgid "ISDN using CAPI, outgoing"
-@@ -1785,12 +1786,12 @@
- #: cfg_trunk_capi.py:36 cfg_trunk_zaphfc.py:36 ../cfg_trunk_capi.py:36
- #: ../cfg_trunk_zaphfc.py:36
- msgid "Calls to the ISDN network"
--msgstr "Appels vers le rÃƒÂ©seau IDSN"
-+msgstr "Appels vers le rÃ©seau IDSN"
- 
- #: cfg_trunk_capi.py:38 cfg_trunk_zaphfc.py:38 ../cfg_trunk_capi.py:38
- #: ../cfg_trunk_zaphfc.py:38
- msgid "Outgoing prefix"
--msgstr "PrÃƒÂ©fixe sortant"
-+msgstr "PrÃ©fixe sortant"
- 
- #: cfg_trunk_fwdiax.py:26 ../cfg_trunk_fwdiax.py:26
- msgid "VOIP-Provider FreeworldDialup (IAX)"
-@@ -1812,16 +1813,16 @@
- msgstr ""
- "Vous pouvez vous inscire gratuitement sur\n"
- "\t\t\thttp://freeworlddialup.com et recevoir un identifiant via\n"
--"\t\t\tle quel on peut vous appeler. Ces appels sont gratuits ÃƒÂ©galement.\n"
-+"\t\t\tle quel on peut vous appeler. Ces appels sont gratuits Ã©galement.\n"
- "\n"
- "\t\t\tSi vous avez un compte, vous devez activer le support IAX chez FWD "
- "sur\n"
- "\t\t\thttp://www.freeworlddialup.com/advanced/iax pour utiliser celui-ci\n"
--"\t\t\tsur cette ligne de tÃƒÂ©lÃƒÂ©phone."
-+"\t\t\tsur cette ligne de tÃ©lÃ©phone."
- 
- #: cfg_trunk_fwdiax.py:41 ../cfg_trunk_fwdiax.py:41
- msgid "FWD number"
--msgstr "NumÃƒÂ©ro FWD"
-+msgstr "NumÃ©ro FWD"
- 
- #: cfg_trunk_fwdiax.py:42 ../cfg_trunk_fwdiax.py:42
- msgid "FWD password"
-@@ -1853,12 +1854,12 @@
- msgid ""
- "Used to setup an IAX trunk to another Asterisk server or an IAX termination."
- msgstr ""
--"UtilisÃƒÂ© pour configurer un canal IAX vers un autre serveur Asterisk ou un "
--"point d'accÃƒÂ¨s IAX."
-+"UtilisÃ© pour configurer un canal IAX vers un autre serveur Asterisk ou un "
-+"point d'accÃ¨s IAX."
- 
- #: cfg_trunk_iax.py:35 ../cfg_trunk_iax.py:35
- msgid "IAX host"
--msgstr "HÃƒÂ´te IAX"
-+msgstr "HÃ´te IAX"
- 
- #: cfg_trunk_iax.py:36 ../cfg_trunk_iax.py:36
- msgid "Bandwith"
-@@ -1878,7 +1879,7 @@
- 
- #: cfg_trunk_iax.py:41 ../cfg_trunk_iax.py:41
- msgid "Authentication Method"
--msgstr "MÃƒÂ©thode d'Authentification"
-+msgstr "MÃ©thode d'Authentification"
- 
- #: cfg_trunk_iax.py:42 ../cfg_trunk_iax.py:42
- msgid "Plain text"
-@@ -1898,7 +1899,7 @@
- 
- #: cfg_trunk_iax.py:44 ../cfg_trunk_iax.py:44
- msgid "Public key from remote server"
--msgstr "ClÃƒÂ© publique du serveur distant"
-+msgstr "ClÃ© publique du serveur distant"
- 
- #: cfg_trunk_iax.py:44 cfg_trunk_iax.py:45 ../cfg_trunk_iax.py:44
- #: ../cfg_trunk_iax.py:45
-@@ -1907,7 +1908,7 @@
- 
- #: cfg_trunk_iax.py:45 ../cfg_trunk_iax.py:45
- msgid "Private local key"
--msgstr "ClÃƒÂ© privÃƒÂ©e locale"
-+msgstr "ClÃ© privÃ©e locale"
- 
- #: cfg_trunk_iax.py:47 ../cfg_trunk_iax.py:47
- msgid "Enable trunking?"
-@@ -1922,7 +1923,7 @@
- #: ../cfg_trunk_sip.py:50 ../cfg_trunk_zappbx.py:51 ../cfg_trunk_zappri.py:59
- #: ../cfg_trunk_zap.py:48
- msgid "Extension to ring"
--msgstr "Extension Ãƒ  faire sonner"
-+msgstr "Extension Ã  faire sonner"
- 
- #: cfg_trunk_iaxtel.py:26 ../cfg_trunk_iaxtel.py:26
- msgid "VOIP-Provider Iaxtel"
-@@ -1939,12 +1940,12 @@
- "\t\t\tpeople can call you. These calls are free of charge, too.'."
- msgstr ""
- "Vous pouvez vous inscire gratuitement sur\n"
--"\t\t\thttp://www.iaxtel.com et recevoir un numÃƒÂ©ro IAXtel surlequel\n"
--"\t\t\tvous ÃƒÂªtes contactable. Ces appels sont gratuits."
-+"\t\t\thttp://www.iaxtel.com et recevoir un numÃ©ro IAXtel surlequel\n"
-+"\t\t\tvous Ãªtes contactable. Ces appels sont gratuits."
- 
- #: cfg_trunk_iaxtel.py:40 ../cfg_trunk_iaxtel.py:40
- msgid "IAXTEL number"
--msgstr "NumÃƒÂ©ro IAXTEL"
-+msgstr "NumÃ©ro IAXTEL"
- 
- #: cfg_trunk_iaxtel.py:41 ../cfg_trunk_iaxtel.py:41
- msgid "IAXTEL password"
-@@ -1969,8 +1970,8 @@
- #: cfg_trunk_sip.py:30 ../cfg_trunk_sip.py:30
- msgid "Used to setup a SIP trunk to a SIP provider or a different SIP server."
- msgstr ""
--"UtilisÃƒÂ© pour configurer un canal SIP vers un fournisseur SIP ou un serveur "
--"sip diffÃƒÂ©rent."
-+"UtilisÃ© pour configurer un canal SIP vers un fournisseur SIP ou un serveur "
-+"sip diffÃ©rent."
- 
- #: cfg_trunk_sip.py:36 ../cfg_trunk_sip.py:36
- msgid "SIP username"
-@@ -1982,11 +1983,11 @@
- 
- #: cfg_trunk_sip.py:38 ../cfg_trunk_sip.py:38
- msgid "SIP host"
--msgstr "HÃƒÂ´te SIP"
-+msgstr "HÃ´te SIP"
- 
- #: cfg_trunk_sip.py:39 ../cfg_trunk_sip.py:39
- msgid "Register with remote host?"
--msgstr "S'enregistrer (se faire connaÃƒÂ®tre) de l'hÃƒÂ´te distant ?"
-+msgstr "S'enregistrer (se faire connaÃ®tre) de l'hÃ´te distant ?"
- 
- #: cfg_trunk_sip.py:40 ../cfg_trunk_sip.py:40
- msgid "Enable forward address type?"
-@@ -1994,7 +1995,7 @@
- 
- #: cfg_trunk_sip.py:41 ../cfg_trunk_sip.py:41
- msgid "Is the trunk behind NAT?"
--msgstr "Le canal est-il derriÃƒÂ¨re un NAT ?"
-+msgstr "Le canal est-il derriÃ¨re un NAT ?"
- 
- #: cfg_trunk_sip.py:42 ../cfg_trunk_sip.py:42
- msgid "Bypass auth for incoming calls?"
-@@ -2032,17 +2033,17 @@
- #: cfg_trunk_zappbx.py:37 cfg_trunk_zappri.py:47 cfg_trunk_zap.py:36
- #: ../cfg_trunk_zappbx.py:37 ../cfg_trunk_zappri.py:47 ../cfg_trunk_zap.py:36
- msgid "Callout group"
--msgstr "Groupe d'appel vers l'extÃƒÂ©rieur"
-+msgstr "Groupe d'appel vers l'extÃ©rieur"
- 
- #: cfg_trunk_zappbx.py:42 cfg_trunk_zappri.py:52 cfg_trunk_zap.py:41
- #: ../cfg_trunk_zappbx.py:42 ../cfg_trunk_zappri.py:52 ../cfg_trunk_zap.py:41
- msgid "Reception and Transmission Gains"
--msgstr "Gains de rÃƒÂ©ception et de transmission"
-+msgstr "Gains de rÃ©ception et de transmission"
- 
- #: cfg_trunk_zappbx.py:43 cfg_trunk_zappri.py:53 cfg_trunk_zap.py:42
- #: ../cfg_trunk_zappbx.py:43 ../cfg_trunk_zappri.py:53 ../cfg_trunk_zap.py:42
- msgid "Reception gain"
--msgstr "Gain de rÃƒÂ©ception"
-+msgstr "Gain de rÃ©ception"
- 
- #: cfg_trunk_zappbx.py:43 cfg_trunk_zappbx.py:44 cfg_trunk_zappri.py:53
- #: cfg_trunk_zappri.py:54 cfg_trunk_zap.py:42 cfg_trunk_zap.py:43
-@@ -2059,11 +2060,11 @@
- 
- #: cfg_trunk_zappbx.py:46 ../cfg_trunk_zappbx.py:46
- msgid "Outbound prefix"
--msgstr "PrÃƒÂ©fixe de sortie"
-+msgstr "PrÃ©fixe de sortie"
- 
- #: cfg_trunk_zappbx.py:46 ../cfg_trunk_zappbx.py:46
- msgid "Used to call through a PBX"
--msgstr "UtilisÃƒÂ© pour appelÃƒÂ© Ãƒ  travers un PBX"
-+msgstr "UtilisÃ© pour appelÃ© Ã  travers un PBX"
- 
- #: cfg_trunk_zappri.py:28 ../cfg_trunk_zappri.py:28
- msgid "Standard ZAP PRI trunk"
-@@ -2075,11 +2076,11 @@
- 
- #: cfg_trunk_zappri.py:36 ../cfg_trunk_zappri.py:36
- msgid "PRI signalling, CPE side"
--msgstr "Signalisation PRI, cotÃƒÂ© CPE"
-+msgstr "Signalisation PRI, cotÃ© CPE"
- 
- #: cfg_trunk_zappri.py:36 ../cfg_trunk_zappri.py:36
- msgid "PRI signalling, Network side"
--msgstr "Signalisation PRI, cotÃƒÂ© rÃƒÂ©seau"
-+msgstr "Signalisation PRI, cotÃ© rÃ©seau"
- 
- #: cfg_trunk_zappri.py:37 ../cfg_trunk_zappri.py:37
- msgid "Switch type"
-@@ -2091,7 +2092,7 @@
- 
- #: cfg_trunk_zappri.py:90 ../cfg_trunk_zappri.py:90
- msgid "Group already in use"
--msgstr "Groupe dÃƒÂ©ja utlisÃƒÂ©"
-+msgstr "Groupe dÃ©ja utlisÃ©"
- 
- #: cfg_trunk_zap.py:27 ../cfg_trunk_zap.py:27
- msgid "Standard ZAP trunk"
-@@ -2118,7 +2119,7 @@
- 
- #: configlets.py:637 ../configlets.py:620 ../configlets.py:624
- msgid "Name already in use"
--msgstr "Le nom est dÃƒÂ©ja utilisÃƒÂ©"
-+msgstr "Le nom est dÃ©ja utilisÃ©"
- 
- #: configlets.py:733 configlets.py:1015 ../configlets.py:716
- #: ../configlets.py:1034 ../configlets.py:720 ../configlets.py:1048
-@@ -2133,7 +2134,7 @@
- 
- #: configlets.py:785
- msgid "Price for this pattern"
--msgstr "CoÃƒÂ»t de ce pattern"
-+msgstr "CoÃ»t de ce pattern"
- 
- #: configlets.py:797 ../configlets.py:780 ../configlets.py:784
- msgid "Password:"
-@@ -2145,7 +2146,7 @@
- 
- #: configlets.py:845 ../configlets.py:828 ../configlets.py:832
- msgid "You should select a phone to ring to"
--msgstr "SÃƒÂ©lectionner un tÃƒÂ©lÃƒÂ©phone Ãƒ  faire sonner"
-+msgstr "SÃ©lectionner un tÃ©lÃ©phone Ã  faire sonner"
- 
- #: language.py:64 language.py:71 ../language.py:67
- msgid "This menu will contain all sorts of administration stuff:"
-@@ -2173,7 +2174,7 @@
- 
- #: panelutils.py:124 ../panelutils.py:124
- msgid "Restarting the panel daemon ..."
--msgstr "RedÃƒÂ©marrage du dÃƒÂ©mon du panneau..."
-+msgstr "RedÃ©marrage du dÃ©mon du panneau..."
- 
- #: ConfigHelper.ptl:53 ../ConfigHelper.ptl:53
- msgid "E"
-@@ -2215,38 +2216,38 @@
- msgid ""
- "The following configlets depends on this object in a direct or indirect way:"
- msgstr ""
--"L'outil de configuration suivant depend de cet objet de faÃƒÂ§on directe ou "
-+"L'outil de configuration suivant depend de cet objet de faÃ§on directe ou "
- "indirecte :"
- 
- #: ConfigHelper.ptl:209 ConfigHelper.ptl:211 ../ConfigHelper.ptl:211
- msgid "Hard Dependencie:"
--msgstr "DÃƒÂ©pendance forte:"
-+msgstr "DÃ©pendance forte:"
- 
- #: ConfigHelper.ptl:212 ConfigHelper.ptl:214 ../ConfigHelper.ptl:214
- msgid "Soft Dependencie:"
--msgstr "DÃƒÂ©pendance faible"
-+msgstr "DÃ©pendance faible"
- 
- #: ConfigHelper.ptl:229 ConfigHelper.ptl:231 ../ConfigHelper.ptl:233
- msgid ""
- "Hard dependencie: The dependent object can not exist if this object is "
- "deleted"
- msgstr ""
--"DÃƒÂ©pendance forte : L'objet dÃƒÂ©pendant ne peut pas si l'objet est supprimÃƒÂ©"
-+"DÃ©pendance forte : L'objet dÃ©pendant ne peut pas si l'objet est supprimÃ©"
- 
- #: ConfigHelper.ptl:233 ConfigHelper.ptl:235 ../ConfigHelper.ptl:237
- msgid ""
- "Soft dependencie. The dependent object still can exist if this object is "
- "deleted"
- msgstr ""
--"DÃƒÂ©pendance faible : l'objet dÃƒÂ©pendant peut encore exister si cette objet "
--"est supprimÃƒÂ©"
-+"DÃ©pendance faible : l'objet dÃ©pendant peut encore exister si cette objet "
-+"est supprimÃ©"
- 
- #: ConfigHelper.ptl:277 ConfigHelper.ptl:298 ConfigHelper.ptl:305
- #: ConfigHelper.ptl:279 ConfigHelper.ptl:300 ConfigHelper.ptl:307
- #: ../ConfigHelper.ptl:281 ../ConfigHelper.ptl:302 ../ConfigHelper.ptl:309
- #, python-format
- msgid "Required '%s' not found"
--msgstr "'%s' requis non trouvÃƒÂ©"
-+msgstr "'%s' requis non trouvÃ©"
- 
- #: ConfigHelper.ptl:320 page_admin_callsstats.ptl:69
- #: page_admin_dialoutsstats.ptl:85 page_admin_phonestats.ptl:83
-@@ -2262,7 +2263,7 @@
- 
- #: ConfigHelper.ptl:323 ConfigHelper.ptl:325 ../ConfigHelper.ptl:327
- msgid "Update"
--msgstr "Mise Ãƒ  jour"
-+msgstr "Mise Ã  jour"
- 
- #: ConfigHelper.ptl:324 ConfigHelper.ptl:326 ../ConfigHelper.ptl:328
- msgid "Delete"
-@@ -2282,7 +2283,7 @@
- #: page_admin_callsstats.ptl:99 ../page_stats_callsstats.ptl:106
- #: ../page_stats_calls.ptl:106
- msgid "Calls per Hour in a Day"
--msgstr "Appels par heure dans une journÃƒÂ©e"
-+msgstr "Appels par heure dans une journÃ©e"
- 
- #: page_admin_callsstats.ptl:99 page_admin_callsstats.ptl:100
- #: page_admin_callsstats.ptl:101 ../page_stats_callsstats.ptl:106
-@@ -2295,7 +2296,7 @@
- #: page_admin_callsstats.ptl:100 ../page_stats_callsstats.ptl:107
- #: ../page_stats_calls.ptl:107
- msgid "Minutes per Hour in a Day"
--msgstr "Minuntes par heure dans une journÃƒÂ©e"
-+msgstr "Minuntes par heure dans une journÃ©e"
- 
- #: page_admin_callsstats.ptl:100 page_admin_callsstats.ptl:132
- #: page_admin_callsstats.ptl:165 page_admin_callsstats.ptl:166
-@@ -2312,7 +2313,7 @@
- #: page_admin_callsstats.ptl:101 ../page_stats_callsstats.ptl:108
- #: ../page_stats_calls.ptl:108
- msgid "Cost per Hour in a Day"
--msgstr "CoÃƒÂ»t par heure dans une journÃƒÂ©e"
-+msgstr "CoÃ»t par heure dans une journÃ©e"
- 
- #: page_admin_callsstats.ptl:101 page_admin_callsstats.ptl:133
- #: page_admin_callsstats.ptl:195 StatsHelper.ptl:113
-@@ -2321,7 +2322,7 @@
- #: ../page_stats_calls.ptl:108 ../page_stats_calls.ptl:142
- #: ../page_stats_calls.ptl:212
- msgid "Cost"
--msgstr "CoÃƒÂ»t"
-+msgstr "CoÃ»t"
- 
- #: page_admin_callsstats.ptl:130 ../page_stats_callsstats.ptl:140
- #: ../page_stats_calls.ptl:139
-@@ -2349,7 +2350,7 @@
- #: page_admin_callsstats.ptl:133 ../page_stats_callsstats.ptl:143
- #: ../page_stats_calls.ptl:142
- msgid "Cost per Day in a Month"
--msgstr "CoÃƒÂ»t par jour dans un mois"
-+msgstr "CoÃ»t par jour dans un mois"
- 
- #: page_admin_callsstats.ptl:162 ../page_stats_callsstats.ptl:175
- #: ../page_stats_calls.ptl:177
-@@ -2359,7 +2360,7 @@
- #: page_admin_callsstats.ptl:164 ../page_stats_callsstats.ptl:177
- #: ../page_stats_calls.ptl:179
- msgid "Calls per Month in a Year"
--msgstr "Appels par mois dans une annÃƒÂ©e"
-+msgstr "Appels par mois dans une annÃ©e"
- 
- #: page_admin_callsstats.ptl:164 page_admin_callsstats.ptl:165
- #: page_admin_callsstats.ptl:166 ../page_stats_callsstats.ptl:177
-@@ -2372,17 +2373,17 @@
- #: page_admin_callsstats.ptl:165 ../page_stats_callsstats.ptl:178
- #: ../page_stats_calls.ptl:180
- msgid "Minutes per Month in a Year"
--msgstr "Minutes par mois dans une annÃƒÂ©e"
-+msgstr "Minutes par mois dans une annÃ©e"
- 
- #: page_admin_callsstats.ptl:166 ../page_stats_callsstats.ptl:179
- #: ../page_stats_calls.ptl:181
- msgid "Cost per Month in a Year"
--msgstr "CoÃƒÂ»t par mois dans une annÃƒÂ©e"
-+msgstr "CoÃ»t par mois dans une annÃ©e"
- 
- #: page_admin_callsstats.ptl:192 ../page_stats_callsstats.ptl:210
- #: ../page_stats_calls.ptl:209
- msgid "Year"
--msgstr "AnnÃƒÂ©e"
-+msgstr "AnnÃ©e"
- 
- #: page_admin_callsstats.ptl:193 ../page_stats_callsstats.ptl:211
- #: ../page_stats_calls.ptl:210
-@@ -2405,7 +2406,7 @@
- #: page_admin_callsstats.ptl:195 ../page_stats_callsstats.ptl:213
- #: ../page_stats_calls.ptl:212
- msgid "cost per Year"
--msgstr "coÃƒÂ»t par an"
-+msgstr "coÃ»t par an"
- 
- #: page_admin_callsstats.ptl:198 page_admin_cdr.ptl:109 StatsHelper.ptl:95
- #: ../page_owner_cdr.ptl:108 ../page_stats_callsstats.ptl:216
-@@ -2417,7 +2418,7 @@
- #: page_admin_callsstats.ptl:209 ../page_stats_callsstats.ptl:227
- #: ../page_stats_calls.ptl:226
- msgid "Sorry, this kind of query is not supported yet"
--msgstr "DÃƒÂ©solÃƒÂ©, ce type de requÃƒÂªte n'est pas encore supportÃƒÂ©"
-+msgstr "DÃ©solÃ©, ce type de requÃªte n'est pas encore supportÃ©"
- 
- #: page_admin_callsstats.ptl:213 ../page_stats_callsstats.ptl:231
- #: ../page_stats_calls.ptl:230
-@@ -2431,7 +2432,7 @@
- #: ../page_stats_calls.ptl:235 ../page_stats_dialouts.ptl:176
- #: ../page_stats_phone.ptl:183 ../page_stats_trunks.ptl:190
- msgid "Results"
--msgstr "RÃƒÂ©sultat"
-+msgstr "RÃ©sultat"
- 
- #: page_admin_callsstats.ptl:226 page_admin_dialoutsstats.ptl:178
- #: page_admin_trunksstats.ptl:177 ../page_stats_callsstats.ptl:244
-@@ -2446,11 +2447,11 @@
- 
- #: page_admin_cdr.ptl:38 ../page_stats_cdr.ptl:38
- msgid "Call Details"
--msgstr "DÃƒÂ©tail des appels"
-+msgstr "DÃ©tail des appels"
- 
- #: page_admin_cdr.ptl:39 ../page_owner_cdr.ptl:39 ../page_stats_cdr.ptl:39
- msgid "Get statistics about made and received calls"
--msgstr "Statistiques des appels effectuÃƒÂ©s et reÃƒÂ§us"
-+msgstr "Statistiques des appels effectuÃ©s et reÃ§us"
- 
- #: page_admin_cdr.ptl:74 ../page_owner_cdr.ptl:73 ../page_stats_cdr.ptl:74
- #: ../page_owner_cdr.ptl:74 ../page_stats_cdr.ptl:75
-@@ -2460,7 +2461,7 @@
- #: page_admin_cdr.ptl:75 ../page_owner_cdr.ptl:74 ../page_stats_cdr.ptl:75
- #: ../page_owner_cdr.ptl:75 ../page_stats_cdr.ptl:76
- msgid "Previous"
--msgstr "PrÃƒÂ©cÃƒÂ©dent"
-+msgstr "PrÃ©cÃ©dent"
- 
- #: page_admin_cdr.ptl:86 ../page_owner_cdr.ptl:85 ../page_stats_cdr.ptl:86
- #: ../page_owner_cdr.ptl:86 ../page_stats_cdr.ptl:87
-@@ -2482,7 +2483,7 @@
- #: ../page_stats_cdr.ptl:118 ../StatsHelper.ptl:102 ../page_owner_cdr.ptl:118
- #: ../page_stats_cdr.ptl:119
- msgid "February"
--msgstr "FÃƒÂ©vrier"
-+msgstr "FÃ©vrier"
- 
- #: page_admin_cdr.ptl:118 StatsHelper.ptl:102 ../page_owner_cdr.ptl:117
- #: ../page_stats_cdr.ptl:118 ../StatsHelper.ptl:102 ../page_owner_cdr.ptl:118
-@@ -2518,7 +2519,7 @@
- #: ../page_stats_cdr.ptl:118 ../StatsHelper.ptl:103 ../page_owner_cdr.ptl:118
- #: ../page_stats_cdr.ptl:119
- msgid "August"
--msgstr "AoÃƒÂ»t"
-+msgstr "AoÃ»t"
- 
- #: page_admin_cdr.ptl:118 StatsHelper.ptl:104 ../page_owner_cdr.ptl:117
- #: ../page_stats_cdr.ptl:118 ../StatsHelper.ptl:104 ../page_owner_cdr.ptl:118
-@@ -2542,7 +2543,7 @@
- #: ../page_stats_cdr.ptl:118 ../StatsHelper.ptl:104 ../page_owner_cdr.ptl:118
- #: ../page_stats_cdr.ptl:119
- msgid "December"
--msgstr "DÃƒÂ©cembre"
-+msgstr "DÃ©cembre"
- 
- #: page_admin_cdr.ptl:140 ../page_owner_cdr.ptl:139 ../page_stats_cdr.ptl:141
- #: ../page_owner_cdr.ptl:140 ../page_stats_cdr.ptl:142
-@@ -2558,8 +2559,8 @@
- "Wildcards: % is the 'zero or more characters' wildcard, and _ is the "
- "'exactly one character' wildcard"
- msgstr ""
--"Le caractÃƒÂ¨re: % reprÃƒÂ©sente 'zÃƒÂ©ro ou plusieurs caractÃƒÂ¨res' et _ "
--"reprÃƒÂ©sente 'exactement un caractÃƒÂ¨re'"
-+"Le caractÃ¨re: % reprÃ©sente 'zÃ©ro ou plusieurs caractÃ¨res' et _ reprÃ©sente "
-+"'exactement un caractÃ¨re'"
- 
- #: page_admin_cdr.ptl:141 page_admin_phonestats.ptl:43 page_user_state.ptl:100
- #: ../page_owner_cdr.ptl:140 ../page_stats_cdr.ptl:142
-@@ -2577,7 +2578,7 @@
- #: page_admin_cdr.ptl:142 ../page_owner_cdr.ptl:141 ../page_stats_cdr.ptl:143
- #: ../page_owner_cdr.ptl:142 ../page_stats_cdr.ptl:144
- msgid "You can use the same wildcards as above"
--msgstr "Vous pouvez utiliser les mÃƒÂªmes caractÃƒÂ¨res de matching que ci-dessus"
-+msgstr "Vous pouvez utiliser les mÃªmes caractÃ¨res de matching que ci-dessus"
- 
- #: page_admin_cdr.ptl:143 page_admin_cdr.ptl:291 ../page_owner_cdr.ptl:142
- #: ../page_owner_cdr.ptl:278 ../page_stats_cdr.ptl:144
-@@ -2585,7 +2586,7 @@
- #: ../page_owner_cdr.ptl:283 ../page_stats_cdr.ptl:145
- #: ../page_stats_cdr.ptl:285
- msgid "Duration"
--msgstr "DurÃƒÂ©e"
-+msgstr "DurÃ©e"
- 
- #: page_admin_cdr.ptl:144 ../page_owner_cdr.ptl:143 ../page_stats_cdr.ptl:145
- #: ../page_owner_cdr.ptl:144 ../page_stats_cdr.ptl:146
-@@ -2595,7 +2596,7 @@
- #: page_admin_cdr.ptl:145 ../page_owner_cdr.ptl:144 ../page_stats_cdr.ptl:146
- #: ../page_owner_cdr.ptl:145 ../page_stats_cdr.ptl:147
- msgid "Number of records to show:"
--msgstr "Nombre d'enregistrements affichÃƒÂ©s :"
-+msgstr "Nombre d'enregistrements affichÃ©s :"
- 
- #: page_admin_cdr.ptl:146 ../page_owner_cdr.ptl:145 ../page_stats_cdr.ptl:147
- #: ../page_owner_cdr.ptl:146 ../page_stats_cdr.ptl:148
-@@ -2605,7 +2606,7 @@
- #: page_admin_cdr.ptl:147 ../page_owner_cdr.ptl:146 ../page_stats_cdr.ptl:148
- #: ../page_owner_cdr.ptl:147 ../page_stats_cdr.ptl:149
- msgid "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Start:"
--msgstr "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;DÃƒÂ©but :"
-+msgstr "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;DÃ©but :"
- 
- #: page_admin_cdr.ptl:150 ../page_owner_cdr.ptl:149 ../page_stats_cdr.ptl:151
- #: ../page_owner_cdr.ptl:150 ../page_stats_cdr.ptl:152
-@@ -2625,44 +2626,44 @@
- #: page_admin_cdr.ptl:265 ../page_owner_cdr.ptl:265 ../page_stats_cdr.ptl:268
- #: ../page_owner_cdr.ptl:266 ../page_stats_cdr.ptl:269
- msgid "Desc. Order"
--msgstr "Ordre dÃƒÂ©croissant"
-+msgstr "Ordre dÃ©croissant"
- 
- #: page_admin_cdr.ptl:270
- msgid "Duration of Call"
--msgstr "DurÃƒÂ©e d'appel"
-+msgstr "DurÃ©e d'appel"
- 
- #: page_admin_cdr.ptl:273
- msgid "Cost of call"
--msgstr "CoÃƒÂ»t de l'appel"
-+msgstr "CoÃ»t de l'appel"
- 
- #: page_admin_cdr.ptl:281 page_admin_cdr.ptl:283 page_admin_cdr.ptl:285
- #: page_admin_cdr.ptl:287
- msgid "Result"
--msgstr "RÃƒÂ©sultat"
-+msgstr "RÃ©sultat"
- 
- #: page_admin_cdr.ptl:282 StatsHelper.ptl:160 ../StatsHelper.ptl:160
- msgid "Answered"
--msgstr "RÃƒÂ©ponse"
-+msgstr "RÃ©ponse"
- 
- #: page_admin_cdr.ptl:284
- msgid "Not answered"
--msgstr "Pas rÃƒÂ©pondu"
-+msgstr "Pas rÃ©pondu"
- 
- #: page_admin_cdr.ptl:286 StatsHelper.ptl:162 ../StatsHelper.ptl:162
- msgid "Busy"
--msgstr "OccupÃƒÂ©"
-+msgstr "OccupÃ©"
- 
- #: page_admin_cdr.ptl:288 StatsHelper.ptl:163 ../StatsHelper.ptl:163
- msgid "Failed"
--msgstr "EchouÃƒÂ©"
-+msgstr "EchouÃ©"
- 
- #: page_admin_cdr.ptl:289
- msgid "start"
--msgstr "dÃƒÂ©but"
-+msgstr "dÃ©but"
- 
- #: page_admin_cdr.ptl:294
- msgid "Cost_per_Minute"
--msgstr "CoÃƒÂ»t_par_Minute"
-+msgstr "CoÃ»t_par_Minute"
- 
- #: page_admin_cdr.ptl:321 page_admin_cdr.ptl:323 ../page_owner_cdr.ptl:293
- #: ../page_owner_cdr.ptl:295 ../page_stats_cdr.ptl:296
-@@ -2671,18 +2672,18 @@
- #: ../page_stats_cdr.ptl:302
- #, python-format
- msgid "Showing records from %s to %s of %s <br /><br />"
--msgstr "Affiche les enregistrements de %s Ãƒ  %s de %s <br /><br />"
-+msgstr "Affiche les enregistrements de %s Ã  %s de %s <br /><br />"
- 
- #: page_admin_cdr.ptl:325 ../page_owner_cdr.ptl:297 ../page_stats_cdr.ptl:300
- #: ../page_owner_cdr.ptl:302 ../page_stats_cdr.ptl:304
- #, python-format
- msgid "Total Duration of shown calls: %s min."
--msgstr "DurÃƒÂ©e totale des appels affichÃƒÂ©s : %s min."
-+msgstr "DurÃ©e totale des appels affichÃ©s : %s min."
- 
- #: page_admin_cdr.ptl:329
- #, python-format
- msgid "Total Cost of shown calls: %s"
--msgstr "CoÃƒÂ»t total des appels affichÃƒÂ©s : %s"
-+msgstr "CoÃ»t total des appels affichÃ©s : %s"
- 
- #: page_admin_dialoutsstats.ptl:35 ../page_stats_dialouts.ptl:35
- #: ../page_stats_dialouts.ptl:34
-@@ -2692,7 +2693,7 @@
- #: page_admin_dialoutsstats.ptl:36 ../page_stats_dialouts.ptl:36
- #: ../page_stats_dialouts.ptl:35
- msgid "Statistics for Dialout Entries"
--msgstr "Statistiques des entrÃƒÂ©es d'appels sortants"
-+msgstr "Statistiques des entrÃ©es d'appels sortants"
- 
- #: page_admin_dialoutsstats.ptl:48 page_admin_phonestats.ptl:46
- #: page_admin_trunksstats.ptl:47 ../page_stats_dialouts.ptl:51
-@@ -2722,7 +2723,7 @@
- #: page_admin_dialoutsstats.ptl:156 page_admin_phonestats.ptl:154
- #: ../page_stats_dialouts.ptl:159 ../page_stats_phone.ptl:157
- msgid "Incomming Calls per Dialout Entry"
--msgstr "Appels entrants par entrÃƒÂ©e d'appels sortants"
-+msgstr "Appels entrants par entrÃ©e d'appels sortants"
- 
- #: page_admin_dialoutsstats.ptl:157 page_admin_dialoutsstats.ptl:159
- #: page_admin_phonestats.ptl:155 page_admin_phonestats.ptl:157
-@@ -2736,12 +2737,12 @@
- #: ../page_stats_dialouts.ptl:161 ../page_stats_phone.ptl:159
- #: ../page_stats_dialouts.ptl:167 ../page_stats_phone.ptl:174
- msgid "Outgoing Calls per Dialout Entry"
--msgstr "Appels sortants par entrÃƒÂ©e d'appels sortants"
-+msgstr "Appels sortants par entrÃ©e d'appels sortants"
- 
- #: page_admin_dialoutsstats.ptl:165 ../page_stats_dialouts.ptl:168
- #: ../page_stats_dialouts.ptl:171 ../page_stats_phone.ptl:178
- msgid "Statistics of Calls by Dialout Entry:"
--msgstr "Statistiques des appels par entrÃƒÂ©e d'appels sortants :"
-+msgstr "Statistiques des appels par entrÃ©e d'appels sortants :"
- 
- #: page_admin_panel.ptl:28 ../page_admin_panel.ptl:28
- msgid "Asternic Flash Operator Panel"
-@@ -2749,11 +2750,11 @@
- 
- #: page_admin_panel.ptl:43 ../page_admin_panel.ptl:43
- msgid "You don't have a panel configured yet"
--msgstr "Vous n'avez pas encore configurÃƒÂ© le panneau"
-+msgstr "Vous n'avez pas encore configurÃ© le panneau"
- 
- #: page_admin_panel.ptl:47 ../page_admin_panel.ptl:47
- msgid "You have a panel configured "
--msgstr "Vous avez un panneau configurÃƒÂ©"
-+msgstr "Vous avez un panneau configurÃ©"
- 
- #: page_admin_panel.ptl:49 ../page_admin_panel.ptl:49
- msgid "here"
-@@ -2773,7 +2774,7 @@
- #: ../page_admin_reload.ptl:44 ../page_user_quickdiallist.ptl:76
- #: ../page_user_settings.ptl:105 ../page_user_state.ptl:138
- msgid "Asterisk is not running!"
--msgstr "Asterisk n'est pas lancÃƒÂ©"
-+msgstr "Asterisk n'est pas lancÃ©"
- 
- #: page_admin_pbxstate.ptl:85 page_config_reload.ptl:49
- #: page_user_quickdiallist.ptl:81 page_user_settings.ptl:110
-@@ -2781,7 +2782,7 @@
- #: ../page_admin_reload.ptl:49 ../page_user_quickdiallist.ptl:81
- #: ../page_user_settings.ptl:110 ../page_user_state.ptl:143
- msgid "The manager access is not working!"
--msgstr "L'accÃƒÂ¨s de gestion ne fonctionne pas"
-+msgstr "L'accÃ¨s de gestion ne fonctionne pas"
- 
- #: page_admin_phonestats.ptl:30 ../page_stats_phone.ptl:30
- #: ../page_stats_phone.ptl:34
-@@ -2795,7 +2796,7 @@
- 
- #: page_admin_phonestats.ptl:163 ../page_stats_phone.ptl:166
- msgid "Statistics of Extension Calls by Dialout Entry:"
--msgstr "Statistiques des appels d'extension par entrÃƒÂ©e d'appel sortant"
-+msgstr "Statistiques des appels d'extension par entrÃ©e d'appel sortant"
- 
- #: page_admin.ptl:25 ../page_admin.ptl:25
- msgid "Administration"
-@@ -2844,7 +2845,7 @@
- 
- #: page_config_applications.ptl:27 ../page_config_applications.ptl:27
- msgid "Special Asterisk Applications"
--msgstr "Application spÃƒÂ©cial d'Asterisk"
-+msgstr "Application spÃ©cial d'Asterisk"
- 
- #: page_config_backup.ptl:27 ../page_admin_backup.ptl:27
- msgid "Backup a config file"
-@@ -2853,7 +2854,7 @@
- #: page_config_backup.ptl:44 ../page_admin_backup.ptl:44
- #, python-format
- msgid "I had a problem backing up %s"
--msgstr "ProblÃƒÂ¨me de sauvegarde de %s"
-+msgstr "ProblÃ¨me de sauvegarde de %s"
- 
- #: page_config_dialout.ptl:27 ../page_config_dialout.ptl:27
- msgid "Dialout"
-@@ -2861,17 +2862,17 @@
- 
- #: page_config_dialout.ptl:28 ../page_config_dialout.ptl:28
- msgid "Dialout entries for outgoing calls"
--msgstr "EntrÃƒÂ©e d'appel sortant pour les appels extÃƒÂ©rieurs"
-+msgstr "EntrÃ©e d'appel sortant pour les appels extÃ©rieurs"
- 
- #: page_config_down.ptl:26 ../page_config_down.ptl:26
- msgid "Moves a configlet one position down"
--msgstr "DÃƒÂ©place un outils de configuration une position en-dessous"
-+msgstr "DÃ©place un outils de configuration une position en-dessous"
- 
- #: page_config_down.ptl:41 page_config_up.ptl:41 ../page_config_down.ptl:41
- #: ../page_config_up.ptl:41
- #, python-format
- msgid "Could not swap id's %s and %s"
--msgstr "Ne paut pas ÃƒÂ©changer %s et %s"
-+msgstr "Ne paut pas Ã©changer %s et %s"
- 
- #: page_config_edit.ptl:27 ../page_config_edit.ptl:27
- msgid "Edit a configlet"
-@@ -2892,16 +2893,16 @@
- 
- #: page_config_options.ptl:27 ../page_config_options.ptl:27
- msgid "DeStar and Asterisk options and parameters"
--msgstr "DeStar et Asterisk options et paramÃƒÂ¨tres"
-+msgstr "DeStar et Asterisk options et paramÃ¨tres"
- 
- #: page_config_phones.ptl:26 page_config.ptl:86 ../page_config_phones.ptl:26
- #: ../page_config.ptl:86
- msgid "Phones"
--msgstr "TÃƒÂ©lÃƒÂ©phones"
-+msgstr "TÃ©lÃ©phones"
- 
- #: page_config_phones.ptl:27 ../page_config_phones.ptl:27
- msgid "Phones and their settings"
--msgstr "TÃƒÂ©lÃƒÂ©phones et leurs paramÃƒÂ¨tres"
-+msgstr "TÃ©lÃ©phones et leurs paramÃ¨tres"
- 
- #: page_config.ptl:26 page_config.ptl:68 page_config.ptl:80 page_config.ptl:86
- #: page_config.ptl:92 ../page_config.ptl:26 ../page_config.ptl:68
-@@ -2922,7 +2923,7 @@
- "You should create a user with type 'Configurator'. Without this user, "
- "everyone connecting to DeStar can configure everything."
- msgstr ""
--"Vous devez crÃƒÂ©er un utilisateur de type 'Configurateur'. Sans cet "
-+"Vous devez crÃ©er un utilisateur de type 'Configurateur'. Sans cet "
- "utilisateur, tout le monde se connectant sur DeStar peut modifier tout."
- 
- #: page_config.ptl:72 ../page_config.ptl:72
-@@ -2932,25 +2933,25 @@
- "ability to modify the configuration files DeStar would be pretty useless. "
- "You should 'chmod g+rwx' this directory and set it's group to one of '%s'."
- msgstr ""
--"Vous devez authoriser l'accÃƒÂ¨s en ÃƒÂ©criture au rÃƒÂ©pertoire /etc/asterisk. "
--"Sans cette possibilitÃƒÂ© de modification des fichiers de configuration DeStar "
--"est inutilisable. Vous devez 'chmod g+rwx' ce rÃƒÂ©pertoire et mettre son "
--"groupe Ãƒ  un de '%s'."
-+"Vous devez authoriser l'accÃ¨s en Ã©criture au rÃ©pertoire /etc/asterisk. Sans "
-+"cette possibilitÃ© de modification des fichiers de configuration DeStar est "
-+"inutilisable. Vous devez 'chmod g+rwx' ce rÃ©pertoire et mettre son groupe Ã  "
-+"un de '%s'."
- 
- #: page_config.ptl:78 ../page_config.ptl:78
- msgid ""
- "You should create a management API entry. Without this entry, DeStar can't "
- "control the Asterisk PBX software."
- msgstr ""
--"Vous devez crÃƒÂ©er une entrÃƒÂ©e API de gestion. Sans cette entrÃƒÂ©e, DeStar ne "
--"peut pas contrÃƒÂ´ler le logiciel de PBX Asterisk."
-+"Vous devez crÃ©er une entrÃ©e API de gestion. Sans cette entrÃ©e, DeStar ne "
-+"peut pas contrÃ´ler le logiciel de PBX Asterisk."
- 
- #: page_config.ptl:84 ../page_config.ptl:84
- msgid ""
- "You should create a phone. Without defined phones you can't make and receive "
- "calls."
- msgstr ""
--"Vous devez crÃƒÂ©er un tÃƒÂ©lÃƒÂ©phone. Sans tÃƒÂ©lÃƒÂ©phones dÃƒÂ©finis vous ne pouvez "
-+"Vous devez crÃ©er un tÃ©lÃ©phone. Sans tÃ©lÃ©phones dÃ©finis vous ne pouvez "
- "pas effecuer et recevoir  des appels."
- 
- #: page_config.ptl:90 ../page_config.ptl:90
-@@ -2958,9 +2959,9 @@
- "You should create a trunk (connection to a Phone company or VOIP Provider). "
- "Without a trunk you can only make calls between local phones."
- msgstr ""
--"Vous devriez crÃƒÂ©er un canal (connection vers une compagnie de tÃƒÂ©lÃƒÂ©phone "
-+"Vous devriez crÃ©er un canal (connection vers une compagnie de tÃ©lÃ©phone "
- "ou un fournisseur VOIP). Sans un canl vous pouvez seulement effectuer des "
--"appels entre tÃƒÂ©lÃƒÂ©phones locaux."
-+"appels entre tÃ©lÃ©phones locaux."
- 
- #: page_config.ptl:92 page_config_trunks.ptl:26 ../page_config.ptl:92
- #: ../page_config_trunks.ptl:26
-@@ -2975,10 +2976,10 @@
- "cards, ZapHFC ISDN cards, etc. You should 'chmod g+rw' this file and set "
- "it's group to one of '%s'."
- msgstr ""
--"Vous devez autoriser l'ÃƒÂ©criture sur /etc/zaptel.conf. Sans l'accÃƒÂ¨s Ãƒ  ce "
--"fichier vous ne serez pas Ãƒ  mÃƒÂªme de configurer les produits Zaptel, entre "
-+"Vous devez autoriser l'Ã©criture sur /etc/zaptel.conf. Sans l'accÃ¨s Ã  ce "
-+"fichier vous ne serez pas Ã  mÃªme de configurer les produits Zaptel, entre "
- "autres cartes FXO/FXS, cartes T1/E1, cartes ZapHFC ISDN, etc. Vous devez "
--"'chmod g+rw' ce fichier et mettre son groupe Ãƒ  un de '%s'."
-+"'chmod g+rw' ce fichier et mettre son groupe Ã  un de '%s'."
- 
- #: page_config.ptl:101 ../page_config.ptl:101
- #, python-format
-@@ -2987,17 +2988,17 @@
- "modify the Asternic Flash Operator Panel configuration files DeStar won't be "
- "integrated whit the panel."
- msgstr ""
--"Vous devriez activer l'accÃƒÂ¨s en ÃƒÂ©criture au rÃƒÂ©pertoire %s. Sans cette "
--"capacitÃƒÂ© Ãƒ  modifer les fichiers de configuration du panneau Asternic Flash "
--"Operator, celui ne pourra pasÃƒÂªtre intÃƒÂ©grÃƒÂ© au panneau."
-+"Vous devriez activer l'accÃ¨s en Ã©criture au rÃ©pertoire %s. Sans cette "
-+"capacitÃ© Ã  modifer les fichiers de configuration du panneau Asternic Flash "
-+"Operator, celui ne pourra pasÃªtre intÃ©grÃ© au panneau."
- 
- #: page_config.ptl:116 ../page_config.ptl:116
- msgid "Configured"
--msgstr "ConfigurÃƒÂ©"
-+msgstr "ConfigurÃ©"
- 
- #: page_config.ptl:116 ../page_config.ptl:116
- msgid "Category"
--msgstr "CatÃƒÂ©gorie"
-+msgstr "CatÃ©gorie"
- 
- #: page_config.ptl:132 ../page_config.ptl:132
- msgid "Other things you can configure:"
-@@ -3013,23 +3014,23 @@
- 
- #: page_config_reload.ptl:28 ../page_admin_reload.ptl:28
- msgid "Reload Asterisk/DeStar PBX"
--msgstr "RedÃƒÂ©marrer Asterisk/DeStar PBX"
-+msgstr "RedÃ©marrer Asterisk/DeStar PBX"
- 
- #: page_config_reload.ptl:53 ../page_admin_reload.ptl:53
- msgid "Doing a reload, result is:"
--msgstr "En train de faire un redÃƒÂ©marrage, le rÃƒÂ©sultat est :"
-+msgstr "En train de faire un redÃ©marrage, le rÃ©sultat est :"
- 
- #: page_config_trunks.ptl:27 ../page_config_trunks.ptl:27
- msgid "Telephone company lines and VoIP-Trunks"
--msgstr "Lignes de compagnies de tÃƒÂ©lÃƒÂ©phone et canaux VoIP"
-+msgstr "Lignes de compagnies de tÃ©lÃ©phone et canaux VoIP"
- 
- #: page_config_trunks.ptl:46 ../page_config_trunks.ptl:46
- msgid "You should add at least one phone to configure trunks"
--msgstr "Vous devez ajouter au moins un tÃƒÂ©lÃƒÂ©phone pour configurer des canaux"
-+msgstr "Vous devez ajouter au moins un tÃ©lÃ©phone pour configurer des canaux"
- 
- #: page_config_up.ptl:26 ../page_config_up.ptl:26
- msgid "Moves a configlet one position up"
--msgstr "DÃƒÂ©place un outil de configuration une position au dessus"
-+msgstr "DÃ©place un outil de configuration une position au dessus"
- 
- #: page_config_users.ptl:26 ../page_config_users.ptl:26
- msgid "Users"
-@@ -3037,7 +3038,7 @@
- 
- #: page_config_users.ptl:27 ../page_config_users.ptl:27
- msgid "Users and Mailboxes"
--msgstr "Utilisateurs et boites Ãƒ  messages"
-+msgstr "Utilisateurs et boites Ã  messages"
- 
- #: page_config_viewconf.ptl:29 ../page_admin_viewconf.ptl:29
- msgid "View Configuration"
-@@ -3057,20 +3058,20 @@
- 
- #: page_config_viewconf.ptl:101 ../page_admin_viewconf.ptl:101
- msgid "Nothing to Show"
--msgstr "Rien Ãƒ  afficher"
-+msgstr "Rien Ã  afficher"
- 
- #: page_config_viewconf.ptl:103 ../page_admin_viewconf.ptl:103
- msgid "There is nothing configured yet."
--msgstr "Rien n'a encore ÃƒÂ©tÃƒÂ© configurÃƒÂ©"
-+msgstr "Rien n'a encore Ã©tÃ© configurÃ©"
- 
- #: page_debug.ptl:25 ../page_debug.ptl:25
- msgid "Debug"
--msgstr "DÃƒÂ©bug"
-+msgstr "DÃ©bug"
- 
- #: page_debug.ptl:26 ../page_debug.ptl:26
- msgid "Various functions to debug DeStar, mostly useful for programmers"
- msgstr ""
--"Diverse fonctions pour dÃƒÂ©bugguer DeStar, la plupart utiles aux dÃƒÂ©veloppeurs"
-+"Diverse fonctions pour dÃ©bugguer DeStar, la plupart utiles aux dÃ©veloppeurs"
- 
- #: page_debug_values.ptl:25 ../page_debug_values.ptl:25
- msgid "Values"
-@@ -3078,7 +3079,7 @@
- 
- #: page_debug_values.ptl:26 ../page_debug_values.ptl:26
- msgid "Dumps all values in the HTTP request"
--msgstr "Affiche toutes les valeurs dans une requÃƒÂªte HTTP"
-+msgstr "Affiche toutes les valeurs dans une requÃªte HTTP"
- 
- #: page_login.ptl:26 ../page_login.ptl:26
- msgid "Login"
-@@ -3090,7 +3091,7 @@
- 
- #: page_login.ptl:42 ../page_login.ptl:42
- msgid "User or phone name/number"
--msgstr "Utilisateur ou numÃƒÂ©ro/nom de tÃƒÂ©lÃƒÂ©phone"
-+msgstr "Utilisateur ou numÃ©ro/nom de tÃ©lÃ©phone"
- 
- #: page_login.ptl:43 ../page_login.ptl:43
- msgid "Password or PIN"
-@@ -3103,11 +3104,11 @@
- #: page_logout.ptl:25 Templates.ptl:234 ../page_logout.ptl:25
- #: ../Templates.ptl:259 ../Templates.ptl:260
- msgid "Logout"
--msgstr "Se dÃƒÂ©logguer"
-+msgstr "Se dÃ©logguer"
- 
- #: page_logout.ptl:26 ../page_logout.ptl:26
- msgid "Logout and become a guest user"
--msgstr "Se dÃƒÂ©logguer et devenir un utilisateur invitÃƒÂ©"
-+msgstr "Se dÃ©logguer et devenir un utilisateur invitÃ©"
- 
- #: page_main.ptl:28 ../page_main.ptl:28
- msgid "Main menu"
-@@ -3119,11 +3120,11 @@
- 
- #: page_main.ptl:137 ../page_main.ptl:137
- msgid "Access Denied"
--msgstr "AccÃƒÂ¨s refusÃƒÂ©"
-+msgstr "AccÃ¨s refusÃ©"
- 
- #: page_main.ptl:139 ../page_main.ptl:139
- msgid "You don't have access to this page."
--msgstr "Vous n'avez pas accÃƒÂ¨s Ãƒ  cette page"
-+msgstr "Vous n'avez pas accÃ¨s Ã  cette page"
- 
- #: page_user_info.ptl:26 ../page_user_info.ptl:26
- msgid "User Info"
-@@ -3131,17 +3132,17 @@
- 
- #: page_user_info.ptl:27 ../page_user_info.ptl:27
- msgid "Your access rights in DeStar"
--msgstr "Vos droits d'accÃƒÂ¨s dans DeStar"
-+msgstr "Vos droits d'accÃ¨s dans DeStar"
- 
- #: page_user_info.ptl:43 page_user.ptl:40 ../page_user_info.ptl:43
- #: ../page_user.ptl:40
- msgid "You are now logged in as user"
--msgstr "Vous ÃƒÂªtes maintenant logguÃƒÂ© comme l'utilisateur"
-+msgstr "Vous Ãªtes maintenant logguÃ© comme l'utilisateur"
- 
- #: page_user_info.ptl:48 page_user.ptl:45 ../page_user_info.ptl:48
- #: ../page_user.ptl:45
- msgid "Your access level is "
--msgstr "Votre niveau d'accÃƒÂ¨s est"
-+msgstr "Votre niveau d'accÃ¨s est"
- 
- #: page_user_info.ptl:53 page_user.ptl:50 ../page_user_info.ptl:53
- #: ../page_user.ptl:50
-@@ -3151,12 +3152,12 @@
- #: page_user_info.ptl:56 page_user.ptl:53 ../page_user_info.ptl:56
- #: ../page_user.ptl:53
- msgid "Your account is disabled. "
--msgstr "Votre compte est dÃƒÂ©sactivÃƒÂ©"
-+msgstr "Votre compte est dÃ©sactivÃ©"
- 
- #: page_user_info.ptl:58 page_user.ptl:55 ../page_user_info.ptl:58
- #: ../page_user.ptl:55
- msgid "You are not logged in."
--msgstr "Vous n'ÃƒÂªtes pas logguÃƒÂ©s"
-+msgstr "Vous n'Ãªtes pas logguÃ©s"
- 
- #: page_user_info.ptl:60 page_user.ptl:57 ../page_user_info.ptl:60
- #: ../page_user.ptl:57
-@@ -3165,11 +3166,11 @@
- 
- #: page_user_info.ptl:64 ../page_user_info.ptl:64
- msgid "access all public accessible info pages"
--msgstr "accÃƒÂ¨s Ãƒ  toutes les pages d'info publique"
-+msgstr "accÃ¨s Ã  toutes les pages d'info publique"
- 
- #: page_user_info.ptl:68 ../page_user_info.ptl:68
- msgid "change your personal phone settings"
--msgstr "changez votre configuration personnelle de tÃƒÂ©lÃƒÂ©phone"
-+msgstr "changez votre configuration personnelle de tÃ©lÃ©phone"
- 
- #: page_user_info.ptl:72 ../page_user_info.ptl:72
- msgid "change phone settings of other people"
-@@ -3181,7 +3182,7 @@
- 
- #: page_user_info.ptl:80 ../page_user_info.ptl:80
- msgid "access debug pages to help program DeStar"
--msgstr "accÃƒÂ¨s aux pages de dÃƒÂ©bug pour aider Ãƒ  la programmation de DeStar"
-+msgstr "accÃ¨s aux pages de dÃ©bug pour aider Ã  la programmation de DeStar"
- 
- #: page_user_info.ptl:83 ../page_user_info.ptl:83
- msgid "Have fun!"
-@@ -3189,19 +3190,19 @@
- 
- #: page_user.ptl:26 ../page_user.ptl:26
- msgid "Perform tasks allowed by users"
--msgstr "Effetuer des tÃƒÂ¢ches autorisÃƒÂ©es par utilisateurs"
-+msgstr "Effetuer des tÃ¢ches autorisÃ©es par utilisateurs"
- 
- #: page_user.ptl:61 ../page_user.ptl:61
- msgid "Access all public accessible info pages"
--msgstr "AccÃƒÂ¨s Ãƒ  toutes les pages d'info publiquement accessible"
-+msgstr "AccÃ¨s Ã  toutes les pages d'info publiquement accessible"
- 
- #: page_user.ptl:65 ../page_user.ptl:65
- msgid "Change your personal phone settings"
--msgstr "Changez vos paramÃƒÂ¨tres personnels"
-+msgstr "Changez vos paramÃ¨tres personnels"
- 
- #: page_user.ptl:69 ../page_user.ptl:69
- msgid "Change phone settings of other people"
--msgstr "Changez les paramÃƒÂ¨tres des tÃƒÂ©lÃƒÂ©phones d'autres gens"
-+msgstr "Changez les paramÃ¨tres des tÃ©lÃ©phones d'autres gens"
- 
- #: page_user.ptl:73 ../page_user.ptl:73
- msgid "Configure the PBX"
-@@ -3209,12 +3210,12 @@
- 
- #: page_user.ptl:77 ../page_user.ptl:77
- msgid "Access debug pages to help program DeStar"
--msgstr "AccÃƒÂ¨s aux pages de dÃƒÂ©bug pour aider Ãƒ  la programmation de DeStar"
-+msgstr "AccÃ¨s aux pages de dÃ©bug pour aider Ã  la programmation de DeStar"
- 
- #: page_user_quickdiallist.ptl:28 page_user_quickdiallist.ptl:29
- #: ../page_user_quickdiallist.ptl:28 ../page_user_quickdiallist.ptl:29
- msgid "Quick Dial List"
--msgstr "Liste de numÃƒÂ©rotation rapide"
-+msgstr "Liste de numÃ©rotation rapide"
- 
- #: page_user_quickdiallist.ptl:46 ../page_user_quickdiallist.ptl:46
- msgid "Global Shorcuts and Final Destinations"
-@@ -3222,41 +3223,41 @@
- 
- #: page_user_quickdiallist.ptl:54 ../page_user_quickdiallist.ptl:54
- msgid "No Global Shorcuts Found on Database"
--msgstr "Pas de raccourcis globaux trouvÃƒÂ©s dans la base de donnÃƒÂ©es"
-+msgstr "Pas de raccourcis globaux trouvÃ©s dans la base de donnÃ©es"
- 
- #: page_user_quickdiallist.ptl:60 ../page_user_quickdiallist.ptl:60
- msgid "Private Shorcuts and Final Destinations"
--msgstr "Raccourcis privÃƒÂ©s et destinations finales"
-+msgstr "Raccourcis privÃ©s et destinations finales"
- 
- #: page_user_quickdiallist.ptl:68 ../page_user_quickdiallist.ptl:68
- msgid "No Private Shorcuts Found on Database"
--msgstr "Pas de raccourcis privÃƒÂ©s trouvÃƒÂ©s dans la base de donnÃƒÂ©es"
-+msgstr "Pas de raccourcis privÃ©s trouvÃ©s dans la base de donnÃ©es"
- 
- #: page_user_quickdiallist.ptl:88 page_user_settings.ptl:118
- #: page_user_state.ptl:151 ../page_user_quickdiallist.ptl:88
- #: ../page_user_settings.ptl:118 ../page_user_state.ptl:151
- msgid "You don't have an associated phone"
--msgstr "Vous n'avez pas de tÃƒÂ©lÃƒÂ©phone associÃƒÂ©"
-+msgstr "Vous n'avez pas de tÃ©lÃ©phone associÃ©"
- 
- #: page_user_settings.ptl:27 ../page_user_settings.ptl:27
- msgid "Phone Settings"
--msgstr "ParamÃƒÂ¨tres des tÃƒÂ©lÃƒÂ©phones"
-+msgstr "ParamÃ¨tres des tÃ©lÃ©phones"
- 
- #: page_user_settings.ptl:28 ../page_user_settings.ptl:28
- msgid "Set your phone settings"
--msgstr "Configurez votre tÃƒÂ©lÃƒÂ©phone"
-+msgstr "Configurez votre tÃ©lÃ©phone"
- 
- #: page_user_settings.ptl:56 ../page_user_settings.ptl:56
- msgid "Enable 'do not disturb'"
--msgstr "Activer 'Ne pas dÃƒÂ©ranger'"
-+msgstr "Activer 'Ne pas dÃ©ranger'"
- 
- #: page_user_settings.ptl:57 ../page_user_settings.ptl:57
- msgid "Immediate call forwarding to"
--msgstr "Faire suivre l'appel immÃƒÂ©diatement Ãƒ "
-+msgstr "Faire suivre l'appel immÃ©diatement Ã "
- 
- #: page_user_settings.ptl:58 ../page_user_settings.ptl:58
- msgid "Forward call when busy/unavailable to"
--msgstr "Faire suivre l'appel quand occupÃƒÂ©/non disponible Ãƒ "
-+msgstr "Faire suivre l'appel quand occupÃ©/non disponible Ã "
- 
- #: page_user_settings.ptl:59 ../page_user_settings.ptl:59
- msgid "Seconds of incoming ring time"
-@@ -3264,7 +3265,7 @@
- 
- #: page_user_settings.ptl:61 ../page_user_settings.ptl:61
- msgid "Voicemail pin"
--msgstr "Pin de boite Ãƒ  message"
-+msgstr "Pin de boite Ã  message"
- 
- #: page_user_settings.ptl:64 ../page_user_settings.ptl:64
- msgid "Extension Password"
-@@ -3272,15 +3273,15 @@
- 
- #: page_user_settings.ptl:95 ../page_user_settings.ptl:95
- msgid "Could not create destar configuration file."
--msgstr "Impossible de crÃƒÂ©er le fichier de configuration DeStar."
-+msgstr "Impossible de crÃ©er le fichier de configuration DeStar."
- 
- #: page_user_state.ptl:27 ../page_user_state.ptl:27
- msgid "Phone State"
--msgstr "Status du tÃƒÂ©lÃƒÂ©phone"
-+msgstr "Status du tÃ©lÃ©phone"
- 
- #: page_user_state.ptl:28 ../page_user_state.ptl:28
- msgid "Status of your phone"
--msgstr "Status de votre tÃƒÂ©lÃƒÂ©phone"
-+msgstr "Status de votre tÃ©lÃ©phone"
- 
- #: page_user_state.ptl:48 ../page_user_state.ptl:48
- msgid "State"
-@@ -3288,7 +3289,7 @@
- 
- #: page_user_state.ptl:57 ../page_user_state.ptl:57
- msgid "Last updated"
--msgstr "DerniÃƒÂ¨re mise Ãƒ  jour"
-+msgstr "DerniÃ¨re mise Ã  jour"
- 
- #: page_user_state.ptl:69 ../page_user_state.ptl:69
- msgid "Registration status"
-@@ -3308,7 +3309,7 @@
- 
- #: page_user_state.ptl:81 ../page_user_state.ptl:81
- msgid "Called extension"
--msgstr "Extension appelÃƒÂ©e"
-+msgstr "Extension appelÃ©e"
- 
- #: page_user_state.ptl:87 ../page_user_state.ptl:87 ../cfg_opt_music.py:33
- msgid "Application"
-@@ -3344,19 +3345,19 @@
- 
- #: StatsHelper.ptl:114 ../StatsHelper.ptl:114
- msgid "Answered Calls"
--msgstr "Appels rÃƒÂ©pondus"
-+msgstr "Appels rÃ©pondus"
- 
- #: StatsHelper.ptl:115 ../StatsHelper.ptl:115
- msgid "Not Answered Calls"
--msgstr "Appels non rÃƒÂ©pondus"
-+msgstr "Appels non rÃ©pondus"
- 
- #: StatsHelper.ptl:116 ../StatsHelper.ptl:116
- msgid "Busy Calls"
--msgstr "Appels occupÃƒÂ©s"
-+msgstr "Appels occupÃ©s"
- 
- #: StatsHelper.ptl:117 ../StatsHelper.ptl:117
- msgid "Failed Calls"
--msgstr "Appels ayant ÃƒÂ©chouÃƒÂ©s"
-+msgstr "Appels ayant Ã©chouÃ©s"
- 
- #: StatsHelper.ptl:158 ../StatsHelper.ptl:158
- msgid "Calls"
-@@ -3364,7 +3365,7 @@
- 
- #: StatsHelper.ptl:161 ../StatsHelper.ptl:161
- msgid "Not Answered"
--msgstr "Non rÃƒÂ©pondu"
-+msgstr "Non rÃ©pondu"
- 
- #: Templates.ptl:255 ../Templates.ptl:280 ../Templates.ptl:281
- msgid "Error"
-@@ -3372,7 +3373,7 @@
- 
- #: Templates.ptl:263 ../Templates.ptl:288 ../Templates.ptl:289
- msgid "You don't have access to this page"
--msgstr "Vous n'avez pas accÃƒÂ¨s Ãƒ  cette page"
-+msgstr "Vous n'avez pas accÃ¨s Ã  cette page"
- 
- #: destar:98 ../destar:105 ../destar:106
- msgid "Error:"
-@@ -3414,15 +3415,15 @@
- 
- #: ../cfg_opt_pbx.py:29
- msgid "You can have several logically separated PBX"
--msgstr "Vous pouvez avoir plusieurs PBX sÃƒÂ©parÃƒÂ©s logiquement"
-+msgstr "Vous pouvez avoir plusieurs PBX sÃ©parÃ©s logiquement"
- 
- #: ../cfg_opt_user.py:36
- msgid "Associated Virtual PBX"
--msgstr "PBX virtuel associÃƒÂ©"
-+msgstr "PBX virtuel associÃ©"
- 
- #: ../configlets.py:768 ../configlets.py:772
- msgid "Price/Account_code for this pattern"
--msgstr "CoÃƒÂ»t/Code_de_compte pour ce pattern"
-+msgstr "CoÃ»t/Code_de_compte pour ce pattern"
- 
- #: ../page_admin.ptl:26
- msgid "Perform administrative actions to PBX"
-@@ -3434,22 +3435,22 @@
- 
- #: ../page_config_dids.ptl:28
- msgid "Direct Inward Dialing."
--msgstr "SÃƒÂ©lection directe Ãƒ  l'arrivÃƒÂ©e"
-+msgstr "SÃ©lection directe Ã  l'arrivÃ©e"
- 
- #: ../page_owner_cdr.ptl:38
- msgid "Call Details For Virtual PBX"
--msgstr "DÃƒÂ©tails d'appel pour le PBX virtuel"
-+msgstr "DÃ©tails d'appel pour le PBX virtuel"
- 
- #: ../page_owner_cdr.ptl:155 ../page_owner_cdr.ptl:241
- #: ../page_stats_cdr.ptl:157 ../page_stats_cdr.ptl:244
- #: ../page_owner_cdr.ptl:156 ../page_owner_cdr.ptl:242
- #: ../page_stats_cdr.ptl:158 ../page_stats_cdr.ptl:245
- msgid "Time_of_start"
--msgstr "Heure_du_dÃƒÂ©but"
-+msgstr "Heure_du_dÃ©but"
- 
- #: ../page_owner.ptl:25
- msgid "Virtual PBX Owner"
--msgstr "PropriÃƒÂ©taire du PBX virtuel"
-+msgstr "PropriÃ©taire du PBX virtuel"
- 
- #: ../page_stats_cdr.ptl:140 ../page_stats_cdr.ptl:141
- msgid "PBX"

Deleted: destar/trunk/debian/patches/40_zaptypo.dpatch
===================================================================
--- destar/trunk/debian/patches/40_zaptypo.dpatch	2006-09-05 19:59:04 UTC (rev 2352)
+++ destar/trunk/debian/patches/40_zaptypo.dpatch	2006-09-07 20:33:19 UTC (rev 2353)
@@ -1,232 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_zaptypo.dpatch by  <root at localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad destar-0.2beta~/cfg_phone_zap.py destar-0.2beta/cfg_phone_zap.py
---- destar-0.2beta~/cfg_phone_zap.py	2006-05-31 05:52:56.000000000 +0000
-+++ destar-0.2beta/cfg_phone_zap.py	2006-06-27 05:33:50.000000000 +0000
-@@ -202,7 +202,7 @@
- 			self.technology,
- 			self.channels,
- 			self.name,
--			int(self.usevm)),
-+			int(self.usevm),
- 			pbx,
--			ext
-+			ext)
- 		      )
-diff -urNad destar-0.2beta~/cfg_phone_zap.py.orig destar-0.2beta/cfg_phone_zap.py.orig
---- destar-0.2beta~/cfg_phone_zap.py.orig	1970-01-01 00:00:00.000000000 +0000
-+++ destar-0.2beta/cfg_phone_zap.py.orig	2006-05-31 05:52:56.000000000 +0000
-@@ -0,0 +1,208 @@
-+# -*- coding: iso-latin-1 -*-
-+#
-+# Copyright (C) 2005 by Holger Schurig,
-+# 
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+#
-+
-+
-+from configlets import *
-+import panelutils
-+
-+
-+class CfgPhoneZap(CfgPhone):
-+
-+	shortName = _("Normal ZAP phone")
-+	newObjectTitle = _("New ZAP phone")
-+	technology = "ZAP"
-+	
-+	def createVariables(self):
-+		self.variables = [
-+			VarType("pbx",    
-+				title=_("Virtual PBX"), 
-+				type="choice", 
-+				options=getChoice("CfgOptPBX")),
-+
-+			VarType("name",
-+				title=_("Name"),
-+				len=35),
-+
-+			VarType("channels",
-+				title=_("Zaptel channel number"),
-+				type="string",
-+				len=5),
-+
-+			VarType("sigtype",
-+				title=_("Signalling type"),
-+				type="choice",
-+				options=[('ls','loopstart'),
-+					('ks', 'kewlstart')]),
-+				
-+			VarType("group",
-+				title=_("Group"),
-+				type="int",
-+				optional=True),
-+				
-+			VarType("ext",
-+				title=_("Extension"),
-+				len=6),
-+
-+			VarType("did",
-+				title=_("Allow direct dialling from outside?"),
-+				type="bool",
-+				hide=True,
-+				default=False),
-+
-+			VarType("Call Group",
-+				title=_("Call group"),
-+				type="label"),
-+				
-+			VarType("enablecallgroup",
-+				title=_("Enable call group"),
-+				type="bool",
-+				optional=False,
-+				default=False),
-+				
-+			VarType("callgroup",
-+				title=_("Call group number"),
-+				optional=True),
-+			
-+			VarType("panelLab",
-+				title=_("Operator Panel"),
-+				type="label",
-+				hide=True),
-+
-+			VarType("panel",
-+				title=_("Show this phone in the panel"),
-+				type="bool",
-+				hide=True,
-+				optional=True),
-+			
-+			VarType("Voicemail",
-+				title=_("Voicemail settings"),
-+				type="label",
-+				len=6),
-+			
-+			VarType("usevm",
-+				title=_("Use voicemail"),
-+				type="bool",
-+				optional=True),
-+				
-+			VarType("usemwi",
-+				title=_("Signal waiting mail"),
-+				type="bool",
-+				optional=True),
-+
-+			VarType("pin",
-+				title=_("Voicemail PIN"),
-+				optional=True,
-+				len=6),
-+	
-+			VarType("Outbound",
-+				title=_("Calls from the phone"),
-+				type="label"),
-+				
-+			VarType("calleridnum",
-+				title=_("Caller-Id Number"),
-+				optional=True),
-+				
-+			VarType("calleridname",
-+				title=_("Caller-Id Name"),
-+				optional=True),
-+				
-+			VarType("Dialout",
-+				title=_("Allowed dialout-entries"),
-+				type="label",
-+				hide=True),
-+
-+			VarType("timeout",
-+				title=_("Enable time restriction?"),
-+				type="bool",
-+				optional=True,
-+				hide=True),]
-+
-+		if varlist_manager.hasDialouts():
-+			self.variables += varlist_manager.getDialouts()
-+			for v in self.variables:
-+				if v.name == "Dialout" or v.name=="timeout":
-+					v.hide = False
-+					
-+		queues = len(configlet_tree.getConfigletsByName('CfgPhoneQueue'))
-+		if queues > 0:
-+			for v in self.variables:
-+				if v.name == "QueueLab" or v.name == "queues":
-+					v.hide = False
-+		self.dependencies = [
-+			DepType("pbx", 
-+					type="hard",
-+					message = _("This is a Dependency")),
-+		]
-+		for var in self.__dict__.keys():
-+			if var.startswith('dialout_'):
-+				self.dependencies.append(
-+					DepType(var,
-+							type="hard",
-+							message = _("This is a Dependency")))
-+
-+	def createAsteriskConfig(self):
-+		needModule("chan_zap")
-+
-+		# Create config for chan_zap:
-+		c = AstConf("zapata.conf")
-+		c.append("signalling=fxo_%s" % self.sigtype)
-+
-+		if self.calleridname and self.calleridnum:
-+			c.append('callerid="%s" <%s>' % (self.calleridname, self.calleridnum))
-+		elif self.calleridname:
-+			c.append('callerid="%s"' % self.calleridname)
-+		elif self.calleridnum:
-+			c.append('callerid=%s' % self.calleridnum)
-+		c.append("context=out-%s" % self.name)
-+
-+		if self.group:
-+			c.appendValue(self, "group")
-+		c.append("txgain=0.0")
-+		c.append("rxgain=0.0")
-+		c.append("channel=%s" % self.channels)
-+		c.append("")
-+
-+		c = AstConf("zaptel.conf")
-+		c.setSection("")
-+		c.destar_comment = False
-+		c.append("fxo%s=%s" % (self.sigtype, self.channels))
-+		c.append("")
-+
-+		if self.enablecallgroup:
-+			c.append('callgroup=%s' % self.callgroup)
-+			c.append('pickupgroup=%s' % self.callgroup)
-+
-+		self.createExtensionConfig()
-+		self.createVoicemailConfig(c)
-+		self.createOutgoingContext()
-+		self.createPanelConfig()
-+
-+	def channelString(self):
-+		return "%s/%s" % (self.technology, self.channels)
-+
-+
-+	def createDialEntry(self, extensions, exten, pbx, ext):
-+		ret = extensions.appendExten(exten, "Macro(dial-std-exten,%s/%s,out-%s,%d,%s,%s)" % (
-+			self.technology,
-+			self.channels,
-+			self.name,
-+			int(self.usevm)),
-+			pbx,
-+			ext
-+		      )

Deleted: destar/trunk/debian/patches/50_portbug.dpatch
===================================================================
--- destar/trunk/debian/patches/50_portbug.dpatch	2006-09-05 19:59:04 UTC (rev 2352)
+++ destar/trunk/debian/patches/50_portbug.dpatch	2006-09-07 20:33:19 UTC (rev 2353)
@@ -1,1273 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_portbug.dpatch by  <root at localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad destar-0.2beta~/configlets.py destar-0.2beta/configlets.py
---- destar-0.2beta~/configlets.py	2006-06-17 12:23:57.000000000 +0000
-+++ destar-0.2beta/configlets.py	2006-06-27 05:40:04.000000000 +0000
-@@ -379,6 +379,8 @@
- 		self.groups[configlet.groupName].append(configlet)
- 	
- 
-+configlet_tree = ConfigletTree()
-+
- class Holder(object):
- 	"""
- 	This is a simple wrapper class so that you can write
-@@ -443,7 +445,6 @@
- 
- 
- 
--configlet_tree = ConfigletTree()
- 
- class DependentObject:
- 	def __init__(self, configlet, dependency):
-@@ -604,6 +605,7 @@
- 		May be overridden for additional test."""
- 
- 		# Make sure we don't add two thingies with the same extension on the same pbx
-+		global configlet_tree
- 		if self.__dict__.has_key('ext'):
- 			for o in configlet_tree:
- 				if o==self: continue
-@@ -745,6 +747,7 @@
- 		'clazz' where the child class can tell us which class should
- 		be unique in the configlet_tree."""
- 
-+		global configlet_tree
- 		if not clazz:
- 			clazz = self
- 		for o in configlet_tree:
-@@ -766,6 +769,7 @@
- 		return self.trunks
- 		
- 	def updateTrunks(self):
-+		global configlet_tree
- 		self.trunks = []
- 		for obj in configlet_tree['Trunks']:
- 			self.trunks.append(VarType("trunk_%s" % obj.name, title=_("%s") % obj.name, type="bool", optional=True,render_br=False))
-@@ -778,6 +782,7 @@
- 		return self.dialouts
- 
- 	def updateDialouts(self):
-+		global configlet_tree
- 		self.dialouts = []
- 		for obj in configlet_tree['Dialout']:
- 			self.dialouts.append(VarType("dialout_%s" % obj.name, title=_("%s") % obj.name, type="bool", optional=True,render_br=False))
-@@ -897,6 +902,7 @@
- 	def fixup(self):
- 		Cfg.fixup(self)
- 		self.lookPanel()
-+		global configlet_tree
- 		if configlet_tree.hasConfiglet('CfgPhoneQueue'):
- 			for v in self.variables:
- 				if v.name == "QueueLab" or v.name == "queues":
-diff -urNad destar-0.2beta~/configlets.py.orig destar-0.2beta/configlets.py.orig
---- destar-0.2beta~/configlets.py.orig	1970-01-01 00:00:00.000000000 +0000
-+++ destar-0.2beta/configlets.py.orig	2006-06-17 12:23:57.000000000 +0000
-@@ -0,0 +1,1053 @@
-+# -*- coding: iso-latin-1 -*-
-+#
-+# Copyright (C) 2005 by Holger Schurig
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
-+#
-+
-+
-+import sys, os, types, sha, binascii, time
-+import panelutils
-+
-+CONF_DIR = "/etc/asterisk"
-+CONF_TAG = "; Automatically created by DESTAR\n"
-+
-+
-+class AsteriskConfigFile:
-+	"""
-+	A class to generate Asterisk configuration files more easily.
-+
-+	Create an AstConf class with the filename of the configfile, change
-+	sections and append lines or extension lines. When you call you
-+	destroy the class (normally at the end of program), the config file
-+	will be written. You can force a write with the write() method.
-+
-+	This autowrite on destroy allows us to create an instance of this
-+	class at several places in the source code, add stuff and be sure that
-+	all those writes will make it into the config file.
-+	"""
-+
-+
-+	def __init__(self, fn):
-+		if fn == 'zaptel.conf':
-+			fn = os.path.join("/etc", fn)
-+		if fn == 'op_server.cfg' or fn == 'op_buttons.cfg':
-+			fn = os.path.join(panelutils.PANEL_CONF_DIR, fn)
-+		elif fn.find('/')==-1:
-+			fn = os.path.join(CONF_DIR, fn)
-+		self.fn		  = fn
-+		self.sections = {}		# dictionary of sections
-+		self.order	  = []		# ordered list of sections
-+		self.dirty	  = False		# nothing to write yet
-+		self.extpriority = 1
-+		self.section  = "general"
-+		self.destar_comment = True
-+		self.lastext  = None
-+
-+	def write(self, f=None):
-+		"Write myself into the config file"
-+		if self.dirty:
-+			if not f:
-+				f = open(self.fn, "w")
-+			if self.destar_comment:
-+				f.write(CONF_TAG)
-+			for sect in self.order:
-+				if sect:
-+					f.write("\n[%s]" % sect)
-+				f.write("\n")
-+				for l in self.sections[sect]:
-+					f.write(l)
-+					f.write("\n")
-+			self.dirty = False
-+
-+	def setSection(self, sect):
-+		"Select a config file section where append() etc will put their data"
-+		self.section = sect
-+		self.extpriority  = 1
-+
-+	def hasSection(self, sect):
-+		"Does the section already exists?"
-+		return sect in self.sections
-+
-+	def append(self,l):
-+		"""Append an ordinary line to the current section"""
-+		try:
-+			self.sections[self.section].append(l)
-+		except KeyError:
-+			self.sections[self.section] = [l]
-+			self.order.append(self.section)
-+		self.dirty = True
-+
-+	def prepend(self,l):
-+		"""Prepend an ordinary line to the current section"""
-+		try:
-+			self.sections[self.section].insert(0,l)
-+		except KeyError:
-+			self.sections[self.section] = [l]
-+			self.order.append(self.section)
-+		self.dirty = True
-+
-+	def appendExten(self,ext,l,e=None):
-+		"""Append an extension line l to the current section. Append
-+		an optional error extenion e as well. Increments the priorty
-+		if the extension stays the same, resets the prio to 1 if the
-+		extension changes."""
-+
-+		if ext != self.lastext:
-+			self.extpriority = 1
-+		self.lastext = ext
-+		self.append("exten=%s,%d,%s" % (ext, self.extpriority, l))
-+		if e:
-+			self.append("exten=%s,%d,%s" % (ext, self.extpriority+101, e))
-+			
-+		ret = self.extpriority
-+		self.extpriority = self.extpriority + 1
-+		return ret
-+
-+	def setPriority(self,n):
-+		"""Manually set extension priority to an arbitrary number."""
-+		self.extpriority = n
-+
-+	def appendValue(self,conf,var, name=None):
-+		"""Write an value that is inside an configuration class"""
-+		try:
-+			val = getattr(conf,var)
-+		except:
-+			return
-+
-+		if not name:
-+			name = var
-+
-+		if val==None:
-+			return
-+
-+		if type(val) == types.IntType:
-+			self.append("%s=%d" % (name, val))
-+		elif type(val) == types.StringType:
-+			self.append("%s=%s" % (name, val))
-+		elif type(val) == types.FloatType:
-+			self.append("%s=%f" % (name, val))
-+		elif type(val) == types.BooleanType:
-+			if val:
-+				self.append("%s=yes" % name)
-+			else:
-+				self.append("%s=no" % name)
-+		else:
-+			print "invalid type ", val
-+			raise Exception
-+
-+
-+asterisk_configfiles = []
-+
-+
-+def AstConf(fn):
-+	"""Retrieve the AsteriskConfigFile class that contains file 'fn'
-+	from our config file cache, create a new class if it doesn't exist."""
-+	global asterisk_configfiles
-+	for cfg, obj in asterisk_configfiles:
-+		if cfg == fn:
-+			return obj
-+	obj = AsteriskConfigFile(fn)
-+	asterisk_configfiles.append( (fn,obj) )
-+	return obj
-+
-+
-+
-+
-+#########################################################################
-+
-+class __PasswordGeneratorClass:
-+	def __init__(self):
-+		self.hash = sha.new("D35tar r0ck5")
-+		self.hash.update(str(time.time()))
-+
-+	def __call__(self, len=6, seed=""):
-+		try:
-+			self.hash.update(open("/dev/urandom", "rb").read(32))
-+		except IOError:
-+			self.hash.update(str(time.time()))
-+
-+		if seed:
-+			self.hash.update(str(seed))
-+		return binascii.b2a_base64(self.hash.digest())[:len]
-+
-+generatePassword = __PasswordGeneratorClass()
-+
-+
-+#########################################################################
-+
-+
-+def needModule(mod):
-+	#print "Need module", mod
-+	c = AstConf("modules.conf")
-+	if not "modules" in dir(c):
-+		#print "setting c.modules"
-+		c.modules = Holder(
-+			pbx =	[
-+				"pbx_config",
-+				"pbx_spool",
-+				"pbx_functions",
-+				],
-+			# TODO: get list of codecs and format from /usr/lib/asterisk/modules
-+			codec = [
-+				"codec_a_mu",
-+				"codec_adpcm",
-+				"codec_alaw",
-+				"codec_g726",
-+				"codec_gsm",
-+				"codec_ilbc",
-+				"codec_lpc10",
-+				"codec_ulaw",
-+				],
-+			format = [
-+				"format_g726",
-+				"format_g729",
-+				"format_gsm",
-+				"format_h263",
-+				"format_ilbc",
-+				"format_jpeg",
-+				"format_pcm",
-+				"format_vox",
-+				"format_wav",
-+				"format_wav_gsm",
-+				],
-+			res =	[ "res_musiconhold",
-+				  "res_features" ],
-+			cdr =	[ ],
-+			chan =	[ ],
-+			func =	[ 
-+				"func_callerid",
-+				],
-+			app =	[
-+				"app_db",
-+				"app_dial", # needs res_musiconhold, res_parking
-+				"app_macro",
-+				"app_playback",
-+				],
-+			preload = [],
-+			)
-+
-+	sect = mod.split("_")[0]
-+	#print "sect", sect
-+	try:
-+		sect = c.modules[sect]
-+		#print "sect now:", sect
-+	except KeyError:
-+		# create new array
-+		c.modules[sect] = [mod]
-+		return
-+	# sect contains now the entire section array
-+	if not mod in sect:
-+		sect.append(mod)
-+	#print "sect finally", sect
-+
-+
-+
-+#########################################################################
-+
-+class ConfigletTree:
-+	
-+	def __init__(self):
-+		self.groups = {}
-+		self.name = ''
-+	
-+	def __getitem__(self, key):
-+		if self.groups.has_key(key):
-+			return self.groups[key]
-+		else: return []
-+
-+	def __setitem__(self, key, val):
-+		self.groups[key] = val
-+		
-+	def __iter__(self):
-+		for group in self.groups.values():
-+			for element in group:
-+				yield element
-+				
-+	def __str__(self):
-+		stringname = ''
-+		for element in self:
-+			stringname += str(element) + ', '
-+		return stringname[:-2]
-+	
-+	def __len__(self):
-+		length = 0
-+		for i in self.groups.values():
-+			length += len(i)
-+		return length
-+			
-+	def updateConfiglet(self, obj):
-+		configlet_list = self.groups[obj.groupName]
-+		
-+		
-+		for i in range(len(configlet_list)):
-+			if configlet_list[i]._id == obj._id:
-+				configlet_list[i] = obj
-+				
-+	def deleteConfiglet(self, _id):
-+		for group in self.groups.values():
-+			for i in range(len(group)):
-+				if group[i]._id == _id:
-+					for dep in group[i].dependent_objs:
-+						self.deleteConfiglet(dep.configlet._id)
-+					del group[i]
-+					return
-+					
-+	def moveConfigletUp(self, _id):
-+		obj = self.getConfiglet(_id)
-+		configlet_list = self.groups[obj.groupName]
-+		
-+		for i in range(len(configlet_list)):
-+			if configlet_list[i]._id == obj._id and i > 0:
-+				configlet_list[i] = configlet_list[i-1]
-+				configlet_list[i-1] = obj
-+				return obj
-+		return None
-+		
-+	def moveConfigletDown(self, _id):
-+		obj = self.getConfiglet(_id)
-+		configlet_list = self.groups[obj.groupName]
-+		
-+		for i in range(len(configlet_list)):
-+			if configlet_list[i]._id == obj._id and i < (len(configlet_list) -1):
-+				configlet_list[i] = configlet_list[i+1]
-+				configlet_list[i+1] = obj
-+				return obj
-+		return None
-+	
-+	def getConfigletsByGroup(self, groupName):
-+		return self[groupName]
-+	
-+	#TODO: Make this as fast as getConfigletsByGroup
-+	def getConfigletsByName(self, name):
-+		result = []
-+		for obj in self:
-+			if obj.shortName == name or obj.__class__.__name__ == name:
-+				result.append(obj)
-+		return result
-+
-+	def getConfigletsByClass(self, _class):
-+		result = []
-+		for obj in self:
-+			if isinstance(obj, _class):
-+				result.append(obj)
-+		return result
-+		
-+	def hasConfiglet(self, _class):
-+		for obj in self:
-+			if obj.__class__.__name__ == _class: 
-+				return True
-+		return False
-+			
-+
-+	def empty(self):
-+		return len(self)==0
-+		
-+	def getConfiglet(self, _id):
-+		for obj in self:
-+			try:
-+				if obj._id == int(_id):
-+					return obj
-+			except:
-+				pass
-+		return None
-+		
-+	def getConfigletByName(self, name):
-+		for obj in self:
-+			try:
-+				if obj.name == name:
-+					return obj
-+			except:
-+				pass
-+		return None
-+		
-+	def addConfiglet(self, configlet):
-+		if not self.groups.has_key(configlet.groupName):
-+			self.groups[configlet.groupName] = []
-+		self.groups[configlet.groupName].append(configlet)
-+	
-+
-+class Holder(object):
-+	"""
-+	This is a simple wrapper class so that you can write
-+
-+	 foo = Holder(bar = 1,
-+				baz = "test")
-+	instead of
-+
-+	 foo["bar"] = 1
-+	 baz["bar"] = "test"
-+
-+	Holder will be a base class for all configuration options and
-+	modules.
-+	"""
-+
-+	def __init__(self, **kw):
-+		self.__dict__.update(kw)
-+
-+	def keys(self):
-+		"""Return list of stored variables."""
-+		return self.__dict__.keys()
-+
-+	def __getitem__(self,key):
-+		"""Allows access to the variables via obj[name] syntax."""
-+		return self.__dict__[key]
-+
-+	def __setitem__(self,key,val):
-+		"""Allows access to the variables via obj[name] syntax."""
-+		self.__dict__[key] = val
-+
-+	def __repr__(self):
-+		return "<configlets.Holder object: " + self.__dict__.__repr__()
-+
-+
-+class DepType(Holder):
-+	"""We use this class to store meta-information about dependendencies"""
-+	
-+	def __init__(self,name,**kw):
-+		Holder.__init__(self,**kw)
-+		self.name = name
-+		self.__dict__.setdefault("type","hard")
-+		self.__dict__.setdefault("message", _("This is a Dependency"))
-+
-+class VarType(Holder):
-+	"""We use this class to store meta-information about configuration variables"""
-+
-+	def __init__(self,name,**kw):
-+		Holder.__init__(self,**kw)
-+		self.name = name
-+		self.__dict__.setdefault("type","string")
-+		self.__dict__.setdefault("len",60)
-+		self.__dict__.setdefault("size",20)
-+		self.__dict__.setdefault("title",self.name)
-+		self.__dict__.setdefault("hint","")
-+		self.__dict__.setdefault("optional", False)
-+		self.__dict__.setdefault("read", "admin")		# admin, user, all
-+		self.__dict__.setdefault("write", "admin")
-+		#self.__dict__.setdefault("default", "")
-+		self.__dict__.setdefault("hide", False)
-+		self.__dict__.setdefault("render_br", True)
-+	
-+
-+
-+
-+configlet_tree = ConfigletTree()
-+
-+class DependentObject:
-+	def __init__(self, configlet, dependency):
-+		self.configlet = configlet
-+		self.dependency = dependency
-+
-+class Cfg(Holder):
-+	"""Base class for all configlets.
-+
-+	Configlets belong to a group, see CfgPhone, CfgOpt, CfgTrunk etc. The
-+	group is also stored in the variable 'group'.
-+
-+	Configlets also contain data. This data is stored quite normally, as
-+	anyone would store data inside a class. What is not so normal is that
-+	a configurable has a variables[] array that contains various VarType
-+	objects that describe those variables (name, description, default
-+	value, length etc). This descriptions are used to automatically
-+	create forms.
-+
-+	And, last not least, a configurabe also have a name, stored in 'shortName'
-+	(to keep 'name' available for actual data)."""
-+
-+	#shortName = "Cfg class (do not use directly)"
-+	#group	   = "Generic option"
-+	variables  = []
-+	dependent_objs = []
-+	dependencies = []
-+
-+
-+	def __init__(self,autoAdd=True,**kw):
-+		"""Stores values from '*kw' into self.__dict__ and add the
-+		newly instantiated object into configlets.configlet_tree if
-+		'autoAdd' says so."""
-+
-+		Holder.__init__(self,**kw)
-+
-+		# Store the object into global array
-+		global configlet_tree
-+		self._id = len(configlet_tree)
-+		if autoAdd:
-+			configlet_tree.addConfiglet(self)
-+		else:
-+			self.createVariables();
-+			self.fixup();
-+
-+		for v in self.variables:
-+			# Labels don't have values. We set 'optional' to True
-+			# so that we later don't get warnings about missing
-+			# values.
-+			if v.type=="label":
-+				v.optional = True
-+				continue
-+				
-+		self.dependent_objs = []
-+		self.dependencies = []
-+				
-+	def __getattr__(self, field):
-+		self.createVariables()
-+		self.fixup()
-+		if self.__dict__.has_key(field):
-+			return self.__dict__[field]
-+		else:
-+			raise AttributeError
-+
-+	def lookPanel(self):
-+		if panelutils.isConfigured() == 1:
-+			for v in self.variables:
-+				if v.name == "panelLab" or v.name == "panel":
-+					v.hide = False
-+					
-+	def renameDependencies(self, new_name):
-+		for dep in self.dependent_objs:
-+				dep.configlet.__dict__[dep.dependency.name] = new_name
-+
-+	def hasDependencies(self):
-+		return len(self.dependent_objs) > 0
-+
-+	def createDependencies(self):
-+		for dep in self.dependencies:
-+			if self.__dict__.has_key(dep.name):
-+				obj_name = self.__dict__[dep.name]
-+				import configlets
-+				obj = configlets.configlet_tree.getConfigletByName(obj_name)
-+				if obj is None:
-+					return
-+				dependent_obj = DependentObject(self, dep)
-+				obj.dependent_objs.append(dependent_obj)
-+
-+	def createVariables(self):
-+		variables = []
-+		
-+	def clearDependencies(self):
-+		self.dependent_objs = []
-+
-+	def fixup(self):
-+		"""Each configlet's fixup() method get's called after the
-+		modules have been loaded from the config file."""
-+
-+		# Make sure all variables are set:
-+		for v in self.variables:
-+			if not self.__dict__.has_key(v.name):
-+				_v = ""
-+				#print v.name,v.type
-+				if v.__dict__.has_key("default"):
-+					#print "set",v.name,"to default",v.default
-+					_v = v.default
-+				elif v.type in ["string","rostring","choice","mchoice","radio"]:
-+					#print "set",v.name,"to ''"
-+					_v = ""
-+				elif v.type=="int":
-+					#print "set",v.name,"to 0"
-+					_v = 0
-+				elif v.type=="bool":
-+					#print "set",v.name,"to false"
-+					_v = False
-+				elif v.type=="label":
-+					continue
-+				else:
-+					print "didn't set",v.name,"to anything"
-+				#print "set %s %s to" % (v.type, v.name), _v
-+				self.__dict__[v.name] = _v
-+
-+
-+	def head(self):
-+		"""Configlets can return a tuple of headers and values via
-+		row() that can be used to display them in tables.
-+
-+		This method gives the header. Usually it will be overwritten."""
-+
-+		return ( _("Extension"),_("Type") )
-+
-+
-+	def row(self):
-+		"""Like head(), but returns a table row."""
-+
-+		try:
-+			ext = self.ext
-+		except AttributeError:
-+			ext = _('None')
-+		return (ext, self.shortName)
-+
-+
-+	def isAddable(self):
-+		"""Teturns True if it is OK to create instances of this class.
-+
-+		This can be used to check if a configlet should be presented
-+		in the menu. The method is a classMethod, so that we can call
-+		it without instantiating an object, e.g. we can call this
-+		like CfgOptPhoneZap.isAddable()."""
-+
-+		# Normally every object is addable
-+		return True
-+	isAddable = classmethod(isAddable)
-+
-+
-+	def checkConfig(self):
-+		"""Test if all variables are set, used by createAsteriskConfig().
-+		May be overridden for additional test."""
-+
-+		# Make sure we don't add two thingies with the same extension on the same pbx
-+		if self.__dict__.has_key('ext'):
-+			for o in configlet_tree:
-+				if o==self: continue
-+				try:
-+					if o.ext == self.ext and o.pbx == self.pbx:
-+						return ("ext", _("Extension already in use on that PBX"))
-+				except AttributeError:
-+					pass
-+
-+		# Make sure we don't add two thingies with the same name
-+		if self.__dict__.has_key('name'):
-+			if self.name.find("-") > 1 or self.name.find(" ") > 1:
-+				return ("name", _("Name should not contain '-' or spaces"))
-+			for o in configlet_tree:
-+				if o==self: continue
-+				try:
-+					if o.name == self.name:
-+						return ("name", _("Name already in use"))
-+				except AttributeError:
-+					pass
-+
-+
-+
-+	def createAsteriskConfig(self):
-+		"Creates AsteriskConfigFile entries if checkConfig() gave us an 'ok'."
-+		if self.checkConfig()==None:
-+			self.createAsteriskConfig()
-+
-+
-+	def createPythonConfig(self):
-+		"""Returns an array of strings that resends this class in Python
-+		syntax. Can be stored in cfg.py (or whereever) and re-read with
-+		execfile()."""
-+
-+		python_cfg = []
-+		python_cfg.append("%s(" % self.__class__.__name__)
-+
-+		for v in self.variables:
-+			if not self.__dict__.has_key(v.name): continue
-+			_v = self.__dict__[v.name]
-+			if _v == None or _v == "":
-+				continue
-+			#print v.name,v.type,_v
-+			if v.__dict__.has_key("default") and _v==v.default:
-+				continue
-+			if v.type in ("string","rostring","choice","mchoice","radio"):
-+				cont = '"%s"' % _v
-+			elif v.type=="text":
-+				cont = '"""%s"""' % _v
-+			elif v.type=="int":
-+				if _v == 0:
-+					print v.name
-+					continue
-+				else:
-+					cont = _v
-+			elif v.type=="bool":
-+				if _v:
-+					cont = "True"
-+				else:
-+					continue
-+			elif v.type=="label":
-+				continue
-+			else:
-+				print "unknown type", v.type
-+				cont = v.type
-+			python_cfg.append("\t%-8s = %s," % (v.name, cont))
-+		python_cfg.append("\t)")
-+		python_cfg.append("")
-+		return python_cfg
-+
-+	
-+
-+#######################################################################
-+#
-+# Accessors for various settings
-+#
-+
-+def getSetting(name, default=None):
-+	return getConfig('CfgOptSettings',name, default)
-+
-+
-+def getChoice(clazz):
-+	"""
-+	Here we actually use a trick. In the configlets, the variables[]
-+	get's build once at configlets load-time. While the configlets are
-+	in the middle of being loaded, you can't really iterate in
-+	configlets.configlet_tree to get a list of, say, all Phones. So this
-+	iteration needs to be postponed. We do this with a lambda function.
-+
-+	This getChoice() uses __getChoice(), which is not defined here in
-+	configlets. It comes from backend.py. But because backend.py imports
-+	us, we don't import backend.py. Therefore, backend.py "implants"
-+	this helper function with "configlets._getChoice = getChoice".
-+	"""
-+
-+	return (lambda : __getChoice(clazz=clazz))
-+
-+
-+#######################################################################
-+#
-+# Base classes for the different configlet groups
-+#
-+
-+class CfgOpt(Cfg):
-+	"""Base class for all Asterisk options."""
-+
-+	groupName = "Options"
-+
-+
-+	def __init__(self,**kw):
-+		Cfg.__init__(self,**kw)
-+
-+	def head(self):
-+		return (_("Name"),_("Info"))
-+
-+
-+	def row(self):
-+		return (self.shortName,'')
-+
-+
-+
-+
-+class CfgOptSingle(CfgOpt):
-+	"""Some Asterisk options should only exist exactly once in the
-+	config. Descend them from this class."""
-+
-+	groupName = "Options"
-+
-+
-+	def isAddable(self, clazz=None):
-+		"""Allow Options to be added exactly once. We'll enforce this
-+		by looking if the current class is already contained in
-+		configlet_tree.
-+
-+		If	a child class, e.g.	 CfgOptZapAudio.isAddable(), wants
-+		to call us, then 'self' is no longer CfgOptZapAudio, but it
-+		is CfgOptSingle. This is because of the classMethod
-+		attribute of isAddable. So we have an optional parameter
-+		'clazz' where the child class can tell us which class should
-+		be unique in the configlet_tree."""
-+
-+		if not clazz:
-+			clazz = self
-+		for o in configlet_tree:
-+			#print o.__class__, clazz
-+			if o.__class__ == clazz: return False
-+		return True
-+	isAddable = classmethod(isAddable)
-+
-+class VarListManager:
-+
-+	def __init__(self):
-+		self.trunks = []
-+		self.dialouts = []
-+		
-+	def hasTrunks(self):
-+		return len(self.trunks)>0
-+		
-+	def getTrunks(self):
-+		return self.trunks
-+		
-+	def updateTrunks(self):
-+		self.trunks = []
-+		for obj in configlet_tree['Trunks']:
-+			self.trunks.append(VarType("trunk_%s" % obj.name, title=_("%s") % obj.name, type="bool", optional=True,render_br=False))
-+			self.trunks.append(VarType("trunk_%s_price" % obj.name, title=_("Price/Account_code for this pattern"), type="int", optional=True, len=10, default=0))
-+
-+	def hasDialouts(self):
-+		return len(self.dialouts)>0
-+
-+	def getDialouts(self):
-+		return self.dialouts
-+
-+	def updateDialouts(self):
-+		self.dialouts = []
-+		for obj in configlet_tree['Dialout']:
-+			self.dialouts.append(VarType("dialout_%s" % obj.name, title=_("%s") % obj.name, type="bool", optional=True,render_br=False))
-+			self.dialouts.append(VarType("dialout_%s_secret" % obj.name, title=_("Password:"), len=50, optional=True))
-+
-+varlist_manager = VarListManager()
-+
-+
-+class CfgTrunk(Cfg):
-+	"""Base class for external lines."""
-+
-+	groupName = "Trunks"
-+
-+
-+	def __init__(self,**kw):
-+		Cfg.__init__(self,**kw)
-+
-+	def fixup(self):
-+		Cfg.fixup(self)
-+		self.lookPanel()
-+
-+
-+	def head(self):
-+		return (_("Name"), _("Type"), _("Dial Command"))
-+
-+
-+	def row(self):
-+		return (self.name, self.shortName, self.dial)
-+
-+
-+	def channel(self):
-+		return "%s/%s" % (self.technology, self.name)
-+
-+	def isAddable(self):
-+		"We can only add this object if we have at least one other phone defined."
-+
-+		# BUG: it does somehow not work to simply write for obj in configlet_tree,
-+		# despite the "from configlets import *" above
-+		global configlet_tree
-+		if len(configlet_tree['Phones']) > 0:
-+			return True
-+		else:
-+			return False
-+	isAddable = classmethod(isAddable)
-+	# BUG: if the choosed phone is deleted, we have a problem
-+
-+	def checkConfig(self):
-+		res = Cfg.checkConfig(self)
-+		if res:
-+			return res
-+		if self.contextin == 'phone' and not self.phone:
-+			return ('phone',_("You should select a phone to ring to"))
-+
-+	def createIncomingContext(self): 
-+		c = AstConf("extensions.conf")
-+		contextin = "in-%s" % self.name
-+		c.setSection(contextin)
-+		c.appendExten("_X.","Set(CDR(intrunk)=%s)" %  self.name)
-+		if self.clid:
-+			needModule("func_callerid")
-+			c.appendExten("_X.","Set(CALLERID(name)=%s)" %  self.clid)
-+		if self.contextin == 'phone' and self.phone:
-+			global configlet_tree
-+			obj = configlet_tree.getConfigletByName(self.phone)
-+			try:
-+				pbx = obj.pbx
-+			except AttributeError:
-+				pass
-+			c.appendExten("_X.", "Goto(%s,%s,1)" % (pbx,self.phone))
-+		if self.contextin == 'ivr' and self.ivr:
-+			c.appendExten("_X.", "Goto(%s,s,1)" % self.ivr)
-+		c.appendExten("s","Set(CDR(intrunk)=%s)" %  self.name)
-+		if self.clid:
-+			needModule("func_callerid")
-+			c.appendExten("s","Set(CALLERID(name)=%s)" %  self.clid)
-+		if self.contextin == 'phone' and self.phone:
-+			global configlet_tree
-+			obj = configlet_tree.getConfigletByName(self.phone)
-+			try:
-+				pbx = obj.pbx
-+			except AttributeError:
-+				pass
-+			c.appendExten("s", "Goto(%s,%s,1)" % (pbx,self.phone))
-+		if self.contextin == 'ivr' and self.ivr:
-+			c.appendExten("s", "Goto(%s,s,1)" % self.ivr)
-+
-+		
-+class CfgPhone(Cfg):
-+	"""Base class for all phone devices."""
-+
-+	groupName = "Phones"
-+
-+
-+	def __init__(self,**kw):
-+		self.did = True
-+		Cfg.__init__(self,**kw)
-+
-+
-+	def head(self):
-+		return (_("Type"), _("Extension"), _("Name"), _("Virtual PBX"))
-+
-+
-+	def row(self):
-+		try:
-+			ext = self.ext
-+			pbx = self.pbx
-+		except AttributeError:
-+			ext = _('None')
-+			pbx = _('None')
-+		return (self.shortName, ext, self.name, pbx)
-+
-+
-+	def channelString(self):
-+		return "%s/%s" % (self.technology, self.name)
-+
-+
-+	def fixup(self):
-+		Cfg.fixup(self)
-+		self.lookPanel()
-+		if configlet_tree.hasConfiglet('CfgPhoneQueue'):
-+			for v in self.variables:
-+				if v.name == "QueueLab" or v.name == "queues":
-+					v.hide = False
-+
-+	def createDialEntry(self, extensions, exten, pbx, ext):
-+		ret = extensions.appendExten(exten, "Macro(dial-std-exten,%s/%s,out-%s,%d,%s,%s)" % (
-+			self.technology,
-+			self.name,
-+			self.name,
-+			int(self.usevm),
-+			ext,
-+			pbx
-+			))
-+
-+	def createExtensionConfig(self):
-+		needModule("res_adsi")
-+		needModule("app_voicemail")
-+		extensions = AstConf("extensions.conf")
-+                try:
-+                        pbx = self.pbx
-+                except AttributeError:
-+                        pbx = "phones"
-+                extensions.setSection(pbx)
-+		extensions.appendExten(self.ext,"Set(CDR(pbx)=%s,CDR(userfield)=%s)" % (pbx,self.name))
-+		self.createDialEntry(extensions, self.ext, pbx, self.ext)
-+		extensions.appendExten(self.name,"Set(CDR(pbx)=%s,CDR(userfield)=%s)" % (pbx,self.name))
-+		self.createDialEntry(extensions, self.name, pbx, self.ext)
-+
-+	def createVoicemailConfig(self, conf):
-+		if self.ext and self.usevm:
-+			needModule("res_adsi")
-+			needModule("app_voicemail")
-+			if self.usemwi:
-+				conf.append("mailbox=%s@%s" % (self.ext,self.pbx))
-+
-+			vm = AstConf("voicemail.conf")
-+			vm.setSection(self.pbx)
-+			try:
-+				pin = self.pin
-+			except:
-+				pin = ""
-+			#TODO: deal with timezones
-+			#options = "tz=cest"
-+			options = ""
-+			if self.email:
-+				vm.append("%s=%s,%s,%s,%s" % (self.ext, pin, self.name, self.email, options))
-+			else:
-+				vm.append("%s=%s,%s,,%s" % (self.ext, pin, self.name, options))
-+	
-+	def createQueuesConfig(self):
-+		try:
-+			if self.queues:
-+				c = AstConf("queues.conf")
-+				for queue in self.queues.split(','):
-+					c.setSection(queue)
-+					c.append("member => %s/%s" % (self.technology,self.name))
-+		except AttributeError:
-+			pass
-+
-+	def createOutgoingContext(self):
-+		c = AstConf("extensions.conf")
-+		c.setSection("out-%s" % self.name)
-+		try:
-+			pbx = self.pbx
-+		except AttributeError:
-+			pbx = "phones"
-+		c.append("include=>%s" % pbx)
-+		c.appendExten("i","Playback(privacy-invalid)")
-+		c.appendExten("_**XX","Set(dest=${DB( QUICKDIALLIST/${CALLERIDNUM}/${EXTEN:2} )})", e="Playback(privacy-invalid)")
-+		c.appendExten("_**XX","Goto(${dest},1)")
-+		try:
-+			timeoutvalue = not self.timeout and "0" or "1"
-+		except AttributeError:
-+			timeoutvalue=0
-+		global configlet_tree
-+		for obj in configlet_tree:
-+			if obj.__class__.__name__ == 'CfgDialoutNormal':
-+				try:
-+					if self.__getitem__("dialout_"+obj.name):
-+						c.appendExten("%s" % obj.pattern,"Set(CDR(pbx)=%s)" % (self.pbx))
-+						c.appendExten("%s" % obj.pattern,"Set(CDR(userfield)=%s)" % (self.name))
-+						c.appendExten("%s" % obj.pattern,"Set(CDR(dialout)=%s)" % (obj.name))
-+						if self.calleridnum:
-+							c.appendExten("%s" % obj.pattern,"Set(CALLERID(number)=%s)" % self.calleridnum)
-+						secret = self.__getitem__("dialout_%s_secret" % obj.name)
-+						if secret:
-+                                                        c.appendExten("%s" % obj.pattern,"Macro(%s,%s${EXTEN:%s},%s,%s)" % (obj.name,obj.addprefix,obj.rmprefix,secret,timeoutvalue))
-+                                                else:
-+                                                        c.appendExten("%s" % obj.pattern,"Macro(%s,%s${EXTEN:%s},n,%s)" % (obj.name,obj.addprefix,obj.rmprefix,timeoutvalue))
-+				except KeyError:
-+					pass
-+	
-+	def createPanelConfig(self):
-+		try:
-+			if panelutils.isConfigured() == 1 and self.panel:
-+				panelutils.createExtButton(self)
-+		except AttributeError:
-+			pass
-+
-+class CfgApp(Cfg):
-+	"""Base class for all applications (an application is a piece
-+	of software that has a number and that you can dial)."""
-+
-+	groupName ="Applications"
-+
-+	def head(self):
-+		return (_("Extension"), _("Type"), _("Virtual PBX"))
-+
-+	def row(self):
-+		try:
-+			pbx = self.pbx
-+		except AttributeError:
-+			pbx = _('None')
-+		return (self.ext, self.shortName, pbx)
-+ 
-+	
-+class CfgDialout(Cfg):
-+	"""Base class for dialout entries."""
-+
-+	groupName = "Dialout"
-+
-+
-+	def __init__(self,**kw):
-+		Cfg.__init__(self,**kw)
-+
-+
-+	def head(self):
-+		return (_("Extension"), _("Name"), _("Type"))
-+
-+
-+	def row(self):
-+		try:
-+			ext = self.pattern
-+		except AttributeError:
-+			ext = _('None')
-+		return (ext, self.name, self.shortName)
-+
-+class CfgIVR(Cfg):
-+	"""Base class for IVRs."""
-+
-+	groupName = "IVRs"
-+
-+
-+	def __init__(self,**kw):
-+		Cfg.__init__(self,**kw)
-+
-+	def head(self):
-+		return (_("Name"),_("Info"))
-+
-+
-+	def row(self):
-+		return (self.shortName,self.name)
-+
-diff -urNad destar-0.2beta~/destar destar-0.2beta/destar
---- destar-0.2beta~/destar	2006-06-17 11:11:18.000000000 +0000
-+++ destar-0.2beta/destar	2006-06-27 05:35:50.000000000 +0000
-@@ -63,11 +63,11 @@
- 
- try:
- 	opts,args = getopt.getopt(sys.argv[1:],'dhpr:v', 
--		['daemonize=','help','pid=', 'port', 'version'])
-+		['daemonize','help','pid=', 'port=', 'version'])
- except getopt.GetoptError:
- 	print _("DeStar: Command-line parsing error. Aborting.")
- 	print_usage()
--	exit(2)
-+	sys.exit(2)
- 
- for opt,val in opts:
- 	if opt in  ('-d', '--daemonize'):
-diff -urNad destar-0.2beta~/destar.orig destar-0.2beta/destar.orig
---- destar-0.2beta~/destar.orig	1970-01-01 00:00:00.000000000 +0000
-+++ destar-0.2beta/destar.orig	2006-06-17 11:11:18.000000000 +0000
-@@ -0,0 +1,128 @@
-+#!/usr/bin/env python
-+# -*- coding: iso-latin-1 -*-
-+#
-+# Copyright (C) 2005 by Holger Schurig
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+#
-+
-+
-+"""
-+An HTTP handler for Medusa that publishes the Asterisk setup Quixote application
-+"""
-+
-+# A simple HTTP server, using Medusa, that publishes a Quixote application,
-+# based on medusa_http.py from Quixote
-+
-+
-+
-+import language
-+language.setLanguage('en')
-+
-+import sys, getopt, panelutils
-+import daemonize
-+be_daemon = False
-+rport = 8080
-+pid_file = '/var/run/destar.pid'
-+VERSION = '0.2beta'
-+
-+
-+def print_version():
-+	print _("DeStar %s, Copyright (C) 2005 by Holger Schurig and contributors.\n\n"\
-+	"DeStar comes with ABSOLUTELY NO WARRANTY. This is free software,\n"\
-+	"you are welcome to redistribute it under certain conditions;\n"\
-+	"see the included files GPL-2.txt and COPYRIGHT.txt\n") % VERSION
-+	
-+
-+def print_usage():
-+	program = "destar"
-+	print _("DeStar: Asterisk Management web interface")
-+	print
-+	print _("Usage:")
-+	print _("  %s [options]: normal execution") % program
-+	print _("  %s -h|--help: print this text and exit peacefully") % program
-+	print _("  %s -v|--version: only print version information") % program
-+	print ""
-+	print _("Options:")
-+	print _("  -p <pid>  | --pid=<pid>: use <pid> to store the daemon's PID")
-+	print _("  -d | --daemonize: run in the background")
-+	print _("  -r <port> | --port=<port>: run on port <port> (default: 8080)")
-+
-+
-+try:
-+	opts,args = getopt.getopt(sys.argv[1:],'dhpr:v', 
-+		['daemonize=','help','pid=', 'port', 'version'])
-+except getopt.GetoptError:
-+	print _("DeStar: Command-line parsing error. Aborting.")
-+	print_usage()
-+	exit(2)
-+
-+for opt,val in opts:
-+	if opt in  ('-d', '--daemonize'):
-+		be_daemon=True
-+	if opt in  ('-h', '--help'):
-+		print_usage()
-+		sys.exit(0)
-+	if opt in ('-p', '--pid'):
-+		pid_file = val
-+	if opt in ('-r', '--port'):
-+		rport = val
-+	if opt in ('-v', '--version'):
-+		print_version()
-+		sys.exit(0)
-+
-+# Validate parameters to give better errors:
-+try:
-+	rport_num = int(rport)
-+except ValueError:
-+	print _("Error: rport (-r <num>/--port=<num> must be a number)")
-+	print_usage()
-+	sys.exit(2)
-+
-+print_version()
-+
-+
-+# 'medusa' is a stand-alone web server
-+import medusa
-+
-+# 'quixote' is a web application framework
-+try:
-+	import quixote
-+	if quixote.__version__ < "1.2" or quixote.__version__ >= "2.0":
-+		raise ImportError
-+except ImportError:
-+	print _("Error:"), _("please install Quixote > 1.2  and < 2.0")
-+	import sys
-+	sys.exit(1)
-+
-+# 'Publisher.py' contains our session management, 'page_main' contains
-+# the start page.
-+import Server, Publisher
-+pub = Server.Server("page_main", port=int(rport), publisher=Publisher.DeStarPublisher)
-+
-+
-+
-+
-+# only daemonize after binding to the port. This makes error handling saner
-+if be_daemon:
-+	quixote.config.DISPLAY_EXCEPTIONS = 'plain'
-+	daemonize.daemonize(stdout='/var/log/asterisk/destar.log', stderr='/var/log/asterisk/destar.err', pidfile=pid_file)
-+
-+try:
-+	pub.run()
-+except KeyboardInterrupt:
-+	if panelutils.isConfigured():
-+		panelutils.stopPanelDaemon()
-+	pass


