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>2021-09-15 06:18:13 +0300
committerownClouders <devops@owncloud.com>2021-09-15 06:18:13 +0300
commit83e1f9c3fa3e46aeaa3adee21a97a83015eb6dd5 (patch)
tree05ccfa5db2334e4af00b74a04c1a18b2240ab011
parente698d5622a5bf4b333d382b82aea93adca0c407c (diff)
[tx] updated client translations from transifex [skip ci]
-rw-r--r--translations/client_ar.ts109
-rw-r--r--translations/client_bg_BG.ts109
-rw-r--r--translations/client_cs.ts109
-rw-r--r--translations/client_de.ts109
-rw-r--r--translations/client_de_CH.ts109
-rw-r--r--translations/client_el.ts109
-rw-r--r--translations/client_en.ts109
-rw-r--r--translations/client_en_GB.ts109
-rw-r--r--translations/client_es.ts109
-rw-r--r--translations/client_fr.ts109
-rw-r--r--translations/client_gl.ts109
-rw-r--r--translations/client_he.ts109
-rw-r--r--translations/client_it.ts109
-rw-r--r--translations/client_nl.ts109
-rw-r--r--translations/client_pt_BR.ts109
-rw-r--r--translations/client_ru.ts109
-rw-r--r--translations/client_sq.ts109
-rw-r--r--translations/client_th.ts109
-rw-r--r--translations/client_tr.ts109
-rw-r--r--translations/client_zh_CN.ts109
-rw-r--r--translations/client_zh_TW.ts109
21 files changed, 1764 insertions, 525 deletions
diff --git a/translations/client_ar.ts b/translations/client_ar.ts
index a1e187ced..ce8339fa2 100644
--- a/translations/client_ar.ts
+++ b/translations/client_ar.ts
@@ -1885,7 +1885,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>توجد تعارضات. &lt;a href=&quot;%1&quot;&gt;افحص المستندات لمعرفة كيفية إصلاحها.&lt;/a&gt;</translation>
</message>
@@ -2747,27 +2747,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>لا يمكن حذف الملف %1، خطأ: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>لا يمكن إنشاء المجلد %1</translation>
</message>
@@ -2775,7 +2775,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation type="unfinished"/>
</message>
@@ -2783,32 +2783,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>لا يمكن إعادة تسمية الملف %1 إلى %2 بسبب تعارض اسم الملف المحلي</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation>خطأ في إعداد حالة التثبيت</translation>
</message>
@@ -3011,40 +3011,45 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>وقت</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>ملف</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>مجلد</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation>مسائل</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>الإجراء</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>الحجم</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>حساب</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3059,27 +3064,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>بروتوكول المزامنة المحلي</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>نسخ إلى الحافظة</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation type="unfinished"/>
</message>
@@ -4501,6 +4506,60 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_bg_BG.ts b/translations/client_bg_BG.ts
index af7d07411..0ef7fba2a 100644
--- a/translations/client_bg_BG.ts
+++ b/translations/client_bg_BG.ts
@@ -1885,7 +1885,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>Има конфликти. &lt;a href=&quot;%1&quot;&gt;Проверете документацията как да ги разрешите.&lt;/a&gt;</translation>
</message>
@@ -2743,27 +2743,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>неуспешно изтриване на файл %1, грешка: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>неуспешно създаване на папка %1</translation>
</message>
@@ -2771,7 +2771,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation type="unfinished"/>
</message>
@@ -2779,32 +2779,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Файл %1 не може да бъде преименуван на %2 поради сблъсък с името на локален файл</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation>Грешка при настройка на пин определението</translation>
</message>
@@ -3007,40 +3007,45 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>Време</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>Файл</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>Папка</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>Действие</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>Размер</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>Профил</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3055,27 +3060,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Протокол за локална синхронизация</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>Копирай</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation type="unfinished"/>
</message>
@@ -4497,6 +4502,60 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index 82e7e8548..dd48bb029 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -1871,7 +1871,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>Byly nalezeny konflikty. &lt;a href=&quot;%1&quot;&gt;Přečtěte si dokumentaci k jejich vyřešení.&lt;/a&gt;</translation>
</message>
@@ -2727,27 +2727,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>smazání souboru %1 se nezdařilo, chyba: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>nepodařilo se vytvořit adresář %1</translation>
</message>
@@ -2755,7 +2755,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation type="unfinished"/>
</message>
@@ -2763,32 +2763,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Soubor %1 nemohl být přejmenován na %2 z důvodu kolize názvu se souborem v místním systému</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
@@ -2991,40 +2991,45 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>Čas</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>Soubor</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>Adresář</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>Akce</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>Velikost</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>Účet</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3039,27 +3044,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Místní protokol synchronizace</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>Zkopírovat do schránky</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation type="unfinished"/>
</message>
@@ -4481,6 +4486,60 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_de.ts b/translations/client_de.ts
index 0b4232eb4..0c74ee573 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -1884,7 +1884,7 @@ Objekte, bei denen Löschen erlaubt ist, werden gelöscht, wenn sie die Löschun
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>Es bestehen Konflikte. &lt;a href=&quot;%1&quot;&gt;Prüfen Sie die Dokumentation, wie diese zu lösen sind.&lt;/a&gt;</translation>
</message>
@@ -2743,27 +2743,27 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>Konnte Datei %1 nicht löschen. Fehler: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>Ordner %1 konnte nicht angelegt werden </translation>
</message>
@@ -2771,7 +2771,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation type="unfinished"/>
</message>
@@ -2779,32 +2779,32 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>%1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht zu %2 umbenannt werden</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation>Konnte %1 nicht in %2 umbenennen, die Datei wird gerade benutzt</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation>Fehler beim Setzen des PIN-Zustandes</translation>
</message>
@@ -3007,40 +3007,45 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>Zeit</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>Datei</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>Ordner</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>Aktion</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>Größe</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>Benutzerkonto</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3055,27 +3060,27 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<translation>Lokales Sychronisationsprotokoll</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation>Spaltenbreiten zurücksetzen</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>In die Zwischenablage kopieren</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation>Im Datei Browser anzeigen</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation type="unfinished"/>
</message>
@@ -4497,6 +4502,60 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_de_CH.ts b/translations/client_de_CH.ts
index 154899fd1..5fc3a272a 100644
--- a/translations/client_de_CH.ts
+++ b/translations/client_de_CH.ts
@@ -1882,7 +1882,7 @@ Elemente, für die Löschen erlaubt ist, werden gelöscht, wenn sie andernfalls
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>Es bestehen Konflikte. &lt;a href=&quot;%1&quot;&gt;Prüfe die Dokumentation, wie diese zu lösen sind.&lt;/a&gt;</translation>
</message>
@@ -2739,27 +2739,27 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>Die Datei %1 konnte nicht gelöscht werden, Fehler: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>konnte Verzeichnis %1 nicht anlegen</translation>
</message>
@@ -2767,7 +2767,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation type="unfinished"/>
</message>
@@ -2775,32 +2775,32 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>%1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht zu %2 umbenannt werden</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation>Fehler beim Setzen des PIN-Zustandes</translation>
</message>
@@ -3003,40 +3003,45 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>Zeit</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>Datei</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>Ordner</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>Aktion</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>Grösse</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>Nutzerkonto</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3051,27 +3056,27 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<translation>Lokales synchronisations Protokoll</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>In Zwischenablage kopieren</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation type="unfinished"/>
</message>
@@ -4493,6 +4498,60 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_el.ts b/translations/client_el.ts
index 390bc03ac..2325f0d32 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -1885,7 +1885,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>Υπήρχαν συγκρούσεις. &lt;a href=&quot;%1&quot;&gt;Ελέγξτε την τεκμηρίωση σχετικά με τον τρόπο επίλυσής τους.&lt;/a&gt;</translation>
</message>
@@ -2743,27 +2743,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>αδυναμία διαγραφής αρχείου %1, σφάλμα: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>αδυναμία δημιουργίας φακέλου %1</translation>
</message>
@@ -2771,7 +2771,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation type="unfinished"/>
</message>
@@ -2779,32 +2779,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Το αρχείο %1 δεν είναι δυνατό να μετονομαστεί σε %2 λόγω μιας διένεξης με το όνομα ενός τοπικού αρχείου</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation>Σφάλμα στη ρύθμιση της κατάστασης pin</translation>
</message>
@@ -3007,40 +3007,45 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>Ώρα</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>Αρχείο</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>Φάκελος</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>Ενέργεια</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>Μέγεθος</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>Λογαριασμός</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3055,27 +3060,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Πρωτόκολλο τοπικού συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>Αντιγραφή στο πρόχειρο</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation type="unfinished"/>
</message>
@@ -4497,6 +4502,60 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_en.ts b/translations/client_en.ts
index 918228f8c..9cf915bd3 100644
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -1898,7 +1898,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -2747,27 +2747,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2775,7 +2775,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation type="unfinished"></translation>
</message>
@@ -2783,32 +2783,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation type="unfinished"></translation>
</message>
@@ -3011,40 +3011,45 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3059,27 +3064,27 @@ 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/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation type="unfinished"></translation>
</message>
@@ -4506,6 +4511,60 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <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="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="89"/>
+ <source>Info</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts
index 7ec99c974..61bed0301 100644
--- a/translations/client_en_GB.ts
+++ b/translations/client_en_GB.ts
@@ -1883,7 +1883,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</translation>
</message>
@@ -2734,27 +2734,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>could not delete file %1, error: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>could not create folder %1</translation>
</message>
@@ -2762,7 +2762,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation type="unfinished"/>
</message>
@@ -2770,32 +2770,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>File %1 cannot be renamed to %2 because of a local file name clash</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
@@ -2998,40 +2998,45 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>Time</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>File</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>Folder</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>Action</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>Size</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>Account</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3046,27 +3051,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Local sync protocol</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>Copy to clipboard</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation type="unfinished"/>
</message>
@@ -4486,6 +4491,60 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_es.ts b/translations/client_es.ts
index 387cdd3c9..ae32644cf 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -1885,7 +1885,7 @@ Los objetos donde se permite el borrado serán borrados si impiden que un direct
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>Ha habido conflictos. &lt;a href=&quot;%1&quot;&gt;Comprueba la documentación sobre cómo resolverlos.&lt;/a&gt;</translation>
</message>
@@ -2745,27 +2745,27 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>no pudo borrar el archivo %1, error: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>No se ha podido crear el directorio %1</translation>
</message>
@@ -2773,7 +2773,7 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation type="unfinished"/>
</message>
@@ -2781,32 +2781,32 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>El archivo %1 no se puede renombrar a %2 por causa de un conflicto con el nombre de un archivo local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation>Error al establecer el estado del pin</translation>
</message>
@@ -3009,40 +3009,45 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>Hora</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>Archivo</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation>Problemas</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>Acción</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>Tamaño</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3057,27 +3062,27 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<translation>Protocolo de sincronización local</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>Copiar al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation type="unfinished"/>
</message>
@@ -4499,6 +4504,60 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index 089fb72b6..bbb6c46b7 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -1886,7 +1886,7 @@ Les éléments dont la suppression est autorisée seront supprimés s&apos;ils e
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>Il y a eu des conflits. &lt;a href=&quot;%1&quot;&gt;Consultez la documentation pour pouvoir les résoudre.&lt;/a&gt;</translation>
</message>
@@ -2748,27 +2748,27 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>impossible de supprimer le fichier %1. Erreur : %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>Impossible de créer le dossier %1</translation>
</message>
@@ -2776,7 +2776,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation type="unfinished"/>
</message>
@@ -2784,32 +2784,32 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Le fichier %1 ne peut pas être renommé en %2 à cause d&apos;un conflit local de nom de fichier</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation>Erreur lors de la modification de l&apos;état de l&apos;épingle</translation>
</message>
@@ -3012,40 +3012,45 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>Heure</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>Fichier</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>Dossier</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation>problèmes</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>Action</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>Taille</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>Compte</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3060,27 +3065,27 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Historique des opérations de synchronisation locale</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>Copier dans le presse papiers</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation type="unfinished"/>
</message>
@@ -4503,6 +4508,60 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index de8fdb08f..29c916fe7 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -1886,7 +1886,7 @@ Os elementos onde se permite a eliminación eliminaranse se impiden que se elimi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>Houbo conflitos. &lt;a href=&quot;%1&quot;&gt;Vexa na documentación como resolvelos.&lt;/a&gt;</translation>
</message>
@@ -2748,27 +2748,27 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>non foi posíbel eliminar o ficheiro %1, erro: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>Non foi posíbel crear o cartafol %1</translation>
</message>
@@ -2776,7 +2776,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation type="unfinished"/>
</message>
@@ -2784,32 +2784,32 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Non é posíbel renomear o ficheiro %1 como %2 por mor dunha colisión co nome dun ficheiro local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation>Produciuse un erro ao axustar o estado do PIN</translation>
</message>
@@ -3012,40 +3012,45 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>Hora</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>Ficheiro</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>Cartafol</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation>Incidencias</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>Acción</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>Tamaño</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>Conta</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3060,27 +3065,27 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<translation>Protocolo de sincronización local</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>Copiar ao portapapeis</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation type="unfinished"/>
</message>
@@ -4502,6 +4507,60 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_he.ts b/translations/client_he.ts
index ece39711a..27732d36a 100644
--- a/translations/client_he.ts
+++ b/translations/client_he.ts
@@ -1885,7 +1885,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>קיימות התנגשויות. &lt;a href=&quot;%1&quot;&gt;יש לבדוק בתיעוד איך לפתור אותן.&lt;/a&gt;</translation>
</message>
@@ -2747,27 +2747,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>לא ניתן למחוק קובץ %1, שגיאה: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>לא ניתן היה ליצור תיקייה %1</translation>
</message>
@@ -2775,7 +2775,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation type="unfinished"/>
</message>
@@ -2783,32 +2783,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>לא ניתן לשנות שם לקובץ %1 ל- %2 בשל התנגשות עם שם קובץ מקומי</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation>שגיאה בזמן הגדרת מצב קוד</translation>
</message>
@@ -3011,40 +3011,45 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>זמן</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>קובץ</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>תיקייה</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>פעולה</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>גודל</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>חשבון</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3059,27 +3064,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>פרוטוקול סנכרון מקומי</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>העתקה ללוח הגזירים</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation type="unfinished"/>
</message>
@@ -4501,6 +4506,60 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index 3a608eda8..44a779da4 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -1886,7 +1886,7 @@ Gli elementi per i quali è consentita l&apos;eliminazione, saranno eliminati se
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>Ci sono stati conflitti. &lt;a href=&quot;%1&quot;&gt;Controlla la documentazione su come risolverli.&lt;/a&gt;</translation>
</message>
@@ -2742,27 +2742,27 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>Impossibile eliminare il file %1, errore: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>impossibile creare la cartella %1</translation>
</message>
@@ -2770,7 +2770,7 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation type="unfinished"/>
</message>
@@ -2778,32 +2778,32 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Il file %1 non può essere rinominato in %2 a causa di un conflitto con il nome di un file locale</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation>Errore ad impostare il pin state</translation>
</message>
@@ -3006,40 +3006,45 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>Ora</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>File</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>Cartella</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>Azione</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>Dimensione</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>Account</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3054,27 +3059,27 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo
<translation>Protocollo di sincronizzazione locale</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>Copia negli appunti</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation type="unfinished"/>
</message>
@@ -4496,6 +4501,60 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index 2b09746fb..d6560348c 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -1889,7 +1889,7 @@ Items waar verwijderen is toegestaan zullen gewist worden als ze voorkomen dat e
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>Er waren conflicten. &lt;a href=&quot;%1&quot;&gt;Raadpleeg de documentatie om ze te verhelpen.&lt;/a&gt;</translation>
</message>
@@ -2752,27 +2752,27 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>kon bestand file %1 niet verwijderen, fout: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>kon map %1 niet maken</translation>
</message>
@@ -2780,7 +2780,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation type="unfinished"/>
</message>
@@ -2788,32 +2788,32 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Bestand %1 kan niet worden hernoemd naar %2, omdat de naam conflicteert met een lokaal bestand</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation>Kan %1 niet naar %2 verplaatsen, het bestand is in gebruik</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation>Fout bij het instellen van pin staat</translation>
</message>
@@ -3016,40 +3016,45 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>Tijd</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>Bestand</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>Map</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>Handeling</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>Grootte</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>Account</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3064,27 +3069,27 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d
<translation>Lokaal sync protocol</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>Kopiëren naar klembord</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation type="unfinished"/>
</message>
@@ -4507,6 +4512,60 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index 9a26ba559..e43c29b34 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -1886,7 +1886,7 @@ Os itens em que a exclusão é permitida serão excluídos se impedirem que um d
<translation>O arquivo %1 foi ignorado porque este nome foi reservado por %2</translation>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>Houve conflitos.&lt;a href=&quot;%1&quot;&gt;Verifique a documentação sobre como resolvê-los.&lt;/a&gt;</translation>
</message>
@@ -2747,27 +2747,27 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>não foi possível apagar o arquivo %1, erro: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation>Não foi possível criar a pasta local %1 devido a um conflito de nome de arquivo local com %2 </translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation>Erro ao atualizar metadados : %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation>O arquivo %1 está atualmente em uso </translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>não foi possível criar a pasta %1</translation>
</message>
@@ -2775,7 +2775,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation>Não foi possível remover %1 por causa de um conflito de nome de arquivo local com %2! </translation>
</message>
@@ -2783,32 +2783,32 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>O arquivo %1 não pode ser renomeado para %2 por causa de um choque com nome de arquivo local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation>Não foi possível renomear %1 para %2, o arquivo está em uso</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation>Erro ao atualizar metadados: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation>O arquivo %1 está atualmente em uso </translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation>Falha ao renomear arquivo</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation>Erro ao definir o estado do pin</translation>
</message>
@@ -3011,40 +3011,45 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>Horário</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>Arquivo</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>Pasta</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation>Problemas</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>Ação</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>Tamanho</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>Conta</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3059,27 +3064,27 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Protocolo de sincronização local</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation>Redefinir tamanhos de coluna </translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>Copiar para área de transferência</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation>Mostrar no navegador de arquivos </translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation>Mostrar no navegador da web </translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation>Tentar sincronizar novamente </translation>
</message>
@@ -4501,6 +4506,60 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index 97e31c81d..900ebf57d 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -1886,7 +1886,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation>Файл %1 был проигнорирован, так как его имя зарезервировано %2</translation>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>Имеются конфликты. &lt;a href=&quot;%1&quot;&gt;См. документацию по их разрешению.&lt;/a&gt;</translation>
</message>
@@ -2748,27 +2748,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>не удалось удалить файл %1, ошибка: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation>Не могу создать локальный каталог %1 из-за совпадения локального имени файла с %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation>Ошибка обновления метаданных: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation>Файл %1 сейчас занят</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>не удается создать папку %1</translation>
</message>
@@ -2776,7 +2776,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation>Не удалось удалить %1 из-за пересечения локального имени файла с %2!</translation>
</message>
@@ -2784,32 +2784,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Файл %1 не может быть переименован в %2 из-за локального конфликта имен</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation>Не удалось переименовать %1 в %2, файл сейчас используется</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation>Ошибка обновления метаданных: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation>Файл %1 сейчас занят</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation>Не удалось переименовать файл</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation>Ошибка при установке состояния прикреплённости</translation>
</message>
@@ -3012,40 +3012,45 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>Время</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>Файл</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>Папка</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation>Проблемы</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>Действие</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>Размер</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>Уч.запись</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3060,27 +3065,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Локальный протокол синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation>Сбросить размеры колонок</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>Скопировать в буфер обмена</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation>Показать в файловом браузере</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation>Показать в веб-барузере</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation>Повторить попытку синхронизации</translation>
</message>
@@ -4502,6 +4507,60 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_sq.ts b/translations/client_sq.ts
index f750db6a3..6761f3c05 100644
--- a/translations/client_sq.ts
+++ b/translations/client_sq.ts
@@ -1888,7 +1888,7 @@ Objektet mbi të cilët lejohet fshirja do të fshihen, nëse pengojnë heqjen e
<translation>Kartela %1 u shpërfill, ngaqë emri i saj është i rezervuar nga2</translation>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>Pati përplasje. &lt;a href=&quot;%1&quot;&gt;Se si t’i zgjidhni, shihni dokumentimin.&lt;/a&gt;</translation>
</message>
@@ -2750,27 +2750,27 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>s’u fshi dot kartela %1, gabim: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation>S’krijohet dot dosje vendore %1, për shkak të një përplasje emrash kartele vendore me %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation>Gabim në përditësim tejtëdhënash: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation>Kartela %1 është aktualisht në përdorim</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>s’u krijua dot dosja %1</translation>
</message>
@@ -2778,7 +2778,7 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation>S’u hoq dot %1, për shkak të një përplasjeje emrash kartele vendore me %2!</translation>
</message>
@@ -2786,32 +2786,32 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Kartela %1 s’mund të riemërtohet si %2, për shkak të një përplasje emrash kartele vendore</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation>S’u riemërtua dot %1 si %2, kartela është aktualisht në përdorim</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation>Gabim në përditësim tejtëdhënash: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation>Kartela %1 është aktualisht në përdorim</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation>S’u arrit të riemërtohej kartela</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation>Gabim në caktim gjendjeje pini</translation>
</message>
@@ -3014,40 +3014,45 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>Kohë</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>Kartelë</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>Dosje</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation>Probleme</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>Veprim</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>Madhësi</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>Llogari</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3062,27 +3067,27 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju
<translation>Protokoll vendor njëkohësimesh</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation>Ricaktoni madhësi shtyllash</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>Kopjoje në të papastër</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation>Me këtë hedhje në qarkullim Clementine-a përfiton një dialog fringo të ri përpunimi etiketash, me vetëplotësim dhe me aftësinë të identifikojë automatikisht muzikë dhe të sjellë etiketa që mungojnë që nga MusicBrainz. Tani mbulohen “CUE sheets” - këto pikasen automatikisht kur skanohet mediateka juaj dhe çdo pjesë do të shfaqet veçmas. Kemi bërë edhe shumë përmirësime të vogla, të tilla si shfaqja e kopertinës së albumit te skeda Mediatekë, duke ngjyrosur gri këngët e fshira, shtimi i një mundësie “Shfaqe në shfletues kartelash”, mbulim për ndërmjetës rrjeti, shtimi i një mundësie “Riskanim i plotë i mediatekës”, dhe një ndihmëz të re për rrëshqitësin e pjesë</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation>Shfaqe në shfletues</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation>Riprovo njëkohësim</translation>
</message>
@@ -4504,6 +4509,60 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_th.ts b/translations/client_th.ts
index 8343a8e4d..22da54154 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -1885,7 +1885,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>มีข้อขัดแย้งเกิดขึ้น &lt;a href=&quot;%1&quot;&gt;ตรวจสอบเอกสารเกี่ยวกับวิธีแก้ปัญหา&lt;/a&gt;</translation>
</message>
@@ -2742,27 +2742,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>ไม่สามารถลบไฟล์ %1, ข้อผิดพลาด: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>ไม่สามารถสร้างโฟลเดอร์ %1</translation>
</message>
@@ -2770,7 +2770,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation type="unfinished"/>
</message>
@@ -2778,32 +2778,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>ไม่สามารถเปลี่ยนชื่อไฟล์ %1 เป็น %2 เพราะไฟล์ชื่อนี้มีอยู่แล้ว</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation>ไม่สามารถเปลี่ยนชื่อ %1 เป็น %2 ได้เนื่องจากกำลังมีการใช้งานไฟล์นี้อยู่</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation>เกิดข้อผิดพลาดขณะตั้งค่าสถานะพิน</translation>
</message>
@@ -3006,40 +3006,45 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>เวลา</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>ไฟล์</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>สร้างโฟลเดอร์ใหม่</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation>ปัญหา</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>การกระทำ</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>ขนาด</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>บัญชี</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3054,27 +3059,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>โปรโตคอลการประสานข้อมูลในเครื่อง</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>คัดลอกลิงก์ไปยังคลิปบอร์ด</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation type="unfinished"/>
</message>
@@ -4494,6 +4499,60 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index 5d8b0850a..62afdd4fb 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -1885,7 +1885,7 @@ Bir dizinin kaldırılmasını engelliyorlarsa işaretli ögeler de silinecektir
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>Çakışmalar mevcut. &lt;a href=&quot;%1&quot;&gt;Nasıl çözüleceğini dokümantasyondan kontrol edin.&lt;/a&gt;</translation>
</message>
@@ -2745,27 +2745,27 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>%1 dosyası silinemedi, hata: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>%1 klasörü oluşturulamadı</translation>
</message>
@@ -2773,7 +2773,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation type="unfinished"/>
</message>
@@ -2781,32 +2781,32 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Yerel bir dosya adı çakışması nedeniyle %1 dosyası %2 olarak adlandırılamadı</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation>Pin durumu ayarlanırken hata oluştu</translation>
</message>
@@ -3009,40 +3009,45 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>Zaman</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>Dosya</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>Klasör</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>Eylem</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>Boyut</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>Hesap</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3057,27 +3062,27 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka
<translation>Yerel eşitleme protokolü</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>Panoya kopyala</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation type="unfinished"/>
</message>
@@ -4499,6 +4504,60 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index 1a7c952ed..c2e2e23ef 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -1873,7 +1873,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>有冲突.&lt;a href=&quot;%1&quot;&gt;查阅相关解决问题的文档&lt;/a&gt;</translation>
</message>
@@ -2723,27 +2723,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>不能删除文件 %1, 错误: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>无法创建文件夹 %1</translation>
</message>
@@ -2751,7 +2751,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation type="unfinished"/>
</message>
@@ -2759,32 +2759,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>由于本地文件名冲突,文件 %1 无法更名为 %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
@@ -2987,40 +2987,45 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>时间</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>文件</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>文件夹</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>动作</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>大小</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>账户</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3035,27 +3040,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>本地同步协议</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>复制到剪贴板 </translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation type="unfinished"/>
</message>
@@ -4477,6 +4482,60 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts
index 3b1b50a43..ada850217 100644
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -1885,7 +1885,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/issueswidget.cpp" line="117"/>
+ <location filename="../src/gui/issueswidget.cpp" line="119"/>
<source>There were conflicts. &lt;a href=&quot;%1&quot;&gt;Check the documentation on how to resolve them.&lt;/a&gt;</source>
<translation>有衝突&lt;a href=&quot;%1&quot;&gt;查看有關如何解決它們的文檔。&lt;/a&gt;</translation>
</message>
@@ -2747,27 +2747,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="146"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="141"/>
<source>could not delete file %1, error: %2</source>
<translation>無法刪除檔案 %1,錯誤: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="161"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
<source>Can not create local folder %1 because of a local file name clash with %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="180"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="183"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="178"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="167"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="162"/>
<source>could not create folder %1</source>
<translation>無法建立資料夾 %1</translation>
</message>
@@ -2775,7 +2775,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="99"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="94"/>
<source>Could not remove %1 because of a local file name clash with %2!</source>
<translation type="unfinished"/>
</message>
@@ -2783,32 +2783,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="221"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="216"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>檔案 %1 無法更名成 %2,因為本地端的檔案名稱已毀損</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="223"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="260"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="255"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="266"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="261"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="267"/>
<source>Error setting pin state</source>
<translation>設定引腳狀態時錯誤</translation>
</message>
@@ -3011,40 +3011,45 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProtocolItemModel</name>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="123"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
<source>Time</source>
<translation>時間</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
<source>File</source>
<translation>檔案</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
<source>Folder</source>
<translation>資料夾</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Issues</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
<source>Action</source>
<translation>動作</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/>
<source>Size</source>
<translation>容量</translation>
</message>
<message>
- <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="137"/>
<source>Account</source>
<translation>帳號</translation>
</message>
+ <message>
+ <location filename="../src/gui/models/protocolitemmodel.cpp" line="139"/>
+ <source>Status</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::ProtocolWidget</name>
@@ -3059,27 +3064,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>本機同步協定</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="83"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="84"/>
<source>Reset column sizes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="92"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="93"/>
<source>Copy to clipboard</source>
<translation>複製到剪貼簿</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="102"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="103"/>
<source>Show in file browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="113"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="114"/>
<source>Show in web browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="126"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="127"/>
<source>Retry sync</source>
<translation type="unfinished"/>
</message>
@@ -4501,6 +4506,60 @@ This is a new, experimental mode. If you decide to use it, please report any iss
</message>
</context>
<context>
+ <name>SyncFileItem::Status</name>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="83"/>
+ <source>Undefined</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="85"/>
+ <source>Fatal Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="87"/>
+ <location filename="../src/libsync/syncfileitem.cpp" line="99"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="89"/>
+ <source>Info</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="91"/>
+ <source>Success</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="93"/>
+ <source>Conflict</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="95"/>
+ <source>Error Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="97"/>
+ <source>Restored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="101"/>
+ <source>Blacklisted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncfileitem.cpp" line="103"/>
+ <source>Excluded</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Utility</name>
<message>
<location filename="../src/common/utility.cpp" line="131"/>