diff --git a/combo/locale/fr/LC_MESSAGES/django.po b/combo/locale/fr/LC_MESSAGES/django.po
index 33d6f9f2..dac6aca0 100644
--- a/combo/locale/fr/LC_MESSAGES/django.po
+++ b/combo/locale/fr/LC_MESSAGES/django.po
@@ -7,136 +7,137 @@ msgid ""
 msgstr ""
 "Project-Id-Version: combo 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-17 07:21+0000\n"
+"POT-Creation-Date: 2017-05-21 13:31+0000\n"
 "PO-Revision-Date: 2017-03-17 23:58+0100\n"
-"Last-Translator: Frederic Peters <fpeters@entrouvert.com>\n"
+"Last-Translator: Thomas NOËL <tnoel@entrouvert.com>\n"
 "Language: French\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: apps/dataviz/__init__.py:27
+#: combo/apps/dataviz/__init__.py:27
 msgid "Data Visualisation"
 msgstr "Visualisation de données"
 
-#: apps/dataviz/forms.py:48
+#: combo/apps/dataviz/forms.py:48
 msgid "None"
 msgstr "Aucun(e)"
 
-#: apps/dataviz/forms.py:97
+#: combo/apps/dataviz/forms.py:97
 msgid "Other parameter must be a JSON object containing only strings"
 msgstr "Doit être un objet JSON contenant uniquement des chaînes"
 
-#: apps/dataviz/models.py:33 apps/dataviz/models.py:68
-#: apps/dataviz/models.py:94 apps/lingo/models.py:411 apps/lingo/models.py:514
-#: apps/newsletters/models.py:63 apps/wcs/models.py:38 apps/wcs/models.py:88
-#: data/models.py:83 data/models.py:619 data/models.py:653 data/models.py:696
-#: data/models.py:809
+#: combo/apps/dataviz/models.py:33 combo/apps/dataviz/models.py:68
+#: combo/apps/dataviz/models.py:94 combo/apps/lingo/models.py:410
+#: combo/apps/lingo/models.py:513 combo/apps/newsletters/models.py:63
+#: combo/apps/wcs/models.py:38 combo/apps/wcs/models.py:88
+#: combo/data/models.py:83 combo/data/models.py:621 combo/data/models.py:655
+#: combo/data/models.py:698 combo/data/models.py:878
 msgid "Title"
 msgstr "Titre"
 
-#: apps/dataviz/models.py:34 apps/dataviz/models.py:69
-#: apps/dataviz/models.py:95 apps/notifications/models.py:45
-#: apps/wcs/models.py:39 data/models.py:620 data/models.py:654
-#: data/models.py:697 data/models.py:810
+#: combo/apps/dataviz/models.py:34 combo/apps/dataviz/models.py:69
+#: combo/apps/dataviz/models.py:95 combo/apps/notifications/models.py:45
+#: combo/apps/wcs/models.py:39 combo/data/models.py:622
+#: combo/data/models.py:656 combo/data/models.py:699 combo/data/models.py:879
 msgid "URL"
 msgstr "URL"
 
-#: apps/dataviz/models.py:35
+#: combo/apps/dataviz/models.py:35
 msgid "Data Source"
 msgstr "Source de données"
 
-#: apps/dataviz/models.py:36
+#: combo/apps/dataviz/models.py:36
 msgid "Use JSONP to get data"
 msgstr "Utiliser JSONP pour récupérer les données"
 
-#: apps/dataviz/models.py:37
+#: combo/apps/dataviz/models.py:37
 msgid "Max Value"
 msgstr "Valeur maximale"
 
-#: apps/dataviz/models.py:45
+#: combo/apps/dataviz/models.py:45
 msgid "Gauge"
 msgstr "Jauge"
 
-#: apps/dataviz/models.py:72
+#: combo/apps/dataviz/models.py:72
 msgid "Chart"
 msgstr "Graphe"
 
-#: apps/dataviz/models.py:96 apps/wcs/models.py:36
+#: combo/apps/dataviz/models.py:96 combo/apps/wcs/models.py:36
 msgid "Form"
 msgstr "Formulaire"
 
-#: apps/dataviz/models.py:97
+#: combo/apps/dataviz/models.py:97
 msgid "Aggregate"
 msgstr "Agrégat"
 
-#: apps/dataviz/models.py:98
+#: combo/apps/dataviz/models.py:98
 msgid "Criterion 1"
 msgstr "Critère 1"
 
-#: apps/dataviz/models.py:100
+#: combo/apps/dataviz/models.py:100
 msgid "Criterion 2"
 msgstr "Critère 2"
 
-#: apps/dataviz/models.py:102
+#: combo/apps/dataviz/models.py:102
 msgid "Other parameters"
 msgstr "Paramètres additionnels"
 
-#: apps/dataviz/models.py:234
+#: combo/apps/dataviz/models.py:234
 msgid "Cubes Barchart"
 msgstr "Diagramme à colonnes (BI)"
 
-#: apps/dataviz/models.py:247
+#: combo/apps/dataviz/models.py:247
 msgid "Cubes Table"
 msgstr "Tableau (BI)"
 
-#: apps/dataviz/utils.py:73
+#: combo/apps/dataviz/utils.py:73
 msgid "by "
 msgstr "par "
 
-#: apps/dataviz/utils.py:73
+#: combo/apps/dataviz/utils.py:73
 msgid " and "
 msgstr " et "
 
-#: apps/dataviz/utils.py:83
+#: combo/apps/dataviz/utils.py:83
 #, python-format
 msgid "by %s"
 msgstr "par %s"
 
-#: apps/family/__init__.py:22
+#: combo/apps/family/__init__.py:22
 msgid "Family"
 msgstr "Famille"
 
-#: apps/family/forms.py:21
+#: combo/apps/family/forms.py:21
 msgid "Family identifier"
 msgstr "Identifiant famille"
 
-#: apps/family/forms.py:23
+#: combo/apps/family/forms.py:23
 msgid "Secret code"
 msgstr "Code secret"
 
-#: apps/family/models.py:32
+#: combo/apps/family/models.py:32
 msgid "Family Information Cell"
 msgstr "Cellule Famille"
 
-#: apps/family/models.py:50
+#: combo/apps/family/models.py:50
 msgid "An error occured while retrieving family details."
 msgstr "Une erreur a eu lieu lors de la récupération des informations famille."
 
-#: apps/family/templates/family/infos.html:2
+#: combo/apps/family/templates/family/infos.html:2
 msgid "Informations related to your family"
 msgstr "Informations relatives à votre famille"
 
-#: apps/family/templates/family/infos.html:5
+#: combo/apps/family/templates/family/infos.html:5
 msgid "You have to connect and link your account to a family."
 msgstr "Vous devez vous connecter et relier votre compte à une famille."
 
-#: apps/family/templates/family/infos.html:11
+#: combo/apps/family/templates/family/infos.html:11
 msgid "No family linked to your account."
 msgstr "Aucune famille n'est reliée à votre compte."
 
-#: apps/family/templates/family/infos.html:14
+#: combo/apps/family/templates/family/infos.html:14
 #, python-format
 msgid ""
 "\n"
@@ -151,24 +152,24 @@ msgstr ""
 "\">cliquez ici</a> pour y lier votre compte.\n"
 " "
 
-#: apps/family/templates/family/infos.html:23
-#: apps/family/templates/family/unlink_confirm.html:8
+#: combo/apps/family/templates/family/infos.html:23
+#: combo/apps/family/templates/family/unlink_confirm.html:8
 msgid "Unlink"
 msgstr "Se délier"
 
-#: apps/family/templates/family/infos.html:28
+#: combo/apps/family/templates/family/infos.html:28
 msgid "Adults"
 msgstr "Adultes"
 
-#: apps/family/templates/family/infos.html:37
+#: combo/apps/family/templates/family/infos.html:37
 msgid "Children"
 msgstr "Enfants"
 
-#: apps/family/templates/family/link_form.html:4
+#: combo/apps/family/templates/family/link_form.html:4
 msgid "Link to a family"
 msgstr "Se lier à une famille"
 
-#: apps/family/templates/family/link_form.html:12
+#: combo/apps/family/templates/family/link_form.html:12
 msgid ""
 "\n"
 "      Enter your family credentials below.\n"
@@ -178,320 +179,328 @@ msgstr ""
 "Entez vos identifiants famille ci-dessous.\n"
 "   "
 
-#: apps/family/templates/family/link_form.html:24
-#: apps/wcs/templates/combo/wcs/tracking_code_input.html:13
+#: combo/apps/family/templates/family/link_form.html:24
+#: combo/apps/wcs/templates/combo/wcs/tracking_code_input.html:13
 msgid "Submit"
 msgstr "Valider"
 
-#: apps/family/templates/family/person.html:4
+#: combo/apps/family/templates/family/person.html:4
 msgid "Born on"
 msgstr "Né(e) le"
 
-#: apps/family/templates/family/person.html:7
+#: combo/apps/family/templates/family/person.html:7
 msgid "Address"
 msgstr "Adresse"
 
-#: apps/family/templates/family/person.html:8
+#: combo/apps/family/templates/family/person.html:8
 msgid "Address:"
 msgstr "Adresse :"
 
-#: apps/family/templates/family/person.html:11
+#: combo/apps/family/templates/family/person.html:11
 msgid "Contact"
 msgstr "Contact"
 
-#: apps/family/templates/family/person.html:12
+#: combo/apps/family/templates/family/person.html:12
 msgid "Phone:"
 msgstr "Téléphone :"
 
-#: apps/family/templates/family/person.html:13
+#: combo/apps/family/templates/family/person.html:13
 msgid "Cellphone:"
 msgstr "Téléphone portable :"
 
-#: apps/family/templates/family/person.html:14
-#: apps/lingo/templates/lingo/combo/item.html:47
+#: combo/apps/family/templates/family/person.html:14
+#: combo/apps/lingo/templates/lingo/combo/item.html:47
 msgid "Email:"
 msgstr "Courriel :"
 
-#: apps/family/templates/family/unlink_confirm.html:6
+#: combo/apps/family/templates/family/unlink_confirm.html:6
 msgid "Unlink your personal account from this family account?"
 msgstr "Délier votre compte personnel du compte famille ?"
 
-#: apps/family/views.py:28
+#: combo/apps/family/views.py:28
 msgid "Wrong credentials: make sure you typed them correctly."
 msgstr "Codes invalides : assurez-vous de les saisir correctement."
 
-#: apps/family/views.py:29
+#: combo/apps/family/views.py:29
 msgid "This family account is blocked."
 msgstr "Ce compte famille est bloqué."
 
-#: apps/family/views.py:53
+#: combo/apps/family/views.py:53
 msgid ""
 "Failed to link to family. Please check your credentials and retry later."
 msgstr ""
 "Échec de liaison avec la famille. Veuillez vérifier les codes d'accès et "
 "réessayer."
 
-#: apps/family/views.py:56
+#: combo/apps/family/views.py:56
 msgid "Your account was successfully linked."
 msgstr "Votre compte a été relié avec succès."
 
-#: apps/family/views.py:68
+#: combo/apps/family/views.py:68
 msgid "An error occured when unlinking."
 msgstr "Une erreur est survenue lors de la déliaison."
 
-#: apps/family/views.py:70
+#: combo/apps/family/views.py:70
 msgid "Your account was successfully unlinked."
 msgstr "Votre compte a été délié avec succès."
 
-#: apps/fargo/__init__.py:22
+#: combo/apps/fargo/__init__.py:22
 msgid "Portfolio"
 msgstr "Porte-documents"
 
-#: apps/fargo/models.py:31
-#: apps/fargo/templates/combo/fargo/recent-documents-cell.html:3
+#: combo/apps/fargo/models.py:31
+#: combo/apps/fargo/templates/combo/fargo/recent-documents-cell.html:3
 msgid "Recent Documents"
 msgstr "Documents récents"
 
-#: apps/fargo/templates/combo/fargo/recent-documents-cell.html:11
+#: combo/apps/fargo/templates/combo/fargo/recent-documents-cell.html:11
 msgid "You don't have any recent document."
 msgstr "Vous n'avez pas de documents récents."
 
-#: apps/lingo/__init__.py:24
+#: combo/apps/lingo/__init__.py:24
 msgid "Payment"
 msgstr "Paiement"
 
-#: apps/lingo/__init__.py:32 apps/lingo/templates/lingo/manager_base.html:5
-#: apps/lingo/templates/lingo/manager_base.html:10
+#: combo/apps/lingo/__init__.py:32
+#: combo/apps/lingo/templates/lingo/manager_base.html:5
+#: combo/apps/lingo/templates/lingo/manager_base.html:10
 msgid "Online Payment"
 msgstr "Paiement en ligne"
 
-#: apps/lingo/models.py:49
+#: combo/apps/lingo/models.py:48
 msgid "Dummy (for tests)"
 msgstr "Factice (pour tests)"
 
-#: apps/lingo/models.py:51
+#: combo/apps/lingo/models.py:50
 msgid "SIPS (Atos, France)"
 msgstr "SIPS (Atos, France)"
 
-#: apps/lingo/models.py:52
+#: combo/apps/lingo/models.py:51
 msgid "SIPS (Atos, other countries)"
 msgstr "SIPS (Atos, autres pays)"
 
-#: apps/lingo/models.py:53
+#: combo/apps/lingo/models.py:52
 msgid "SP+ (Caisse d'epargne)"
 msgstr "SP+ (Caisse d'épargne)"
 
-#: apps/lingo/models.py:54
+#: combo/apps/lingo/models.py:53
 msgid "Ingenico (formerly Ogone)"
 msgstr "Ingenico (précédemment Ogone)"
 
-#: apps/lingo/models.py:55
+#: combo/apps/lingo/models.py:54
 msgid "Paybox"
 msgstr "Paybox"
 
-#: apps/lingo/models.py:56
+#: combo/apps/lingo/models.py:55
 msgid "PayZen"
 msgstr "PayZen"
 
-#: apps/lingo/models.py:57
+#: combo/apps/lingo/models.py:56
 msgid "TIPI"
 msgstr "TIPI"
 
-#: apps/lingo/models.py:76 apps/lingo/templates/lingo/combo/items.html:10
-#: apps/notifications/models.py:43
+#: combo/apps/lingo/models.py:75
+#: combo/apps/lingo/templates/lingo/combo/items.html:10
+#: combo/apps/notifications/models.py:43
 msgid "Label"
 msgstr "Libellé"
 
-#: apps/lingo/models.py:78 apps/momo/models.py:72 apps/wcs/models.py:89
+#: combo/apps/lingo/models.py:77 combo/apps/momo/models.py:71
+#: combo/apps/wcs/models.py:89
 msgid "Description"
 msgstr "Description"
 
-#: apps/lingo/models.py:79
+#: combo/apps/lingo/models.py:78
 msgid "Payment Service"
 msgstr "Service de paiement"
 
-#: apps/lingo/models.py:82
+#: combo/apps/lingo/models.py:81
 msgid "Payment Service Options"
 msgstr "Options du service de paiement"
 
-#: apps/lingo/models.py:83
+#: combo/apps/lingo/models.py:82
 msgid "Default Regie"
 msgstr "Régie par défaut"
 
-#: apps/lingo/models.py:84
+#: combo/apps/lingo/models.py:83
 msgid "Webservice URL to retrieve remote items"
 msgstr "Webservice de récuperation des factures distantes"
 
-#: apps/lingo/models.py:86
+#: combo/apps/lingo/models.py:85
 msgid "Minimal payment amount"
 msgstr "Montant minimum de paiement"
 
-#: apps/lingo/models.py:90
+#: combo/apps/lingo/models.py:89
 msgid "Custom text displayed on success"
 msgstr "Texte personnalisé affiché après un paiement"
 
-#: apps/lingo/models.py:97 apps/lingo/models.py:410
+#: combo/apps/lingo/models.py:96 combo/apps/lingo/models.py:409
 msgid "Regie"
 msgstr "Régie"
 
-#: apps/lingo/models.py:121
+#: combo/apps/lingo/models.py:120
 msgid "Your payment has been succesfully registered."
 msgstr "Votre paiement a été pris en compte."
 
-#: apps/lingo/models.py:174
+#: combo/apps/lingo/models.py:173
 msgid "Subject"
 msgstr "Objet"
 
-#: apps/lingo/models.py:175
+#: combo/apps/lingo/models.py:174
 msgid "Source URL"
 msgstr "URL de source"
 
-#: apps/lingo/models.py:176
+#: combo/apps/lingo/models.py:175
 msgid "Details"
 msgstr "Détails"
 
-#: apps/lingo/models.py:177 apps/lingo/templates/lingo/combo/items.html:13
-#: apps/lingo/templates/lingo/tipi_form.html:34
-#: apps/lingo/templates/lingo/transaction_list.html:24
+#: combo/apps/lingo/models.py:176
+#: combo/apps/lingo/templates/lingo/combo/items.html:13
+#: combo/apps/lingo/templates/lingo/tipi_form.html:34
+#: combo/apps/lingo/templates/lingo/transaction_list.html:24
 msgid "Amount"
 msgstr "Montant (TTC)"
 
-#: apps/lingo/models.py:238
+#: combo/apps/lingo/models.py:237
 msgid "This invoice is in litigation."
 msgstr "Cette facture est en contentieux."
 
-#: apps/lingo/models.py:239
+#: combo/apps/lingo/models.py:238
 msgid "Autobilling has been set for this invoice."
 msgstr "Un prélévement automatique a lieu pour cette facture."
 
-#: apps/lingo/models.py:240
+#: combo/apps/lingo/models.py:239
 msgid "Due date is over."
 msgstr "La date limite est dépassée."
 
-#: apps/lingo/models.py:269
+#: combo/apps/lingo/models.py:268
 msgid "Anonymous User"
 msgstr "Usager anonyme"
 
-#: apps/lingo/models.py:276
+#: combo/apps/lingo/models.py:275
 msgid "Running"
 msgstr "En cours"
 
-#: apps/lingo/models.py:277
+#: combo/apps/lingo/models.py:276
 msgid "Paid"
 msgstr "Payé"
 
-#: apps/lingo/models.py:278
+#: combo/apps/lingo/models.py:277
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: apps/lingo/models.py:279
+#: combo/apps/lingo/models.py:278
 msgid "Expired"
 msgstr "Expiré"
 
-#: apps/lingo/models.py:280
+#: combo/apps/lingo/models.py:279
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: apps/lingo/models.py:285
+#: combo/apps/lingo/models.py:284
 msgid "Validation"
 msgstr "Validation"
 
-#: apps/lingo/models.py:286
+#: combo/apps/lingo/models.py:285
 msgid "Cancellation"
 msgstr "Annulation"
 
-#: apps/lingo/models.py:300 apps/lingo/templates/lingo/combo/basket.html:3
+#: combo/apps/lingo/models.py:299
+#: combo/apps/lingo/templates/lingo/combo/basket.html:3
 msgid "Basket"
 msgstr "Panier"
 
-#: apps/lingo/models.py:326
+#: combo/apps/lingo/models.py:325
 #, python-format
 msgid "%d€"
 msgstr "%d €"
 
-#: apps/lingo/models.py:351
-#: apps/lingo/templates/lingo/combo/recent_transactions.html:2
+#: combo/apps/lingo/models.py:350
+#: combo/apps/lingo/templates/lingo/combo/recent_transactions.html:2
 msgid "Recent Transactions"
 msgstr "Transactions récentes"
 
-#: apps/lingo/models.py:380
+#: combo/apps/lingo/models.py:379
 msgid "Basket Link"
 msgstr "Lien vers le panier"
 
-#: apps/lingo/models.py:412 data/models.py:492 data/models.py:497
+#: combo/apps/lingo/models.py:411 combo/data/models.py:494
+#: combo/data/models.py:499
 msgid "Text"
 msgstr "Texte"
 
-#: apps/lingo/models.py:435 apps/wcs/models.py:208
+#: combo/apps/lingo/models.py:434 combo/apps/wcs/models.py:208
 msgid "All"
 msgstr "Tout"
 
-#: apps/lingo/models.py:468
+#: combo/apps/lingo/models.py:467
 msgid "Items History Cell"
 msgstr "Historique des factures"
 
-#: apps/lingo/models.py:481
+#: combo/apps/lingo/models.py:480
 msgid "Active Items Cell"
 msgstr "Factures actives"
 
-#: apps/lingo/models.py:496
+#: combo/apps/lingo/models.py:495
 msgid "Self declared invoice payment"
 msgstr "Déclaration manuelle de facture"
 
-#: apps/lingo/models.py:508
+#: combo/apps/lingo/models.py:507
 msgid "Indigo/PES v2"
 msgstr "Indigo/PES v2"
 
-#: apps/lingo/models.py:509
+#: combo/apps/lingo/models.py:508
 msgid "ROLMRE"
 msgstr "ROLMRE"
 
-#: apps/lingo/models.py:515
+#: combo/apps/lingo/models.py:514
 msgid "TIPI payment service URL"
 msgstr "URL du service de paiement TIPI"
 
-#: apps/lingo/models.py:516 apps/lingo/templates/lingo/manager_home.html:7
-#: apps/lingo/templates/lingo/regie_list.html:5
-#: apps/lingo/templates/lingo/regie_list.html:11
+#: combo/apps/lingo/models.py:515
+#: combo/apps/lingo/templates/lingo/manager_home.html:7
+#: combo/apps/lingo/templates/lingo/regie_list.html:5
+#: combo/apps/lingo/templates/lingo/regie_list.html:11
 msgid "Regies"
 msgstr "Régies"
 
-#: apps/lingo/models.py:516
+#: combo/apps/lingo/models.py:515
 msgid "separated by commas"
 msgstr "régies séparées par des virgules"
 
-#: apps/lingo/models.py:517
+#: combo/apps/lingo/models.py:516
 msgid "Control protocol"
 msgstr "Protocole de contrôle"
 
-#: apps/lingo/models.py:518
+#: combo/apps/lingo/models.py:517
 msgid "Test mode"
 msgstr "Mode test"
 
-#: apps/lingo/models.py:522
+#: combo/apps/lingo/models.py:521
 msgid "TIPI Payment Form"
 msgstr "Formulaire de Paiement TIPI"
 
-#: apps/lingo/templates/lingo/combo/basket.html:14
+#: combo/apps/lingo/templates/lingo/combo/basket.html:14
+#: combo/manager/templates/combo/page_view.html:66
 msgid "remove"
 msgstr "supprimer"
 
-#: apps/lingo/templates/lingo/combo/basket.html:18
+#: combo/apps/lingo/templates/lingo/combo/basket.html:18
 msgid "Total:"
 msgstr "Total :"
 
-#: apps/lingo/templates/lingo/combo/basket.html:20
-#: apps/lingo/templates/lingo/combo/item.html:58
-#: apps/lingo/templates/lingo/combo/self-declared-invoice-payment.html:26
-#: apps/lingo/templates/lingo/tipi_form.html:46
+#: combo/apps/lingo/templates/lingo/combo/basket.html:20
+#: combo/apps/lingo/templates/lingo/combo/item.html:58
+#: combo/apps/lingo/templates/lingo/combo/self-declared-invoice-payment.html:26
+#: combo/apps/lingo/templates/lingo/tipi_form.html:46
 msgid "Pay"
 msgstr "Payer"
 
-#: apps/lingo/templates/lingo/combo/basket_link.html:3
+#: combo/apps/lingo/templates/lingo/combo/basket_link.html:3
 msgid "Basket:"
 msgstr "Panier :"
 
-#: apps/lingo/templates/lingo/combo/basket_link.html:4
+#: combo/apps/lingo/templates/lingo/combo/basket_link.html:4
 #, python-format
 msgid ""
 "\n"
@@ -510,7 +519,7 @@ msgstr[1] ""
 "%(counter)s éléments\n"
 " "
 
-#: apps/lingo/templates/lingo/combo/cancel-item.html:10
+#: combo/apps/lingo/templates/lingo/combo/cancel-item.html:10
 #, python-format
 msgid ""
 "\n"
@@ -519,32 +528,32 @@ msgstr ""
 "\n"
 "Êtes-vous sûr de vouloir supprimer « %(subject)s » ?\n"
 
-#: apps/lingo/templates/lingo/combo/cancel-item.html:14
+#: combo/apps/lingo/templates/lingo/combo/cancel-item.html:14
 msgid "Remove"
 msgstr "Supprimer"
 
-#: apps/lingo/templates/lingo/combo/cancel-item.html:15
-#: apps/lingo/templates/lingo/regie_confirm_delete.html:14
-#: apps/lingo/templates/lingo/regie_form.html:19
-#: apps/momo/templates/momo/momooptions_form.html:15
-#: manager/templates/combo/cell_options.html:16
-#: manager/templates/combo/cell_options.html:18
-#: manager/templates/combo/cell_visibility.html:16
-#: manager/templates/combo/cell_visibility.html:18
-#: manager/templates/combo/delete_page.html:24
-#: manager/templates/combo/generic_confirm_delete.html:14
-#: manager/templates/combo/page_add.html:20
-#: manager/templates/combo/page_add.html:22
-#: manager/templates/combo/site_import.html:15
+#: combo/apps/lingo/templates/lingo/combo/cancel-item.html:15
+#: combo/apps/lingo/templates/lingo/regie_confirm_delete.html:14
+#: combo/apps/lingo/templates/lingo/regie_form.html:19
+#: combo/apps/momo/templates/momo/momooptions_form.html:15
+#: combo/manager/templates/combo/cell_options.html:16
+#: combo/manager/templates/combo/cell_options.html:18
+#: combo/manager/templates/combo/cell_visibility.html:16
+#: combo/manager/templates/combo/cell_visibility.html:18
+#: combo/manager/templates/combo/delete_page.html:24
+#: combo/manager/templates/combo/generic_confirm_delete.html:14
+#: combo/manager/templates/combo/page_add.html:20
+#: combo/manager/templates/combo/page_add.html:22
+#: combo/manager/templates/combo/site_import.html:15
 msgid "Cancel"
 msgstr "Annuler"
 
-#: apps/lingo/templates/lingo/combo/invoice_fullpage.html:5
+#: combo/apps/lingo/templates/lingo/combo/invoice_fullpage.html:5
 #, python-format
 msgid "Invoice number %(number)s"
 msgstr "Facture n⁰ %(number)s"
 
-#: apps/lingo/templates/lingo/combo/item.html:5
+#: combo/apps/lingo/templates/lingo/combo/item.html:5
 #, python-format
 msgid ""
 "\n"
@@ -555,7 +564,7 @@ msgstr ""
 "Facture n⁰ %(number)s\n"
 " "
 
-#: apps/lingo/templates/lingo/combo/item.html:13
+#: combo/apps/lingo/templates/lingo/combo/item.html:13
 #, python-format
 msgid ""
 "\n"
@@ -566,7 +575,7 @@ msgstr ""
 "Libellé : %(label)s\n"
 " "
 
-#: apps/lingo/templates/lingo/combo/item.html:19
+#: combo/apps/lingo/templates/lingo/combo/item.html:19
 #, python-format
 msgid ""
 "\n"
@@ -577,7 +586,7 @@ msgstr ""
 "Montant total : <span class=\"amount\">%(amount)s €</span>\n"
 " "
 
-#: apps/lingo/templates/lingo/combo/item.html:25
+#: combo/apps/lingo/templates/lingo/combo/item.html:25
 #, python-format
 msgid ""
 "\n"
@@ -588,35 +597,35 @@ msgstr ""
 "Montant à régler : <span class=\"amount\">%(amount)s €</span>\n"
 " "
 
-#: apps/lingo/templates/lingo/combo/item.html:30
+#: combo/apps/lingo/templates/lingo/combo/item.html:30
 msgid "Issue date:"
 msgstr "Date d'émission :"
 
-#: apps/lingo/templates/lingo/combo/item.html:32
+#: combo/apps/lingo/templates/lingo/combo/item.html:32
 msgid "Payment due date:"
 msgstr "Date limite de paiement :"
 
-#: apps/lingo/templates/lingo/combo/item.html:36
+#: combo/apps/lingo/templates/lingo/combo/item.html:36
 msgid "Payment date:"
 msgstr "Date de paiement :"
 
-#: apps/lingo/templates/lingo/combo/item.html:38
+#: combo/apps/lingo/templates/lingo/combo/item.html:38
 msgid "Invoice has been paid."
 msgstr "La facture a été payée."
 
-#: apps/lingo/templates/lingo/combo/items.html:9
+#: combo/apps/lingo/templates/lingo/combo/items.html:9
 msgid "Number"
 msgstr "Numéro"
 
-#: apps/lingo/templates/lingo/combo/items.html:11
+#: combo/apps/lingo/templates/lingo/combo/items.html:11
 msgid "Issue date"
 msgstr "Date d'émission"
 
-#: apps/lingo/templates/lingo/combo/items.html:12
+#: combo/apps/lingo/templates/lingo/combo/items.html:12
 msgid "Payment limit date"
 msgstr "Date limite de paiement"
 
-#: apps/lingo/templates/lingo/combo/items.html:24
+#: combo/apps/lingo/templates/lingo/combo/items.html:24
 #, python-format
 msgid ""
 "\n"
@@ -627,88 +636,88 @@ msgstr ""
 "      %(amount)s €\n"
 "      "
 
-#: apps/lingo/templates/lingo/combo/items.html:30
+#: combo/apps/lingo/templates/lingo/combo/items.html:30
 msgid "View"
 msgstr "Voir"
 
-#: apps/lingo/templates/lingo/combo/items.html:31
+#: combo/apps/lingo/templates/lingo/combo/items.html:31
 msgid "and pay"
 msgstr "et payer"
 
-#: apps/lingo/templates/lingo/combo/items.html:35
+#: combo/apps/lingo/templates/lingo/combo/items.html:35
 msgid "Download"
 msgstr "Télécharger"
 
-#: apps/lingo/templates/lingo/combo/items.html:44
+#: combo/apps/lingo/templates/lingo/combo/items.html:44
 msgid "No items yet"
 msgstr "Aucune facture"
 
-#: apps/lingo/templates/lingo/combo/recent_transactions.html:11
+#: combo/apps/lingo/templates/lingo/combo/recent_transactions.html:11
 msgid "open"
 msgstr "ouvrir"
 
-#: apps/lingo/templates/lingo/combo/self-declared-invoice-payment.html:8
+#: combo/apps/lingo/templates/lingo/combo/self-declared-invoice-payment.html:8
 msgid "Invoice Number"
 msgstr "Numéro de facture"
 
-#: apps/lingo/templates/lingo/combo/self-declared-invoice-payment.html:17
+#: combo/apps/lingo/templates/lingo/combo/self-declared-invoice-payment.html:17
 msgid "Invoice Amount"
 msgstr "Montant de la facture"
 
-#: apps/lingo/templates/lingo/manager_home.html:6
-#: apps/lingo/templates/lingo/transaction_list.html:5
-#: apps/lingo/templates/lingo/transaction_list.html:11
+#: combo/apps/lingo/templates/lingo/manager_home.html:6
+#: combo/apps/lingo/templates/lingo/transaction_list.html:5
+#: combo/apps/lingo/templates/lingo/transaction_list.html:11
 msgid "Transactions"
 msgstr "Transactions"
 
-#: apps/lingo/templates/lingo/payment_form.html:7
+#: combo/apps/lingo/templates/lingo/payment_form.html:7
 msgid ""
 "Please wait while your browser is being redirected to the payment website..."
 msgstr ""
 "Veuillez patienter, votre navigateur est envoyé sur le site de paiement en "
 "ligne…"
 
-#: apps/lingo/templates/lingo/regie_confirm_delete.html:11
-#: manager/templates/combo/generic_confirm_delete.html:11
+#: combo/apps/lingo/templates/lingo/regie_confirm_delete.html:11
+#: combo/manager/templates/combo/generic_confirm_delete.html:11
 msgid "Are you sure you want to delete this?"
 msgstr "Êtes-vous sûr de vouloir supprimer ceci ?"
 
-#: apps/lingo/templates/lingo/regie_confirm_delete.html:13
-#: apps/lingo/templates/lingo/regie_form.html:21
-#: manager/templates/combo/cell_form.html:15
-#: manager/templates/combo/delete_page.html:23
-#: manager/templates/combo/generic_confirm_delete.html:13
-#: manager/templates/combo/manager_assets.html:47
+#: combo/apps/lingo/templates/lingo/regie_confirm_delete.html:13
+#: combo/apps/lingo/templates/lingo/regie_form.html:21
+#: combo/manager/templates/combo/cell_form.html:15
+#: combo/manager/templates/combo/delete_page.html:23
+#: combo/manager/templates/combo/generic_confirm_delete.html:13
+#: combo/manager/templates/combo/manager_assets.html:47
 msgid "Delete"
 msgstr "Supprimer"
 
-#: apps/lingo/templates/lingo/regie_form.html:6
+#: combo/apps/lingo/templates/lingo/regie_form.html:6
 msgid "Edit Regie"
 msgstr "Modification de la régie"
 
-#: apps/lingo/templates/lingo/regie_form.html:8
+#: combo/apps/lingo/templates/lingo/regie_form.html:8
 msgid "New Regie"
 msgstr "Nouvelle régie"
 
-#: apps/lingo/templates/lingo/regie_form.html:18
-#: apps/momo/templates/momo/momooptions_form.html:14
-#: manager/templates/combo/cell_form.html:20
-#: manager/templates/combo/cell_options.html:14
-#: manager/templates/combo/cell_visibility.html:14
-#: manager/templates/combo/page_add.html:18
+#: combo/apps/lingo/templates/lingo/regie_form.html:18
+#: combo/apps/momo/templates/momo/momooptions_form.html:14
+#: combo/manager/templates/combo/cell_form.html:20
+#: combo/manager/templates/combo/cell_options.html:14
+#: combo/manager/templates/combo/cell_visibility.html:14
+#: combo/manager/templates/combo/page_add.html:18
 msgid "Save"
 msgstr "Enregistrer"
 
-#: apps/lingo/templates/lingo/regie_list.html:6
-#: manager/templates/combo/manager_home.html:7
+#: combo/apps/lingo/templates/lingo/regie_list.html:6
+#: combo/manager/templates/combo/manager_home.html:7
 msgid "New"
 msgstr "Nouvelle"
 
-#: apps/lingo/templates/lingo/regie_list.html:22
+#: combo/apps/lingo/templates/lingo/regie_list.html:22
 msgid "(default regie)"
 msgstr "(régie par défaut)"
 
-#: apps/lingo/templates/lingo/regie_list.html:29
+#: combo/apps/lingo/templates/lingo/regie_list.html:29
 msgid ""
 "\n"
 "  This site doesn't have any regie yet. Click on the \"New\" button in the "
@@ -720,7 +729,7 @@ msgstr ""
 "  Ce site n'a pas encore de régie.  Cliquez sur le bouton « Nouvelle »   "
 "dans le coin supérieur droit de la page pour en ajouter une première.  "
 
-#: apps/lingo/templates/lingo/tipi_form.html:6
+#: combo/apps/lingo/templates/lingo/tipi_form.html:6
 msgid ""
 "Your browser is blocking popups but they are required to start the payment, "
 "make sure they are allowed for this site."
@@ -728,59 +737,55 @@ msgstr ""
 "Votre navigateur bloque les fenêtres « popup » mais elles sont nécessaires "
 "pour démarrer le paiement. Vous devriez les autoriser pour ce site."
 
-#: apps/lingo/templates/lingo/tipi_form.html:8
+#: combo/apps/lingo/templates/lingo/tipi_form.html:8
 msgid "Community identifier"
 msgstr "Identifiant de la collectivité"
 
-#: apps/lingo/templates/lingo/tipi_form.html:16
+#: combo/apps/lingo/templates/lingo/tipi_form.html:16
 msgid "invalid reference"
 msgstr "référence invalide"
 
-#: apps/lingo/templates/lingo/tipi_form.html:19
+#: combo/apps/lingo/templates/lingo/tipi_form.html:19
 msgid "Reference"
 msgstr "Référence"
 
-#: apps/lingo/templates/lingo/tipi_form.html:31
+#: combo/apps/lingo/templates/lingo/tipi_form.html:31
 msgid "invalid amount"
 msgstr "montant invalide"
 
-#: apps/lingo/templates/lingo/tipi_form.html:39
+#: combo/apps/lingo/templates/lingo/tipi_form.html:39
 msgid "invalid email"
 msgstr "adresse électronique invalide"
 
-#: apps/lingo/templates/lingo/tipi_form.html:42
+#: combo/apps/lingo/templates/lingo/tipi_form.html:42
 msgid "Email"
 msgstr "Courriel"
 
-#: apps/lingo/templates/lingo/tipi_form.html:43
-msgid "user@example.net"
-msgstr "user@example.net"
-
-#: apps/lingo/templates/lingo/transaction_list.html:6
+#: combo/apps/lingo/templates/lingo/transaction_list.html:6
 msgid "download CSV"
 msgstr "Télécharger au format CSV"
 
-#: apps/lingo/templates/lingo/transaction_list.html:20
+#: combo/apps/lingo/templates/lingo/transaction_list.html:20
 msgid "Order Identifier"
 msgstr "Identifiant de paiement"
 
-#: apps/lingo/templates/lingo/transaction_list.html:21
+#: combo/apps/lingo/templates/lingo/transaction_list.html:21
 msgid "Transaction Identifier"
 msgstr "Identifiant de transaction"
 
-#: apps/lingo/templates/lingo/transaction_list.html:22
+#: combo/apps/lingo/templates/lingo/transaction_list.html:22
 msgid "Date"
 msgstr "Date"
 
-#: apps/lingo/templates/lingo/transaction_list.html:23
+#: combo/apps/lingo/templates/lingo/transaction_list.html:23
 msgid "User"
 msgstr "Usager"
 
-#: apps/lingo/templates/lingo/transaction_list.html:25
+#: combo/apps/lingo/templates/lingo/transaction_list.html:25
 msgid "Items"
 msgstr "Éléments"
 
-#: apps/lingo/templates/lingo/transaction_list.html:71
+#: combo/apps/lingo/templates/lingo/transaction_list.html:71
 msgid ""
 "\n"
 "  This site doesn't have any transaction yet.\n"
@@ -790,431 +795,435 @@ msgstr ""
 "Il n'y a encore aucune transaction sur ce site.\n"
 "  "
 
-#: apps/lingo/views.py:290
+#: combo/apps/lingo/views.py:291
 msgid "You have to choose at least one item to pay"
 msgstr "Vous devez au moins choisir un élément à payer"
 
-#: apps/lingo/views.py:309
+#: combo/apps/lingo/views.py:310
 msgid "Invalid grouping for basket items."
 msgstr "Regroupement d'éléments de panier invalide."
 
-#: apps/lingo/views.py:324
+#: combo/apps/lingo/views.py:325
 msgid "You must give an email address."
 msgstr "Vous devez fournir une adresse électronique."
 
-#: apps/lingo/views.py:344
+#: combo/apps/lingo/views.py:345
 #, python-format
 msgid "Minimal payment amount is %s €."
 msgstr "Le montant minimal pour les paiement est de %s €."
 
-#: apps/lingo/views.py:437
+#: combo/apps/lingo/views.py:438
 #, python-format
 msgid "Invoice #%s"
 msgstr "Facture n⁰ %s"
 
-#: apps/lingo/views.py:475
+#: combo/apps/lingo/views.py:476
 msgid ""
 "We are sorry but the payment service failed to provide a correct answer."
 msgstr ""
 "Nous sommes désolé, le service de paiement n'a pas envoyé une réponse valide."
 
-#: apps/lingo/views.py:522
+#: combo/apps/lingo/views.py:523
 msgid "We are sorry but an error occured when retrieving the invoice."
 msgstr ""
 "Nous sommes désolés mais une erreur a eu lieu à la récupération de la "
 "facture."
 
-#: apps/lingo/views.py:550
+#: combo/apps/lingo/views.py:551
 msgid "No item was found."
 msgstr "Aucun élément n'a été trouvé."
 
-#: apps/lingo/views.py:576
+#: combo/apps/lingo/views.py:577
 msgid "An error occured when removing the item. (no authenticated user)"
 msgstr ""
 "Une erreur a eu lieu lors de la suppression.  (pas d'utilisateur authentifié)"
 
-#: apps/lingo/views.py:580
+#: combo/apps/lingo/views.py:581
 msgid "This item cannot be removed."
 msgstr "Cet élément ne peut être retiré."
 
-#: apps/lingo/views.py:585
+#: combo/apps/lingo/views.py:586
 msgid "An error occured when removing the item."
 msgstr "Une erreur a eu lieu lors de la suppression."
 
-#: apps/lingo/views.py:609
+#: combo/apps/lingo/views.py:610
 msgid "Sorry, the provided amount is invalid."
 msgstr "Le montant que vous avez entré n'est pas valide."
 
-#: apps/lingo/views.py:622
+#: combo/apps/lingo/views.py:623
 msgid "Sorry, no invoice were found with that number and amount."
 msgstr ""
 "Une facture avec ce numéro et ce montant n'a pu être trouvée. Veuillez "
 "vérifier que vous les avez entrés correctement."
 
-#: apps/momo/__init__.py:24 apps/momo/__init__.py:35
-#: apps/momo/templates/momo/manager_base.html:5
-#: apps/momo/templates/momo/manager_base.html:10
-#: apps/momo/templates/momo/manager_home.html:5
+#: combo/apps/momo/__init__.py:24 combo/apps/momo/__init__.py:35
+#: combo/apps/momo/templates/momo/manager_base.html:5
+#: combo/apps/momo/templates/momo/manager_base.html:10
+#: combo/apps/momo/templates/momo/manager_home.html:5
 msgid "Mobile Application"
 msgstr "Application mobile"
 
-#: apps/momo/models.py:30
+#: combo/apps/momo/models.py:29
 msgid "Application Title"
 msgstr "Titre de l'application"
 
-#: apps/momo/models.py:31
+#: combo/apps/momo/models.py:30
 msgid "Contact Email"
 msgstr "Courriel de contact"
 
-#: apps/momo/models.py:32
+#: combo/apps/momo/models.py:31
 msgid "Update Frequency (in seconds)"
 msgstr "Fréquence de mise à jour (en secondes)"
 
-#: apps/momo/models.py:35
+#: combo/apps/momo/models.py:34
 msgid "Use icons on the homepage"
 msgstr "Utiliser des icones sur la page d'accueil"
 
-#: apps/momo/models.py:36
+#: combo/apps/momo/models.py:35
 msgid "Extra CSS"
 msgstr "CSS supplémentaire"
 
-#: apps/momo/models.py:53
+#: combo/apps/momo/models.py:52
 msgid "Icon"
 msgstr "Icone"
 
-#: apps/momo/models.py:56 manager/views.py:88
+#: combo/apps/momo/models.py:55 combo/manager/views.py:89
 msgid "Home"
 msgstr "Accueil"
 
-#: apps/momo/models.py:57
+#: combo/apps/momo/models.py:56
 msgid "Globe"
 msgstr "Globe"
 
-#: apps/momo/models.py:58
+#: combo/apps/momo/models.py:57
 msgid "Mobile"
 msgstr "Portable"
 
-#: apps/momo/models.py:59
+#: combo/apps/momo/models.py:58
 msgid "Comments"
 msgstr "Commentaires"
 
-#: apps/momo/models.py:60
+#: combo/apps/momo/models.py:59
 msgid "Map"
 msgstr "Carte"
 
-#: apps/momo/models.py:61
+#: combo/apps/momo/models.py:60
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: apps/momo/models.py:62
+#: combo/apps/momo/models.py:61
 msgid "Institution"
 msgstr "Institution"
 
-#: apps/momo/models.py:63
+#: combo/apps/momo/models.py:62
 msgid "Bull Horn"
 msgstr "Porte-voix"
 
-#: apps/momo/models.py:64
+#: combo/apps/momo/models.py:63
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: apps/momo/models.py:65
+#: combo/apps/momo/models.py:64
 msgid "Map Marker"
 msgstr "Marqueur sur la carte"
 
-#: apps/momo/models.py:66
+#: combo/apps/momo/models.py:65
 msgid "Book"
 msgstr "Livre"
 
-#: apps/momo/models.py:67
+#: combo/apps/momo/models.py:66
 msgid "Envelope"
 msgstr "Enveloppe"
 
-#: apps/momo/models.py:68
+#: combo/apps/momo/models.py:67
 msgid "Car"
 msgstr "Voiture"
 
-#: apps/momo/models.py:69
+#: combo/apps/momo/models.py:68
 msgid "Road"
 msgstr "Route"
 
-#: apps/momo/models.py:70
+#: combo/apps/momo/models.py:69
 msgid "Heart"
 msgstr "Cœur"
 
-#: apps/momo/models.py:73
+#: combo/apps/momo/models.py:72
 msgid "Style"
 msgstr "Style"
 
-#: apps/momo/models.py:74
+#: combo/apps/momo/models.py:73
 msgid "Embed redirection URL"
 msgstr "Intégrer l'URL de redirection"
 
-#: apps/momo/models.py:77
+#: combo/apps/momo/models.py:76
 msgid "Meta for mobile"
 msgstr "Meta pour mobile"
 
-#: apps/momo/templates/momo/manager_home.html:11
-#: apps/momo/templates/momo/momooptions_form.html:5
-#: manager/templates/combo/cell_form.html:17
+#: combo/apps/momo/templates/momo/manager_home.html:11
+#: combo/apps/momo/templates/momo/momooptions_form.html:5
+#: combo/manager/templates/combo/cell_form.html:17
 msgid "Options"
 msgstr "Options"
 
-#: apps/momo/templates/momo/manager_home.html:15
+#: combo/apps/momo/templates/momo/manager_home.html:15
 msgid "Generate Content Update"
 msgstr "Générer une mise à jour"
 
-#: apps/momo/utils.py:134
+#: combo/apps/momo/utils.py:134
 msgid "Missing base assets file"
 msgstr "Fichier de base des ressources manquant"
 
-#: apps/momo/utils.py:156
+#: combo/apps/momo/utils.py:156
 msgid "The homepage needs to be created first."
 msgstr "La page d'accueil doit d'abord être créée."
 
-#: apps/momo/utils.py:209
+#: combo/apps/momo/utils.py:209
 msgid "Update Application"
 msgstr "Mettre à jour l'application"
 
-#: apps/momo/utils.py:238
+#: combo/apps/momo/utils.py:238
 msgid "No changes were detected."
 msgstr "Aucun changement détecté."
 
-#: apps/momo/utils.py:266
+#: combo/apps/momo/utils.py:266
 msgid "A new update (including new assets) has been generated."
 msgstr ""
 "Une nouvelle mise à jour(incluant des nouvelles ressources) a été générée."
 
-#: apps/momo/utils.py:268
+#: combo/apps/momo/utils.py:268
 msgid "A new update has been generated."
 msgstr "Une nouvelle mise à jour a été générée."
 
-#: apps/newsletters/__init__.py:22 apps/newsletters/models.py:81
+#: combo/apps/newsletters/__init__.py:22 combo/apps/newsletters/models.py:81
 msgid "Newsletters"
 msgstr "Newsletters"
 
-#: apps/newsletters/forms.py:36
+#: combo/apps/newsletters/forms.py:36
 msgid "An error occured while getting newsletters. Please try later."
 msgstr ""
 "Une erreur est survenue lors de la récuperation des newsletters. Veuillez "
 "essayer plus tard."
 
-#: apps/newsletters/forms.py:45
+#: combo/apps/newsletters/forms.py:45
 msgid "An error occured while getting subscriptions. Please try later."
 msgstr ""
 "Une erreur est survenue lors de la récuperation des vos abonnements. "
 "Veuillez essayer plus tard."
 
-#: apps/newsletters/models.py:64
+#: combo/apps/newsletters/models.py:64
 msgid "Newsletters service url"
 msgstr "Adresse du service des newsletters"
 
-#: apps/newsletters/models.py:66
+#: combo/apps/newsletters/models.py:66
 msgid "resources restrictions"
 msgstr "restrictions des ressources"
 
-#: apps/newsletters/models.py:68
+#: combo/apps/newsletters/models.py:68
 msgid "list of resources(themes) separated by commas"
 msgstr "liste des ressources(thèmes) spérarées par des virgules"
 
-#: apps/newsletters/models.py:69
+#: combo/apps/newsletters/models.py:69
 msgid "transports restrictions"
 msgstr "restrictions de transport"
 
-#: apps/newsletters/models.py:71
+#: combo/apps/newsletters/models.py:71
 msgid "list of transports separated by commas"
 msgstr "liste des transports séparés par des virgules"
 
-#: apps/newsletters/templates/newsletters/newsletters.html:16
+#: combo/apps/newsletters/templates/newsletters/newsletters.html:16
 msgid "Theme"
 msgstr "Rubrique"
 
-#: apps/newsletters/templates/newsletters/newsletters.html:36
+#: combo/apps/newsletters/templates/newsletters/newsletters.html:36
 msgid "Modify"
 msgstr "Modifier"
 
-#: apps/newsletters/templates/newsletters/newsletters.html:40
+#: combo/apps/newsletters/templates/newsletters/newsletters.html:40
 msgid "No subscriptions"
 msgstr "Aucun abonnement"
 
-#: apps/newsletters/views.py:32
+#: combo/apps/newsletters/views.py:32
 msgid "Your subscriptions are successfully saved"
 msgstr "Vos abonnements ont été bien pris en compte."
 
-#: apps/newsletters/views.py:34 apps/newsletters/views.py:44
+#: combo/apps/newsletters/views.py:34 combo/apps/newsletters/views.py:44
 msgid "An error occured while saving your subscriptions. Please try later."
 msgstr ""
 "Une erreur est survenue lors de la sauvegarde des vo abonnements. Veuillez "
 "essayer plus tard."
 
-#: apps/notifications/__init__.py:22 apps/notifications/models.py:52
+#: combo/apps/notifications/__init__.py:22
+#: combo/apps/notifications/models.py:52
 msgid "Notification"
 msgstr "Notification"
 
-#: apps/notifications/models.py:44
+#: combo/apps/notifications/models.py:44
 msgid "Body"
 msgstr "Corps"
 
-#: apps/notifications/models.py:46
+#: combo/apps/notifications/models.py:46
 msgid "Start date and time"
 msgstr "Date et heure de début"
 
-#: apps/notifications/models.py:47
+#: combo/apps/notifications/models.py:47
 msgid "End date and time"
 msgstr "Date et heure de fin"
 
-#: apps/notifications/models.py:48
+#: combo/apps/notifications/models.py:48
 msgid "Acked"
 msgstr "Validée"
 
-#: apps/notifications/models.py:49
+#: combo/apps/notifications/models.py:49
 msgid "External identifier"
 msgstr "Identifiant externe"
 
-#: apps/notifications/models.py:111
+#: combo/apps/notifications/models.py:111
 msgid "User Notifications"
 msgstr "Notifications à l'usager"
 
-#: apps/notifications/templates/combo/notificationscell.html:2
+#: combo/apps/notifications/templates/combo/notificationscell.html:2
 msgid "Notifications"
 msgstr "Notifications"
 
-#: apps/notifications/templates/combo/notificationscell.html:18
+#: combo/apps/notifications/templates/combo/notificationscell.html:18
 msgid "No notifications."
 msgstr "Aucune notification."
 
-#: apps/search/__init__.py:22 apps/search/models.py:39
-#: apps/search/templates/combo/search-cell.html:6
+#: combo/apps/search/__init__.py:22 combo/apps/search/models.py:39
+#: combo/apps/search/templates/combo/search-cell.html:6
 msgid "Search"
 msgstr "Recherche"
 
-#: apps/search/models.py:36
+#: combo/apps/search/models.py:36
 msgid "Search Service"
 msgstr "Service de recherche"
 
-#: apps/search/models.py:47
+#: combo/apps/search/models.py:47
 msgid "Not configured"
 msgstr "Non configuré"
 
-#: apps/search/models.py:48 apps/search/models.py:66
+#: combo/apps/search/models.py:48 combo/apps/search/models.py:66
 msgid "Page Contents"
 msgstr "Contenu des pages"
 
-#: apps/usersearch/__init__.py:22
+#: combo/apps/usersearch/__init__.py:22
 msgid "Backoffice User Search"
 msgstr "Recherche d'usager backoffice"
 
-#: apps/usersearch/models.py:32
+#: combo/apps/usersearch/models.py:32
 msgid "User Search"
 msgstr "Recherche d'usager"
 
-#: apps/usersearch/templates/combo/usersearch.html:3
+#: combo/apps/usersearch/templates/combo/usersearch.html:3
 msgid "Name, email, etc."
 msgstr "Nom, courriel, etc."
 
-#: apps/usersearch/templates/combo/usersearch.html:7
+#: combo/apps/usersearch/templates/combo/usersearch.html:7
 msgid "Selected user is:"
 msgstr "Utilisateur choisi :"
 
-#: apps/wcs/__init__.py:22
+#: combo/apps/wcs/__init__.py:22
 msgid "Forms"
 msgstr "Démarches"
 
-#: apps/wcs/models.py:45
+#: combo/apps/wcs/models.py:45
 msgid "Form Link"
 msgstr "Lien vers une démarche"
 
-#: apps/wcs/models.py:86
+#: combo/apps/wcs/models.py:86
 msgid "Category"
 msgstr "Catégorie"
 
-#: apps/wcs/models.py:90
+#: combo/apps/wcs/models.py:90
 msgid "Cached URL"
 msgstr "Cache de l'URL"
 
-#: apps/wcs/models.py:118
+#: combo/apps/wcs/models.py:118
 msgid "Category Link"
 msgstr "Lien vers une catégorie"
 
-#: apps/wcs/models.py:187 apps/wcs/models.py:387
+#: combo/apps/wcs/models.py:187 combo/apps/wcs/models.py:387
 msgid "Site"
 msgstr "Site"
 
-#: apps/wcs/models.py:198
+#: combo/apps/wcs/models.py:198
 msgid "All Sites"
 msgstr "Tous les sites"
 
-#: apps/wcs/models.py:240 apps/wcs/models.py:266
-#: apps/wcs/templates/combo/wcs/current_forms.html:2
+#: combo/apps/wcs/models.py:240 combo/apps/wcs/models.py:266
+#: combo/apps/wcs/templates/combo/wcs/current_forms.html:2
 msgid "Current Forms"
 msgstr "Demandes en cours"
 
-#: apps/wcs/models.py:241 apps/wcs/models.py:264
-#: apps/wcs/templates/combo/wcs/user_done_forms.html:2
+#: combo/apps/wcs/models.py:241 combo/apps/wcs/models.py:264
+#: combo/apps/wcs/templates/combo/wcs/user_done_forms.html:2
 msgid "Done Forms"
 msgstr "Demandes terminées"
 
-#: apps/wcs/models.py:244
+#: combo/apps/wcs/models.py:244
 msgid "User Forms"
 msgstr "Demandes de l'usager"
 
-#: apps/wcs/models.py:262 apps/wcs/templates/combo/wcs/user_all_forms.html:2
+#: combo/apps/wcs/models.py:262
+#: combo/apps/wcs/templates/combo/wcs/user_all_forms.html:2
 msgid "All Forms"
 msgstr "Toutes les demandes"
 
-#: apps/wcs/models.py:296 apps/wcs/templates/combo/wcs/current_drafts.html:2
+#: combo/apps/wcs/models.py:296
+#: combo/apps/wcs/templates/combo/wcs/current_drafts.html:2
 msgid "Current Drafts"
 msgstr "Brouillons en cours"
 
-#: apps/wcs/models.py:301
+#: combo/apps/wcs/models.py:301
 msgid "Order"
 msgstr "Ordre"
 
-#: apps/wcs/models.py:303
+#: combo/apps/wcs/models.py:303
 msgid "Default (alphabetical)"
 msgstr "Par défaut (alphabétique)"
 
-#: apps/wcs/models.py:304
+#: combo/apps/wcs/models.py:304
 msgid "Popularity"
 msgstr "Popularité"
 
-#: apps/wcs/models.py:305
+#: combo/apps/wcs/models.py:305
 msgid "Manual"
 msgstr "Manuel"
 
-#: apps/wcs/models.py:307
+#: combo/apps/wcs/models.py:307
 msgid "Manual Order"
 msgstr "Ordre manuel"
 
-#: apps/wcs/models.py:308
+#: combo/apps/wcs/models.py:308
 msgid "Use drag and drop to reorder forms"
 msgstr "L'ordre des démarches se modifie par drag'n drop."
 
-#: apps/wcs/models.py:309
+#: combo/apps/wcs/models.py:309
 msgid "Limit"
 msgstr "Limite"
 
-#: apps/wcs/models.py:313
+#: combo/apps/wcs/models.py:313
 msgid "Forms of Category"
 msgstr "Démarches d'une catégorie"
 
-#: apps/wcs/models.py:381 apps/wcs/templates/combo/wcs/form_categories.html:2
+#: combo/apps/wcs/models.py:381
+#: combo/apps/wcs/templates/combo/wcs/form_categories.html:2
 msgid "Form Categories"
 msgstr "Catégories de démarches"
 
-#: apps/wcs/models.py:391
+#: combo/apps/wcs/models.py:391
 msgid "Tracking Code Input"
 msgstr "Entrée de code de suivi"
 
-#: apps/wcs/templates/combo/wcs/current_drafts.html:12
+#: combo/apps/wcs/templates/combo/wcs/current_drafts.html:12
 msgid "draft"
 msgstr "brouillon"
 
-#: apps/wcs/templates/combo/wcs/tracking_code_input.html:3
+#: combo/apps/wcs/templates/combo/wcs/tracking_code_input.html:3
 msgid "Tracking Code"
 msgstr "Code de suivi"
 
-#: apps/wcs/templates/combo/wcs/tracking_code_input.html:6
+#: combo/apps/wcs/templates/combo/wcs/tracking_code_input.html:6
 msgid ""
 "\n"
 "    A tracking code is attached to all your forms, it is there to help you "
@@ -1229,113 +1238,117 @@ msgstr ""
 "échanges avec les services. Pour retrouver une demande disposant d'un code "
 "de suivi, indiquez ce dernier ci-dessous : "
 
-#: apps/wcs/templates/combo/wcs/tracking_code_input.html:12
+#: combo/apps/wcs/templates/combo/wcs/tracking_code_input.html:12
 msgid "ex: CNPHNTFB"
 msgstr "ex: CNPHNTFB"
 
-#: data/models.py:84 data/models.py:287
+#: combo/data/models.py:84 combo/data/models.py:289
 msgid "Slug"
 msgstr "Slug"
 
-#: data/models.py:85 data/models.py:811
+#: combo/data/models.py:85 combo/data/models.py:880
 msgid "Template"
 msgstr "Modèle de page"
 
-#: data/models.py:88
+#: combo/data/models.py:88
 msgid "Exclude from navigation"
 msgstr "Exclure de la navigation"
 
-#: data/models.py:89
+#: combo/data/models.py:89
 msgid "Redirect URL"
 msgstr "URL de redirection"
 
-#: data/models.py:91 data/models.py:205 data/models.py:290
+#: combo/data/models.py:91 combo/data/models.py:207 combo/data/models.py:292
 msgid "Public"
 msgstr "Publique"
 
-#: data/models.py:92 data/models.py:293
+#: combo/data/models.py:92 combo/data/models.py:295
 msgid "Groups"
 msgstr "Groupes"
 
-#: data/models.py:206
+#: combo/data/models.py:95
+msgid "Picture"
+msgstr "Image"
+
+#: combo/data/models.py:208
 #, python-format
 msgid "Private (%s)"
 msgstr "Privée (%s)"
 
-#: data/models.py:288
+#: combo/data/models.py:290
 msgid "Extra classes for CSS styling"
 msgstr "Classes supplémentaires pour le style par CSS"
 
-#: data/models.py:292
+#: combo/data/models.py:294
 msgid "Restrict to unlogged users"
 msgstr "Restreindre aux utilisateurs non connectés"
 
-#: data/models.py:425
+#: combo/data/models.py:427
 msgid "Restrict to logged-in users"
 msgstr "Restreindre aux utilisateurs connectés"
 
-#: data/models.py:519
+#: combo/data/models.py:521
 msgid "Fortune"
 msgstr "Fortune du jour"
 
-#: data/models.py:541
+#: combo/data/models.py:543
 msgid "Unlock Marker"
 msgstr "Marqueur de déblocage"
 
-#: data/models.py:563
+#: combo/data/models.py:565 combo/data/models.py:909
 msgid "Extra"
 msgstr "Extra"
 
-#: data/models.py:589
+#: combo/data/models.py:591
 msgid "Depth"
 msgstr "Profondeur"
 
-#: data/models.py:591
+#: combo/data/models.py:593
 msgid "Initial Level"
 msgstr "Niveau initial"
 
-#: data/models.py:592
+#: combo/data/models.py:594
 msgid "Same as page"
 msgstr "Identique à la page"
 
-#: data/models.py:595
+#: combo/data/models.py:597
 msgid "Root Page"
 msgstr "Page racine"
 
-#: data/models.py:600
+#: combo/data/models.py:602
 msgid "Menu"
 msgstr "Menu"
 
-#: data/models.py:622
+#: combo/data/models.py:624
 msgid "Internal link"
 msgstr "Lien interne"
 
-#: data/models.py:623
+#: combo/data/models.py:625
 msgid "Anchor"
 msgstr "Ancre"
 
-#: data/models.py:628
+#: combo/data/models.py:630
 msgid "Link"
 msgstr "Lien"
 
-#: data/models.py:655
+#: combo/data/models.py:657
 msgid "Maximum number of entries"
 msgstr "Nombre maximum d'entrées"
 
-#: data/models.py:661
+#: combo/data/models.py:663
 msgid "RSS/Atom Feed"
 msgstr "Flux RSS/Atom"
 
-#: data/models.py:698
+#: combo/data/models.py:700
 msgid "Empty label"
 msgstr "Libellé pour l'option par défaut"
 
-#: data/models.py:699 data/models.py:708
-#: manager/templates/combo/page_view.html:22
+#: combo/data/models.py:701 combo/data/models.py:710
+#: combo/manager/templates/combo/page_view.html:23
 msgid "Parameters"
 msgstr "Paramètres"
 
-#: data/models.py:700
+#: combo/data/models.py:702
 msgid ""
 "Must be a JSON list, containing dictionaries with 3 keys: name, value and "
 "optionnally roles; name must be a string, value must be a dictionary and "
@@ -1348,111 +1361,127 @@ msgstr ""
 "rôle.  Les noms de rôles permettent de restreindre la visibilité de "
 "l'élément."
 
-#: data/models.py:718
+#: combo/data/models.py:720
 msgid "it must be a list"
 msgstr "doit être une liste"
 
-#: data/models.py:720
+#: combo/data/models.py:722
 msgid "it must be a list of dictionaries"
 msgstr "doit être une liste de dictionnaires"
 
-#: data/models.py:722
+#: combo/data/models.py:724
 msgid "permitted keys in the dictionaries are name, roles and value"
 msgstr "les clés autorisées sont name, roles et value"
 
-#: data/models.py:727
+#: combo/data/models.py:729
 msgid "roles must be a list"
 msgstr "roles doit être une liste"
 
-#: data/models.py:729
+#: combo/data/models.py:731
 msgid "roles must be a list of strings"
 msgstr "roles doit être une liste de chaînes"
 
-#: data/models.py:731
+#: combo/data/models.py:733
 msgid "role's names must be unique in a list of roles"
 msgstr "les noms de rôle doivent être uniques"
 
-#: data/models.py:735
+#: combo/data/models.py:737
 #, python-format
 msgid "role(s) %s do(es) not exist"
 msgstr "Le ou les rôles %s n'existent pas"
 
-#: data/models.py:737
+#: combo/data/models.py:739
 msgid "name must be a string"
 msgstr "name doit être une chaîne"
 
-#: data/models.py:741
+#: combo/data/models.py:743
 msgid "names must be unique"
 msgstr "Les noms doivent être uniques"
 
-#: data/models.py:747
+#: combo/data/models.py:749
 #, python-format
 msgid "Parameters does not validate the expected schema: %s"
 msgstr "Les paramètres ne correspondent pas au schéma attendu : %s"
 
-#: data/models.py:787
+#: combo/data/models.py:789
 msgid "Same as parent"
 msgstr "Identique à la page parente"
 
-#: data/models.py:813
+#: combo/data/models.py:882
 msgid "Cache duration"
 msgstr "Durée de cache"
 
-#: data/models.py:818
+#: combo/data/models.py:883
+msgid "Force asynchronous mode"
+msgstr "Forcer le mode asynchrone"
+
+#: combo/data/models.py:885
+msgid "Variable names"
+msgstr "Noms des variables"
+
+#: combo/data/models.py:886
+msgid ""
+"Comma separated list of query-string variables to be copied in template "
+"context"
+msgstr ""
+"Liste des variables de la query-string à envoyer dans le contexte pour le "
+"template (noms séparés par des virgules)"
+
+#: combo/data/models.py:890
 msgid "JSON Feed"
 msgstr "Fil JSON"
 
-#: manager/forms.py:42
+#: combo/manager/forms.py:42
 msgid "Slug must be unique"
 msgstr "Le slug doit être unique"
 
-#: manager/forms.py:92
+#: combo/manager/forms.py:98
 msgid "Site Export File"
 msgstr "Fichier d'export de site"
 
-#: manager/templates/combo/cell_form.html:10
+#: combo/manager/templates/combo/cell_form.html:10
 msgid "There are no options for this cell."
 msgstr "Il n'y a pas d'option pour cette cellule."
 
-#: manager/templates/combo/cell_form.html:16
+#: combo/manager/templates/combo/cell_form.html:16
 msgid "Visibility"
 msgstr "Visibilité"
 
-#: manager/templates/combo/cell_form.html:18
+#: combo/manager/templates/combo/cell_form.html:18
 msgid "Close"
 msgstr "Fermer"
 
-#: manager/templates/combo/cell_options.html:5
+#: combo/manager/templates/combo/cell_options.html:5
 msgid "Cell Options"
 msgstr "Options de cellule"
 
-#: manager/templates/combo/cell_visibility.html:5
+#: combo/manager/templates/combo/cell_visibility.html:5
 msgid "Cell Visibility"
 msgstr "Visibilité de la cellule"
 
-#: manager/templates/combo/delete_page.html:13
+#: combo/manager/templates/combo/delete_page.html:13
 msgid "This page has subpages, what do you want to do with them?"
 msgstr "Cette page contient des sous-pages, que voulez-vous en faire ?"
 
-#: manager/templates/combo/delete_page.html:15
+#: combo/manager/templates/combo/delete_page.html:15
 msgid "Delete only this page"
 msgstr "Supprimer uniquement cette page"
 
-#: manager/templates/combo/delete_page.html:16
+#: combo/manager/templates/combo/delete_page.html:16
 msgid "Delete this page and all subpages"
 msgstr "Supprimer cette page et toutes ses sous-pages"
 
-#: manager/templates/combo/delete_page.html:19
+#: combo/manager/templates/combo/delete_page.html:19
 msgid "Are you sure you want to delete this page?"
 msgstr "Êtes-vous sûr de vouloir supprimer cette page ?"
 
-#: manager/templates/combo/manager_assets.html:5
-#: manager/templates/combo/manager_assets.html:10
-#: manager/templates/combo/manager_home.html:9
+#: combo/manager/templates/combo/manager_assets.html:5
+#: combo/manager/templates/combo/manager_assets.html:10
+#: combo/manager/templates/combo/manager_home.html:9
 msgid "Assets"
 msgstr "Ressources"
 
-#: manager/templates/combo/manager_assets.html:17
+#: combo/manager/templates/combo/manager_assets.html:17
 msgid ""
 "\n"
 "  This site doesn't have any asset yet. You can add some directly when "
@@ -1464,27 +1493,27 @@ msgstr ""
 "  Ce site n'a pas encore de ressources.  Vous pouvez en ajouter directement "
 "lors de l'édition des pages, dans la fenêtre de transfert d'images."
 
-#: manager/templates/combo/manager_base.html:17
+#: combo/manager/templates/combo/manager_base.html:17
 msgid "Portal"
 msgstr "Portail"
 
-#: manager/templates/combo/manager_base.html:23
+#: combo/manager/templates/combo/manager_base.html:23
 msgid "Portal Management"
 msgstr "Gestion du portail"
 
-#: manager/templates/combo/manager_home.html:5
+#: combo/manager/templates/combo/manager_home.html:5
 msgid "Pages"
 msgstr "Pages"
 
-#: manager/templates/combo/manager_home.html:10
+#: combo/manager/templates/combo/manager_home.html:10
 msgid "Export Site"
 msgstr "Exporter le site"
 
-#: manager/templates/combo/manager_home.html:11
+#: combo/manager/templates/combo/manager_home.html:11
 msgid "Import Site"
 msgstr "Importer un site"
 
-#: manager/templates/combo/manager_home.html:23
+#: combo/manager/templates/combo/manager_home.html:23
 msgid ""
 "\n"
 "Use drag and drop with the ⣿ handles to reorder and change hierarchy of "
@@ -1494,7 +1523,7 @@ msgstr ""
 "Vous pouvez utiliser les poignées ⣿ pour ordonner et modifier la hiérarchie "
 "des pages.\n"
 
-#: manager/templates/combo/manager_home.html:37
+#: combo/manager/templates/combo/manager_home.html:37
 msgid ""
 "\n"
 "  This site doesn't have any page yet. Click on the \"New\" button in the "
@@ -1506,119 +1535,125 @@ msgstr ""
 "  Ce site n'a pas encore de pages.  Cliquez sur le bouton « Nouvelle »   "
 "dans le coin supérieur droit de la page pour en ajouter une première.  "
 
-#: manager/templates/combo/page_add.html:6
+#: combo/manager/templates/combo/page_add.html:6
 msgid "Edit Page"
 msgstr "Modification de la page"
 
-#: manager/templates/combo/page_add.html:8
+#: combo/manager/templates/combo/page_add.html:8
 msgid "New Page"
 msgstr "Nouvelle page"
 
-#: manager/templates/combo/page_view.html:6
-#: manager/templates/combo/page_view.html:14
+#: combo/manager/templates/combo/page_view.html:7
+#: combo/manager/templates/combo/page_view.html:15
 msgid "Page"
 msgstr "Page"
 
-#: manager/templates/combo/page_view.html:7
+#: combo/manager/templates/combo/page_view.html:8
 msgid "see online"
 msgstr "voir en ligne"
 
-#: manager/templates/combo/page_view.html:8
+#: combo/manager/templates/combo/page_view.html:9
 msgid "export"
 msgstr "exporter"
 
-#: manager/templates/combo/page_view.html:9
+#: combo/manager/templates/combo/page_view.html:10
 msgid "delete"
 msgstr "supprimer"
 
-#: manager/templates/combo/page_view.html:25
+#: combo/manager/templates/combo/page_view.html:26
 msgid "Title:"
 msgstr "Titre :"
 
-#: manager/templates/combo/page_view.html:27
-#: manager/templates/combo/page_view.html:33
-#: manager/templates/combo/page_view.html:39
-#: manager/templates/combo/page_view.html:45
-#: manager/templates/combo/page_view.html:51
-#: manager/templates/combo/page_view.html:57
+#: combo/manager/templates/combo/page_view.html:28
+#: combo/manager/templates/combo/page_view.html:34
+#: combo/manager/templates/combo/page_view.html:40
+#: combo/manager/templates/combo/page_view.html:46
+#: combo/manager/templates/combo/page_view.html:52
+#: combo/manager/templates/combo/page_view.html:58
+#: combo/manager/templates/combo/page_view.html:69
 msgid "change"
 msgstr "modifier"
 
-#: manager/templates/combo/page_view.html:31
+#: combo/manager/templates/combo/page_view.html:32
 msgid "Slug:"
 msgstr "Slug :"
 
-#: manager/templates/combo/page_view.html:37
+#: combo/manager/templates/combo/page_view.html:38
 msgid "Template:"
 msgstr "Modèle de page :"
 
-#: manager/templates/combo/page_view.html:43
+#: combo/manager/templates/combo/page_view.html:44
 msgid "Visibility:"
 msgstr "Visibilité :"
 
-#: manager/templates/combo/page_view.html:49
+#: combo/manager/templates/combo/page_view.html:50
 msgid "Exclude from navigation:"
 msgstr "Exclure de la navigation "
 
-#: manager/templates/combo/page_view.html:50
+#: combo/manager/templates/combo/page_view.html:51
 msgid "yes"
 msgstr "oui"
 
-#: manager/templates/combo/page_view.html:50
+#: combo/manager/templates/combo/page_view.html:51
 msgid "no"
 msgstr "non"
 
-#: manager/templates/combo/page_view.html:55
+#: combo/manager/templates/combo/page_view.html:56
 msgid "Redirection:"
 msgstr "URL de redirection :"
 
-#: manager/templates/combo/page_view.html:56
+#: combo/manager/templates/combo/page_view.html:57
+#: combo/manager/templates/combo/page_view.html:68
 msgid "none"
 msgstr "aucune"
 
-#: manager/templates/combo/page_view.html:86
-#: manager/templates/combo/page_view.html:94
+#: combo/manager/templates/combo/page_view.html:62
+msgid "Picture:"
+msgstr "Image :"
+
+#: combo/manager/templates/combo/page_view.html:98
+#: combo/manager/templates/combo/page_view.html:106
 msgid "Restricted visibility"
 msgstr "Visibilité restreinte"
 
-#: manager/templates/combo/page_view.html:90
+#: combo/manager/templates/combo/page_view.html:102
 msgid "logged users"
 msgstr "utilisateurs connectés"
 
-#: manager/templates/combo/page_view.html:95
+#: combo/manager/templates/combo/page_view.html:107
 msgid "unlogged users"
 msgstr "utilisateurs non connectés"
 
-#: manager/templates/combo/page_view.html:105
+#: combo/manager/templates/combo/page_view.html:117
 msgid "Add a new cell"
 msgstr "Ajouter une nouvelle cellule"
 
-#: manager/templates/combo/site_import.html:5
+#: combo/manager/templates/combo/site_import.html:5
 msgid "Site Import"
 msgstr "Importation de site"
 
-#: manager/templates/combo/site_import.html:14
+#: combo/manager/templates/combo/site_import.html:14
 msgid "Import"
 msgstr "Importer"
 
-#: manager/templates/registration/login.html:8
+#: combo/manager/templates/registration/login.html:8
 msgid "Log in"
 msgstr "S'identifier"
 
-#: manager/views.py:404
+#: combo/manager/views.py:424
 #, python-format
 msgid "Editing \"%(site_title)s\""
 msgstr "Édition « %(site_title)s »"
 
-#: manager/views.py:406
+#: combo/manager/views.py:426
 msgid "Content Management"
 msgstr "Gestion de contenu"
 
-#: public/templates/combo/404.html:6
+#: combo/public/templates/combo/404.html:6
 msgid "This page doesn't exist"
 msgstr "Cette page n'existe pas"
 
-#: public/templates/combo/404.html:7
+#: combo/public/templates/combo/404.html:7
 msgid ""
 "\n"
 "  <p>\n"
@@ -1635,16 +1670,16 @@ msgstr ""
 "  </p>\n"
 "  "
 
-#: public/templates/combo/deferred-cell.html:3
-#: public/templates/combo/placeholder.html:5
+#: combo/public/templates/combo/deferred-cell.html:3
+#: combo/public/templates/combo/placeholder.html:5
 msgid "Loading..."
 msgstr "Chargement…"
 
-#: public/templates/combo/empty_site.html:52
+#: combo/public/templates/combo/empty_site.html:52
 msgid "Welcome!"
 msgstr "Bienvenue !"
 
-#: public/templates/combo/empty_site.html:53
+#: combo/public/templates/combo/empty_site.html:53
 msgid ""
 "\n"
 "<p>\n"
@@ -1663,66 +1698,70 @@ msgstr ""
 "</p>\n"
 "   "
 
-#: public/templates/combo/json-error-cell.html:3
+#: combo/public/templates/combo/json-error-cell.html:3
 msgid "Technical error getting data."
 msgstr "Erreur technique à la récupération des données."
 
-#: public/views.py:212
+#: combo/public/views.py:206
 msgid "Style Demo"
 msgstr "Démonstration des styles"
 
-#: public/views.py:238
+#: combo/public/views.py:232
 msgid "Select"
 msgstr "Sélectionner"
 
-#: public/views.py:249
+#: combo/public/views.py:243
 msgid "Info notice"
 msgstr "Message d'information"
 
-#: public/views.py:250
+#: combo/public/views.py:244
 msgid "Warning notice"
 msgstr "Message d'avertissement"
 
-#: public/views.py:251
+#: combo/public/views.py:245
 msgid "Error notice"
 msgstr "Message d'erreur"
 
-#: settings.py:166
+#: combo/settings.py:169
 msgid "One column"
 msgstr "Une colonne"
 
-#: settings.py:170 settings.py:183
+#: combo/settings.py:173 combo/settings.py:186
 msgid "Content"
 msgstr "Contenu"
 
-#: settings.py:173 settings.py:189 settings.py:205 settings.py:224
+#: combo/settings.py:176 combo/settings.py:192 combo/settings.py:208
+#: combo/settings.py:227
 msgid "Footer"
 msgstr "Pied de page"
 
-#: settings.py:179
+#: combo/settings.py:182
 msgid "One column + sidebar"
 msgstr "Une colonne et une barre latérale"
 
-#: settings.py:186 settings.py:221
+#: combo/settings.py:189 combo/settings.py:224
 msgid "Sidebar"
 msgstr "Barre latérale"
 
-#: settings.py:195
+#: combo/settings.py:198
 msgid "Two columns"
 msgstr "Deux colonnes"
 
-#: settings.py:199 settings.py:215
+#: combo/settings.py:202 combo/settings.py:218
 msgid "Left Column"
 msgstr "Colonne de gauche"
 
-#: settings.py:202 settings.py:218
+#: combo/settings.py:205 combo/settings.py:221
 msgid "Right Column"
 msgstr "Colonne de droite"
 
-#: settings.py:211
+#: combo/settings.py:214
 msgid "Two columns + sidebar"
 msgstr "Deux colonnes et une barre latérale"
 
+#~ msgid "user@example.net"
+#~ msgstr "user@example.net"
+
 #~ msgid "Confirm Deletion"
 #~ msgstr "Confirmer la suppression"
 
@@ -1744,9 +1783,6 @@ msgstr "Deux colonnes et une barre latérale"
 #~ msgid "Current template:"
 #~ msgstr "Modèle de page actuel :"
 
-#~ msgid "Available cells"
-#~ msgstr "Cellules disponibles"
-
 #~ msgid "This page redirects to:"
 #~ msgstr "Cette page redirige vers :"