Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorownClouders <devops@owncloud.com>2022-01-27 06:17:47 +0300
committerownClouders <devops@owncloud.com>2022-01-27 06:17:47 +0300
commit1ebe1a8f33118016e892f7fb74548d2a999ae620 (patch)
tree31ae5fe67c0400d7846b7891473eff07fccc668d /translations
parentcc3b63f9dea76f1b164ebb8f316745f5afa8213d (diff)
[tx] updated client translations from transifex [skip ci]
Diffstat (limited to 'translations')
-rw-r--r--translations/client_ar.ts54
-rw-r--r--translations/client_bg_BG.ts54
-rw-r--r--translations/client_cs.ts54
-rw-r--r--translations/client_de.ts54
-rw-r--r--translations/client_de_CH.ts54
-rw-r--r--translations/client_el.ts54
-rw-r--r--translations/client_en.ts52
-rw-r--r--translations/client_en_GB.ts54
-rw-r--r--translations/client_es.ts54
-rw-r--r--translations/client_fr.ts54
-rw-r--r--translations/client_gl.ts54
-rw-r--r--translations/client_he.ts54
-rw-r--r--translations/client_it.ts54
-rw-r--r--translations/client_ko.ts54
-rw-r--r--translations/client_nl.ts54
-rw-r--r--translations/client_pt_BR.ts54
-rw-r--r--translations/client_ru.ts54
-rw-r--r--translations/client_sq.ts56
-rw-r--r--translations/client_th.ts54
-rw-r--r--translations/client_tr.ts54
-rw-r--r--translations/client_zh_CN.ts54
-rw-r--r--translations/client_zh_TW.ts54
22 files changed, 594 insertions, 594 deletions
diff --git a/translations/client_ar.ts b/translations/client_ar.ts
index 9278c33bb..41be774f8 100644
--- a/translations/client_ar.ts
+++ b/translations/client_ar.ts
@@ -2411,7 +2411,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2680,12 +2680,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2908,12 +2908,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation>تعذر تحديث الملف : ٪ 1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2931,28 +2931,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>تمت إزالة الملف</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>تم تغيير الملف المحلي أثناء المزامنة. ستتم المتابعة.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>تم تغيير الملف المحلي أثناء المزامنة.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>تحميل %1 يتجاوز الحصة النسبية المخصصة للمجلد</translation>
</message>
@@ -4554,56 +4549,61 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>خطأ</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>معلومات</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>نجاح</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>تعارض</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>رسالة</translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_bg_BG.ts b/translations/client_bg_BG.ts
index ac7c46325..5b8d8856f 100644
--- a/translations/client_bg_BG.ts
+++ b/translations/client_bg_BG.ts
@@ -2409,7 +2409,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2678,12 +2678,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2906,12 +2906,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2929,28 +2929,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Файлът е премахнат</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>Локалният файл бе променен по време на синхронизация. Той ще бъде обновен.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>Локалният файл се промени по време на синхронизацията.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>Качването на %1 надвишава квотата за папката</translation>
</message>
@@ -4552,56 +4547,61 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>Грешка</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>Информация</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>Успех</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>Конфликт</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation>Файлът е игнориран</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation>Върнат</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>Съобщение</translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index c7d7b2c98..714b59ddd 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -2397,7 +2397,7 @@ můžete být požádáni o dodatečná oprávnění.</translation>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation>Soubor %1 je právě využíván</translation>
</message>
@@ -2660,12 +2660,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2888,12 +2888,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation>Nedaří se aktualizovat soubor: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2911,28 +2911,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Soubor odebrán</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>Místní soubor se během synchronizace změnil. </translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>Místní soubor byl změněn během synchronizace.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>Nahrávání %1 překročilo velikostní limit složky</translation>
</message>
@@ -4534,56 +4529,61 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation>Kritická chyba</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>Info</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>Úspěch</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>Konflikt</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation>Na černé listině</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>Zpráva</translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_de.ts b/translations/client_de.ts
index 82ccdeb35..848f2d67b 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -2409,7 +2409,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation>Datei %1 wird gerade benutzt</translation>
</message>
@@ -2676,12 +2676,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2904,12 +2904,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation>Die Datei konnte nicht aktualisiert werden: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2927,28 +2927,23 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<translation>Datei gelöscht</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>Lokale Datei hat sich während der Synchronisation geändert. Die Synchronisation wird wiederaufgenommen.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>Das Hochladen von %1 überschreitet das Speicherkontingent des Ordners </translation>
</message>
@@ -4550,56 +4545,61 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation>Schwerer Fehler</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>Info</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>Erfolg</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>Konflikt</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation>Wiederhergestellt</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation>Zur schwarzen Liste hinzugefügt</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>Mitteilung</translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_de_CH.ts b/translations/client_de_CH.ts
index 86f5dfa21..37083875a 100644
--- a/translations/client_de_CH.ts
+++ b/translations/client_de_CH.ts
@@ -2405,7 +2405,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2672,12 +2672,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2900,12 +2900,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2923,28 +2923,23 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<translation>Datei entfernt</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>Heruntergeladene Datei entspricht nicht der Prüfsumme, das Herunterladen wird wiederaufgenommen.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>Das Hochladen von %1 überschreitet das Speicherkontingent des Ordners </translation>
</message>
@@ -4546,56 +4541,61 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>Info</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>Erfolg</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>Konflikt</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>Mitteilung</translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_el.ts b/translations/client_el.ts
index ddfb69959..4700468fd 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -2409,7 +2409,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2678,12 +2678,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2906,12 +2906,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2929,28 +2929,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Το αρχείο αφαιρέθηκε</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού. Θα συγχρονιστεί πάλι.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>Η μεταφόρτωση του %1 υπερβαίνει το μέγεθος του φακέλου</translation>
</message>
@@ -4552,56 +4547,61 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation>Μοιραίο Σφάλμα</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>Σφάλμα</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>Πληροφορίες</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>Επιτυχία</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>Διένεξη</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>Μήνυμα</translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_en.ts b/translations/client_en.ts
index 27abb4695..c08600638 100644
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -2420,7 +2420,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"></translation>
</message>
@@ -2682,12 +2682,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation type="unfinished"></translation>
</message>
@@ -2910,12 +2910,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"></translation>
</message>
@@ -2933,28 +2933,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation type="unfinished"></translation>
</message>
@@ -4561,56 +4556,61 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts
index 7831902b2..c065c4c52 100644
--- a/translations/client_en_GB.ts
+++ b/translations/client_en_GB.ts
@@ -2406,7 +2406,7 @@ for additional privileges during the process.</translation>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2669,12 +2669,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2897,12 +2897,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2920,28 +2920,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>File Removed</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>Local file changed during syncing. It will be resumed.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>Local file changed during sync.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>Upload of %1 exceeds the quota for the folder</translation>
</message>
@@ -4541,56 +4536,61 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>Info</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>Success</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>Conflict</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>Message</translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_es.ts b/translations/client_es.ts
index 750ff2c64..d46ba41a1 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -2412,7 +2412,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation>El archivo %1 está actualmente en uso</translation>
</message>
@@ -2681,12 +2681,12 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation>Error al actualizar los metadatos de: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation>La carpeta %1 está actualmente en uso</translation>
</message>
@@ -2909,12 +2909,12 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation>No se pudo actualizar el archivo: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation>El archivo %1 está actualmente en uso</translation>
</message>
@@ -2932,28 +2932,23 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<translation>Archivo eliminado</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>Archivo local cambió durante la sincronización. Será actualizado.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>Un archivo local fue modificado durante la sincronización.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation>Error al actualizar los metadatos de: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation>El archivo %1 está actualmente en uso</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>La subida %1 excede la quota de la carpeta</translation>
</message>
@@ -4555,56 +4550,61 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation>No definido</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation>Error fatal.</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>Información</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>Éxito</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>Conflicto</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation>Archivo ignorado</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation>Restaurado</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation>En la lista negra</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation>Excluido</translation>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>Mensaje</translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index 2cf14600c..59b63eb06 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -2412,7 +2412,7 @@ L&apos;assistant de mise à jour peut vous demandez des autorisations supplémen
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2681,12 +2681,12 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2909,12 +2909,12 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2932,28 +2932,23 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Fichier supprimé</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>Fichier local modifié pendant la synchronisation. Elle va reprendre. </translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>Fichier local modifié pendant la synchronisation.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>Le téléversement de %1 amène un dépassement de quota pour le dossier</translation>
</message>
@@ -4556,56 +4551,61 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation>Erreur fatale</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>Info</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>Succès</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>Conflit</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>Message</translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index b23cbd7fa..83eb1e776 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -2412,7 +2412,7 @@ actualización pode pedir privilexios adicionais durante o procedemento.</transl
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2681,12 +2681,12 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2909,12 +2909,12 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation>Non foi posíbel actualizar o ficheiro: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2932,28 +2932,23 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<translation>Ficheiro retirado</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>O ficheiro local cambiou durante a sincronización. Retomase.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>O ficheiro local cambiou durante a sincronización.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>O envío de %1 excede o límite de tamaño do cartafol</translation>
</message>
@@ -4555,56 +4550,61 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation>Produciuse un erro fatal</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>Información</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>Correcto</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>Conflito</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation>Na lista negra</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>Mensaxe</translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_he.ts b/translations/client_he.ts
index f23743676..753b85b41 100644
--- a/translations/client_he.ts
+++ b/translations/client_he.ts
@@ -2411,7 +2411,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2680,12 +2680,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2908,12 +2908,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation>לא ניתן לעדכן קובץ : %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2931,28 +2931,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>קובץ הוסר</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>קובץ מקומי שונה בזמן הסנכרון. הסנכרון יחודש.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>קובץ מקומי שונה בזמן הסנכרון.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>העלאה של %1 חורגת מהמכסה של התיקייה</translation>
</message>
@@ -4554,56 +4549,61 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation>שגיאה מכרעת</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>שגיאה</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>מידע</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>התנגשות</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>הודעה</translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index a420309f0..d18e2a8ef 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -2408,7 +2408,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2677,12 +2677,12 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2905,12 +2905,12 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2928,28 +2928,23 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo
<translation>File rimosso</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>Il file locale è stato modificato durante la sincronizzazione. Sarà ripristinato.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>Un file locale è cambiato durante la sincronizzazione.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>L&apos;upload eccede di %1 la quota della cartella</translation>
</message>
@@ -4551,56 +4546,61 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation>Errore grave</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>Errore</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>Informazioni</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>Riuscito</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>Conflitto</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation>Sulla lista nera</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_ko.ts b/translations/client_ko.ts
index 4b5ad1a0c..e4aeee00b 100644
--- a/translations/client_ko.ts
+++ b/translations/client_ko.ts
@@ -2398,7 +2398,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation>파일 %1 은(는) 현재 이용 중입니다</translation>
</message>
@@ -2661,12 +2661,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation>메타데이터 갱신 오류: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation>%1 폴더는 현재 이용 중입니다</translation>
</message>
@@ -2889,12 +2889,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation>파일을 갱신할 수 없습니다 : %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation>파일 %1 은(는) 현재 이용 중입니다</translation>
</message>
@@ -2912,28 +2912,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>파일이 제거됨</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>로컬 파일이 동기화 중 변경되었습니다. 다시 시작됩니다.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>로컬 파일이 동기화 중 변경되었습니다.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation>메타데이터 갱신 에러: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation>파일 %1 은(는) 현재 이용 중입니다</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>%1을(를) 업로드하면 폴더 할당량을 초과함</translation>
</message>
@@ -4535,56 +4530,61 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation>정의되지 않음</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation>치명적 오류</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>오류</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>정보</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>성공</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>충돌</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation>복원됨</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation>블랙리스트에 들어감</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation>제외됨</translation>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>메시지</translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index 6a3a5ee6d..a3d144ec4 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -2416,7 +2416,7 @@ vragen om extra autorisaties tijdens installatie.</translation>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation>Bestand %1 is in gebruik</translation>
</message>
@@ -2685,12 +2685,12 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2913,12 +2913,12 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation>Kon bestand niet bijwerken : %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2936,28 +2936,23 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d
<translation>Bestand verwijderd</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>Lokaal bestand gewijzigd bij sync. Wordt opnieuw meengenomen.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>Lokaal bestand gewijzigd bij sync.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>Upload van %1 overtreft de quota van de folder</translation>
</message>
@@ -4560,56 +4555,61 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation>Fatale fout</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>Fout</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>Info</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>Succes</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>Conflict</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>Bericht</translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index a501ff5fd..ef7ceeb9d 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -2412,7 +2412,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation>O arquivo %1 está atualmente em uso</translation>
</message>
@@ -2680,12 +2680,12 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation>Erro ao atualizar metadados : %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation>A pasta %1 está atualmente em uso</translation>
</message>
@@ -2908,12 +2908,12 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation>Não foi possível atualizar o arquivo: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation>O arquivo %1 está atualmente em uso </translation>
</message>
@@ -2931,28 +2931,23 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Arquivo Removido</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>Arquivo local alterado durante a sincronização. Ele será retomado.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>Arquivo local modificado durante a sincronização.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation>Erro ao atualizar metadados : %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation>O arquivo %1 está atualmente em uso </translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>O envio de %1 excede a quota da pasta</translation>
</message>
@@ -4554,56 +4549,61 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation>Indefinido</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation>Erro Fatal</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>Informação</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>Sucesso</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>Conflito</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation>Arquivo Ignorado</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation>Restaurado</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation>Lista Negra</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation>Excluído</translation>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>Mensagem</translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index 061b5fe24..ee32b2b1e 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -2412,7 +2412,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation>Файл %1 сейчас используется</translation>
</message>
@@ -2681,12 +2681,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation>Ошибка обновления метаданных: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation>%1 каталог сейчас занят</translation>
</message>
@@ -2909,12 +2909,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation>Не удалось обновить файл : %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation>Файл %1 сейчас занят</translation>
</message>
@@ -2932,28 +2932,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Файл Перемещён</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>Локальный файл изменился в процессе синхронизации. Операция будет возобновлена.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>Локальный файл изменился в процессе синхронизации.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation>Ошибка обновления метаданных: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation>Файл %1 сейчас занят</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>Закачка %1 превышает квоту для каталога</translation>
</message>
@@ -4555,56 +4550,61 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation>Неисправимая ошибка</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>Инфо</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>Успешно</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>Конфликт</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>Сообщение</translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_sq.ts b/translations/client_sq.ts
index aa773a281..b6d691359 100644
--- a/translations/client_sq.ts
+++ b/translations/client_sq.ts
@@ -2414,7 +2414,7 @@ Gjatë procesit përditësuesi mund të kërkojë privilegje shtesë.</translati
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation>Kartela %1 është aktualisht në përdorim</translation>
</message>
@@ -2683,12 +2683,12 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation>Gabim në përditësim tejtëdhënash: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2724,7 +2724,7 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="707"/>
<source>Broken webserver returned empty content length for non-empty file on resume</source>
- <translation type="unfinished"/>
+ <translation>Shërbyes i dëmtuar u përgjigj me gjatësi lënde të zbrazët për kartelë jo të zbrazët, gjatë rimarrjeje</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="714"/>
@@ -2911,12 +2911,12 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation>S’u përditësua dot kartela : %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation>Kartela %1 është aktualisht në përdorim</translation>
</message>
@@ -2934,28 +2934,23 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju
<translation>Kartela u Hoq</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>Kartela vendore ndryshoi gjatë njëkohësimit. Do të rimerret.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>Kartela vendore ndryshoi gjatë njëkohësimit.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation>Gabim në përditësim tejtëdhënash: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation>Kartela %1 është aktualisht në përdorim</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>Ngarkimi i %1 i tejkalon kuotat për dosjen</translation>
</message>
@@ -4557,56 +4552,61 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation>I papërcaktuar</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation>Gabim Fatal</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>Gabim</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>Të dhëna</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>Sukses</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>Përplasje</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation>Kartela u Shpërfill</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation>E rikthyer</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation>Në listë bllokimesh</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation>E përjashtuar</translation>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>Mesazh</translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_th.ts b/translations/client_th.ts
index 1069dd8ed..1b4039de5 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -2409,7 +2409,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation>ไฟล์ %1 กำลังถูกใช้งานอยู่</translation>
</message>
@@ -2676,12 +2676,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2904,12 +2904,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation>ไม่สามารถอัปเดตไฟล์: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2927,28 +2927,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ไฟล์ถูกลบไปแล้ว</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>ไฟล์ในเครื่องถูกเปลี่ยนแปลงในระหว่างการประสานข้อมูล</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>ไฟล์ในเครื่องถูกเปลี่ยนแปลงขณะกำลังประสานข้อมูล</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>การอัปโหลด %1 เกินโควต้าของโฟลเดอร์</translation>
</message>
@@ -4548,56 +4543,61 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation>ไม่ได้กำหนด</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation>ข้อผิดพลาดร้ายแรง</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>ข้อผิดพลาด</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>ข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>เสร็จสิ้น</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>ปัญหา</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation>ไฟล์ที่ถูกละเว้น</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation>คืนค่าแล้ว</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation>ขึ้นบัญชีดำแล้ว</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation>ยกเว้นแล้ว</translation>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>ข้อความ</translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index 938aeeadd..d2d45f870 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -2409,7 +2409,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2678,12 +2678,12 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2906,12 +2906,12 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2929,28 +2929,23 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka
<translation>Dosya Kaldırıldı</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>Eşitleme sırasında yerel dosya değişti. Devam edilecek.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>Eşitleme sırasında yerel dosya değişti.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>%1 karşı tarafa yüklenmesi klasörün kotasını aşıyor.</translation>
</message>
@@ -4552,56 +4547,61 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation>Ölümcül Hata</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>Hata</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>Bilgi</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>Başarılı</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>Çakışma</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation>Kara listede</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>Mesaj</translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index 867eea734..c3affb199 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -2400,7 +2400,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2662,12 +2662,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2890,12 +2890,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2913,28 +2913,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>已移除文件</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>本地文件在同步时已修改,完成后会再次同步</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>本地文件在同步时已修改。</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>上传 %1 超出了此文件夹的限额</translation>
</message>
@@ -4536,56 +4531,61 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation>致命错误</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>错误</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>信息</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>成功</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>冲突</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>消息</translation>
+ </message>
</context>
<context>
<name>Utility</name>
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts
index b86f259d1..8061432fd 100644
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -2411,7 +2411,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="703"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2680,12 +2680,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1043"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1044"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1046"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1047"/>
<source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2908,12 +2908,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1199"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1200"/>
<source>Could not update file : %1</source>
<translation>無法更新檔案:%1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1202"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1203"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2931,28 +2931,23 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>檔案已移除</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="235"/>
- <source>Local file changed during syncing. It will be resumed.</source>
- <translation>本地端的檔案在同步的過程中被更改,此檔案將會被還原。</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="247"/>
- <source>Local file changed during sync.</source>
- <translation>本地端的檔案在同步過程中被更改。</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="240"/>
+ <source>Local file changed during sync. It will be resumed.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="568"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="561"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="571"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="564"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="129"/>
- <location filename="../src/libsync/propagateupload.cpp" line="467"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="460"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>上傳的 %1 超出目錄的配額</translation>
</message>
@@ -4554,56 +4549,61 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>SyncFileItem::Status</name>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="82"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
<source>Undefined</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="84"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
<source>Fatal Error</source>
<translation>嚴重錯誤</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="86"/>
- <location filename="../src/libsync/syncfileitem.cpp" line="98"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
<source>Error</source>
<translation>錯誤</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="88"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
<source>Info</source>
<translation>信息</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="90"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
<source>Success</source>
<translation>成功</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="92"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
<source>Conflict</source>
<translation>衝突</translation>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="94"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
<source>File Ignored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="96"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
<source>Restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="100"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
<source>Blacklisted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncfileitem.cpp" line="102"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
<source>Excluded</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="105"/>
+ <source>Message</source>
+ <translation>訊息</translation>
+ </message>
</context>
<context>
<name>Utility</name>