[tx-robot] updated from transifex

diff --git a/mirall.desktop.in b/mirall.desktop.in
index a22c743088a365cfc955b48f907bf09acd2ccef5..8c14ca7a81083855fb9d73b3655d18ffb909873d 100644 (file)
--- 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 53db5be06fd75d01e19a8a6faea784e825cd4d58..e04a4c8b0d72fc4136f98f5489f6d1e47b667a83 100644 (file)
--- 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"/>