From 2ec8194d0187c45671f12faf216c1ca9dfad6a56 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Mon, 25 Sep 2017 02:18:29 +0200
Subject: [PATCH] [tx-robot] updated from transifex

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

diff --git a/mirall.desktop.in b/mirall.desktop.in
index a22c74308..8c14ca7a8 100644
--- a/mirall.desktop.in
+++ b/mirall.desktop.in
@@ -150,6 +150,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_th.ts b/translations/client_th.ts
index 53db5be06..e04a4c8b0 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -3312,7 +3312,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>ข้อขัดแย้งที่ยังไม่ได้แก้ไข</translation>
     </message>
     <message>
         <location filename="../src/libsync/syncengine.cpp" line="498"/>
-- 
2.30.2