Bump version to 1.8.2 final

Finish 1.8.2 ChangeLog
AccountState: do not change the state when we stay connected
2026-04-09 15:13:06 +02:00 · 2015-06-08 14:10:08 +02:00 · 2015-06-08 14:06:57 +02:00 · 2015-06-08 12:14:37 +02:00 · 2015-06-08 02:18:37 -04:00 · 2015-06-07 02:18:54 -04:00
38 changed files with 186 additions and 134 deletions
--- a/37
+++ b/37
@@ -1,36 +1,37 @@
 ChangeLog
 =========
-version 1.8.2 (release 2015-05-xx)
- * Improve reporting of server error messages. (#3220)
- * Discovery: Ignore folders with any 503. (#3113)
- * Wizard: Show server error message if possible. (#3220)
+version 1.8.2 (release 2015-06-08)
+ * Improve reporting of server error messages (#3220)
+ * Discovery: Ignore folders with any 503 (#3113)
+ * Wizard: Show server error message if possible (#3220)
 * QNAM: Fix handling of mitm cert changes (#3283)
- * Some more NSIS fixes, translations added
+ * Win32: Installer translations added (#3277)
+ * Win32: Allow concurrent OEM (un-)installers (#3272)
 * Win32: Make Setup/Update Mutex theme-unique (#3272)
- * HTTP: Add the branding name to the UserAgent string.
- * ConnectonValidator: Always run with new credentials. (#3266)
+ * HTTP: Add the branding name to the UserAgent string
+ * ConnectonValidator: Always run with new credentials (#3266)
 * Recall Feature: Admins can trigger an upload of a file from
-   client to server again
- * Propagator: Add 'Content-Length: 0' header to MKCOL request
+   client to server again (#3246)
+ * Propagator: Add 'Content-Length: 0' header to MKCOL request (#3256)
 * Switch on checksum verification through branding or config
 * Add ability for checksum verification of up and download
 * Fix opening external links for some labels (#3135)
 * AccountState: Run only a single validator, allow error message
-   overriding (#3236 #3153)
+   overriding (#3236, #3153)
 * SyncJournalDB: Minor fixes and simplificatons
 * SyncEngine: Force re-read of folder Etags for upgrades from
   1.8.0 and 1.8.1
- * Propagator: Limit length of temporary file name #2789
- * ShareDialog: Password ui fixes. #3189
- * Fix startup hang by removing QSettings lock file. (#3175)
- * Wizard: Allow SSL cert dialog to show twice. (#3168)
- * ProtocolWidget: Fix rename message. (#3210)
+ * Propagator: Limit length of temporary file name (#2789)
+ * ShareDialog: Password ui fixes (#3189)
+ * Fix startup hang by removing QSettings lock file (#3175)
+ * Wizard: Allow SSL cert dialog to show twice (#3168)
+ * ProtocolWidget: Fix rename message (#3210)
 * Discovery: Test better, treat invalid hrefs as error (#3176)
- * Propagator: Overwrite local data only if unchanged. (#3156)
+ * Propagator: Overwrite local data only if unchanged (#3156)
 * ShareDialog: Improve error reporting for share API fails
- * OSX Updater: Only allow if in /Applications (#2931)
+ * OSX Updater: Only allow updates only if in /Applications (#2931)
 * Wizard: Fix lock icon (#1447)
- * Fix compile with gcc 5
+ * Fix compilation with GCC 5
 * Treat any 503 error as temporary (#3113)
 * Work around for the Qt PUT corruption bug (#2425)
 * OSX Shell integration: Optimizations
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -4,7 +4,7 @@ set( MIRALL_VERSION_PATCH 2 )
 set( MIRALL_SOVERSION 0 )

 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "rc1") #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )

 if( NOT DEFINED MIRALL_VERSION_BUILD )
--- a/admin/win/nsi/l10n/Thai.nsh
+++ b/admin/win/nsi/l10n/Thai.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "แสดงบันทึกประจำรุ่น"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "พบว่ากระบวนการ ${APPLICATION_EXECUTABLE} จะต้องหยุดทำงาน\nคุณต้องการติดตั้งเพื่อหยุดการทำงานเหล่านี้ของคุณ?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "ฆ่ากระบวนการทำงาน ${APPLICATION_EXECUTABLE}"
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "ไม่พบการฆ่ากระบวนการ!"
+StrCpy $PageReinstall_NEW_Field_1 "รุ่นเก่าของ ${APPLICATION_NAME} มีการติดตั้งในระบบของคุณ ขอแนะนำให้คุณถอนการติดตั้งรุ่นปัจจุบันออกก่อน เลือกการดำเนินการที่คุณต้องการที่จะดำเนินการและคลิกถัดไปเพื่อดำเนินการต่อ"
+StrCpy $PageReinstall_NEW_Field_2 "ถอนการติดตั้งก่อนการติดตั้ง"
+StrCpy $PageReinstall_NEW_Field_3 "อย่าถอนการติดตั้ง"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "ติดตั้งแล้ว"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "เลือกวิธีที่คุณต้องการติดตั้ง ${APPLICATION_NAME}"
+StrCpy $PageReinstall_OLD_Field_1 "รุ่นใหม่ของ ${APPLICATION_NAME} ถูกติดตั้งแล้ว! เราไม่แนะนำให้คุณติดตั้งรุ่นเก่า ถ้าคุณอยากจะติดตั้งรุ่นเก่าก็สามารถสอนการติดตั้งได้"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} ได้ถูกติดตั้งแล้ว เลือกการดำเนินการที่คุณต้องการที่จะดำเนินการและคลิกถัดไปเพื่อดำเนินการต่อ"
+StrCpy $PageReinstall_SAME_Field_2 "ส่วนประกอบ เพิ่ม/ติดตั้งใหม่ "
+StrCpy $PageReinstall_SAME_Field_3 "ถอนการติดตั้ง ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "ถอนการติดตั้ง ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "เลือกตัวเลือกการบำรุงรักษาเพื่อดำเนินการ"
+StrCpy $SEC_APPLICATION_DETAILS "กำลังติดตั้งข้อมูลที่เป็นเป็นของ ${APPLICATION_NAME}"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "บูรณาการสำหรับ Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "บูรณาการกำลังติดตั้งสำหรับ Windows Explorer"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "โปรแกรมทางลัดเมนูเริ่มต้น"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "เพิ่มทางลัดสำหรับ ${APPLICATION_NAME} ที่เมนูเริ่มต้น"
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "ทางลัดพื้นโต๊ะ"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "สร้างทางลัดบนเดสก์ทอป"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "ทางลัดเร่งด่วน"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "สร้างทางลัดเร่งด่วน"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} ที่จำเป็น"
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "ทางลัด ${APPLICATION_NAME}"
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "ทางลัดบนเดสก์ทอปสำหรับ ${APPLICATION_NAME}"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "ทางลัดเร่งด่วนสำหรับ ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "ลบ ${APPLICATION_NAME} ของโฟลเดอร์ข้อมูลจากคอมพิวเตอร์ของคุณ"
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "คุณต้องการลบ ${APPLICATION_NAME} ของโฟลเดอร์ข้อมูล?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "ปล่อยให้ตรวจสอบสำหรับใช้โฟลเดอร์ข้อมูลในภายหลังหรือตรวจสอบเพื่อลบโฟลเดอร์ข้อมูล"
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "ใช่ลบโฟลเดอร์ข้อมูลนี้"
+StrCpy $UNINSTALLER_FILE_Detail "กำลังถอนการติดตั้ง"
+StrCpy $UNINSTALLER_REGISTRY_Detail "กำลังติดตั้งรหัสรีจิสทรี"
+StrCpy $UNINSTALLER_FINISHED_Detail "เสร็จสิ้น"
+StrCpy $UNINSTALL_MESSAGEBOX "มันจะไม่ปรากฏ ${APPLICATION_NAME} ที่มีการติดตั้งในไดเรกทอรี '$INSTDIR' ดำเนินการต่อไป (ไม่แนะนำ)?"
+StrCpy $UNINSTALL_ABORT "ถอนการติดตั้งถูกยกเลิกโดยผู้ใช้"
+StrCpy $INIT_NO_QUICK_LAUNCH "ทางลัดเร่งด่วน (N/A)"
+StrCpy $INIT_NO_DESKTOP "ทางลัดเดสก์ทอป (จะเขียนทับหากมีอยู่แล้ว)"
+StrCpy $UAC_ERROR_ELEVATE "ไม่สามารถที่จะยกระดับข้อผิดพลาด:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "การติดตั้งนี้จะต้องมีการเข้าถึงผู้ดูแลระบบ กรุณาลองอีกครั้ง"
+StrCpy $INIT_INSTALLER_RUNNING "กำลังทำการติดตั้ง"
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "การถอนการติดตั้งนี้จะต้องมีการเข้าถึงส่วนผู้ดูแลระบบ กรุณาลองอีกครั้ง"
+StrCpy $INIT_UNINSTALLER_RUNNING "กำลังทำการถอนการติดตั้ง"
+StrCpy $SectionGroup_Shortcuts "ทางลัด"
--- a/admin/win/nsi/l10n/languages.nsh
+++ b/admin/win/nsi/l10n/languages.nsh
@@ -10,6 +10,7 @@
 !insertmacro MUI_LANGUAGE "French"
 !insertmacro MUI_LANGUAGE "Norwegian"
 !insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "Thai"
 !insertmacro MUI_LANGUAGE "Finnish"
 !insertmacro MUI_LANGUAGE "Basque"
 !insertmacro MUI_LANGUAGE "Greek"
--- a/src/gui/accountstate.cpp
+++ b/src/gui/accountstate.cpp
@@ -208,6 +208,7 @@ void AccountState::slotConnectionValidatorResult(ConnectionValidator::Status sta
        return;
    }

+    auto oldStatus = _connectionStatus;
    if (_connectionStatus != status) {
        qDebug() << "AccountState connection status change: "
                 << connectionStatusString(_connectionStatus) << "->"
@@ -219,7 +220,9 @@ void AccountState::slotConnectionValidatorResult(ConnectionValidator::Status sta
    switch (status)
    {
    case ConnectionValidator::Connected:
-        setState(Connected);
+        if (oldStatus != ConnectionValidator::Connected) {
+            setState(Connected);
+        }
        break;
    case ConnectionValidator::Undefined:
    case ConnectionValidator::NotConfigured:
--- a/src/libsync/propagatorjobs.cpp
+++ b/src/libsync/propagatorjobs.cpp
@@ -119,6 +119,7 @@ void PropagateLocalMkdir::start()
        done( SyncFileItem::NormalError, tr("Attention, possible case sensitivity clash with %1").arg(newDirStr) );
        return;
    }
+    _propagator->addTouchedFile(newDirStr);
    QDir localDir(_propagator->_localDir);
    if (!localDir.mkpath(_item._file)) {
        done( SyncFileItem::NormalError, tr("could not create directory %1").arg(newDirStr) );
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -75,7 +75,7 @@ SyncEngine::SyncEngine(AccountPtr account, CSYNC *ctx, const QString& localPath,
    qRegisterMetaType<SyncFileItem::Status>("SyncFileItem::Status");
    qRegisterMetaType<Progress::Info>("Progress::Info");

-    _thread.setObjectName("CSync_Neon_Thread");
+    _thread.setObjectName("SyncEngine_Thread");
    _thread.start();
 }

--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@@ -1066,7 +1066,7 @@ Els elements marcats també s&apos;eliminaran si prevenen l&apos;eliminació d&a
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="56"/>
        <source>New %1 Update Ready</source>
-        <translation type="unfinished"/>
+        <translation>Nova actualització de %1 preparada</translation>
    </message>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="57"/>
@@ -1487,7 +1487,7 @@ No és aconsellada usar-la.</translation>
        <translation>Atenció, possible xoc entre majúscules i minúscules amb %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>No s&apos;ha pogut crear el directori %1</translation>
    </message>
@@ -1513,7 +1513,7 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>El fitxer %1 no es pot reanomenar a %2 perquè hi ha un xoc amb el nom d&apos;un fitxer local</translation>
    </message>
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -1486,7 +1486,7 @@ Nedoporučuje se jí používat.</translation>
        <translation>Pozor, možná kolize z důvodu velikosti písmen s %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>nepodařilo se vytvořit adresář %1</translation>
    </message>
@@ -1512,7 +1512,7 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Soubor %1 nemohl být přejmenován na %2 z důvodu kolize názvu se souborem v místním systému</translation>
    </message>
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -1486,7 +1486,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Achtung, es könnte ein Problem mit der Groß- und Kleinschreibung für %1 auftreten</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>Verzeichnis %1 konnte nicht erstellt werden</translation>
    </message>
@@ -1512,7 +1512,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>%1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht zu %2 umbenannt werden</translation>
    </message>
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -1487,7 +1487,7 @@ It is not advisable to use it.</source>
        <translation>Προσοχή, πιθανή διένεξη κεφαλαίων-πεζών γραμμάτων με το %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>αδυναμία δημιουργίας καταλόγου %1</translation>
    </message>
@@ -1513,7 +1513,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Το αρχείο %1 δεν είναι δυνατό να μετονομαστεί σε %2 λόγω μιας διένεξης με το όνομα ενός τοπικού αρχείου</translation>
    </message>
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -1481,7 +1481,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1507,7 +1507,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation type="unfinished"></translation>
    </message>
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -1485,7 +1485,7 @@ No se recomienda usarla.</translation>
        <translation>Atención, posible error de mayúsculas/minúsculas en %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>No se pudo crear el directorio %1</translation>
    </message>
@@ -1511,7 +1511,7 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>El archivo %1 no se puede renombrar a %2 por causa de un conflicto con el nombre de un archivo local</translation>
    </message>
--- a/translations/client_es_AR.ts
+++ b/translations/client_es_AR.ts
@@ -1483,7 +1483,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation type="unfinished"/>
    </message>
@@ -1509,7 +1509,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_et.ts
+++ b/translations/client_et.ts
@@ -1485,7 +1485,7 @@ Selle kasutamine pole soovitatav.</translation>
        <translation>Tähelepanu, võimalik tõusutundliku nime konflikt %1-ga</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>ei suuda luua kataloogi %1</translation>
    </message>
@@ -1511,7 +1511,7 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Faili %1 ei saa ümber nimetada %2-ks, kuna on konflikt kohaliku faili nimega</translation>
    </message>
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@@ -1485,7 +1485,7 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>Ezin izan da %1 karpeta sortu</translation>
    </message>
@@ -1511,7 +1511,7 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -1481,7 +1481,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation type="unfinished"/>
    </message>
@@ -1507,7 +1507,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -1481,7 +1481,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>kansion %1 luominen epäonnistui</translation>
    </message>
@@ -1507,7 +1507,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -1486,7 +1486,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>Attention, collision possible avec %1 à cause de la casse</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>impossible de créer le répertoire %1</translation>
    </message>
@@ -1512,7 +1512,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Le fichier %1 ne peut pas être renommé en %2 à cause d&apos;un conflit local de nom de fichier</translation>
    </message>
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -1486,7 +1486,7 @@ Recomendámoslle que non o use.</translation>
        <translation>Atención, posíbel colisión entre maiúsculas e minúsculas con %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>non foi posíbel crear o directorio %1</translation>
    </message>
@@ -1512,7 +1512,7 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Non é posíbel renomear o ficheiro %1 como %2 por mor dunha colisión co nome dun ficheiro local</translation>
    </message>
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
@@ -1479,7 +1479,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation type="unfinished"/>
    </message>
@@ -1505,7 +1505,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -1485,7 +1485,7 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Attenzione, possibile conflitto relativo all&apos;uso di maiuscole e minuscole con %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>impossibile creare la cartella %1</translation>
    </message>
@@ -1511,7 +1511,7 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Il file %1 non può essere rinominato in %2 a causa di un conflitto con il nome di un file locale</translation>
    </message>
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -1484,7 +1484,7 @@ It is not advisable to use it.</source>
        <translation>注意: %1 で大文字小文字が競合している可能性</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>ディレクトリ %1 を作成できませんでした</translation>
    </message>
@@ -1510,7 +1510,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>ファイル %1 はローカルファイル名が衝突しているため %2 に名前を変更できません</translation>
    </message>
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -1486,7 +1486,7 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>Merk! mulig sammenfall med %1 pga. sensitivitet for store/små bokstaver</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>klarte ikke å opprette mappe %1</translation>
    </message>
@@ -1512,7 +1512,7 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Fil %1 kan ikke omdøpes til %2 på grunn av lokalt sammenfall av filnavn</translation>
    </message>
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -1486,7 +1486,7 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Let op, mogelijk conflict hoofdlettergevoeligheid met 1%</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>kon map %1 niet maken</translation>
    </message>
@@ -1512,7 +1512,7 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Bestand %1 kan niet worden hernoemd naar %2, omdat de naam conflicteert met een lokaal bestand</translation>
    </message>
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -1485,7 +1485,7 @@ Niezalecane jest jego użycie.</translation>
        <translation>Uwaga, możliwa niezgodność związana z wielością liter w %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>nie można utworzyć katalogu %1</translation>
    </message>
@@ -1511,7 +1511,7 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Plik %1 nie może być nazwany %2 z powodu kolizji z lokalną nazwą pliku</translation>
    </message>
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -1484,7 +1484,7 @@ It is not advisable to use it.</source>
        <translation>Atenção, possível sensibilidade a maiúsculas em conflito com %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>Não foi possível criar a directoria %1</translation>
    </message>
@@ -1510,7 +1510,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>O ficheiro %1 nao pode ser renomeado para %2 devido a conflito com nome de ficheiro local</translation>
    </message>
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -1485,7 +1485,7 @@ It is not advisable to use it.</source>
        <translation>Atenção, possível caso de sensibilidade de minúscula/maiúscula, choque com 1%</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>Não foi possível criar diretório %1</translation>
    </message>
@@ -1511,7 +1511,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>O arquivo %1 não pode ser renomeado para %2 por causa de um choque com nome de arquivo local</translation>
    </message>
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -104,7 +104,7 @@
    <message>
        <location filename="../src/gui/accountsettings.ui" line="104"/>
        <source>Storage Usage</source>
-        <translation>Использование хранилища</translation>
+        <translation>Использование доступного пространства</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="126"/>
@@ -1112,7 +1112,7 @@ for additional privileges during the process.</source>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="94"/>
        <source>No updates available. Your installation is at the latest version.</source>
-        <translation>Обновлений нет. Установлена последняя версия.</translation>
+        <translation>Обновлений в настоящий момент нет. У вас установлена самая последняя версия программы.</translation>
    </message>
 </context>
 <context>
@@ -1486,7 +1486,7 @@ It is not advisable to use it.</source>
        <translation>Внимание, возможен конфликт чувствительности к регистру с %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>не удалось создать каталог %1</translation>
    </message>
@@ -1512,7 +1512,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Файл %1 не может быть переименован в %2 из-за локального конфликта имен</translation>
    </message>
@@ -1779,7 +1779,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/settingsdialog.cpp" line="76"/>
        <source>Account</source>
-        <translation>Учётная запись</translation>
+        <translation>Уч.запись</translation>
    </message>
    <message>
        <location filename="../src/gui/settingsdialog.cpp" line="81"/>
@@ -2015,7 +2015,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/sslbutton.cpp" line="102"/>
        <source>&lt;h3&gt;Certificate Details&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Детали сертификата&lt;/h3&gt;</translation>
+        <translation>&lt;h3&gt;Данные сертификата:&lt;/h3&gt;</translation>
    </message>
    <message>
        <location filename="../src/gui/sslbutton.cpp" line="105"/>
@@ -2055,7 +2055,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/sslbutton.cpp" line="115"/>
        <source>&lt;h3&gt;Issuer&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Издатель&lt;/h3&gt;</translation>
+        <translation>&lt;h3&gt;Выдан:&lt;/h3&gt;</translation>
    </message>
    <message>
        <location filename="../src/gui/sslbutton.cpp" line="118"/>
@@ -2117,7 +2117,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/sslbutton.cpp" line="217"/>
        <source>Certificate information:</source>
-        <translation>Информация сертификата:</translation>
+        <translation>Информация о TLS-сертификатах:</translation>
    </message>
    <message>
        <location filename="../src/gui/sslbutton.cpp" line="195"/>
@@ -2454,7 +2454,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Права принадлежат ownCloud, Incorporated&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Все права принадлежат ownCloud, Incorporated&lt;/p&gt;</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="275"/>
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@@ -1485,7 +1485,7 @@ Nie je vhodné ju používať.</translation>
        <translation>Pozor, možná kolízia z dôvodu veľkosti písmen s %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>nepodarilo sa vytvoriť priečinok %1</translation>
    </message>
@@ -1511,7 +1511,7 @@ Nie je vhodné ju používať.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Súbor %1 nemôže byť premenovaný na %2 z dôvodu, že tento názov je už použitý</translation>
    </message>
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -1485,7 +1485,7 @@ Uporaba ni priporočljiva.</translation>
        <translation>Pozor, mogoče je neskladje v velikosti črk imena %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>ni mogoče ustvariti mape %1</translation>
    </message>
@@ -1511,7 +1511,7 @@ Uporaba ni priporočljiva.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Datoteke %1 ni mogoče preimenovati v %2 zaradi že obstoječe datoteke s tem imenom.</translation>
    </message>
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@@ -1486,7 +1486,7 @@ It is not advisable to use it.</source>
        <translation>Пажња! Могуће сударање због величине слова са %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>не могу да направим директоријум %1</translation>
    </message>
@@ -1512,7 +1512,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Фајл %1 се не може преименовати у %2 због сударања са називом локалног фајла</translation>
    </message>
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -1485,7 +1485,7 @@ Det är inte lämpligt använda den.</translation>
        <translation>Observera, eventuell skiftlägeskänslig konflikt med %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>kunde ej skapa katalogen %1</translation>
    </message>
@@ -1511,7 +1511,7 @@ Det är inte lämpligt använda den.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Filen %1 kan inte döpas om till %2 på grund av ett lokalt filnamn</translation>
    </message>
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -164,7 +164,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="482"/>
        <source>Sync Running</source>
-        <translation>การซิงค์ข้อมูลกำลังทำงาน</translation>
+        <translation>กำลังผสานข้อมูล</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="483"/>
@@ -499,7 +499,7 @@ Are you sure you want to perform this operation?</source>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1022"/>
        <source>Waits to start syncing.</source>
-        <translation>รอการเริ่มต้นซิงค์ข้อมูล</translation>
+        <translation>รอเริ่มต้นการผสานข้อมูล</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1025"/>
@@ -509,12 +509,12 @@ Are you sure you want to perform this operation?</source>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1028"/>
        <source>Sync is running.</source>
-        <translation>การซิงค์ข้อมูลกำลังทำงาน</translation>
+        <translation>การผสานข้อมูลกำลังทำงาน</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1031"/>
        <source>Last Sync was successful.</source>
-        <translation>การซิงค์ข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation>
+        <translation>ผสานข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1036"/>
@@ -534,7 +534,7 @@ Are you sure you want to perform this operation?</source>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1045"/>
        <source>Sync is paused.</source>
-        <translation>การซิงค์ข้อมูลถูกหยุดไว้ชั่วคราว</translation>
+        <translation>การผสานข้อมูลถูกหยุดไว้ชั่วคราว</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1051"/>
@@ -740,7 +740,7 @@ Are you sure you want to perform this operation?</source>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="20"/>
        <source>General Settings</source>
-        <translation type="unfinished"/>
+        <translation>การตั้งค่าทั่วไป</translation>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="26"/>
@@ -771,7 +771,7 @@ Are you sure you want to perform this operation?</source>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="73"/>
        <source>Updates</source>
-        <translation type="unfinished"/>
+        <translation>อัพเดท</translation>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="98"/>
@@ -1479,7 +1479,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation type="unfinished"/>
    </message>
@@ -1505,7 +1505,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation type="unfinished"/>
    </message>
@@ -1632,7 +1632,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/protocolwidget.cpp" line="50"/>
        <source>Time</source>
-        <translation type="unfinished"/>
+        <translation>เวลา</translation>
    </message>
    <message>
        <location filename="../src/gui/protocolwidget.cpp" line="51"/>
@@ -2988,17 +2988,17 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/theme.cpp" line="59"/>
        <source>Waiting to start sync</source>
-        <translation>กำลังรอการเริ่มต้นเชื่อมข้อมูล</translation>
+        <translation>กำลังรอการเริ่มต้นผสานข้อมูล</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="62"/>
        <source>Sync is running</source>
-        <translation>การเชื่อมข้อมูลกำลังทำงาน</translation>
+        <translation>การผสานข้อมูลกำลังทำงาน</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="65"/>
        <source>Sync Success</source>
-        <translation>การเชื่อมข้อมูลเสร็จสิ้น</translation>
+        <translation>การผสานข้อมูลเสร็จสิ้น</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="68"/>
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -4,7 +4,7 @@
    <message>
        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
-        <translation type="unfinished"/>
+        <translation>Hedef dosya beklenilmeyen boyuta veya düzenlenme tarihine sahip</translation>
    </message>
 </context>
 <context>
@@ -318,7 +318,7 @@ Toplam kalan süre: %5</translation>
    <message>
        <location filename="../src/libsync/connectionvalidator.cpp" line="144"/>
        <source>Authentication error: Either username or password are wrong.</source>
-        <translation>Giriş hatası: Kullanıcı adı veya şifre yanlış.</translation>
+        <translation>Giriş hatası: Kullanıcı adı veya parola hatalı.</translation>
    </message>
    <message>
        <location filename="../src/libsync/connectionvalidator.cpp" line="146"/>
@@ -661,7 +661,7 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="309"/>
        <source>Authentication failed accessing %1</source>
-        <translation>%1 erişim için giriş başarısız</translation>
+        <translation>%1 erişimi için giriş başarısız</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="311"/>
@@ -702,12 +702,12 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="46"/>
        <source>&lt;b&gt;Warning:&lt;/b&gt; %1</source>
-        <translation>&lt;b&gt;Dikkat:&lt;/b&gt; %1</translation>
+        <translation>&lt;b&gt;Uyarı:&lt;/b&gt; %1</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="48"/>
        <source>&lt;b&gt;Warning:&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Dikkat:&lt;/b&gt;</translation>
+        <translation>&lt;b&gt;Uyarı:&lt;/b&gt;</translation>
    </message>
 </context>
 <context>
@@ -867,7 +867,7 @@ Bir dizinin kaldırılmasını engelliyorlarsa işaretli ögeler de silinecektir
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="71"/>
        <source>&amp;Search:</source>
-        <translation>&amp;Arama:</translation>
+        <translation>&amp;Ara:</translation>
    </message>
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="79"/>
@@ -907,7 +907,7 @@ Bir dizinin kaldırılmasını engelliyorlarsa işaretli ögeler de silinecektir
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="194"/>
        <source>Could not write to log file %1</source>
-        <translation>Log dosyasına yazılamıyor %1</translation>
+        <translation>%1 günlük dosyasına yazılamadı</translation>
    </message>
 </context>
 <context>
@@ -1065,7 +1065,7 @@ Bir dizinin kaldırılmasını engelliyorlarsa işaretli ögeler de silinecektir
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="56"/>
        <source>New %1 Update Ready</source>
-        <translation>%1 Güncelleme hazır</translation>
+        <translation>Yeni %1 Güncellemesi Hazır</translation>
    </message>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="57"/>
@@ -1139,7 +1139,7 @@ for additional privileges during the process.</source>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/>
        <source>Sync the directory &apos;%1&apos;</source>
-        <translation>&apos;%1&apos; dizini senkronize et</translation>
+        <translation>&apos;%1&apos; dizinini eşitle</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
@@ -1251,7 +1251,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
-        <translation>Yetkilendirilmiş webdav isteği geçersiz bir cevap verdi</translation>
+        <translation>Yetkilendirilmiş webdav isteği geçersiz bir cevap alındı</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
@@ -1266,7 +1266,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
-        <translation>Yerel eşitleme klasörü oluşturuluyor %1...</translation>
+        <translation>Yerel eşitleme klasörü %1 oluşturuluyor...</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
@@ -1456,7 +1456,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
-        <translation type="unfinished"/>
+        <translation>Dosya, bulunduğundan itibaren değişmiş</translation>
    </message>
 </context>
 <context>
@@ -1464,7 +1464,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/>
        <source>; Restoration Failed: %1</source>
-        <translation>; Yeniden yapılandırma başarısız: %1</translation>
+        <translation>; Geri Yükleme Başarısız: %1</translation>
    </message>
    <message>
        <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/>
@@ -1485,7 +1485,7 @@ Kullanmanız önerilmez.</translation>
        <translation>Uyarı, %1 ile muhtemel harf duyarlılığı çatışması</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>%1 dizini oluşturulamadı</translation>
    </message>
@@ -1495,12 +1495,12 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="60"/>
        <source>Error removing &apos;%1&apos;: %2;</source>
-        <translation>Silme hatası &apos;%1&apos;: %2;</translation>
+        <translation>&apos;%1&apos; silme hatası: %2;</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="71"/>
        <source>Could not remove directory &apos;%1&apos;;</source>
-        <translation>Dizin silinemiyor &apos;%1&apos;;</translation>
+        <translation>&apos;%1&apos; dizini silinemiyor;</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="86"/>
@@ -1511,7 +1511,7 @@ Kullanmanız önerilmez.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Yerel bir dosya adı çakışması nedeniyle %1 dosyası %2 olarak adlandırılamadı</translation>
    </message>
@@ -1526,7 +1526,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/>
        <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
-        <translation>Sunucudan yanlış HTTP kodu dönüyor. 204 bekliyorduk, ama &quot;%1 %2&quot; geldi.</translation>
+        <translation>Sunucudan yanlış HTTP kodu döndü. 204 bekleniyordu, ancak &quot;%1 %2&quot; geldi.</translation>
    </message>
 </context>
 <context>
@@ -1534,7 +1534,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
-        <translation>Sunucudan yanlış HTTP kodu dönüyor. 201 bekliyorduk, ama &quot;%1 %2&quot; geldi.</translation>
+        <translation>Sunucudan yanlış HTTP kodu döndü. 201 bekleniyordu, ancak &quot;%1 %2&quot; geldi.</translation>
    </message>
 </context>
 <context>
@@ -1557,7 +1557,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/propagateremotemove.cpp" line="143"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
-        <translation>Sunucudan yanlış HTTP kodu dönüyor. 201 bekliyorduk, ama &quot;%1 %2&quot; geldi.</translation>
+        <translation>Sunucudan yanlış HTTP kodu döndü. 201 bekleniyordu, ancak &quot;%1 %2&quot; geldi.</translation>
    </message>
 </context>
 <context>
@@ -1589,7 +1589,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
        <source>Local file changed during syncing. It will be resumed.</source>
-        <translation type="unfinished"/>
+        <translation>Eşitleme sırasında yerel dosya değişti. Devam edilecek.</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
@@ -1600,7 +1600,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
-        <translation type="unfinished"/>
+        <translation>Qt &lt; 5.4.2 ile HTTP bağlantı sıfırlamasında görev iptali zorlanıyor.</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
@@ -1846,12 +1846,12 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="182"/>
        <source>Set &amp;password </source>
-        <translation>&amp;Şifre belirle</translation>
+        <translation>&amp;Parola belirle</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="196"/>
        <source>Set &amp;expiration date</source>
-        <translation>Sonlanma tarihi b&amp;elirle</translation>
+        <translation>Son kullanma tarihi b&amp;elirle</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="77"/>
@@ -1886,12 +1886,12 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="110"/>
        <source>Folder: %2</source>
-        <translation>Dizin: %2</translation>
+        <translation>Klasör: %2</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="114"/>
        <source>P&amp;assword protect</source>
-        <translation>Şi&amp;fre koruma</translation>
+        <translation>&amp;Parola koruması</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="203"/>
@@ -1907,7 +1907,7 @@ Kullanmanız önerilmez.</translation>
        <location filename="../src/gui/sharedialog.cpp" line="506"/>
        <location filename="../src/gui/sharedialog.cpp" line="507"/>
        <source>&amp;Share link</source>
-        <translation>Bağlantıyı pa&amp;ylaş</translation>
+        <translation>&amp;Paylaşma bağlantısı</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="525"/>
@@ -1922,7 +1922,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="559"/>
        <source>Cannot find an folder to upload to.</source>
-        <translation>Yüklenecek dizin bulunamıyor.</translation>
+        <translation>Yüklenecek klasör bulunamıyor.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="581"/>
@@ -1942,7 +1942,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="448"/>
        <source>Public sh&amp;aring requires a password</source>
-        <translation type="unfinished"/>
+        <translation>Herkese &amp;açık paylaşım için parola gerekir</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="470"/>
@@ -2316,7 +2316,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="160"/>
        <source>The service is temporarily unavailable</source>
-        <translation>Heçici olarak hizmet verilemiyor</translation>
+        <translation>Hizmet geçiçi olarak kullanılamıyor</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="166"/>
@@ -2326,7 +2326,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="169"/>
        <source>An internal error number %1 occurred.</source>
-        <translation>Dahili bir hata oluştu %1</translation>
+        <translation>%1 numaralı dahili bir hata oluştu </translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="224"/>
@@ -2463,12 +2463,12 @@ Kullanmanız önerilmez.</translation>
        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
        <source>The checksum header is malformed.</source>
-        <translation type="unfinished"/>
+        <translation>Sağlama toplam başlığı bozulmuş.</translation>
    </message>
    <message>
        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
        <source>The downloaded file does not match the checksum, it will be resumed.</source>
-        <translation type="unfinished"/>
+        <translation>İndirilen dosya sağlama toplamı ile eşleşmiyor, devam edilecek.</translation>
    </message>
 </context>
 <context>
@@ -2907,7 +2907,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
-        <translation>&lt;p&gt;&lt;small&gt; &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; numaralı Git revizyonunundan oluşturuldu %3, %4 Qt kullanılıyor %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;&lt;small&gt;&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; Git gözden geçirmesi ile %3, %4 tarihinde, Qt %5, %6 kullanılarak derlendi.&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
 </context>
 <context>
--- a/translations/client_uk.ts
+++ b/translations/client_uk.ts
@@ -1485,7 +1485,7 @@ It is not advisable to use it.</source>
        <translation>Увага, можливий конфлікт чутливості до реєстру з %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>Не вдалося створити теку %1</translation>
    </message>
@@ -1511,7 +1511,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>%1 не можна перейменувати на %2 через локальний конфлікт імен</translation>
    </message>
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -1484,7 +1484,7 @@ It is not advisable to use it.</source>
        <translation>小心！%1 的文件名可能有大小写冲突</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>不能创建文件夹 %1</translation>
    </message>
@@ -1510,7 +1510,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>由于本地文件名冲突，文件 %1 无法更名为 %2</translation>
    </message>
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -1479,7 +1479,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>無法建立目錄 %1</translation>
    </message>
@@ -1505,7 +1505,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation type="unfinished"/>
    </message>
Author	SHA1	Message	Date
Daniel Molkentin	69f2b2da7c	Bump version to 1.8.2 final	2015-06-08 14:10:08 +02:00
Daniel Molkentin	4000993200	Finish 1.8.2 ChangeLog	2015-06-08 14:06:57 +02:00
Olivier Goffart	2c6c21d753	AccountState: do not change the state when we stay connected This would cause a full sync every 30 seconds.	2015-06-08 12:14:37 +02:00
Jenkins for ownCloud	34384e3613	[tx-robot] updated from transifex	2015-06-08 02:18:37 -04:00
Jenkins for ownCloud	a42856ef84	[tx-robot] updated from transifex	2015-06-07 02:18:54 -04:00
Jenkins for ownCloud	e7f01b9a95	[tx-robot] updated from transifex	2015-06-07 01:15:27 -04:00
Klaas Freitag	fc2ceb88fb	Rename thread to SyncEngine Thread to avoid confusion about Neon.	2015-06-06 10:49:47 +02:00
Jenkins for ownCloud	36f62f7fd4	[tx-robot] updated from transifex	2015-06-06 02:18:54 -04:00
Christian Kamm	ee08b3759d	SyncScheduling: Avoid new resyncs on local mkdir. (cherry picked from commit `bacf6166c1`)	2015-06-05 10:27:28 +02:00