Big bunch of locale regeneration

[gosa.git] / gosa-plugins / gofon / locale / fr / LC_MESSAGES / messages.po

diff --git a/gosa-plugins/gofon/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/fr/LC_MESSAGES/messages.po
index e299b8231a24ba2c55c1cabfc0c378def6b3708f..ee942527bc0f3f4d3889f699617b7bdd27eda425 100644 (file)
--- a/gosa-plugins/gofon/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/fr/LC_MESSAGES/messages.po
@@ -1,13 +1,13 @@
-# translation of messages.po to Français
+# translation of messages.po to french
 # Benoit Mortier <benoit.mortier@opensides.be>, 2005, 2006, 2007, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-04 09:23+0200\n"
-"PO-Revision-Date: 2008-06-04 18:59+0200\n"
+"POT-Creation-Date: 2008-08-01 16:29+0200\n"
+"PO-Revision-Date: 2008-07-23 23:27+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
-"Language-Team: Français <fr@li.org>\n"
+"Language-Team: french <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -15,19 +15,21 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:106
-#: gofon/conference/class_phoneConferenceGeneric.inc:100
+#: gofon/phoneaccount/class_phoneAccount.inc:134
+#: gofon/conference/class_phoneConferenceGeneric.inc:103
 msgid "Obsolete entry"
 msgstr "Entrée obsolète"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:106
-#: gofon/conference/class_phoneConferenceGeneric.inc:100
+#: gofon/phoneaccount/class_phoneAccount.inc:134
+#: gofon/conference/class_phoneConferenceGeneric.inc:103
 #, php-format
 msgid ""
 "The current home server is not available anymore. It will be moved to '%s' "
 "if you save this entry!"
 msgstr ""
+"Le serveur home n'est plus disponible. Il sera bougé vers '%s' si vous "
+"sauvez cette entrée !"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:121
 msgid "ring all"
@@ -77,10 +79,10 @@ msgstr ""
 #: admin/ogroups/gofon/class_phonequeue.inc:305
 #: admin/ogroups/gofon/class_phonequeue.inc:929
 #: admin/ogroups/gofon/phonequeue.tpl:50
-#: gofon/phoneaccount/class_phoneAccount.inc:1175
-#: gofon/phoneaccount/class_phoneAccount.inc:1518
-#: gofon/phoneaccount/generic.tpl:56
-#: gofon/conference/class_phoneConferenceGeneric.inc:765
+#: gofon/phoneaccount/class_phoneAccount.inc:1275
+#: gofon/phoneaccount/class_phoneAccount.inc:1614
+#: gofon/phoneaccount/generic.tpl:58
+#: gofon/conference/class_phoneConferenceGeneric.inc:780
 #: gofon/conference/generic.tpl:68
 msgid "Home server"
 msgstr "Serveur Primaire"
@@ -108,7 +110,7 @@ msgid "Announce frequency"
 msgstr "Fréquence du message d'annonce"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
-#: gofon/conference/class_phoneConferenceGeneric.inc:386
+#: gofon/conference/class_phoneConferenceGeneric.inc:392
 #: gofon/conference/class_divListConferences.inc:56
 msgid "Number"
 msgstr "Numéro"
@@ -120,16 +122,16 @@ msgstr ""
 
 #: admin/ogroups/gofon/class_phonequeue.inc:378
 #: admin/ogroups/gofon/class_phonequeue.inc:732
-#: gofon/fonreports/class_fonreport.inc:165
-#: gofon/fonreports/class_fonreport.inc:175
-#: gofon/fonreports/class_fonreport.inc:179
-#: gofon/fonreports/class_fonreport.inc:197
-#: gofon/phoneaccount/class_phoneAccount.inc:307
-#: gofon/phoneaccount/class_phoneAccount.inc:905
-#: gofon/conference/class_phoneConferenceGeneric.inc:415
-#: gofon/macro/class_gofonMacro.inc:396 gofon/macro/class_gofonMacro.inc:466
+#: gofon/fonreports/class_fonreport.inc:166
+#: gofon/fonreports/class_fonreport.inc:176
+#: gofon/fonreports/class_fonreport.inc:180
+#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/phoneaccount/class_phoneAccount.inc:363
+#: gofon/phoneaccount/class_phoneAccount.inc:974
+#: gofon/conference/class_phoneConferenceGeneric.inc:430
+#: gofon/macro/class_gofonMacro.inc:400 gofon/macro/class_gofonMacro.inc:479
 msgid "GOfon"
-msgstr ""
+msgstr "Gofon"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:437
 msgid "Cannot find old queue entry!"
@@ -140,7 +142,9 @@ msgstr "Impossible de trouver l'entrée dans l'ancienne queue !"
 msgid ""
 "Found more than one entry named '%s' in queue table. Please inform your "
 "system administrator!"
-msgstr "J'ai trouvé plus d'une entrée nommée '%s' dans la queue. Veuillez informer votre administrateur système !"
+msgstr ""
+"J'ai trouvé plus d'une entrée nommée '%s' dans la queue. Veuillez informer "
+"votre administrateur système !"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:764
 #: admin/ogroups/gofon/class_phonequeue.inc:766
@@ -149,33 +153,33 @@ msgstr "numéro de téléphone"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:823
 #: admin/ogroups/gofon/class_phonequeue.inc:865
-#: admin/systems/gofon/class_phoneGeneric.inc:267
-#: gofon/fonreports/class_fonreport.inc:175
-#: gofon/fonreports/class_fonreport.inc:179
-#: gofon/fonreports/class_fonreport.inc:197
-#: gofon/phoneaccount/class_phoneAccount.inc:896
-#: gofon/phoneaccount/class_phoneAccount.inc:1010
-#: gofon/phoneaccount/class_phoneAccount.inc:1252
-#: gofon/phoneaccount/class_phoneAccount.inc:1330
-#: gofon/phoneaccount/class_phoneAccount.inc:1340
-#: gofon/phoneaccount/class_phoneAccount.inc:1372
-#: gofon/conference/class_phoneConferenceGeneric.inc:254
-#: gofon/conference/class_phoneConferenceGeneric.inc:258
-#: gofon/macro/class_gofonMacro.inc:453 gofon/macro/class_gofonMacro.inc:462
-#: gofon/macro/class_gofonMacro.inc:500
+#: admin/systems/gofon/class_phoneGeneric.inc:271
+#: gofon/fonreports/class_fonreport.inc:176
+#: gofon/fonreports/class_fonreport.inc:180
+#: gofon/fonreports/class_fonreport.inc:198
+#: gofon/phoneaccount/class_phoneAccount.inc:960
+#: gofon/phoneaccount/class_phoneAccount.inc:1079
+#: gofon/phoneaccount/class_phoneAccount.inc:1352
+#: gofon/phoneaccount/class_phoneAccount.inc:1424
+#: gofon/phoneaccount/class_phoneAccount.inc:1434
+#: gofon/phoneaccount/class_phoneAccount.inc:1468
+#: gofon/conference/class_phoneConferenceGeneric.inc:260
+#: gofon/conference/class_phoneConferenceGeneric.inc:264
+#: gofon/macro/class_gofonMacro.inc:466 gofon/macro/class_gofonMacro.inc:475
+#: gofon/macro/class_gofonMacro.inc:513
 msgid "Error"
 msgstr "Erreur"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:838
 #: admin/ogroups/gofon/class_phonequeue.inc:893
 #: admin/systems/services/gofon/class_goFonServer.inc:146
-#: admin/systems/gofon/class_phoneGeneric.inc:277
-#: admin/systems/gofon/class_phoneGeneric.inc:440
-#: gofon/phoneaccount/class_phoneAccount.inc:1279
-#: gofon/phoneaccount/class_phoneAccount.inc:1419
-#: gofon/conference/class_phoneConferenceGeneric.inc:703
-#: gofon/macro/class_gofonMacro.inc:474 gofon/macro/class_gofonMacro.inc:485
-#: gofon/macro/class_gofonMacro.inc:521
+#: admin/systems/gofon/class_phoneGeneric.inc:281
+#: admin/systems/gofon/class_phoneGeneric.inc:452
+#: gofon/phoneaccount/class_phoneAccount.inc:1379
+#: gofon/phoneaccount/class_phoneAccount.inc:1515
+#: gofon/conference/class_phoneConferenceGeneric.inc:718
+#: gofon/macro/class_gofonMacro.inc:487 gofon/macro/class_gofonMacro.inc:498
+#: gofon/macro/class_gofonMacro.inc:534
 #: gofon/macro/class_gofonMacroParameters.inc:401
 msgid "LDAP error"
 msgstr "Erreur LDAP"
@@ -187,12 +191,12 @@ msgstr "Numéro de téléphone"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:918
 #: gofon/phoneaccount/class_phoneAccount.inc:6
-#: gofon/phoneaccount/class_phoneAccount.inc:849
-#: gofon/phoneaccount/class_phoneAccount.inc:862
-#: gofon/phoneaccount/class_phoneAccount.inc:874
-#: gofon/phoneaccount/class_phoneAccount.inc:878
-#: gofon/phoneaccount/class_phoneAccount.inc:881
-#: gofon/phoneaccount/class_phoneAccount.inc:1505
+#: gofon/phoneaccount/class_phoneAccount.inc:913
+#: gofon/phoneaccount/class_phoneAccount.inc:926
+#: gofon/phoneaccount/class_phoneAccount.inc:938
+#: gofon/phoneaccount/class_phoneAccount.inc:942
+#: gofon/phoneaccount/class_phoneAccount.inc:945
+#: gofon/phoneaccount/class_phoneAccount.inc:1599
 msgid "Phone"
 msgstr "Téléphone"
 
@@ -294,7 +298,8 @@ msgid "Announce"
 msgstr "Annonce"
 
 #: admin/ogroups/gofon/phonequeue.tpl:2
-msgid "Only users with the same asterisk home server will be included to this queue."
+msgid ""
+"Only users with the same asterisk home server will be included to this queue."
 msgstr ""
 "Seulement les utilisateurs avec le même serveur asterisk seront inclus dans "
 "cette queue."
@@ -468,134 +473,135 @@ msgstr "Utilisateur de la base de données Asterisk"
 msgid "Country dial prefix"
 msgstr "Préfixe du pays"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:119
+#: admin/systems/gofon/class_phoneGeneric.inc:123
 msgid "phone"
 msgstr "téléphone"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:230
-#: gofon/macro/class_divListMacros.inc:189
+#: admin/systems/gofon/class_phoneGeneric.inc:234
+#: gofon/macro/class_divListMacros.inc:121
 msgid "yes"
 msgstr "oui"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:230
-#: gofon/macro/class_divListMacros.inc:190
+#: admin/systems/gofon/class_phoneGeneric.inc:234
+#: gofon/macro/class_divListMacros.inc:122
 msgid "no"
 msgstr "non"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: admin/systems/gofon/class_phoneGeneric.inc:251
 msgid "dynamic"
 msgstr "dynamique"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: admin/systems/gofon/class_phoneGeneric.inc:251
 msgid "Networksettings"
 msgstr "Configuration réseau"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:267
-#: gofon/macro/class_gofonMacro.inc:453
+#: admin/systems/gofon/class_phoneGeneric.inc:271
+#: gofon/macro/class_gofonMacro.inc:466
 #, php-format
 msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr "Impossible d'éffacer l'entrée parcequ'elle est encore utilisée par '%s' !"
+msgstr ""
+"Impossible d'éffacer l'entrée parcequ'elle est encore utilisée par '%s' !"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:326
-#: admin/systems/gofon/class_phoneGeneric.inc:329
+#: admin/systems/gofon/class_phoneGeneric.inc:330
+#: admin/systems/gofon/class_phoneGeneric.inc:333
 msgid "IP address"
 msgstr "Adresse ip"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:335
 #: admin/systems/gofon/class_phoneGeneric.inc:339
-#: admin/systems/gofon/class_phoneGeneric.inc:342
-#: admin/systems/gofon/class_phoneGeneric.inc:357
-#: admin/systems/gofon/class_phoneGeneric.inc:497
-#: gofon/conference/class_phoneConferenceGeneric.inc:382
-#: gofon/conference/class_phoneConferenceGeneric.inc:404
-#: gofon/conference/class_phoneConferenceGeneric.inc:760
+#: admin/systems/gofon/class_phoneGeneric.inc:343
+#: admin/systems/gofon/class_phoneGeneric.inc:346
+#: admin/systems/gofon/class_phoneGeneric.inc:361
+#: admin/systems/gofon/class_phoneGeneric.inc:509
+#: gofon/conference/class_phoneConferenceGeneric.inc:388
+#: gofon/conference/class_phoneConferenceGeneric.inc:410
+#: gofon/conference/class_phoneConferenceGeneric.inc:775
 #: gofon/conference/class_divListConferences.inc:56
-#: gofon/macro/class_gofonMacro.inc:410 gofon/macro/class_gofonMacro.inc:416
+#: gofon/macro/class_gofonMacro.inc:414 gofon/macro/class_gofonMacro.inc:420
 #: gofon/macro/class_divListMacros.inc:56 gofon/macro/parameter.tpl:6
 msgid "Name"
 msgstr "Nom"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:488
-#: gofon/macro/class_gofonMacro.inc:557
+#: admin/systems/gofon/class_phoneGeneric.inc:500
+#: gofon/macro/class_gofonMacro.inc:570
 msgid "Generic"
 msgstr "Informations"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:489
+#: admin/systems/gofon/class_phoneGeneric.inc:501
 msgid "Phone generic"
 msgstr "Téléphone générique"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:494
-#: gofon/phoneaccount/class_phoneAccount.inc:1520
+#: admin/systems/gofon/class_phoneGeneric.inc:506
+#: gofon/phoneaccount/class_phoneAccount.inc:1613
 msgid "Phone hardware"
 msgstr "Matériel téléphonique"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:498
+#: admin/systems/gofon/class_phoneGeneric.inc:510
 #: admin/systems/gofon/phone.tpl:17
-#: gofon/conference/class_phoneConferenceGeneric.inc:761
+#: gofon/conference/class_phoneConferenceGeneric.inc:776
 #: gofon/conference/generic.tpl:49
-#: gofon/conference/class_divListConferences.inc:131
-#: gofon/macro/class_gofonMacro.inc:568
-#: gofon/macro/class_divListMacros.inc:127 gofon/macro/generic.tpl:27
+#: gofon/conference/class_divListConferences.inc:83
+#: gofon/macro/class_gofonMacro.inc:581 gofon/macro/class_divListMacros.inc:79
+#: gofon/macro/generic.tpl:27
 msgid "Base"
 msgstr "Base"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:499
+#: admin/systems/gofon/class_phoneGeneric.inc:511
 #: admin/systems/gofon/phone.tpl:34
-#: gofon/conference/class_phoneConferenceGeneric.inc:762
-#: gofon/conference/generic.tpl:96 gofon/macro/class_gofonMacro.inc:569
+#: gofon/conference/class_phoneConferenceGeneric.inc:777
+#: gofon/conference/generic.tpl:96 gofon/macro/class_gofonMacro.inc:582
 #: gofon/macro/generic.tpl:49
 msgid "Description"
 msgstr "Description"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:500
+#: admin/systems/gofon/class_phoneGeneric.inc:512
 msgid "SIP Mode"
 msgstr "Mode SIP"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:501
+#: admin/systems/gofon/class_phoneGeneric.inc:513
 msgid "SIP DTMF mode"
 msgstr "Mode DTMF"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:502
+#: admin/systems/gofon/class_phoneGeneric.inc:514
 msgid "SIP Default ip"
 msgstr "SIP Adresse ip par défaut"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:503
+#: admin/systems/gofon/class_phoneGeneric.inc:515
 msgid "SIP Qualify"
 msgstr "Qualification SIP"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:504
+#: admin/systems/gofon/class_phoneGeneric.inc:516
 msgid "IAX authentication type"
 msgstr "Type d'authentification IAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:505
+#: admin/systems/gofon/class_phoneGeneric.inc:517
 msgid "IAX secret"
 msgstr "Secret IAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:506
+#: admin/systems/gofon/class_phoneGeneric.inc:518
 msgid "IAX account code"
 msgstr "Code du compte IAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:507
+#: admin/systems/gofon/class_phoneGeneric.inc:519
 msgid "IAX trunk lines"
 msgstr "Trunk IAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:508
+#: admin/systems/gofon/class_phoneGeneric.inc:520
 msgid "IAX permit settings"
 msgstr "Paramètres de permissions IAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:509
+#: admin/systems/gofon/class_phoneGeneric.inc:521
 msgid "IAX deny settings"
 msgstr "Paramètres d'interdiction IAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:510
+#: admin/systems/gofon/class_phoneGeneric.inc:522
 msgid "CAPI MSN"
 msgstr "MSN CAPI"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:511
+#: admin/systems/gofon/class_phoneGeneric.inc:523
 msgid "Hardware type"
 msgstr "Type de matériel"
 
-#: admin/systems/gofon/phone.tpl:6
+#: admin/systems/gofon/phone.tpl:6 admin/systems/gofon/paste_generic.tpl:3
 msgid "Phone name"
 msgstr "Nom du téléphone"
 
@@ -721,19 +727,19 @@ msgstr "pendant"
 msgid "Search"
 msgstr "Recherche"
 
-#: gofon/fonreports/contents.tpl:30 gofon/fonreports/class_fonreport.inc:404
+#: gofon/fonreports/contents.tpl:30 gofon/fonreports/class_fonreport.inc:405
 msgid "Date"
 msgstr "Date"
 
-#: gofon/fonreports/contents.tpl:31 gofon/fonreports/class_fonreport.inc:405
+#: gofon/fonreports/contents.tpl:31 gofon/fonreports/class_fonreport.inc:406
 msgid "Source"
 msgstr "Emetteur"
 
-#: gofon/fonreports/contents.tpl:32 gofon/fonreports/class_fonreport.inc:406
+#: gofon/fonreports/contents.tpl:32 gofon/fonreports/class_fonreport.inc:407
 msgid "Destination"
 msgstr "Destinataire"
 
-#: gofon/fonreports/contents.tpl:33 gofon/fonreports/class_fonreport.inc:407
+#: gofon/fonreports/contents.tpl:33 gofon/fonreports/class_fonreport.inc:408
 msgid "Channel"
 msgstr "Canal"
 
@@ -745,7 +751,7 @@ msgstr "Applications"
 msgid "Status"
 msgstr "Statut"
 
-#: gofon/fonreports/contents.tpl:36 gofon/fonreports/class_fonreport.inc:410
+#: gofon/fonreports/contents.tpl:36 gofon/fonreports/class_fonreport.inc:411
 msgid "Duration"
 msgstr "Durée"
 
@@ -763,86 +769,88 @@ msgstr "Rapports téléphoniques"
 msgid "This does something"
 msgstr "Ceci fait quelque chose"
 
-#: gofon/fonreports/class_fonreport.inc:165
-#: gofon/fonreports/class_fonreport.inc:168
-#: gofon/phoneaccount/class_phoneAccount.inc:307
-#: gofon/phoneaccount/class_phoneAccount.inc:315
-#: gofon/phoneaccount/class_phoneAccount.inc:905
-#: gofon/phoneaccount/class_phoneAccount.inc:1377
-#: gofon/macro/class_gofonMacro.inc:466
+#: gofon/fonreports/class_fonreport.inc:166
+#: gofon/fonreports/class_fonreport.inc:169
+#: gofon/phoneaccount/class_phoneAccount.inc:363
+#: gofon/phoneaccount/class_phoneAccount.inc:371
+#: gofon/phoneaccount/class_phoneAccount.inc:974
+#: gofon/phoneaccount/class_phoneAccount.inc:1473
+#: gofon/macro/class_gofonMacro.inc:479
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
-#: gofon/fonreports/class_fonreport.inc:209
+#: gofon/fonreports/class_fonreport.inc:210
 msgid "Insufficient permissions"
 msgstr "Permission insuffisantes"
 
-#: gofon/fonreports/class_fonreport.inc:228
+#: gofon/fonreports/class_fonreport.inc:229
 msgid "Y-M-D"
 msgstr "A-M-J"
 
-#: gofon/fonreports/class_fonreport.inc:395
-#: gofon/fonreports/class_fonreport.inc:396 gofon/fonreports/main.inc:16
+#: gofon/fonreports/class_fonreport.inc:396
+#: gofon/fonreports/class_fonreport.inc:397 gofon/fonreports/main.inc:16
 msgid "Phone reports"
 msgstr "Rapports téléphoniques"
 
-#: gofon/fonreports/class_fonreport.inc:396
+#: gofon/fonreports/class_fonreport.inc:397
 msgid "All entries are readonly"
 msgstr "Tous les champs sont en lecture seule"
 
-#: gofon/fonreports/class_fonreport.inc:408
+#: gofon/fonreports/class_fonreport.inc:409
 msgid "Application called"
 msgstr "Application appelée"
 
-#: gofon/fonreports/class_fonreport.inc:409
+#: gofon/fonreports/class_fonreport.inc:410
 msgid "Disposition"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:144
+#: gofon/phoneaccount/class_phoneAccount.inc:172
 msgid "automatic"
 msgstr "automatique"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:180
+#: gofon/phoneaccount/class_phoneAccount.inc:208
 msgid "no macro"
 msgstr "pas de macros"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:198
+#: gofon/phoneaccount/class_phoneAccount.inc:236
 msgid "undefined"
 msgstr "non défini"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:439
-#: gofon/phoneaccount/class_phoneAccount.inc:446
-#: gofon/phoneaccount/class_phoneAccount.inc:464
-#: gofon/phoneaccount/class_phoneAccount.inc:471
+#: gofon/phoneaccount/class_phoneAccount.inc:489
+#: gofon/phoneaccount/class_phoneAccount.inc:496
+#: gofon/phoneaccount/class_phoneAccount.inc:514
+#: gofon/phoneaccount/class_phoneAccount.inc:521
 msgid "Abort saving entries to keep the database consistent."
-msgstr "Abandon de la sauvegarde des données pour garder la base de données consistante."
+msgstr ""
+"Abandon de la sauvegarde des données pour garder la base de données "
+"consistante."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:873
+#: gofon/phoneaccount/class_phoneAccount.inc:937
 msgid "Remove phone account"
 msgstr "Supprimer l'extension téléphonique"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:877
-#: gofon/phoneaccount/class_phoneAccount.inc:880
+#: gofon/phoneaccount/class_phoneAccount.inc:941
+#: gofon/phoneaccount/class_phoneAccount.inc:944
 msgid "Create phone account"
 msgstr "Créer un compte téléphone"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:878
+#: gofon/phoneaccount/class_phoneAccount.inc:942
 msgid "User uid"
 msgstr "id utilisateur"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:896
+#: gofon/phoneaccount/class_phoneAccount.inc:960
 msgid "Selected macro is not available anymore!"
 msgstr "la macro sélectionnée n'est plus disponible !"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:915
+#: gofon/phoneaccount/class_phoneAccount.inc:984
 msgid "Parameter"
 msgstr "Paramètres"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1059
+#: gofon/phoneaccount/class_phoneAccount.inc:1128
 msgid "Choose your private phone"
 msgstr "Choisissez votre téléphone privé"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1171
+#: gofon/phoneaccount/class_phoneAccount.inc:1271
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
@@ -850,44 +858,44 @@ msgstr ""
 "Il doit y avoir au moins un serveur avec une base de données asterisk pour "
 "créer un compte téléphonique."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1179
-#: gofon/phoneaccount/class_phoneAccount.inc:1182
-#: gofon/phoneaccount/paste_generic.tpl:32 gofon/phoneaccount/generic.tpl:68
+#: gofon/phoneaccount/class_phoneAccount.inc:1279
+#: gofon/phoneaccount/class_phoneAccount.inc:1282
+#: gofon/phoneaccount/paste_generic.tpl:32 gofon/phoneaccount/generic.tpl:93
 msgid "Voicemail PIN"
 msgstr "Code PIN de la boite vocale"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1179
+#: gofon/phoneaccount/class_phoneAccount.inc:1279
 msgid "Between 1-4 charactes"
 msgstr "Entre 1-4 caractères."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1187
-#: gofon/phoneaccount/paste_generic.tpl:40 gofon/phoneaccount/generic.tpl:78
+#: gofon/phoneaccount/class_phoneAccount.inc:1287
+#: gofon/phoneaccount/paste_generic.tpl:40 gofon/phoneaccount/generic.tpl:103
 msgid "Phone PIN"
 msgstr "Code PIN du téléphone"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1205
+#: gofon/phoneaccount/class_phoneAccount.inc:1305
 #, php-format
 msgid "macro parameter %s"
 msgstr "paramètre de la macro %s"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1410
+#: gofon/phoneaccount/class_phoneAccount.inc:1506
 #: gofon/conference/headpage.tpl:20 gofon/macro/headpage.tpl:20
 #: gofon/macro/class_gofonMacroParameters.inc:374
 msgid "Information"
 msgstr "Information"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1410
+#: gofon/phoneaccount/class_phoneAccount.inc:1506
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "L'utilisateur '%s' à été enlevé de la queue '%s'."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1449
-#: gofon/phoneaccount/class_phoneAccount.inc:1451
+#: gofon/phoneaccount/class_phoneAccount.inc:1543
+#: gofon/phoneaccount/class_phoneAccount.inc:1545
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Le numéro de téléphone %s est déjà utilisé par '%s'."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1497
+#: gofon/phoneaccount/class_phoneAccount.inc:1591
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -896,52 +904,60 @@ msgstr ""
 "Le serveur asterisk primaire précédemment sélectionné n'existe plus (%s). "
 "Effacement interrompu."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1506
+#: gofon/phoneaccount/class_phoneAccount.inc:1600
 msgid "Phone account settings"
 msgstr "Paramètres compte téléphonique"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1511
-msgid "GOfon reports"
-msgstr "Rapports téléphoniques"
+#: gofon/phoneaccount/class_phoneAccount.inc:1604
+msgid "My account"
+msgstr "Mon Compte"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1517
-#: gofon/conference/class_phoneConferenceGeneric.inc:776
+#: gofon/phoneaccount/class_phoneAccount.inc:1611
+#: gofon/conference/class_phoneConferenceGeneric.inc:791
 msgid "Telephone number"
 msgstr "Numéro de téléphone"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1519
+#: gofon/phoneaccount/class_phoneAccount.inc:1612
 msgid "Macro settings"
 msgstr "Paramètres des macros"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1521
+#: gofon/phoneaccount/class_phoneAccount.inc:1615
+msgid "Phone context"
+msgstr "Contexte téléphonique"
+
+#: gofon/phoneaccount/class_phoneAccount.inc:1616
+msgid "Voice mail context"
+msgstr "Contexte de la boite vocale"
+
+#: gofon/phoneaccount/class_phoneAccount.inc:1617
 msgid "Telephone pin"
 msgstr "Code PIN du téléphone"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1522
+#: gofon/phoneaccount/class_phoneAccount.inc:1618
 msgid "Voicemail pin"
 msgstr "Code PIN de la boite vocale"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1603
+#: gofon/phoneaccount/class_phoneAccount.inc:1700
 msgid "There is currently no asterisk server defined!"
 msgstr "Il n'y a pas de serveur asterisk défini !"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1607
+#: gofon/phoneaccount/class_phoneAccount.inc:1704
 msgid "Asterisk server is invalid!"
 msgstr "Le serveur Asterisk est non valide !"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1613
+#: gofon/phoneaccount/class_phoneAccount.inc:1710
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr "Le code pin de la boîte vocale doit être long de 4 caractères."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1616
+#: gofon/phoneaccount/class_phoneAccount.inc:1713
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "Le code pin de la boîte vocale contient des caractères non valides !"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1621
+#: gofon/phoneaccount/class_phoneAccount.inc:1718
 msgid "Phone pin contains invalid characters!"
 msgstr "Le mot de passe contient des caractères invalides."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1628
+#: gofon/phoneaccount/class_phoneAccount.inc:1725
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -961,16 +977,28 @@ msgstr "Matériel téléphonique"
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: gofon/phoneaccount/generic.tpl:60
+#: gofon/phoneaccount/generic.tpl:62
 msgid "Select the accounts home server"
 msgstr "Sélectionnez le serveur primaire"
 
-#: gofon/phoneaccount/generic.tpl:100 gofon/phoneaccount/generic.tpl:102
+#: gofon/phoneaccount/generic.tpl:69
+msgid "Context"
+msgstr "Contexte"
+
+#: gofon/phoneaccount/generic.tpl:73 gofon/phoneaccount/generic.tpl:84
+msgid "Select the accounts context"
+msgstr "Sélectionnez le contexte du compte"
+
+#: gofon/phoneaccount/generic.tpl:80
+msgid "Voicemail context"
+msgstr "Contexte de la boite vocale"
+
+#: gofon/phoneaccount/generic.tpl:125 gofon/phoneaccount/generic.tpl:127
 #: gofon/macro/class_gofonMacroParameters.inc:200
 msgid "Phone macro"
 msgstr "Macro téléphoniques"
 
-#: gofon/phoneaccount/generic.tpl:113
+#: gofon/phoneaccount/generic.tpl:138
 msgid "Refresh"
 msgstr "Rafraîchir"
 
@@ -980,93 +1008,96 @@ msgstr ""
 "Cliquez sur le bouton 'Editer' ci-dessous pour changer les informations dans "
 "cette boite de dialogue"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:258
+#: gofon/conference/class_phoneConferenceGeneric.inc:264
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
 msgstr ""
+"Impossible d'effacer l'entrée du serveur '%s' parceque l'entrée semble avoir "
+"déjà été effacée !"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:373
-#, fuzzy, php-format
-msgid "The previously selected asterisk home server '%s' is no longer available!"
+#: gofon/conference/class_phoneConferenceGeneric.inc:379
+#, php-format
+msgid ""
+"The previously selected asterisk home server '%s' is no longer available!"
 msgstr ""
 "Le serveur asterisk primaire (%s) précédemment sélectionné n'est plus "
-"disponible."
+"disponible !"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:378
+#: gofon/conference/class_phoneConferenceGeneric.inc:384
 #: gofon/conference/generic.tpl:163
 #: gofon/conference/class_divListConferences.inc:58
 msgid "PIN"
 msgstr "Code PIN"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:390
-#: gofon/conference/class_phoneConferenceGeneric.inc:775
+#: gofon/conference/class_phoneConferenceGeneric.inc:396
+#: gofon/conference/class_phoneConferenceGeneric.inc:790
 msgid "Lifetime"
 msgstr "Durée"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:626
-#: gofon/conference/class_phoneConferenceGeneric.inc:628
-#, fuzzy, php-format
+#: gofon/conference/class_phoneConferenceGeneric.inc:641
+#: gofon/conference/class_phoneConferenceGeneric.inc:643
+#, php-format
 msgid "'%s' is already assigned to '%s'!"
-msgstr "Le numéro de téléphone %s est déjà utilisé par '%s'."
+msgstr "'%s' est déjà utilisé par '%s' !"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:750
-#: gofon/conference/class_divListConferences.inc:143
-#: gofon/conference/class_divListConferences.inc:276
+#: gofon/conference/class_phoneConferenceGeneric.inc:765
+#: gofon/conference/class_divListConferences.inc:95
+#: gofon/conference/class_divListConferences.inc:205
 msgid "Conference"
 msgstr "Conférence"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:751
+#: gofon/conference/class_phoneConferenceGeneric.inc:766
 msgid "Phone conference management"
 msgstr "Gestion des conférences téléphoniques"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:755
+#: gofon/conference/class_phoneConferenceGeneric.inc:770
 msgid "Addons"
 msgstr "Extensions"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:756
+#: gofon/conference/class_phoneConferenceGeneric.inc:771
 msgid "GOfon conference"
 msgstr "Conférences téléphoniques"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:763
+#: gofon/conference/class_phoneConferenceGeneric.inc:778
 msgid "Conference PIN"
 msgstr "Code Pin de la conférence"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:766
+#: gofon/conference/class_phoneConferenceGeneric.inc:781
 #: gofon/conference/generic.tpl:155
 msgid "Preset PIN"
 msgstr "Code PIN préselectionné"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:767
+#: gofon/conference/class_phoneConferenceGeneric.inc:782
 #: gofon/conference/generic.tpl:175
 msgid "Record conference"
 msgstr "Enregistrer la conférence"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:768
+#: gofon/conference/class_phoneConferenceGeneric.inc:783
 #: gofon/conference/generic.tpl:206
 msgid "Play music on hold"
 msgstr "Musique d'attente"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:769
+#: gofon/conference/class_phoneConferenceGeneric.inc:784
 msgid "Activate menu"
 msgstr "Activer le menu"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:770
+#: gofon/conference/class_phoneConferenceGeneric.inc:785
 msgid "Announce user activity"
 msgstr "Annoncer l'activité utilisateur"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:771
+#: gofon/conference/class_phoneConferenceGeneric.inc:786
 msgid "Count user"
 msgstr "Compter les utilisateurs"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:772
+#: gofon/conference/class_phoneConferenceGeneric.inc:787
 msgid "Conference type"
 msgstr "Type de conférence"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:774
+#: gofon/conference/class_phoneConferenceGeneric.inc:789
 msgid "Format"
-msgstr ""
+msgstr "Format"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:777
+#: gofon/conference/class_phoneConferenceGeneric.inc:792
 #: gofon/conference/class_divListConferences.inc:57
 msgid "Owner"
 msgstr "Propriétaire"
@@ -1144,9 +1175,8 @@ msgid "Choose subtree to place conference in"
 msgstr "Sélectionnez la branche où sera enregistrée la conférence"
 
 #: gofon/conference/generic.tpl:81
-#, fuzzy
 msgid "Select language"
-msgstr "Langue du serveur"
+msgstr "Sélectionnez la langue"
 
 #: gofon/conference/generic.tpl:102
 msgid "Descriptive text for department"
@@ -1178,10 +1208,15 @@ msgstr "Annoncer les nouveaux utilisateurs et ceux qui quittent"
 msgid "Count users"
 msgstr "Compter les utilisateurs"
 
+#: gofon/conference/class_divListConferences.inc:50
+#: gofon/macro/class_divListMacros.inc:50
+msgid "Select all"
+msgstr "Sélectionner tout"
+
 #: gofon/conference/class_divListConferences.inc:59
-#: gofon/conference/class_divListConferences.inc:136
+#: gofon/conference/class_divListConferences.inc:88
 #: gofon/macro/class_divListMacros.inc:58
-#: gofon/macro/class_divListMacros.inc:132
+#: gofon/macro/class_divListMacros.inc:84
 msgid "Actions"
 msgstr "Actions"
 
@@ -1189,105 +1224,64 @@ msgstr "Actions"
 msgid "Regular expression for matching conference names"
 msgstr "Expression régulière concordant avec les noms des conférences"
 
-#: gofon/conference/class_divListConferences.inc:133
-#: gofon/macro/class_divListMacros.inc:129
+#: gofon/conference/class_divListConferences.inc:85
+#: gofon/macro/class_divListMacros.inc:81
 msgid "Submit department"
 msgstr "Soumettre le département"
 
-#: gofon/conference/class_divListConferences.inc:133
-#: gofon/macro/class_divListMacros.inc:129
+#: gofon/conference/class_divListConferences.inc:85
+#: gofon/macro/class_divListMacros.inc:81
 msgid "Submit"
 msgstr "Soumettre"
 
-#: gofon/conference/class_divListConferences.inc:138
-#: gofon/macro/class_divListMacros.inc:134
+#: gofon/conference/class_divListConferences.inc:93
+#: gofon/macro/class_divListMacros.inc:89
 msgid "Create"
 msgstr "Créer"
 
-#: gofon/conference/class_divListConferences.inc:149
-#: gofon/macro/class_divListMacros.inc:145
+#: gofon/conference/class_divListConferences.inc:101
+#: gofon/macro/class_divListMacros.inc:97
 msgid "Remove"
 msgstr "Supprimer"
 
-#: gofon/conference/class_divListConferences.inc:155
-#: gofon/macro/class_divListMacros.inc:151
-#, fuzzy
-msgid "Copy"
-msgstr "copier"
-
-#: gofon/conference/class_divListConferences.inc:157
-#: gofon/macro/class_divListMacros.inc:153
-#, fuzzy
-msgid "Cut"
-msgstr "couper"
-
-#: gofon/conference/class_divListConferences.inc:161
-#: gofon/conference/class_divListConferences.inc:164
-#: gofon/macro/class_divListMacros.inc:157
-#: gofon/macro/class_divListMacros.inc:160
-msgid "Paste"
-msgstr "Coller"
-
-#: gofon/conference/class_divListConferences.inc:212
-#: gofon/macro/class_divListMacros.inc:212
-msgid "cut"
-msgstr "couper"
-
-#: gofon/conference/class_divListConferences.inc:212
-#: gofon/macro/class_divListMacros.inc:212
-msgid "Cut this entry"
-msgstr "Couper cette entrée"
-
-#: gofon/conference/class_divListConferences.inc:214
-#: gofon/macro/class_divListMacros.inc:214
-msgid "copy"
-msgstr "copier"
-
-#: gofon/conference/class_divListConferences.inc:214
-#: gofon/macro/class_divListMacros.inc:214
-msgid "Copy this entry"
-msgstr "Copier cette entrée"
-
-#: gofon/conference/class_divListConferences.inc:219
-#: gofon/macro/class_divListMacros.inc:217
+#: gofon/conference/class_divListConferences.inc:150
+#: gofon/macro/class_divListMacros.inc:146
 msgid "edit"
 msgstr "éditer"
 
-#: gofon/conference/class_divListConferences.inc:219
+#: gofon/conference/class_divListConferences.inc:150
 msgid "Edit this entry"
 msgstr "Editer cette entrée"
 
-#: gofon/conference/class_divListConferences.inc:229
-#: gofon/macro/class_divListMacros.inc:225
+#: gofon/conference/class_divListConferences.inc:158
+#: gofon/macro/class_divListMacros.inc:153
 msgid "delete"
 msgstr "supprimer"
 
-#: gofon/conference/class_divListConferences.inc:229
+#: gofon/conference/class_divListConferences.inc:158
 msgid "Delete this entry"
 msgstr "Supprimer cette entrée"
 
-#: gofon/conference/class_divListConferences.inc:256
+#: gofon/conference/class_divListConferences.inc:185
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: gofon/conference/class_divListConferences.inc:293
-#: gofon/conference/class_divListConferences.inc:294
-#, fuzzy, php-format
+#: gofon/conference/class_divListConferences.inc:222
+#: gofon/conference/class_divListConferences.inc:223
+#, php-format
 msgid "Number of listed '%s'"
-msgstr "Nombre de pages"
+msgstr "Nombre de '%s' listés"
 
-#: gofon/conference/class_divListConferences.inc:293
-#, fuzzy
+#: gofon/conference/class_divListConferences.inc:222
 msgid "conferences"
-msgstr "Conférence"
+msgstr "Conférences"
 
-#: gofon/conference/class_divListConferences.inc:294
-#: gofon/macro/class_divListMacros.inc:275
-#, fuzzy
+#: gofon/conference/class_divListConferences.inc:223
+#: gofon/macro/class_divListMacros.inc:203
 msgid "departments"
-msgstr "Département"
+msgstr "Départements"
 
-#: gofon/conference/main.inc:39 gofon/conference/main.inc:41
+#: gofon/conference/main.inc:38 gofon/conference/main.inc:40
 msgid "Conference management"
 msgstr "Gestion des conférences"
 
@@ -1299,25 +1293,28 @@ msgstr "Conférences téléphoniques"
 msgid "Management"
 msgstr "Gestion"
 
-#: gofon/conference/class_phoneConferenceManagment.inc:189
-#: gofon/conference/class_phoneConferenceManagment.inc:251
-#, fuzzy
+#: gofon/conference/class_phoneConferenceManagment.inc:187
+#: gofon/macro/class_gofonMacroManagement.inc:273
+msgid "Permission"
+msgstr "Permissions"
+
+#: gofon/conference/class_phoneConferenceManagment.inc:206
+#: gofon/conference/class_phoneConferenceManagment.inc:268
 msgid "conference"
 msgstr "Conférence"
 
-#: gofon/conference/class_phoneConferenceManagment.inc:210
-#: gofon/conference/class_phoneConferenceManagment.inc:272
-#: gofon/macro/class_gofonMacroManagement.inc:289
-#: gofon/macro/class_gofonMacroManagement.inc:343
-#: gofon/macro/class_gofonMacroManagement.inc:367
+#: gofon/conference/class_phoneConferenceManagment.inc:228
+#: gofon/conference/class_phoneConferenceManagment.inc:289
+#: gofon/macro/class_gofonMacroManagement.inc:320
+#: gofon/macro/class_gofonMacroManagement.inc:373
+#: gofon/macro/class_gofonMacroManagement.inc:397
 msgid "Permission error"
-msgstr ""
+msgstr "Erreur de permissions"
 
-#: gofon/conference/class_phoneConferenceManagment.inc:210
-#: gofon/conference/class_phoneConferenceManagment.inc:272
-#, fuzzy
+#: gofon/conference/class_phoneConferenceManagment.inc:228
+#: gofon/conference/class_phoneConferenceManagment.inc:289
 msgid "You have not permission to delete this entry!"
-msgstr "Vous n'avez pas les droits nécessaires pour supprimer ce département."
+msgstr "Vous n'avez pas les droits nécessaires pour supprimer cette entrée !"
 
 #: gofon/macro/headpage.tpl:6 gofon/macro/class_divListMacros.inc:31
 #: gofon/macro/class_divListMacros.inc:32
@@ -1346,58 +1343,56 @@ msgstr "Afficher les macros correspondantes"
 msgid "Regular expression for matching macro names"
 msgstr "Expression régulière correspondant à des noms de macro"
 
-#: gofon/macro/class_gofonMacro.inc:296 gofon/macro/class_gofonMacro.inc:299
+#: gofon/macro/class_gofonMacro.inc:300 gofon/macro/class_gofonMacro.inc:303
 #, php-format
 msgid "Not supported multiple brace in line %s!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:303
-#, fuzzy, php-format
+#: gofon/macro/class_gofonMacro.inc:307
+#, php-format
 msgid "Application missing in line %s!"
-msgstr "Il y a pas d'application indiquée à la ligne : '%s'."
+msgstr "Il y a pas d'application indiquée à la ligne '%s' !"
 
-#: gofon/macro/class_gofonMacro.inc:307
+#: gofon/macro/class_gofonMacro.inc:311
 #, php-format
 msgid "Extension missing in line %s!"
-msgstr ""
+msgstr "Extension manquante à la ligne %s !"
 
-#: gofon/macro/class_gofonMacro.inc:420
+#: gofon/macro/class_gofonMacro.inc:424
 msgid "Name can be 20 characters at maximum!"
-msgstr ""
+msgstr "Les noms ne peuvent pas dépasser 20 caractères !"
 
-#: gofon/macro/class_gofonMacro.inc:429
-#, fuzzy
+#: gofon/macro/class_gofonMacro.inc:433
 msgid "Macro is still in use!"
-msgstr "Paramètres des macros"
+msgstr "Macro encore en utilisation !"
 
-#: gofon/macro/class_gofonMacro.inc:436
-#, fuzzy
+#: gofon/macro/class_gofonMacro.inc:440
 msgid "Macro is empty!"
-msgstr "Texte de la macro"
+msgstr "La macro est vide !"
 
-#: gofon/macro/class_gofonMacro.inc:558
+#: gofon/macro/class_gofonMacro.inc:571
 msgid "Asterisk macro management"
 msgstr "Gestion des macros d'Asterisk"
 
-#: gofon/macro/class_gofonMacro.inc:563
+#: gofon/macro/class_gofonMacro.inc:576
 msgid "GOfon macro"
-msgstr ""
+msgstr "Macro GOfon"
 
-#: gofon/macro/class_gofonMacro.inc:567 gofon/macro/paste_generic.tpl:4
+#: gofon/macro/class_gofonMacro.inc:580 gofon/macro/paste_generic.tpl:4
 #: gofon/macro/paste_generic.tpl:6 gofon/macro/generic.tpl:6
 #: gofon/macro/generic.tpl:9
 msgid "Macro name"
 msgstr "Nom de la macro"
 
-#: gofon/macro/class_gofonMacro.inc:570 gofon/macro/generic.tpl:14
+#: gofon/macro/class_gofonMacro.inc:583 gofon/macro/generic.tpl:14
 msgid "Display name"
 msgstr "Nom à afficher"
 
-#: gofon/macro/class_gofonMacro.inc:571
+#: gofon/macro/class_gofonMacro.inc:584
 msgid "Macro content and parameter"
 msgstr "Contenu et paramètre des macros"
 
-#: gofon/macro/class_gofonMacro.inc:572
+#: gofon/macro/class_gofonMacro.inc:585
 msgid "Visibility flag"
 msgstr "Etat de visibilité"
 
@@ -1424,37 +1419,36 @@ msgstr "Département"
 msgid "Visible"
 msgstr "Visible"
 
-#: gofon/macro/class_divListMacros.inc:139
-#: gofon/macro/class_divListMacros.inc:188
+#: gofon/macro/class_divListMacros.inc:91
+#: gofon/macro/class_divListMacros.inc:120
 msgid "Macro"
 msgstr "Macro"
 
-#: gofon/macro/class_divListMacros.inc:189
+#: gofon/macro/class_divListMacros.inc:121
 msgid "visible"
 msgstr "visible"
 
-#: gofon/macro/class_divListMacros.inc:190
+#: gofon/macro/class_divListMacros.inc:122
 msgid "invisible"
 msgstr "invisible"
 
-#: gofon/macro/class_divListMacros.inc:218
+#: gofon/macro/class_divListMacros.inc:147
 msgid "Edit macro"
 msgstr "Editer une macro"
 
-#: gofon/macro/class_divListMacros.inc:226
+#: gofon/macro/class_divListMacros.inc:154
 msgid "Delete macro"
 msgstr "Supprimer une macro"
 
-#: gofon/macro/class_divListMacros.inc:274
-#: gofon/macro/class_divListMacros.inc:275
-#, fuzzy, php-format
+#: gofon/macro/class_divListMacros.inc:202
+#: gofon/macro/class_divListMacros.inc:203
+#, php-format
 msgid "Number of listed %s"
-msgstr "Nombre de pages"
+msgstr "Nombre de '%s' listés"
 
-#: gofon/macro/class_divListMacros.inc:274
-#, fuzzy
+#: gofon/macro/class_divListMacros.inc:202
 msgid "macros"
-msgstr "Macro"
+msgstr "macros"
 
 #: gofon/macro/class_gofonMacroParameters.inc:256
 msgid "String"
@@ -1473,22 +1467,24 @@ msgid "Delete unused"
 msgstr "Supprimer les paramètres inutilisés"
 
 #: gofon/macro/class_gofonMacroParameters.inc:340
-#, fuzzy, php-format
+#, php-format
 msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
 msgstr ""
-"Le paramètre %s contient des caractères invalides. '!#' est utilisé comme "
-"séparateur"
+"Le paramètre %s contient des caractères invalides. '!,#' est utilisé comme "
+"séparateur !"
 
 #: gofon/macro/class_gofonMacroParameters.inc:345
 #, php-format
 msgid "Parameter %s is invalid!"
-msgstr ""
+msgstr "Le paramètre %s est non valide !"
 
 #: gofon/macro/class_gofonMacroParameters.inc:374
 msgid ""
 "Number of parameters for this macro has changed. Please update all users "
 "using it!"
 msgstr ""
+"Le nombre de paramètres de cette macro à changé. Veuillez mettre à jour tout "
+"les utilisateurs qui l'utilisent !"
 
 #: gofon/macro/generic.tpl:18
 msgid "Macro name to be displayed"
@@ -1506,12 +1502,11 @@ msgstr "Texte de la macro"
 msgid "Phone macros"
 msgstr "Macros téléphoniques"
 
-#: gofon/macro/class_gofonMacroManagement.inc:336
-#, fuzzy
+#: gofon/macro/class_gofonMacroManagement.inc:366
 msgid "macro"
-msgstr "Macro"
+msgstr "macro"
 
-#: gofon/macro/main.inc:43 gofon/macro/main.inc:47
+#: gofon/macro/main.inc:42 gofon/macro/main.inc:46
 msgid "Phone macro management"
 msgstr "Administration des macros téléphoniques"
 
@@ -1530,4 +1525,3 @@ msgstr "Valeur par défaut"
 #: gofon/macro/parameter.tpl:19
 msgid "You are not allowed to view the macro parameter settings"
 msgstr "Vous n'êtes pas autorisé à voir les paramètres de cette macro."
-