[tx-robot] updated from transifex

diff --git a/mirall.desktop.in b/mirall.desktop.in
index 9f8c723b20049b440ee19bb6e6c62fb8013d7347..0e453d632357ca4fd0ceb99fb787e3db7f908030 100644 (file)
--- 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 c5d0b9bbbeb8e61fdc4ac90f4749a4c25f51e451..989a5cb9670d6fc6dfc9c326ec7314094d04868b 100644 (file)
--- 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"/>