From e832a7d1a077a067755b7f8d4996d57b95e85eea Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 12 May 2014 08:20:52 -0400
Subject: [PATCH] Merge branch 'ticket/70' into develop

---
 src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties
index fc766ce..a6d6184 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties
@@ -670,5 +670,5 @@
 gb.serverDoesNotAcceptPatchsets = Ce serveur n'accepte pas de patchsets.
 gb.ticketIsClosed = Ce ticket est clos.
 gb.mergeToDescription = default integration branch for merging ticket patchsets
-gb.mytickets = mes tickets
-gb.responsibleMeTickets = dont vous �tes responsable
+gb.myTickets = mes tickets
+gb.yourAssignedTickets = dont vous �tes responsable

--
Gitblit v1.9.1