From a6a15711fcc51e0f6581c4b7bec571274dc8eb61 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Sun, 1 Jun 2014 03:46:36 -0500 Subject: [PATCH] Fix merge of PR 298 --- plugin/ticket/lang/english.php | 4 +++- plugin/ticket/lang/french.php | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plugin/ticket/lang/english.php b/plugin/ticket/lang/english.php index 473773ca5c..907906cba5 100644 --- a/plugin/ticket/lang/english.php +++ b/plugin/ticket/lang/english.php @@ -81,4 +81,6 @@ $strings['TicketWasThisAnswerSatisfying'] = "Was this answer satisfactory?"; $strings['TicketDetail'] = "Ticket details"; $strings['AreYouSure'] = "Are you sure?"; $strings['allow_student_add'] = "Allow students to generate tickets"; -?> +$strings['PleaseBeforeRegisterATicketSelectOneUser'] = "Please select a user before you register a ticket."; +$strings['RequestConfirmation'] = "Request confirmation"; + diff --git a/plugin/ticket/lang/french.php b/plugin/ticket/lang/french.php index 33c1f8660e..e22a32bff4 100644 --- a/plugin/ticket/lang/french.php +++ b/plugin/ticket/lang/french.php @@ -81,4 +81,6 @@ $strings['TicketWasThisAnswerSatisfying'] = "La réponse au ticket est-elle sati $strings['TicketDetail'] = "Détails du ticket"; $strings['AreYouSure'] = "Êtes-vous certain?"; $strings['allow_student_add'] = "Permettre à l'étudiant de générer des tickets"; -?> +$strings['PleaseBeforeRegisterATicketSelectOneUser'] = "Veuillez sélectionner un utilisateur avant d'enregistrer un ticket."; +$strings['RequestConfirmation'] = "Demander confirmation"; +