From ad55d54f2d54912e8ae898ccfa0af1942d6f5b59 Mon Sep 17 00:00:00 2001
From: bbe Thanks for being here. Hopefully you've helped resolve a few "
-"tickets and make the world a better place.gd7QnoJm
Successfully Logged Out
\n"
"
Vous pouvez ajouter une nouvelle adresse mail à la liste ou supprimer " "l'un des éléments ci-dessous, au besoin.
" -#: .\templates\helpdesk\ticket_cc_list.html:16 +#: .\templates\helpdesk\ticket_cc_list.html:26 msgid "Ticket CC List" msgstr "Liste des destinataires en copie" -#: .\templates\helpdesk\ticket_cc_list.html:20 +#: .\templates\helpdesk\ticket_cc_list.html:30 msgid "Add an Email or Helpdesk User" msgstr "Ajouter un email ou un utilisateur Helpdesk" -#: .\templates\helpdesk\ticket_cc_list.html:25 +#: .\templates\helpdesk\ticket_cc_list.html:35 msgid "E-Mail Address or Helpdesk User" msgstr "Adresse E-Mail ou Utilisateur Helpdesk" -#: .\templates\helpdesk\ticket_cc_list.html:26 +#: .\templates\helpdesk\ticket_cc_list.html:36 msgid "View?" msgstr "Voir ?" -#: .\templates\helpdesk\ticket_cc_list.html:27 +#: .\templates\helpdesk\ticket_cc_list.html:37 msgid "Update?" msgstr "Mettre à jour ?" -#: .\templates\helpdesk\ticket_cc_list.html:53 +#: .\templates\helpdesk\ticket_cc_list.html:63 #, python-format msgid "Return to %(ticket_title)s" msgstr "Retourner à %(ticket_title)s" #: .\templates\helpdesk\ticket_dependency_add.html:3 +#: .\templates\helpdesk\ticket_dependency_add.html:12 msgid "Add Ticket Dependency" msgstr "Ajouter une dépendance à un ticket" -#: .\templates\helpdesk\ticket_dependency_add.html:5 +#: .\templates\helpdesk\ticket_dependency_add.html:15 msgid "" "\n" "Ajouter une dépendance vous empêchera de résoudre ce billet jusqu'à ce " "que le billet en question ait été résolu ou fermé.
" -#: .\templates\helpdesk\ticket_dependency_add.html:21 +#: .\templates\helpdesk\ticket_dependency_add.html:31 msgid "Save Ticket Dependency" msgstr "Enregistrer la dépendance" #: .\templates\helpdesk\ticket_dependency_del.html:3 +#: .\templates\helpdesk\ticket_dependency_del.html:12 msgid "Delete Ticket Dependency" msgstr "Supprimer la dépendance" -#: .\templates\helpdesk\ticket_dependency_del.html:5 +#: .\templates\helpdesk\ticket_dependency_del.html:15 msgid "" "\n" "Are you sure you wish to remove the dependency on this ticket ?
\n" -#: .\templates\helpdesk\ticket_desc_table.html:8 -msgid "Ticket Summary" -msgstr "Résumé du ticket" - -#: .\templates\helpdesk\ticket_desc_table.html:18 -msgid "Unhold" -msgstr "Reprendre" - -#: .\templates\helpdesk\ticket_desc_table.html:18 -msgid "Hold" -msgstr "Pause" - -#: .\templates\helpdesk\ticket_desc_table.html:20 +#: .\templates\helpdesk\ticket_desc_table.html:13 #, python-format msgid "Queue: %(queue)s" msgstr "File: %(queue)s" -#: .\templates\helpdesk\ticket_desc_table.html:43 -#: .\templates\helpdesk\ticket_list.html:226 +#: .\templates\helpdesk\ticket_desc_table.html:15 +msgid "Edit" +msgstr "Editer" + +#: .\templates\helpdesk\ticket_desc_table.html:17 +msgid "Unhold" +msgstr "Reprendre" + +#: .\templates\helpdesk\ticket_desc_table.html:17 +msgid "Hold" +msgstr "Pause" + +#: .\templates\helpdesk\ticket_desc_table.html:27 +#: .\templates\helpdesk\ticket_list.html:66 msgid "Due Date" msgstr "Date d'échéance" -#: .\templates\helpdesk\ticket_desc_table.html:52 +#: .\templates\helpdesk\ticket_desc_table.html:34 msgid "Assigned To" msgstr "Assigné à" -#: .\templates\helpdesk\ticket_desc_table.html:58 -msgid "Ignore" -msgstr "Ignorer" - -#: .\templates\helpdesk\ticket_desc_table.html:67 +#: .\templates\helpdesk\ticket_desc_table.html:52 msgid "Copies To" msgstr "Copies à" -#: .\templates\helpdesk\ticket_desc_table.html:68 +#: .\templates\helpdesk\ticket_desc_table.html:53 msgid "" "Click here to add / remove people who should receive an e-mail whenever this " "ticket is updated." @@ -2493,11 +2754,7 @@ msgstr "" "Cliquez ici pour ajouter / supprimer des personnes qui pourrait recevoir un " "e-mail lorsque ce ticket est mis à jour." -#: .\templates\helpdesk\ticket_desc_table.html:68 -msgid "Manage" -msgstr "Gérer" - -#: .\templates\helpdesk\ticket_desc_table.html:68 +#: .\templates\helpdesk\ticket_desc_table.html:53 msgid "" "Click here to subscribe yourself to this ticket, if you want to receive an e-" "mail whenever this ticket is updated." @@ -2505,30 +2762,11 @@ msgstr "" "Cliquez ici pour souscrire à ce ticket si vous souhaitez recevoir un e-mail " "dès que ce dernier est mis à jour." -#: .\templates\helpdesk\ticket_desc_table.html:68 -msgid "Subscribe" -msgstr "Souscrire" - -#: .\templates\helpdesk\ticket_desc_table.html:72 +#: .\templates\helpdesk\ticket_desc_table.html:57 msgid "Dependencies" msgstr "Dépendances" -#: .\templates\helpdesk\ticket_desc_table.html:74 -msgid "" -"This ticket cannot be resolved until the following ticket(s) are resolved" -msgstr "" -"Ce ticket ne peut être résolu tant que le(s) ticket(s) suivant(s) n'ont pas " -"été résolu(s)" - -#: .\templates\helpdesk\ticket_desc_table.html:75 -msgid "Remove Dependency" -msgstr "Supprimer la dépendance" - -#: .\templates\helpdesk\ticket_desc_table.html:78 -msgid "This ticket has no dependencies." -msgstr "Ce ticket ne dépend d'aucun autre." - -#: .\templates\helpdesk\ticket_desc_table.html:80 +#: .\templates\helpdesk\ticket_desc_table.html:59 msgid "" "Click on 'Add Dependency', if you want to make this ticket dependent on " "another ticket. A ticket may not be closed until all tickets it depends on " @@ -2538,100 +2776,133 @@ msgstr "" "d'un autre. Un ticket ne peut être fermé tant que les tickets dont il dépend " "ne sont pas fermés." -#: .\templates\helpdesk\ticket_desc_table.html:80 -msgid "Add Dependency" -msgstr "Ajouter une dépendance" +#: .\templates\helpdesk\ticket_desc_table.html:61 +msgid "" +"This ticket cannot be resolved until the following ticket(s) are resolved" +msgstr "" +"Ce ticket ne peut être résolu tant que le(s) ticket(s) suivant(s) n'ont pas " +"été résolu(s)" -#: .\templates\helpdesk\ticket_list.html:13 -msgid "No Tickets Match Your Selection" -msgstr "Aucun ticket correspondant à votre sélection" +#: .\templates\helpdesk\ticket_desc_table.html:65 +msgid "This ticket has no dependencies." +msgstr "Ce ticket ne dépend d'aucun autre." -#: .\templates\helpdesk\ticket_list.html:46 +#: .\templates\helpdesk\ticket_desc_table.html:68 +msgid "Total time spent" +msgstr "Temps passé total" + +#: .\templates\helpdesk\ticket_desc_table.html:73 +msgid "Knowlegebase item" +msgstr "Élément de la base de connaissance" + +#: .\templates\helpdesk\ticket_desc_table.html:107 +msgid "Edit details" +msgstr "Editer les détails" + +#: .\templates\helpdesk\ticket_list.html:21 +msgid "Saved Query" +msgstr "Requête sauvegardée" + +#: .\templates\helpdesk\ticket_list.html:36 +msgid "Query Results" +msgstr "Résultats de la requête" + +#: .\templates\helpdesk\ticket_list.html:41 +msgid "Table" +msgstr "Table" + +#: .\templates\helpdesk\ticket_list.html:47 +msgid "Timeline" +msgstr "Chronologie" + +#: .\templates\helpdesk\ticket_list.html:68 +msgid "Submitter" +msgstr "Émetteur" + +#: .\templates\helpdesk\ticket_list.html:69 +msgid "Time Spent" +msgstr "Temps Passé" + +#: .\templates\helpdesk\ticket_list.html:70 +msgid "KB item" +msgstr "Objet de la Base de Connaissance" + +#: .\templates\helpdesk\ticket_list.html:75 +msgid "Select:" +msgstr "Sélectionner :" + +#: .\templates\helpdesk\ticket_list.html:83 +msgid "Invert" +msgstr "Inverser" + +#: .\templates\helpdesk\ticket_list.html:87 +msgid "With Selected Tickets:" +msgstr "Avec les tickets sélectionnés :" + +#: .\templates\helpdesk\ticket_list.html:89 +msgid "Take (Assign to me)" +msgstr "Prendre (m'assigner ce ticket)" + +#: .\templates\helpdesk\ticket_list.html:91 +msgid "Merge" +msgstr "Fusionner" + +#: .\templates\helpdesk\ticket_list.html:92 +msgid "Close" +msgstr "Fermé" + +#: .\templates\helpdesk\ticket_list.html:93 +msgid "Close (Don't Send E-Mail)" +msgstr "Fermer (ne pas envoyer l'e-mail)" + +#: .\templates\helpdesk\ticket_list.html:94 +msgid "Close (Send E-Mail)" +msgstr "Fermer (envoyer l'e-mail)" + +#: .\templates\helpdesk\ticket_list.html:96 +msgid "Assign To" +msgstr "Assigné à" + +#: .\templates\helpdesk\ticket_list.html:97 +msgid "Nobody (Unassign)" +msgstr "Nul (non assigné)" + +#: .\templates\helpdesk\ticket_list.html:100 +msgid "Set KB Item" +msgstr "Définir objet de la base de connaissance" + +#: .\templates\helpdesk\ticket_list.html:101 +msgid "No KB Item" +msgstr "Pas d'objet de la base de connaissance" + +#: .\templates\helpdesk\ticket_list.html:151 msgid "Query Selection" msgstr "Sélection de requêtes" -#: .\templates\helpdesk\ticket_list.html:54 -msgid "Change Query" -msgstr "Changer la requête" +#: .\templates\helpdesk\ticket_list.html:161 +msgid "Filters" +msgstr "Filtres" -#: .\templates\helpdesk\ticket_list.html:61 -#: .\templates\helpdesk\ticket_list.html:73 -msgid "Sorting" -msgstr "Tri" +#: .\templates\helpdesk\ticket_list.html:170 +msgid "Add filter" +msgstr "Ajouter un filtre" -#: .\templates\helpdesk\ticket_list.html:65 -#: .\templates\helpdesk\ticket_list.html:133 -msgid "Keywords" -msgstr "Mots-clés" - -#: .\templates\helpdesk\ticket_list.html:66 +#: .\templates\helpdesk\ticket_list.html:179 msgid "Date Range" msgstr "Période temporelle" -#: .\templates\helpdesk\ticket_list.html:94 -msgid "Reverse" -msgstr "Renverser" +#: .\templates\helpdesk\ticket_list.html:211 +msgid "Apply Filters" +msgstr "Appliquer les filtres" -#: .\templates\helpdesk\ticket_list.html:96 -msgid "Ordering applied to tickets" -msgstr "Tri appliqué aux tickets" - -#: .\templates\helpdesk\ticket_list.html:101 -msgid "Owner(s)" -msgstr "Propriétaire(s)" - -#: .\templates\helpdesk\ticket_list.html:105 -msgid "(ME)" -msgstr "(MOI)" - -#: .\templates\helpdesk\ticket_list.html:109 -msgid "Ctrl-Click to select multiple options" -msgstr "Ctrl-Click pour sélectionner plusieurs options" - -#: .\templates\helpdesk\ticket_list.html:114 -msgid "Queue(s)" -msgstr "File(s)" - -#: .\templates\helpdesk\ticket_list.html:115 -#: .\templates\helpdesk\ticket_list.html:121 -msgid "Ctrl-click to select multiple options" -msgstr "Ctrl-click pour sélectionner plusieurs options" - -#: .\templates\helpdesk\ticket_list.html:120 -msgid "Status(es)" -msgstr "État(s)" - -#: .\templates\helpdesk\ticket_list.html:126 -msgid "Date (From)" -msgstr "Date (du)" - -#: .\templates\helpdesk\ticket_list.html:127 -msgid "Date (To)" -msgstr "Date (au)" - -#: .\templates\helpdesk\ticket_list.html:128 -msgid "Use YYYY-MM-DD date format, eg 2011-05-29" -msgstr "Utilisez le format de date AAAA-MM-JJ, ex 2011-05-29" - -#: .\templates\helpdesk\ticket_list.html:134 -msgid "" -"Keywords are case-insensitive, and will be looked for in the title, body and " -"submitter fields." -msgstr "" -"Les mots clés sont insensibles à la case et seront appliqués aux champs " -"titre, corps de texte et auteur." - -#: .\templates\helpdesk\ticket_list.html:138 -msgid "Apply Filter" -msgstr "Appliquer le filtre" - -#: .\templates\helpdesk\ticket_list.html:140 +#: .\templates\helpdesk\ticket_list.html:213 #, python-format msgid "" "You are currently viewing saved query \"%(query_name)s\"." -msgstr "Vous visionnez la requête \\\"%(query_name)s\\\"." +msgstr "" +"Vous visionnez actuellement la requête \"%(query_name)s\"." -#: .\templates\helpdesk\ticket_list.html:143 +#: .\templates\helpdesk\ticket_list.html:216 #, python-format msgid "" "Run a report on this " @@ -2641,12 +2912,12 @@ msgstr "" "cette requête pour voir les statistique et graphiques pour les données ci-" "dessous." -#: .\templates\helpdesk\ticket_list.html:152 -#: .\templates\helpdesk\ticket_list.html:170 +#: .\templates\helpdesk\ticket_list.html:229 +#: .\templates\helpdesk\ticket_list.html:248 msgid "Save Query" msgstr "Enregistrer la requête" -#: .\templates\helpdesk\ticket_list.html:162 +#: .\templates\helpdesk\ticket_list.html:240 msgid "" "This name appears in the drop-down list of saved queries. If you share your " "query, other users will see this name, so choose something clear and " @@ -2656,15 +2927,15 @@ msgstr "" "partagez votre requête, les autres utilisateurs verront ce nom, choisissez " "alors quelque chose de clair et représentatif !" -#: .\templates\helpdesk\ticket_list.html:164 +#: .\templates\helpdesk\ticket_list.html:242 msgid "Shared?" msgstr "Partagée ?" -#: .\templates\helpdesk\ticket_list.html:165 +#: .\templates\helpdesk\ticket_list.html:243 msgid "Yes, share this query with other users." msgstr "Oui, partager cette requête avec les autres utilisateurs." -#: .\templates\helpdesk\ticket_list.html:166 +#: .\templates\helpdesk\ticket_list.html:244 msgid "" "If you share this query, it will be visible by all other logged-in " "users." @@ -2672,67 +2943,91 @@ msgstr "" "Si vous partagez cette requête, elle sera visible par tous les " "autres utilisateurs connectés." -#: .\templates\helpdesk\ticket_list.html:179 +#: .\templates\helpdesk\ticket_list.html:260 msgid "Use Saved Query" msgstr "Utiliser la requête enregistrée" -#: .\templates\helpdesk\ticket_list.html:185 +#: .\templates\helpdesk\ticket_list.html:267 msgid "Query" msgstr "Requête" -#: .\templates\helpdesk\ticket_list.html:187 -msgid "Shared" -msgstr "Partagée" - -#: .\templates\helpdesk\ticket_list.html:190 +#: .\templates\helpdesk\ticket_list.html:272 msgid "Run Query" msgstr "Exécuter la requête" -#: .\templates\helpdesk\ticket_list.html:210 -msgid "Query Results" -msgstr "Résultats de la requête" +#: .\templates\helpdesk\ticket_list.html:299 +msgid "No Tickets Match Your Selection" +msgstr "Aucun ticket correspondant à votre sélection" -#: .\templates\helpdesk\ticket_list.html:248 -msgid "Select:" -msgstr "Sélectionner :" +#: .\templates\helpdesk\ticket_merge.html:5 +#: .\templates\helpdesk\ticket_merge.html:16 +#: .\templates\helpdesk\ticket_merge.html:24 +msgid "Merge Tickets" +msgstr "Fusionner les tickets" -#: .\templates\helpdesk\ticket_list.html:251 -msgid "Invert" -msgstr "Inverser" +#: .\templates\helpdesk\ticket_merge.html:34 +msgid "OK" +msgstr "OK" -#: .\templates\helpdesk\ticket_list.html:254 -msgid "With Selected Tickets:" -msgstr "Avec les tickets sélectionnés :" +#: .\templates\helpdesk\ticket_merge.html:43 +msgid "" +"\n" +" Choose the ticket which will be conserved and then, " +"for each information, you can decide to use\n" +" a data from another ticket to merge. I you don't " +"select a data on a row, the information\n" +" from the main ticket will stay unchanged.\n" +" " +msgstr "" +"\n" +" Sélectionnez le ticket qui sera conservé puis, pour " +"chaque information, vous pouvez décider d'utiliser\n" +" la donnée d'un autre ticket à fusionner. Si vous ne " +"sélectionnez rien sur une ligne, l'information\n" +" du ticket principal restera inchangé.\n" +" " -#: .\templates\helpdesk\ticket_list.html:254 -msgid "Take (Assign to me)" -msgstr "Prendre (m'assigner ce ticket)" +#: .\templates\helpdesk\ticket_merge.html:50 +msgid "" +"\n" +" The follow-ups and attachments from " +"the merged tickets will be moved to\n" +" the main ticket.Note: Your keyword search is case sensitive because of "
"your database. This means the search will not be accurate. "
@@ -2851,42 +3176,147 @@ msgstr ""
"ref/databases/#sqlite-string-matching\">documentation de Django sur la "
"recherche de chaîne avec SQLite ."
-#: .\views\staff.py:1079
+#: .\views\staff.py:1285
msgid "Ticket taken off hold"
msgstr "Ticket repris"
-#: .\views\staff.py:1082
+#: .\views\staff.py:1288
msgid "Ticket placed on hold"
msgstr "Ticket mis en pause"
-#: .\views\staff.py:1213
+#: .\views\staff.py:1410
msgid "User by Priority"
msgstr "Utilisateur par Priorité"
-#: .\views\staff.py:1219
+#: .\views\staff.py:1416
msgid "User by Queue"
msgstr "Utilisateur par File"
-#: .\views\staff.py:1226
+#: .\views\staff.py:1423
msgid "User by Status"
msgstr "Utilisateur par État"
-#: .\views\staff.py:1232
+#: .\views\staff.py:1429
msgid "User by Month"
msgstr "Utilisateurs par Mois"
-#: .\views\staff.py:1238
+#: .\views\staff.py:1435
msgid "Queue by Priority"
msgstr "File par Priorité"
-#: .\views\staff.py:1244
+#: .\views\staff.py:1441
msgid "Queue by Status"
msgstr "File par État"
-#: .\views\staff.py:1250
+#: .\views\staff.py:1447
msgid "Queue by Month"
msgstr "File par Mois"
+#~ msgid "Helpdesk Summary"
+#~ msgstr "Résumé Helpdesk"
+
+#~ msgid "Pr"
+#~ msgstr "Pr"
+
+#~ msgid "Knowledgebase Category"
+#~ msgstr "Catégorie de la base de connaissance"
+
+#, python-format
+#~ msgid "You are viewing all items in the %(kbcat)s category."
+#~ msgstr "Vous lisez tous les articles dans la catégorie %(kbcat)s."
+
+#, python-format
+#~ msgid ""
+#~ "View Answer "
+#~ msgstr ""
+#~ "Voir Réponse "
+
+#~ msgid "Rating"
+#~ msgstr "Evaluations"
+
+#, python-format
+#~ msgid "%(item)s"
+#~ msgstr "%(item)s"
+
+#~ msgid "Did you find this article useful?"
+#~ msgstr "Avez-vous trouvé cet article utile ?"
+
+#~ msgid "The results of voting by other readers of this article are below:"
+#~ msgstr ""
+#~ "Les résultats du vote par d'autres lecteurs du présent article sont ci-"
+#~ "dessous:"
+
+#, python-format
+#~ msgid "Recommendations: %(recommendations)s"
+#~ msgstr "Recommendations : %(recommendations)s"
+
+#, python-format
+#~ msgid "Votes: %(votes)s"
+#~ msgstr "Votes : %(votes)s"
+
+#, python-format
+#~ msgid "Overall Rating: %(score)s"
+#~ msgstr "Note globale: %(score)s "
+
+#, python-format
+#~ msgid ""
+#~ "View other %(category_title)s "
+#~ "articles, or continue viewing other knowledgebase "
+#~ "articles."
+#~ msgstr ""
+#~ "Voir les autres%(category_title)s "
+#~ "articles, ou continuer à lire les articles de la base "
+#~ "de connaissances ."
+
+#~ msgid "Toggle navigation"
+#~ msgstr "Basculer la navigation"
+
+#~ msgid "Stats"
+#~ msgstr "Statistiques"
+
+#~ msgid "Knowledgebase Categories"
+#~ msgstr "Catégories de la base de connaissance"
+
+#~ msgid "All fields are required."
+#~ msgstr "Tous les champs sont obligatoires."
+
+#~ msgid "here"
+#~ msgstr "ici"
+
+#~ msgid "Ticket Summary"
+#~ msgstr "Résumé du ticket"
+
+#~ msgid "Ignore"
+#~ msgstr "Ignorer"
+
+#~ msgid "Manage"
+#~ msgstr "Gérer"
+
+#~ msgid "Subscribe"
+#~ msgstr "Souscrire"
+
+#~ msgid "Remove Dependency"
+#~ msgstr "Supprimer la dépendance"
+
+#~ msgid "Add Dependency"
+#~ msgstr "Ajouter une dépendance"
+
+#~ msgid "Change Query"
+#~ msgstr "Changer la requête"
+
+#~ msgid ""
+#~ "Keywords are case-insensitive, and will be looked for in the title, body "
+#~ "and submitter fields."
+#~ msgstr ""
+#~ "Les mots clés sont insensibles à la case et seront appliqués aux champs "
+#~ "titre, corps de texte et auteur."
+
+#~ msgid "Shared"
+#~ msgstr "Partagée"
+
+#~ msgid "Save Options"
+#~ msgstr "Enregistrer les options"
+
#~ msgid "Description of Issue"
#~ msgstr "Description du problème"
@@ -2967,9 +3397,6 @@ msgstr "File par Mois"
#~ msgid "Accept"
#~ msgstr "Accepter"
-#~ msgid "Open Tickets"
-#~ msgstr "Tickets Ouverts"
-
#~ msgid "Attach another File"
#~ msgstr "Attacher un autre fichier"
diff --git a/helpdesk/templates/helpdesk/include/unassigned.html b/helpdesk/templates/helpdesk/include/unassigned.html
index 2864e183..750f83f2 100644
--- a/helpdesk/templates/helpdesk/include/unassigned.html
+++ b/helpdesk/templates/helpdesk/include/unassigned.html
@@ -11,7 +11,7 @@
{% trans "Ticket" %}
- {% trans "Prority" %}
+ {% trans "Priority" %}
{% trans "Queue" %}
{% trans "Created" %}
{% trans "Actions" %}
@@ -51,7 +51,7 @@
{% trans "Ticket" %}
- {% trans "Prority" %}
+ {% trans "Priority" %}
{% trans "Queue" %}
{% trans "Created" %}
{% trans "Actions" %}
diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html
index 4a24c079..bd5b0333 100644
--- a/helpdesk/templates/helpdesk/ticket_list.html
+++ b/helpdesk/templates/helpdesk/ticket_list.html
@@ -59,7 +59,7 @@
{% trans "Ticket" %}
- {% trans "Prority" %}
+ {% trans "Priority" %}
{% trans "Queue" %}
{% trans "Status" %}
{% trans "Created" %}
diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py
index 81e5e43d..b8ba58ef 100644
--- a/helpdesk/views/staff.py
+++ b/helpdesk/views/staff.py
@@ -986,7 +986,7 @@ def merge_tickets(request):
ticket.followup_set.update(
ticket=chosen_ticket,
# Next might exceed maximum 200 characters limit
- title=_('[Merged from #%d] %s') % (ticket.id, ticket.title)
+ title=_('[Merged from #%(id)d] %(title)s') % {'id': ticket.id, 'title': ticket.title}
)
# Add submitter_email, assigned_to email and ticketcc to chosen ticket if necessary