From fe24ba55c4ed1ab2fd095174dd9e9925783c4daf Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sat, 13 Feb 2016 02:18:44 -0500
Subject: [PATCH] [tx-robot] updated from transifex

---
 translations/client_fr.ts | 6 +++---
 translations/client_it.ts | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index aa6a66bba5..f028b644e8 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -657,17 +657,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an
     <message>
         <location filename="../src/gui/folder.cpp" line="1209"/>
         <source>Backup detected</source>
-        <translation type="unfinished"/>
+        <translation>Sauvegarde détecté</translation>
     </message>
     <message>
         <location filename="../src/gui/folder.cpp" line="1211"/>
         <source>Normal Synchronisation</source>
-        <translation type="unfinished"/>
+        <translation>Synchronisation normale</translation>
     </message>
     <message>
         <location filename="../src/gui/folder.cpp" line="1212"/>
         <source>Keep Local Files as Conflict</source>
-        <translation type="unfinished"/>
+        <translation>Garder les fichiers locaux comme Conflits</translation>
     </message>
 </context>
 <context>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index e3c1843508..79d39d3cf9 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -657,17 +657,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an
     <message>
         <location filename="../src/gui/folder.cpp" line="1209"/>
         <source>Backup detected</source>
-        <translation type="unfinished"/>
+        <translation>Backup rilevato</translation>
     </message>
     <message>
         <location filename="../src/gui/folder.cpp" line="1211"/>
         <source>Normal Synchronisation</source>
-        <translation type="unfinished"/>
+        <translation>Sincronizzazione normale</translation>
     </message>
     <message>
         <location filename="../src/gui/folder.cpp" line="1212"/>
         <source>Keep Local Files as Conflict</source>
-        <translation type="unfinished"/>
+        <translation>Mantieni i file locali come conflitto</translation>
     </message>
 </context>
 <context>