From 78458662a58d756482707bf687f375df3ce052b0 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Thu, 21 Sep 2017 02:18:30 +0200
Subject: [PATCH] [tx-robot] updated from transifex

---
 mirall.desktop.in            | 3 +++
 translations/client_pt_BR.ts | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mirall.desktop.in b/mirall.desktop.in
index 9f8c723b2..0e453d632 100644
--- a/mirall.desktop.in
+++ b/mirall.desktop.in
@@ -138,6 +138,9 @@ X-GNOME-Autostart-Delay=3
 # Translations
 
 
+# Translations
+
+
 # Translations
 Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
 GenericName[oc]=Dorsièr de Sincronizacion
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index c5d0b9bbb..989a5cb96 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -3309,7 +3309,7 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/libsync/syncengine.cpp" line="487"/>
         <source>Unresolved conflict.</source>
-        <translation type="unfinished"/>
+        <translation>Conflito não solucionado.</translation>
     </message>
     <message>
         <location filename="../src/libsync/syncengine.cpp" line="498"/>
-- 
2.30.2