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-08-28 06:17:46 +0300
committerownClouders <devops@owncloud.com>2021-08-28 06:17:46 +0300
commit3fcc981c565ebafbeac80f5ca55c28a044fce119 (patch)
tree8d73bfd702d698f69936f5884340ce2263747001
parent79bcf1caf7a67e49d2389e1ad0df34f74554eef8 (diff)
[tx] updated client translations from transifex [skip ci]
-rw-r--r--translations/client_ar.ts146
-rw-r--r--translations/client_bg_BG.ts146
-rw-r--r--translations/client_cs.ts146
-rw-r--r--translations/client_de.ts146
-rw-r--r--translations/client_de_CH.ts146
-rw-r--r--translations/client_el.ts146
-rw-r--r--translations/client_en.ts146
-rw-r--r--translations/client_en_GB.ts146
-rw-r--r--translations/client_es.ts146
-rw-r--r--translations/client_fr.ts146
-rw-r--r--translations/client_gl.ts146
-rw-r--r--translations/client_he.ts146
-rw-r--r--translations/client_it.ts146
-rw-r--r--translations/client_nl.ts146
-rw-r--r--translations/client_pl.ts146
-rw-r--r--translations/client_pt_BR.ts150
-rw-r--r--translations/client_ru.ts146
-rw-r--r--translations/client_sq.ts150
-rw-r--r--translations/client_th.ts158
-rw-r--r--translations/client_tr.ts146
-rw-r--r--translations/client_zh_CN.ts146
-rw-r--r--translations/client_zh_TW.ts146
22 files changed, 1616 insertions, 1616 deletions
diff --git a/translations/client_ar.ts b/translations/client_ar.ts
index 440ac2f93..d379ffc93 100644
--- a/translations/client_ar.ts
+++ b/translations/client_ar.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>انتهت مهلة الاتصال</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>خطأ غير معروف: تم حذف رد الشبكة</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>رد الخادم &quot;%1 %2&quot; على &quot;%3 %4&quot;</translation>
</message>
@@ -1067,36 +1067,36 @@ File synchronization desktop utility.</source>
<translation>تعذّرت قراءة ملف استبعاد النظام</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>تمت إضافة مجلد جديد أكبر من %1 ميجا بايت: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>تمت إضافة مجلد من وحدات التخزين الخارجية.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>يُرجى الانتقال إلى الإعدادات لتحديده إذا كنت ترغب في تنزيله.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>تم إنشاء المجلد %1 لكن تم استبعاده من المزامنة مسبقًا. لن تتم مزامنة البيانات الموجودة بداخله.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>تم إنشاء ملف %1 لكن تم استبعاده من المزامنة مسبقًا. لن تتم مزامنته.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1109,7 +1109,7 @@ This means that the synchronization client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1120,7 +1120,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a
إذا قررت حذف الملفات، ستكون غير متوفرة لك، ما لم تكن أنت المالك.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1129,17 +1129,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
إذا حدث ذلك صدفة، وقررت الاحتفاظ بملفاتك، ستتم إعادة مزامنتها من الخادم.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>هل تريد إزالة كل الملفات؟</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>إزالة كل الملفات</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>حفظ الملفات</translation>
</message>
@@ -1147,117 +1147,117 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>تعذّرت إعادة تعيين حالة المجلد</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>تم العثور على دفتر يومية مزامنة قديم &apos;%1&apos;، لكن تعذّرت إزالته. يُرجى التأكد من عدم وجود أي تطبيق يستخدمها حاليًا.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation> (النسخ الاحتياطي)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation> (النسخ الاحتياطي %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>حالة غير معرفة.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>الانتظار لبدء المزامنة.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>التحضير للمزامنة.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>المزامنة قيد التشغيل.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>المزامنة ناجحة، ولم يتم حل التعارضات.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>المزامنة الأخيرة تمت بنجاح.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>خطأ في الإعداد.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>إلغاء المستخدم.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>توقفت المزامنة مؤقتًا.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (المزامنة متوقفة مؤقتًا)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>لم يتم تحديد مجلد صالح!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>المسار المحدد غير موجود!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>المسار المحدد ليس مجلدًا!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>ليس لديك الصلاحية للكتابة في المجلد المحدد!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>تم إجراء مزامنة من الخادم إلى المجلد المحلي هذا بالفعل. يُرجى اختيار مجلد محلي آخر!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>يحتوي المجلد المحلي %1 بالفعل على مجلد مستخدم في اتصال مزامنة المجلد. يُرجى اختيار مجلد آخر!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>المجلد المحلي %1 موجود في مجلد مستخدم في اتصال مزامنة المجلد بالفعل. يُرجى اختيار مجلد آخر!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -1449,12 +1449,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>أضف اتصال مزامنة المجلد</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>أضف اتصال المزامنة</translation>
</message>
@@ -1515,17 +1515,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>اختر هذا لمزامنة الحساب بالكامل</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>تتم مزامنة هذا المجلد بالفعل.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>تقوم الآن بمزامنة &lt;i&gt;%1&lt;/i&gt; بالفعل، وهو المجلد الأصلي لـ &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>تقوم الآن بمزامنة &lt;i&gt;%1&lt;/i&gt; بالفعل، وهو المجلد الفرعي لـ &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -1533,17 +1533,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation>استخدم الملفات الظاهرية بدلاً من تنزيل المحتوى فورًا٪ 1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation>(تجريبي)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation>الملفات الظاهرية غير متوفرة للمجلد المحدد</translation>
</message>
@@ -2156,66 +2156,66 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>خطأ في البيانات الراجعة من الخادم: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>حدث خطأ أثناء الوصول إلى نقطة النهاية &quot;الرمز المميز&quot;: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>لا يمكن توزيع JSON الراجع من الخادم: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation>نوع الرمز المميز غير معتمد: ٪ 1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation>لم يتضمن الرد من الخادم جميع الحقول المتوقعة
:٪ 1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation>خطأ غير معروف</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation>&lt;h1&gt;خطأ تسجيل الدخول&lt;/h1&gt;&lt;p&gt; فشل في استرداد معلومات المستخدم&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;خطأ في تسجيل الدخول&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation>خطأ أثناء تحديث الرمز المميز: ٪ 1 : ٪ 2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
@@ -2224,7 +2224,7 @@ Received data: %2</source>
البيانات الواردة : ٪ 2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;مستخدم خطأ&lt;/h1&gt;&lt;p&gt;لقد سجّلت دخولك باستخدام المستخدم &lt;em&gt;%1&lt;/em&gt;، لكن يجب تسجيل الدخول باستخدام المستخدم &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;يُرجى تسجيل الخروج من %3 في علامة تبويب أخرى، ثم &lt;a href=&apos;%4&apos;&gt;انقر هنا&lt;/a&gt; وسجِّل الدخول باستخدام مستخدم %2&lt;/p&gt;</translation>
</message>
@@ -2387,7 +2387,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2656,13 +2656,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2868,12 +2868,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation>تعذر تحديث الملف : ٪ 1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3163,33 +3163,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>الإعدادات</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>نشاط</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>إضافة حساب</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>إنهاء %1</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation>هل أنت متأكد من رغبتك في إنهاء %1؟</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>حساب</translation>
</message>
diff --git a/translations/client_bg_BG.ts b/translations/client_bg_BG.ts
index 7f9216980..3a6962d94 100644
--- a/translations/client_bg_BG.ts
+++ b/translations/client_bg_BG.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>Връзката се провали</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>Неизвестна грешка: мрежовият отговор беше изтрит</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>Сървърът отговори „%1%2“ в „%3%4“</translation>
</message>
@@ -1067,36 +1067,36 @@ File synchronization desktop utility.</source>
<translation>Неуспешно прочитане на системния файл за пренебрегване на файлове. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Нова папка по-голяма от %1 МБ е добавена: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>Добавена е папка от външно дисково устройство.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Моля, отидете в настройки за да изберете дали искате да го изтеглите.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Папката %1 беше създадена, но преди това беше изключена от синхронизацията. Данните в нея няма да бъдат синхронизирани.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Файлът %1 беше създаден, но преди това беше изключен от синхронизация. Той няма да бъде синхронизиран.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1109,7 +1109,7 @@ This means that the synchronization client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1120,7 +1120,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a
Но ако решите да изтриете файловете, то те няма да са достъпни за вас, освен ако не сте собственик.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1129,17 +1129,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
Ако това е инцидент и решите да запазите вашите файлове те ще бъдат синхронизирани отново от сървъра.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>Премахни Всички Файлове?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>Премахни всички файлове</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>Запази файловете</translation>
</message>
@@ -1147,117 +1147,117 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>Неуспешно изчистване на състоянието на папката</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Открит е стар файл за синхронизирне %1, но не може да бъде премахнат. Моля уверете се, че никоя програма не го използва в момента.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation>(архив)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation>(архив %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>Неопределено Състояние</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>Изчакване за започване на синхронизацията.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>Подготовка за синхронизация</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>Синхронизирането работи.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Синхронизирането беше успешно, няма нерешени конфликти.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>Последната синхронизация е беше успешна.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>Грешка в Настройките.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>Прекрати</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>Синхронизирането е на пауза.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Синхронизирането е на пауза)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>Няма маркирана валидна папка!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>Избраният път не съществува!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>Избраният път не е папка!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Вие нямате права да записвате в избраната папка!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Вече съществува синхронизиране между сървъра и тази локална папка. Моля, изберете друга локална папка!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локалната папка %1 вече съдържа папка, която се синхронизирва. Моля изберете друга!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локалната папка %1 вече се съдържа в папка, която участва в синхронизация. Моля изберете друга!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -1449,12 +1449,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>Добавяне на синхронизираща връзка за папка</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>Добавяне на връзка за синхронизиране</translation>
</message>
@@ -1515,17 +1515,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Изберете за да синхронизирате целия профил</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>Тази папка вече е сред тези, които се синхронизират.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Вече синхронизирате &lt;i&gt;%1&lt;/i&gt;, която е родителска папка на &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -1533,17 +1533,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2155,72 +2155,72 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>Грешка върната от сървъра: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Възникна грешка при достъп с „маркера“ в края на процеса: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Не можа да се анализира въраният JSON от сървъра: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;Грешка при влизане&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;Грешен потребител&lt;/h1&gt;&lt;p&gt;Влезли сте с потребител&lt;em&gt;%1&lt;/em&gt;, но трябва да влезете с потребител&lt;em&gt;%2&lt;/em&gt;.&lt;br&gt; Моля, излезте от %3 в друг раздел и след това &lt;a href=&apos;%4&apos;&gt;щракнете тук&lt;/a&gt; и влезте като потребител %2&lt;/p&gt;</translation>
</message>
@@ -2383,7 +2383,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2652,13 +2652,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2864,12 +2864,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3159,33 +3159,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>Настройки</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>Активност</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>Добавяне на профил</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>Затвори %1</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation>Наистина ли искате да излезете от %1?</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>Профил</translation>
</message>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index 161c6b0b6..ce7bbb400 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>Připojení vypršelo</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>Neznámá chyba: odpověď sítě byla smazána</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>Odpověď serveru &quot;%1 %2&quot; do &quot;%3 %4&quot;</translation>
</message>
@@ -1063,35 +1063,35 @@ File synchronization desktop utility.</source>
<translation>Nezdařilo se přečtení systémového exclude souboru</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Nová složka větší než %1 MB byla přidána: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>Byla přidána složka z externího úložiště.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Pokud to chcete stáhnout, běžte do nastavení a vyberte to.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1100,7 +1100,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1110,7 +1110,7 @@ Tyto soubory budou smazány i ve vaší místní synchronizované složce a nebu
Rozhodnete-li se soubory smazat, budou vám nedostupné, nejste-li jejich vlastníkem.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1119,17 +1119,17 @@ Jste si jisti, že chcete tyto akce synchronizovat se serverem?
Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze serveru.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -1137,117 +1137,117 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>Nelze obnovit stav adresáře</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Byl nalezen starý záznam synchronizace &apos;%1&apos;, ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation> (záloha)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation> (záloha %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>Čeká na spuštění synchronizace.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>Příprava na synchronizaci.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>Synchronizace probíhá.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Synchronizace byla úspěšně dokončena, nevyřešené konflikty</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>Poslední synchronizace byla úspěšná.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>Chyba nastavení.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>Zrušení uživatelem.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>Synchronizace pozastavena.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizace je pozastavena)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>Nebyl vybrán platný adresář!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>Vybraná cesta ke složce neexistuje!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>Vybraná cesta nevede do adresáře!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Nemáte oprávnění pro zápis do zvoleného adresáře!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Ze serveru se do tohoto umístění již synchronizuje. Prosím zvolte jinou místní složku!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Místní adresář %1 již obsahuje podadresář použitý pro synchronizaci odesílání. Zvolte prosím jiný!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Místní adresář %1 je již obsažen ve adresáři použitém pro synchronizaci. Vyberte prosím jiný!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -1439,12 +1439,12 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>Přidat synchronizaci adresáře</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>Přidat synchronizační připojení</translation>
</message>
@@ -1505,17 +1505,17 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze
<translation>Zvolte toto k provedení synchronizace celého účtu</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>Tento adresář je již synchronizován.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Již synchronizujete adresář &lt;i&gt;%1&lt;/i&gt;, který je adresáři &lt;i&gt;%2&lt;/i&gt; nadřazený.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Již synchronizujete adresář &lt;i&gt;%1&lt;/i&gt;, který je podsložkou &lt;i&gt;%2&lt;/i&gt; .</translation>
</message>
@@ -1523,17 +1523,17 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation>Použijte virtuální soubory namísto přímého stahování obsahu %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation>(experimentální)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Virtuální soubory nejsou dostupné pro zvolenou složku</translation>
</message>
@@ -2142,66 +2142,66 @@ Poznámka: Spouštění aplikace s parametrem přepíše toto nastavení.</trans
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>Chybná odpověď serveru: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Není možné ověřit formát JSON souboru přijatého ze serveru: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation>Nepodporovaný typ tokenu: %1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation>Odpověď serveru neobsahovala všechna očekávaná pole:
%1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation>Neznámá chyba</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation>&lt;h1&gt;Chyba přihlášení&lt;/h1&gt;&lt;p&gt;Nepovedlo se stáhnout informace o uživateli&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;Chyba přihlášení&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation>Chyba při obnově tokenu: %1 : %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
@@ -2210,7 +2210,7 @@ Received data: %2</source>
Přijatá data: %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;Chybný uživatel&lt;/h1&gt;&lt;p&gt;Přihlásil jste se jako uživatel &lt;em&gt;%1&lt;/em&gt;, ale musíte se přihlásit jako &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Prosím odhlaste se z %3 v jiném okně, a poté &lt;a href=&apos;%4&apos;&gt;klikněte sem&lt;/a&gt; a přihlaste se jako %2&lt;/p&gt;</translation>
</message>
@@ -2373,7 +2373,7 @@ můžete být požádáni o dodatečná oprávnění.</translation>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation>Soubor %1 je právě využíván</translation>
</message>
@@ -2636,13 +2636,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2848,12 +2848,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation>Nedaří se aktualizovat soubor: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3143,33 +3143,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>Nastavení</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>Aktivita</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>Přidat účet</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>Ukončit %1</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation>Jste si jistí, že chcete skončit %1?</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>Účet</translation>
</message>
diff --git a/translations/client_de.ts b/translations/client_de.ts
index 5ef31eb09..abe2f38bc 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>Zeitüberschreitung bei der Verbindung</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>Unbekannter Fehler: Netzwerk-Antwort wurde gelöscht</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>Server hat &quot;%1 %2&quot; auf &quot;%3 %4&quot; geantwortet</translation>
</message>
@@ -1067,36 +1067,36 @@ File synchronization desktop utility.</source>
<translation>Systemeigene Ausschlussdatei kann nicht gelesen werden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Ein neues Verzeichnis größer als %1 MB wurde hinzugefügt: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>Ein Verzeichnis, von einem externen Speicher wurde hinzugefügt.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Bitte wechseln Sie zu den Einstellungen, falls Sie das Verzeichnis herunterladen möchten.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Der Ordner %1 wurde erzeugt aber früher von der Synchronisation ausgeschlossen. Daten im Ordner werden nicht synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Die Datei %1 wurde erzeugt aber früher von der Synchronisation ausgeschlossen. Sie wird nicht synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1109,7 +1109,7 @@ Dies bedeutet, dass der Synchronisationsclient lokale Änderungen möglicherweis
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1120,7 +1120,7 @@ Wenn Sie sich dazu entscheiden, diese Dateien zu behalten, werden diese wieder z
Wenn Sie sich zum Löschen der Dateien entscheiden, sind diese nicht mehr verfügbar, außer Sie sind der Eigentümer.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1129,17 +1129,17 @@ Sind Sie sich sicher, dass Sie diese Aktion mit Ihrem Server synchronisieren mö
Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheiden, werden diese wieder vom Server synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -1147,117 +1147,117 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>Konnte Ordner-Zustand nicht zurücksetzen</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Ein altes Synchronisations-Journal &apos;%1&apos; wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation>(Sicherung)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation>(Sicherung %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>Undefinierter Zustand.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>Wartet auf Beginn der Synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>Synchronisation wird vorbereitet.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>Synchronisation läuft.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Synchronisation war erfolgreich, ungelöste Konflikte. </translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>Die letzte Synchronisation war erfolgreich.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>Installationsfehler.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>Benutzer-Abbruch</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>Synchronisation wurde angehalten.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation ist pausiert)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>Kein gültiger Ordner gewählt!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>Der gewählte Pfad existiert nicht!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>Der gewählte Pfad ist kein Ordner!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Sie haben keine Schreibberechtigung für den ausgewählten Ordner!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Es existiert bereits eine Synchronisation vom Server zu diesem lokalen Ordner. Bitte wählen Sie ein anderes lokales Verzeichnis!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Der lokale Ordner %1 liegt innerhalb eines synchronisierten Ordners. Bitte wählen Sie einen anderen aus!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Der lokale Ordner %1 liegt in einem Ordner, der bereits synchronisiert wird. Bitte wählen Sie einen anderen aus!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -1449,12 +1449,12 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>Ordner-Synchronisation hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>Synchronisation hinzufügen</translation>
</message>
@@ -1515,17 +1515,17 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide
<translation>Wählen Sie dies, um das gesamte Konto zu synchronisieren</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>Dieser Ordner wird bereits synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Sie synchronisieren bereits &lt;i&gt;%1&lt;/i&gt;, das ein übergeordneten Ordner von &lt;i&gt;%2&lt;/i&gt; ist.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Sie synchronisieren bereits &lt;i&gt;%1&lt;/i&gt;, das ein untergeordneter Ordner von &lt;i&gt;%2&lt;/i&gt; ist.</translation>
</message>
@@ -1533,17 +1533,17 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation>Virtuelle Dateien verwenden, anstatt die Dateien herunter zu laden%1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation>(Experimentell)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Virtuelle Dateien sind für den ausgewählten Ordner nicht verfügbar</translation>
</message>
@@ -2155,66 +2155,66 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>Fehler vom Server zurückgegeben: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Beim Zugriff auf den &apos;token&apos; Endpunkt trat ein Fehler auf: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Die JSON Antwort des Servers konnte nicht geparst werden: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation>Nicht unterstützter Tokentyp: %1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation>Die Antwort des Servers hat nicht alle erwarteten Felder beinhaltet
:%1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation>Unbekannter Fehler</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation>&lt;h1&gt;Anmeldefehler &lt;/h1&gt;&lt;p&gt;Konnte Benutzerdaten nicht auslesen&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;Anmeldefehler &lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation>Fehler beim Erneuern des Tokens: %1: %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
@@ -2223,7 +2223,7 @@ Received data: %2</source>
Empfangene Daten: %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;Falscher Benutzer&lt;/h1&gt;&lt;p&gt;Sie haben sich mit dem Benutzer &lt;em&gt;%1&lt;/em&gt; angemeldet, sollten sich jedoch mit dem Benutzer &lt;em&gt;%2&lt;/em&gt; anmelden. &lt;br&gt;Bitte melden Sie sich in einem anderen Tab von %3 ab und &lt;a href=&apos;%4&apos;&gt;klicken Sie hier&lt;/a&gt; um sich als %2&lt;/p&gt; anzumelden</translation>
</message>
@@ -2385,7 +2385,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation>Datei %1 wird gerade benutzt</translation>
</message>
@@ -2652,13 +2652,13 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2864,12 +2864,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation>Die Datei konnte nicht aktualisiert werden: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3159,33 +3159,33 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>Einstellungen</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>Aktivität</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>Konto hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>%1 beenden</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation>Sind Sie sicher, dass sie %1 beenden möchten?</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>Benutzerkonto</translation>
</message>
diff --git a/translations/client_de_CH.ts b/translations/client_de_CH.ts
index ab9fa8fca..e4e171150 100644
--- a/translations/client_de_CH.ts
+++ b/translations/client_de_CH.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>Zeitüberschreitung beim Verbindungsaufbau</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>Unbekannter Fehler: Netzwerk-Antwort wurde gelöscht</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>Server hat &quot;%1 %2&quot; auf &quot;%3 %4&quot; geantwortet</translation>
</message>
@@ -1065,36 +1065,36 @@ File synchronization desktop utility.</source>
<translation>Systemeigene Ausschlussdatei kann nicht gelesen werden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Ein neues Verzeichnis, welcher grösser als %1 MB ist, wurde hinzugefügt: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>Ein Verzeichnis, von einem externen Speicher wurde hinzugefügt.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Bitte wechsele zu den Einstellungen, falls du das Verzeichnis herunterladen möchtest.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Ordner %1 wurde angelegt, aber früher von der Synchronisation ausgeschlossen. Daten im Ordner werden nicht synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Datei %1 wurde angelegt, aber früher von der Synchronisation ausgeschlossen, sie wird nicht synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1107,7 +1107,7 @@ Dies bedeutet, dass der Synchronisationsclient lokale Änderungen möglicherweis
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1118,7 +1118,7 @@ Wenn du dich entscheidest, diese Dateien zu behalten, werden diese wieder zum Se
Wenn du dich zum Löschen der Dateien entscheidest, sind diese nicht mehr verfügbar, ausser du bist der Eigentümer.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1127,17 +1127,17 @@ Bist du dir sicher, dass du diese Aktion mit Ihrem Server synchronisieren möcht
Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest, werden diese wieder vom Server synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>Alle Dateien löschen</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -1145,117 +1145,117 @@ Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest,
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>Ordnerzustand konnte nicht zurückgesetzt werden</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Ein altes Synchronisations-Journal &apos;%1&apos; wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stelle sicher, dass keine Anwendung es verwendet.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation>(Backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation>(Backup %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>Undefinierter Zustand.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>Warten auf Beginn der Synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>Synchronisation wird vorbereitet.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>Synchronisation läuft.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Synchronisation war erfolgreich, ungelöste Konflikte. </translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>Die letzte Synchronisation war erfolgreich.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>Installationsfehler.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>Benutzer-Abbruch</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>Synchronisation wurde angehalten.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation ist pausiert)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>Keinen gültigen Ordner ausgewählt!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>Der gewählte Pfad existiert nicht!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>Der gewählte Pfad ist kein Verzeichnis!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Sie sind nicht berechtigt, in diesen Ordner zu schreiben!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Es exisitiert bereits eine Synchronisation vom Server zu diesem lokalen Ordner. Bitte wähle ein anderes lokales Verzeichnis!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Das lokale Verzeichnis %1 enthält schon ein Verzeichnis, das schon mit einer anderen Verbindung synchronisiert wird. Bitte wähle ein anderes Verzeichnis!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Das lokale Verzeichnis %1 liegt innerhalb eines Verzeichnisses, das schon synchronisiert wird. Bitte wähle ein anderes Verzeichnis! </translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -1447,12 +1447,12 @@ Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest,
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>Synchronisiertes Verzeichnis hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>Füge eine Verzeichnis Sychronisation hinzu</translation>
</message>
@@ -1513,17 +1513,17 @@ Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest,
<translation>Wähle dies, um das gesamte Konto zu synchronisieren</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>Dieser Ordner wird bereits synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Du synchronisierst bereits &lt;i&gt;%1&lt;/i&gt;, das ein übergeordneten Ordner von &lt;i&gt;%2&lt;/i&gt; ist.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Der sync von &lt;i&gt;%1&lt;/i&gt; läuft schon, als Unterverzeichnis von &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -1531,17 +1531,17 @@ Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest,
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation>Virtuelle Dateien verwenden, anstatt die Dateien gleich herunter zu laden%1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation>(experimentell)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2152,65 +2152,65 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>Fehler vom Server zurückgegeben: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Beim Zugriff auf den &apos;token&apos; Endpunkt trat ein Fehler auf: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Die JSON Antwort des Servers konnte nicht reparst werden: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation>Nicht unterstützter Token-Typ: %1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation>Die Server-Antwort hat nicht alle erwarteten Felder enthalten: %1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation>Ein unbekannter Fehler ist aufgetreten.</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;Anmeldefehler&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation>Beim Aktualisieren des Tokens ist ein Fehler aufgetreten: %1 : %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
@@ -2219,7 +2219,7 @@ Received data: %2</source>
Empfangene Daten: %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;Falscher Benutzer&lt;/h1&gt;&lt;p&gt;Du hast dich mit dem Benutzer &lt;em&gt;%1&lt;/em&gt; angemeldet, solltest dich jedoch mit dem Benutzer &lt;em&gt;%2&lt;/em&gt; anmelden. Bitte melde dich in einem anderen Tab von %3 ab und &lt;a href=&apos;%4&apos;&gt;klicke hier&lt;/a&gt; um dich als %2 anzumelden&lt;/p&gt;</translation>
</message>
@@ -2381,7 +2381,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2648,13 +2648,13 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2860,12 +2860,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3155,33 +3155,33 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>Einstellungen</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>Aktivität</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>Konto hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>%1 beenden</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation>Sind Sie sicher, dass sie %1 beenden möchten?</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>Konto</translation>
</message>
diff --git a/translations/client_el.ts b/translations/client_el.ts
index 756d0fe9b..de71b606b 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>Η σύνδεση έληξε.</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>Άγνωστο σφάλμα: η απάντηση δικτύου διαγράφηκε</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>Ο διακομιστής απάντησε &quot;%1 %2&quot; σε &quot;%3 %4&quot;</translation>
</message>
@@ -1067,36 +1067,36 @@ File synchronization desktop utility.</source>
<translation>Αδυναμία ανάγνωσης αρχείου αποκλεισμού συστήματος</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Προστέθηκε ένας νέος φάκελος μεγαλύτερος από %1 MB: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>Προστέθηκε ένας φάκελος από εξωτερικό αποθηκευτικό χώρο.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Μεταβείτε στις ρυθμίσεις για να το επιλέξετε εάν επιθυμείτε να το κατεβάσετε.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Ο φάκελος %1 δημιουργήθηκε αλλά εξαιρέθηκε προηγουμένως από συγχρονισμό. Τα δεδομένα στο εσωτερικό του δεν θα συγχρονιστούν.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Το αρχείο %1 δημιουργήθηκε αλλά εξαιρέθηκε προηγουμένως από συγχρονισμό. Δεν θα συγχρονιστεί.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1109,7 +1109,7 @@ This means that the synchronization client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1120,7 +1120,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a
Εφόσον επιλέξετε να διαγράψετε τα αρχεία, δε θα είναι διαθέσιμα σε εσάς, εκτός εάν είστε ο ιδιοκτήτης τους. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1129,17 +1129,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
Αν αυτό ήταν ένα ατύχημα και αποφασίσατε να διατηρήσετε τα αρχεία σας, θα συγχρονιστούν εκ νέου από το διακομιστή.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -1147,117 +1147,117 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>Δεν ήταν δυνατό να επαναφερθεί η κατάσταση του φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Βρέθηκε ένα παλαιότερο αρχείο συγχρονισμού &apos;%1&apos;, αλλά δεν μπόρεσε να αφαιρεθεί. Παρακαλώ βεβαιωθείτε ότι καμμία εφαρμογή δεν το χρησιμοποιεί αυτή τη στιγμή.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation>(αντίγραφο ασφαλείας)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation>(αντίγραοφ ασφαλέιας %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>Απροσδιόριστη Κατάσταση.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>Αναμονή έναρξης συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>Προετοιμασία για συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>Ο συγχρονισμός εκτελείται.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Επιτυχημένος συγχρονισμός, ανεπίλυτες συγκρούσεις.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>Σφάλμα Ρύθμισης.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>Ματαίωση από Χρήστη.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>Παύση συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Παύση συγχρονισμού)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>Δεν επιλέχθηκε έγκυρος φάκελος!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>Η επιλεγμένη διαδρομή δεν υπάρχει!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>Η επιλεγμένη διαδρομή δεν είναι φάκελος!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Δεν έχετε δικαιώματα εγγραφής στον επιλεγμένο φάκελο!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Υπάρχει ήδη συγχρονισμός από το διακομιστή σε αυτόν τον τοπικό φάκελο. Επιλέξτε έναν άλλο τοπικό φάκελο!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Ο τοπικός φάκελος %1 περιέχει ήδη ένα φάκελο που χρησιμοποιείται σε μια σύνδεση συγχρονισμού φακέλου. Παρακαλώ επιλέξτε άλλον!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Ο τοπικός φάκελος %1 περιέχεται ήδη σε φάκελο που χρησιμοποιείται σε μια σύνδεση συγχρονισμού. Παρακαλώ επιλέξτε άλλον!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -1449,12 +1449,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>Προσθήκη Σύνδεσης Συγχρονισμού Φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>Προσθήκη Σύνδεσης Συγχρονισμού</translation>
</message>
@@ -1515,17 +1515,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Επιλέξτε να συγχρονίσετε ολόκληρο το λογαριασμό</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>Αυτός ο φάκελος συγχρονίζεται ήδη.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ο φάκελος &lt;i&gt;%1&lt;/i&gt;, ο οποίος είναι γονεϊκός φάκελος του &lt;i&gt;%2&lt;/i&gt;, συγχρονίζεται ήδη.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -1533,17 +1533,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2155,72 +2155,72 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>Σφάλμα που επέστρεψε από το διακομιστή: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Παρουσιάστηκε ένα σφάλμα κατά την πρόσβαση στο τελικό σημείο του &apos;διακριτικού&apos;: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Αδυναμία ανάλυσης του JSON που επέστρεψε από το διακομιστή: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation>Άγνωστο σφάλμα</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;Σφάλμα εισόδου&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;Λάθος χρήστης&lt;/h1&gt;&lt;p&gt; Συνδεθήκατε με το χρήστη &lt;em&gt;%1&lt;/em&gt;, αλλά πρέπει να συνδεθείτε με το χρήστη &lt;em&gt;%2&lt;/em&gt;. &lt;br&gt;Παρακαλούμε αποσυνδεθείτε από τον %3 σε άλλη καρτέλα, στη συνέχεια &lt;a href=&apos;%4&apos;&gt;κάντε κλικ εδώ&lt;/a&gt; και συνδεθείτε ως χρήστης %2&lt;/p&gt;</translation>
</message>
@@ -2383,7 +2383,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2652,13 +2652,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2864,12 +2864,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3159,33 +3159,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>Ρυθμίσεις</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>Δραστηριότητα</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>Προσθήκη λογαριασμού</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>Κλείσιμο %1</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>Λογαριασμός</translation>
</message>
diff --git a/translations/client_en.ts b/translations/client_en.ts
index a265e7c8e..0ae668a6b 100644
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -212,17 +212,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation type="unfinished"></translation>
</message>
@@ -1092,34 +1092,34 @@ File synchronization desktop utility.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1128,7 +1128,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder &apos;%1&apos; folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1136,24 +1136,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder &apos;%1&apos; were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -1161,117 +1161,117 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"></translation>
</message>
@@ -1466,12 +1466,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation type="unfinished"></translation>
</message>
@@ -1532,17 +1532,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"></translation>
</message>
@@ -1550,17 +1550,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"></translation>
</message>
@@ -2167,72 +2167,72 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -2394,7 +2394,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"></translation>
</message>
@@ -2656,13 +2656,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -2868,12 +2868,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"></translation>
</message>
@@ -3163,33 +3163,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts
index b5ddef07a..14612c1a1 100644
--- a/translations/client_en_GB.ts
+++ b/translations/client_en_GB.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>Connection timed out</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>Unknown error: network reply was deleted</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</translation>
</message>
@@ -1067,36 +1067,36 @@ File synchronization desktop utility.</source>
<translation>Could not read system exclude file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>A new folder larger than %1 MB has been added: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>A folder from an external storage has been added.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Please go in the settings to select it if you wish to download it.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>The folder %1 was created but was excluded from synchronisation previously. Data inside it will not be synchronised.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>The file %1 was created but was excluded from synchronisation previously. It will not be synchronised.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1109,7 +1109,7 @@ This means that the synchronisation client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1120,7 +1120,7 @@ If you decide to keep the files, they will be re-synced with the server if you h
If you decide to delete the files, they will be unavailable to you, unless you are the owner.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1129,17 +1129,17 @@ Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>Remove All Files?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>Remove all files</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>Keep files</translation>
</message>
@@ -1147,117 +1147,117 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>Could not reset folder state</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation> (backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation> (backup %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>Undefined State.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>Waiting to start syncing.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>Preparing for sync.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>Sync is running.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Sync was successful, unresolved conflicts.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>Last sync was successful.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>Setup Error.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>User Abort.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>Sync is paused.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sync is paused)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>No valid folder selected!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>The selected path does not exist!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>The selected path is not a folder!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>You don&apos;t have permission to write to the selected folder!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>There is already a sync from the server to this local folder. Please pick another local folder!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -1449,12 +1449,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>Add Folder Sync Connection</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>Add Sync Connection</translation>
</message>
@@ -1515,17 +1515,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Choose this to sync the entire account</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>This folder is already being synced.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -1533,17 +1533,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2152,72 +2152,72 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</translation>
</message>
@@ -2380,7 +2380,7 @@ for additional privileges during the process.</translation>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2643,13 +2643,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2855,12 +2855,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3150,33 +3150,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>Settings</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>Activity</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>Add account</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>Quit %1</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>Account</translation>
</message>
diff --git a/translations/client_es.ts b/translations/client_es.ts
index c8cc719b4..df57a4dd0 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>Tiempo de conexión agotado</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>Error desconocido: la respuesta de red fue eliminada</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>El servidor respondió &quot;%1 %2&quot; a &quot;%3 %4&quot;</translation>
</message>
@@ -1067,36 +1067,36 @@ File synchronization desktop utility.</source>
<translation>No se ha podido leer el archivo de exclusión del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una carpeta mayor de %1 MB ha sido añadida: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de almacenamiento externo ha sido añadida.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor vaya a opciones a seleccionarlo si desea descargar esto.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>La carpeta %1 ha sido creada, pero tambien ha sido excluida de la sincronización. Los datos que contenga, no serán sincronizados.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>El archivo %1 ha sido creado, pero tambien ha sido excluido de la sincronización. Por tanto, no será sincronizado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1109,7 +1109,7 @@ Esto significa que el cliente de sincronización podría no subir los cambios lo
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1120,7 +1120,7 @@ Si decide mantener estos archivos, serán re-sincronizados con el servidor si di
Si decide borrarlos, no estarán disponibles para usted a menos que sea el propietario.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1129,17 +1129,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados con el servidor.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>¿Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -1147,117 +1147,117 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>No se ha podido restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Se ha encontrado un antiguo registro de sincronización &apos;%1&apos;; pero no se ha podido eliminar. Por favor, asegúrese de que ninguna aplicación la esté utilizando.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation>(copia de seguridad)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation>(copia de seguridad %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>Esperando para comenzar la sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>Preparándose para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>La sincronización se ha realizado. pero hay conflictos sin resolver.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización se ha realizado con éxito.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>Interrumpido por el usuario.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>¡La carpeta seleccionada no es válida!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>La ruta seleccionada no existe!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>¡La ruta seleccionada no es un directorio!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>¡Usted no tiene permiso para escribir en la carpeta seleccionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Ya existe una tarea de sincronización entre el servidor y esta carpeta. Por favor elija otra carpeta local.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>El directorio local %1 ya contiene un directorio usado en una conexión de sincronización de directorios. Por favor, elija otro.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>El directorio local %1 está dentro de un directorio usado en una conexión de sincronización de directorios. Por favor, elija otro.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -1449,12 +1449,12 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>Añadir Conexión para el Directorio de Sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>Añadir Sincronización de Conexión</translation>
</message>
@@ -1515,17 +1515,17 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados
<translation>Elija esto para sincronizar la cuenta entera</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>Este directorio ya se ha sincronizado.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ya ha sincronizado &lt;i&gt;%1&lt;/i&gt;, el cual es la carpeta de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ya estás sincronizando &lt;i&gt;%1&lt;/i&gt;, el cual es un subdirectorio de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -1533,17 +1533,17 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation>Usar archivos virtuales en lugar de descargar inmediatamente el contenido %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation> (experimental)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Archivos Virtuales no está disponible para la carpeta seleccionada</translation>
</message>
@@ -2156,65 +2156,65 @@ Tenga en cuenta que el uso de cualquier opción de línea de comando de registro
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>Error devuelto desde el servidor: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Ha ocurrido un error accediendo al Token endpoint:: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>No puedo procesar el código JSON recibido del servidor: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation>Tipo de token no soportado</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation>La respuesta del servidor no contiene todos los campos esperados</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation>Error desconocido</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation>&lt;h1&gt;Error de acceso&lt;/h1&gt;&lt;p&gt;Fallo al tratar de obtener información del usuario&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;Error de Login&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation>Error al actualizar el token: %1 : %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
@@ -2223,7 +2223,7 @@ Received data: %2</source>
Datos recibidos: %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;Usuario incorrecto&lt;/h1&gt;&lt;p&gt;Se ha intentado logar con el usuario: &lt;em&gt;%1&lt;/em&gt;, pero debe logarse con el usuario: &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Por favor des-loguese de %3 en otra pestaña, entonces&lt;a href=&apos;%4&apos;&gt;click aqui&lt;/a&gt; y loguese como el usuario %2&lt;/p&gt;</translation>
</message>
@@ -2385,7 +2385,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2654,13 +2654,13 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2866,12 +2866,12 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation>No se pudo actualizar el archivo: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3161,33 +3161,33 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>Ajustes</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>Actividad</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>Agregar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>Salir de %1</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation>¿Estás seguro de querer salir de %1?</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index bffdf00a0..4cac3b988 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>Délai de connexion dépassé</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>Erreur inconnue : La réponse du réseau a été supprimée</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>Le serveur a répondu &quot;%1 %2&quot; à &quot;%3 %4&quot;</translation>
</message>
@@ -1067,14 +1067,14 @@ File synchronization desktop utility.</source>
<translation>Impossible de lire le fichier d&apos;exclusion du système</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Un nouveau dossier de taille supérieure à %1 Mo a été ajouté : %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>Un nouveau dossier localisé sur un stockage externe a été ajouté.
@@ -1082,22 +1082,22 @@ File synchronization desktop utility.</source>
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Merci d&apos;aller dans les Paramètres pour indiquer si vous souhaitez le télécharger.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Le dossier %1 a été créé mais avait été exclu de la synchronisation auparavant. Les données à l&apos;intérieur ne seront pas synchronisées.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Le fichier %1 a été créé mais avait été exclu de la synchronisation auparavant. Il ne sera pas synchronisé.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1110,7 +1110,7 @@ Cela veut dire que le client de synchronisation ne peut pas téléverser les cha
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1121,7 +1121,7 @@ Si vous décidez de conserver ces fichiers, ils seront synchronisés à nouveau
Si vous décidez de supprimer ces fichiers, ils vous seront inaccessibles, sauf si vous en êtes le/la propriétaire.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1130,17 +1130,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserver vos fichiers, ils seront synchronisés à nouveau depuis le serveur.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>Conserver les fichiers</translation>
</message>
@@ -1148,117 +1148,117 @@ S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserve
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>Impossible de réinitialiser l&apos;état du dossier</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Un ancien fichier journal &apos;%1&apos; a été trouvé, mais ne peut être supprimé. Veuillez vous assurer qu’aucune application ne l&apos;utilise en ce moment.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation>(sauvegarde)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation>(sauvegarde %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>Statut indéfini.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>En attente de synchronisation.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>Préparation de la synchronisation.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>Synchronisation en cours</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Synchronisation réussie, conflits non résolus.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>Synchronisation terminée avec succès</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>Erreur d&apos;installation.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>Abandon par l&apos;utilisateur.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>La synchronisation est en pause.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation en pause)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>Aucun dossier valable sélectionné !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>Le chemin sélectionné n’existe pas !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>Le chemin sélectionné n&apos;est pas un dossier !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Vous n&apos;avez pas la permission d&apos;écrire dans le dossier sélectionné !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Il y a déjà une synchronisation depuis le serveur vers ce dossier local. Merci de choisir un autre dossier local !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Le dossier local %1 contient un dossier déjà utilisé pour une synchronisation de dossiers. Veuillez en choisir un autre !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Le dossier local %1 se trouve dans un dossier déjà configuré pour une synchronisation de dossier. Veuillez en choisir un autre !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -1450,12 +1450,12 @@ S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserve
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>Ajouter une synchronisation de dossier</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>Ajouter une Synchronisation</translation>
</message>
@@ -1516,17 +1516,17 @@ S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserve
<translation>Sélectionnez ceci pour synchroniser l&apos;ensemble du compte</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>Ce dossier est déjà en cours de synchronisation.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Vous synchronisez déja &lt;i&gt;%1&lt;/i&gt;, qui est un dossier parent de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Vous synchronisez déjà &lt;i&gt;%1&lt;/i&gt;, qui est un sous-dossier de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -1534,17 +1534,17 @@ S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserve
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation>Utilisez des fichiers virtuels au lieu de télécharger du contenu immédiatement%1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation> (expérimental)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Les fichiers virtuels ne sont pas disponibles pour le dossier sélectionné</translation>
</message>
@@ -2157,66 +2157,66 @@ Veuillez noter qu’utiliser les options de journalisation en ligne de commande
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>Erreur retournée par le serveur: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Il y a eu une erreur durant l&apos;accès au jeton de destination: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Impossible d&apos;analyser le fichier JSON récupéré sur le serveur : &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation>Type de jeton non pris en charge: %1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation>La réponse du serveur ne contenait pas tous les champs attendus
:%1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation>Erreur inconnue </translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation>&lt;h1&gt;Erreur d&apos;identification&lt;/h1&gt;&lt;p&gt;Échec de la récupération des informations sur l&apos;utilisateur&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;Erreur de connexion&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation>Erreur lors de l&apos;actualisation du jeton: %1 : %1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
@@ -2225,7 +2225,7 @@ Received data: %2</source>
Données reçues: %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;Mauvais utilisateur&lt;/h1&gt;&lt;p&gt;Vous êtes connecté avec l&apos;utilisateur &lt;em&gt;%1&lt;/em&gt;, mais vous devez vous connecter avec l&apos;utilisateur&lt;em&gt;%2&lt;/em&gt;. Veuillez vous déconnecter de %3 l&apos;autre onglet, puis &lt;a href=&apos;%4&apos;&gt; cliquez ici&lt;/a&gt; et connectez-vous en tant que l&apos;utilisateur &lt;/p&gt;%2</translation>
</message>
@@ -2388,7 +2388,7 @@ L&apos;assistant de mise à jour peut vous demandez des autorisations supplémen
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2657,13 +2657,13 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2869,12 +2869,12 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3164,33 +3164,33 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>Paramètres</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>Activité</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>Ajouter un compte</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>Quitter %1</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation>Êtes-vous sûr de vouloir quitter %1 ?</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>Compte</translation>
</message>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index 183468b8d..adcdce45a 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>Esgotouse o tempo de conexión</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>Produciuse un error descoñecido: a resposta de rede foi eliminada</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>O servidor repondeu «%1 %2» a «%3 %4»</translation>
</message>
@@ -1067,36 +1067,36 @@ File synchronization desktop utility.</source>
<translation>Non foi posíbel ler o ficheiro de exclusión do sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Foi engadido un cartafol maior de %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>Foi engadido un cartafol de almacenamento externo.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Vaia a axustes a seleccionalo se quere descargar isto.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Creouse o cartafol %1 mais foi excluído da sincronización con anterioridade. Os datos no seu interior non se sincronizarán.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Creouse o ficheiro %1 mais foi excluído da sincronización con anterioridade. Non se sincronizará.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1109,7 +1109,7 @@ Isto significa que o cliente de sincronización podería non enviar os cambios i
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1120,7 +1120,7 @@ Se decide manter os ficheiros, resincronizaranse co servidor se ten dereitos par
Se decide eliminar os ficheiros, non poderá dispor deles a non ser que sexa o propietario.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1130,17 +1130,17 @@ Confirma que quere sincronizar estas accións co servidor?
Se fose un accidente e decide manter os seus ficheiros, volverán ser sincronizados dende o servidor.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -1148,117 +1148,117 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>Non foi posíbel restabelecer o estado do cartafol</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Atopouse un diario de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningunha aplicación.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation>(copia de seguridade)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation>(copia de seguridade %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>Estado sen definir.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>Agardando para iniciar a sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>Estase sincronizando.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>A sincronización foi stifactoria, hai conflitos sen resolver.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>A última sincronización fíxose correctamente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>Erro de configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>Interrompido polo usuario.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>Sincronización en pausa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (sincronización en pausa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>Non seleccionou ningún cartafol correcto!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>A ruta seleccionada non existe!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>A ruta seleccionada non é un cartafol!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Vostede non ten permiso para escribir neste cartafol!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Xa existe unha tarefa de sincronización entre o servidor e este cartafol. Escolla outro cartafol local!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>O cartafol local %1 xa contén un cartafol usado nunha conexión de sincronización de cartafoles. Escolla outro!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>O cartafol local %1 está dentro dun cartafol usado nunha conexión de sincronización de cartafoles. Escolla outro!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -1450,12 +1450,12 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>Engadir a conexión da sincronización do cartafol</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>Engadir a conexión da sincronización</translation>
</message>
@@ -1516,17 +1516,17 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza
<translation>Escolla isto para sincronizar toda a conta</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>Este cartafol xa está sincronizado.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Xa está a sincronizar &lt;i&gt;%1&lt;/i&gt;, que é o cartafol pai de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Xa está a sincronizar &lt;i&gt;%1&lt;/i&gt;, que é un subcartafol de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -1534,17 +1534,17 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation>Usar ficheiros virtuais, no canto de descargar o contido inmediatamente%1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation> (experimental)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Os ficheiros virtuais non están dispoñíbeis para o cartafol seleccionado</translation>
</message>
@@ -2157,66 +2157,66 @@ Teña en conta que o uso de calquera opción de rexistro por liña de ordes anul
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>Erro devolto dende o servidor: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Produciuse un erro ao acceder ao punto final do «testemuño»: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Non foi posíbel analizar o JSON devolto dende o servidor: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation>Tipo de testemuño non admitido: %1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation>A resposta do servidor non contiña todos os campos agardados
:%1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation>Erro descoñecido</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation>&lt;h1&gt;Produciuse un erro de acceso&lt;/h1&gt;&lt;p&gt;Produciuse un fallo ao recuperar a información do usuario&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;Produciuse un erro de acceso&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation>Produciuse un erro ao eliminar o testemuño: %1 : %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
@@ -2225,7 +2225,7 @@ Received data: %2</source>
Datos recibidos: %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;Usuario errado&lt;/h1&gt;&lt;p&gt;Accedeu co usuario &lt;em&gt;%1&lt;/em&gt;, mais debe acceder co usuario &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Peche a sesión de %3 noutra lapela, entón &lt;a href=&apos;%4&apos;&gt;prema aquí&lt;/a&gt; e acceda como o usuario %2&lt;/p&gt;</translation>
</message>
@@ -2388,7 +2388,7 @@ actualización pode pedir privilexios adicionais durante o procedemento.</transl
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2657,13 +2657,13 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2869,12 +2869,12 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation>Non foi posíbel actualizar o ficheiro: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3164,33 +3164,33 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>Axustes</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>Actividade</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>Engadir unha conta</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>Saír de %1</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation>Confirma que quere saír de %1?</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>Conta</translation>
</message>
diff --git a/translations/client_he.ts b/translations/client_he.ts
index 4efccb0c4..1b5ca73e7 100644
--- a/translations/client_he.ts
+++ b/translations/client_he.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>פסק זמן חיבור</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>שגיאה לא ידועה: תשובת רשת נמחקה</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>השרת ענה &quot;%1 %2&quot; ל- &quot;%3 %4&quot;</translation>
</message>
@@ -1067,36 +1067,36 @@ File synchronization desktop utility.</source>
<translation>לא ניתן היה לקרוא את קובץ הלא כלולים במערכת</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>תיקייה חדשה הגדולה מ- %1 MB נוספה: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>נוספה תיקייה של אחסון חיצוני.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>יש לעבור להגדרות בכדי לבחור בו אם ברצונך להוריד אותו.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>תיקייה %1 נוצרה אבל לא נכללה בסנכרון בעבר. מידע בתיקייה לא יסונכרן.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>קובץ %1 נוצר אבל לא נכלל בסנכרון בעבר. מידע בקובץ לא יסונכרן.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1109,7 +1109,7 @@ This means that the synchronization client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1120,7 +1120,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a
אם קבלת החלטה למחוק את הקבצים, הם לא יהיו נגישים עבורך יותר, אלא אם כן הנך הבעלים שלהם.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1129,17 +1129,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
אם מדובר בטעות וקבלת החלטה לשמור את הקבצים שלך, הם יסונכרנו מחדש מהשרת.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>הסרת כל הקבצים?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>הסרת כל הקבצים</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>השארת הקבצים</translation>
</message>
@@ -1147,117 +1147,117 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>לא ניתן לאפס את מצב התיקייה</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>יומן סנכרון ישן &apos;%1&apos; אותר, אך לא ניתן להסירו. יש לוודא שאף יישום לא משתמש בו כרגע.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation> (גיבוי)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation> (גיבוי %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>מצב בלתי מוגדר.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>ממתין להתחלת סנכרון.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>מכין סנכרון.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>הסנכרון פועל כרגע.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>הסנכרון עבר בהצלחה, קיימים קונפליקטים שלו יושרו.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>הסנכרון האחרון הושלם בהצלחה.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>שגיאת התקנה.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>משתמש ביטל פעולה.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>סנכרון בהשהייה.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (סנכרון בהשהייה)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>לא נבחרה תיקייה חוקית!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>הנתיב הנבחר אינו קיים!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>הנתיב שנבחר אינו תיקייה!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>אין לך הרשאות לכתיבה לתיקייה הנבחרת!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>כבר קיים סנכרון בין השרת לתיקייה המקומית. יש לבחור תיקייה מקומית אחרת!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>התיקייה המקומית %1 כבר מכילה תיקייה המשמשת לחיבור סנכרון תיקייה. יש לבחור תיקייה אחרת!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>התיקייה המקומית %1 כבר מכילה תיקייה המשמשת לחיבור סנכרון תיקייה. יש לבחור תיקייה אחרת!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -1449,12 +1449,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>הוספת חיבור סנכרון לתיקייההוספת חיבור סנכרון תיקייה</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>הוספת חיבור לסנכרון</translation>
</message>
@@ -1515,17 +1515,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>בחירה בסנכרון זה עבור כל החשבון</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>התיקייה כבר תחת סנכרון.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>הנך מסנכרן/ת כבר את &lt;i&gt;%1&lt;/i&gt;, שהנה תיקיית אב של &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>המערכת מסנכרנת כבר את &lt;i&gt;%1&lt;/i&gt;, תיקיית משנה של &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -1533,17 +1533,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation>שימוש בקבצים וירטואליים במקום הורדה מיידית של תוכן %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation>(ניסיוני)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation>קבצים וירטואליים אינם זמינים לתיקייה הנבחרת</translation>
</message>
@@ -2156,66 +2156,66 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>הוחזרה שגיאה מהשרת: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>אירעה שגיאה בזמן גישה לנקודת קצה &apos;חתימת הייצוג&apos;: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>התקבלה הודעה מהשרת שלא ניתן לנתח את ה- JSON: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation>סוג חתימת ייצוג שאינה נתמכת: %1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation>התשובה מהשרת לא הכילה את כל השדות הצפויים
:%1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation>שגיאה לא מוכרת</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation>&lt;h1&gt;שגיאת התחברות&lt;/h1&gt;&lt;p&gt;אחזור מידע משתמש נכשל&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;שגיאת התחברות&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation>שגיאה בזמן טעינה מחדש של חתימת הייצוג: %1 : %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
@@ -2224,7 +2224,7 @@ Received data: %2</source>
נתונים שהתקבלו: %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;משתמש שגוי&lt;/h1&gt;&lt;p&gt;התחברת עם המשתמש &lt;em&gt;%1&lt;/em&gt;, אבל יש צורך להתחבר עם משתמש &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;יש להתנתק מ- %3 בטאב נפרד, אחר כך &lt;a href=&apos;%4&apos;&gt;יש ללחוץ כאן&lt;/a&gt; ולהתחבר כמשתמש %2&lt;/p&gt;</translation>
</message>
@@ -2387,7 +2387,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2656,13 +2656,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2868,12 +2868,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation>לא ניתן לעדכן קובץ : %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3163,33 +3163,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>הגדרות</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>פעילות</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>הוספת חשבון</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>יציאה %1</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation>האם ברצונך באמת לסגור %1?</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>חשבון</translation>
</message>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index 6df64bfe1..88c927e7f 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>Connessione scaduta</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>Errore sconosciuto: la risposta di rete è stata eliminata</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>Il server ha risposto &quot;%1 %2&quot; a &quot;%3 %4&quot;</translation>
</message>
@@ -1067,14 +1067,14 @@ File synchronization desktop utility.</source>
<translation>Impossibile leggere il file di esclusione di sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nuova cartella più grande di %1 MB è stata aggiunta: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una nuova cartella da un&apos;archiviazione esterna è stata aggiunta.
@@ -1082,22 +1082,22 @@ File synchronization desktop utility.</source>
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Vai nelle impostazioni e selezionala se vuoi scaricarla.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>La cattella %1 è stata creata ma esclusa dalla sincronizzazione in prevecedenza. I dati al suo interno non saranno sincronzzati.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Il file %1 è stato creato ma escluso in precedenza dalla sincronizzazione. Non sarà quindi sincronizzato.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1110,7 +1110,7 @@ Ciò significa che il client di sincronizzazione potrebbe non inviare le modific
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1121,7 +1121,7 @@ Se decidi di mantenere i file, saranno risincronizzati con il server se hai l&ap
Se decidi di eliminarli, non ti saranno più disponibili, a meno che tu non sia il proprietario.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1130,17 +1130,17 @@ Sei sicuro di voler sincronizzare queste azioni con il server?
Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzati dal server.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -1148,117 +1148,117 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>Impossibile ripristinare lo stato della cartella</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>È stato trovato un vecchio registro di sincronizzazione &apos;%1&apos;, ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation>(copia di sicurezza)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation>(copia di sicurezza %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>Stato non definito.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>In attesa di iniziare la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>Preparazione della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>La sincronizzazione è in corso.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>La sincronia ha avuto successo, nessun conflitto.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>L&apos;ultima sincronizzazione è stata completata correttamente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>Errore di configurazione.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>Interrotto dall&apos;utente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>La sincronizzazione è sospesa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (La sincronizzazione è sospesa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>Nessuna cartella valida selezionata!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>Il percorso selezionato non esiste!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>Il percorso selezionato non è una cartella!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Non hai i permessi di scrittura per la cartella selezionata!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Esiste già una sincronizzazione dal server a questa cartella locale. Seleziona un&apos;altra cartella locale!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>La cartella locale %1 contiene già una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un&apos;altra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>La cartella locale %1 è già contenuta in una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un&apos;altra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -1450,12 +1450,12 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>Aggiungi connessioni di sincronizzazione cartelle</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>Aggiungi connessione di sincronizzazione</translation>
</message>
@@ -1516,17 +1516,17 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat
<translation>Selezionala per sincronizzare l&apos;intero account</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>Questa cartella è già sincronizzata.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Stai già sincronizzando &lt;i&gt;%1&lt;/i&gt;, che è la cartella superiore di &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Stai già sincronizzando &lt;i&gt;%1&lt;/i&gt;, che è una sottocartella di &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -1534,17 +1534,17 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation>Usa i file virtuali invece di scaricare il contenuto immediatamente %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation>(sperimentale)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2155,72 +2155,72 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>Messaggio di errore dal server: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Si è verificato un errore accedendo al &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Impossibile gestire la risposta JSON dal server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;Errore di login&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;Utente errato&lt;/h1&gt;&lt;p&gt;Sei entrato con l&apos;utente &lt;em&gt;%1&lt;/em&gt;, ma devi accedere con &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Disconnettiti da %3 in un&apos;altra scheda, poi &lt;a href=&apos;%4&apos;&gt;clicca qui&lt;/a&gt; e accedi come utente %2&lt;/p&gt;</translation>
</message>
@@ -2382,7 +2382,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2651,13 +2651,13 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2863,12 +2863,12 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3158,33 +3158,33 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>Impostazioni</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>Attività</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>Aggiungi account</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>Esci da %1</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation>Sei sicuro di voler terminare %1?</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>Account</translation>
</message>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index c5604397a..dee6807a9 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>Time-out verbinding</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>Onbekende fout: antwoord van het netwerk is verwijderd</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>Server antwoordde &quot;%1 %2&quot; naar &quot;%3 %4&quot;</translation>
</message>
@@ -1067,36 +1067,36 @@ File synchronization desktop utility.</source>
<translation>Kon het systeem-uitsluitingsbestand niet lezen</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Er is een nieuwe map groter dan %1 MB toegevoegd: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>Er is een map op externe opslag toegevoegd.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Ga naar de instellingen om het te selecteren als u deze wilt downloaden.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>De map %1 werd aangemaakt maar eerder ook uitgesloten van synchronisatie. Data erin zullen niet worden gesynchroniseerd.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Het bestand %1 is aangemaakt maar was eerder uitgesloten van synchronisatie. Dit bestand zal niet gesynchroniseerd worden.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1109,7 +1109,7 @@ Dit betekent dat de synchronisatie-applicatie lokale wijzigingen mogelijk niet d
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1120,7 +1120,7 @@ Als u de bestanden wilt behouden, worden ze opnieuw gesynchroniseerd met de serv
Als u de bestanden wilt verwijderen, worden ze niet beschikbaar, tenzij u de eigenaar bent.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1128,17 +1128,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw gesynchroniseerd met de server.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -1146,117 +1146,117 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>Kan de beginstaat van de map niet terugzetten</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Een oud synchronisatieverslag &apos;%1&apos; is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation>(backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation>(backup %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>Ongedefiniëerde staat</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>In afwachting van synchronisatie.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>Synchronisatie wordt voorbereid</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>Bezig met synchroniseren.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Synchronisatie was succesvol, onopgeloste conflicten.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>Laatste synchronisatie was geslaagd.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>Installatiefout.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>Afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>Synchronisatie gepauzeerd.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisatie onderbroken)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>Geen geldige map geselecteerd!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>Het geselecteerde pad bestaat niet!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>Het geselecteerde pad is geen map!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>U heeft geen permissie om te schrijven naar de geselecteerde map!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Er wordt vanaf de server al naar deze lokale map gesynchroniseerd. Kies een andere lokale map!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokale map %1 bevat al een map die wordt gebruikt voor een map-synchronisatie verbinding. Kies een andere!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokale map %1 zit al in een map die wordt gebruikt voor een map-synchronisatie verbinding. Kies een andere!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -1449,12 +1449,12 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>Voeg map-synchronisatie verbinding toe</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>Sync verbinding toevoegen</translation>
</message>
@@ -1515,17 +1515,17 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges
<translation>Kies dit om uw volledige account te synchroniseren</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>Deze map is al gesynchroniseerd.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>U synchroniseert &lt;i&gt;%1&lt;/i&gt; al, dat is de bovenliggende map van &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Je bent &lt;i&gt;%1&lt;/i&gt; al aan het synchroniseren, wat een submap is van &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -1533,17 +1533,17 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation>Gebruik virtuele bestanden in plaats van het meteen downloaden van de inhoud%1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation> (experimenteel)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Virtuele bestanden zijn niet beschikbaar voor de geselecteerde map.</translation>
</message>
@@ -2161,66 +2161,66 @@ Let op dat het gebruik van command line logopties deze instelling zullen oversch
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>Fout gemeld door de server: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Er heeft zich een fout voorgedaan bij het verkrijgen van de &apos;token&apos; eindpunt: 1 2 %1 2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Kon de JSON dat teruggekomen is van de server niet ontleden: 1 2 %1 2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation>Niet-ondersteund token type: %1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation>Het antwoord van de server bevat niet alle verwachte velden
:%1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation>Onbekende fout</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation>&lt;h1&gt;Fout bij aanmelden&lt;/h1&gt;&lt;p&gt;Kan gebruikersinfo niet ophalen&lt;/p&gt; </translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;Inlog fout&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation>Fout bij het verversen van token: %1 : %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
@@ -2229,7 +2229,7 @@ Received data: %2</source>
Ontvangen data: %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>1 Verkeerde gebruiker 1 2 U bent ingelogd met user 3 %1 3, maar dient ingelogd te zijn met user 4 %2 4. 5 Log %3 alstublieft uit in een andere tabblad, vervolgens 6 klikt u hier 6 en log-in als user %2 2</translation>
</message>
@@ -2392,7 +2392,7 @@ vragen om extra autorisaties tijdens installatie.</translation>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation>Bestand %1 is in gebruik</translation>
</message>
@@ -2661,13 +2661,13 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2873,12 +2873,12 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation>Kon bestand niet bijwerken : %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3168,33 +3168,33 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>Instellingen</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>Activiteit</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>Account toevoegen</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>%1 afsluiten</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation>Weet je zeker dat je %1 wilt afsluiten?</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>Account</translation>
</message>
diff --git a/translations/client_pl.ts b/translations/client_pl.ts
index 94b92b407..34ce65da7 100644
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>Przekroczono czas odpowiedzi</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>Nieznany błąd: odpowiedź sieci została usunięta</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>Serwer odpowiedział &quot;%1 %2&quot; do &quot;%3 %4&quot;</translation>
</message>
@@ -1068,36 +1068,36 @@ File synchronization desktop utility.</source>
<translation>Nie można przeczytać pliku wyłączeń</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Nowy folder większy niż %1MB został dodany: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>Folder z pamięci zewnętrznej został dodany .
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Przejdź do ustawień żeby go zaznaczyć i pobrać.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Folder %1 został utworzony ale poprzednio został wykluczony z synchronizacji. Dane wewnątrz folderu nie będą zsynchronizowane.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Plik %1 został utworzony ale poprzednio został wykluczony z synchronizacji. Nie będzie zsynchronizowany.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1108,7 +1108,7 @@ This means that the synchronization client might not upload local changes immedi
Oznacza to, że klient synchronizacji może nie przesyłać zmian lokalnych od razu i zamiast tego będzie tylko skanować w poszukiwaniu zmian lokalnych i przesyłać je sporadycznie (domyślnie co dwie godziny).</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1119,7 +1119,7 @@ Jeśli zdecydujesz się zatrzymać pliki i posiadasz odpowiednie uprawnienia, zo
Jeśli zdecydujesz je usunąć, nie będą więcej dostępne. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1128,17 +1128,17 @@ Czy na pewno chcesz zsynchronizować te działania z serwerem?
Jeśli to był wypadek i zdecydujesz się zatrzymać pliki, zostaną one zsynchronizowane z serwera.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -1146,117 +1146,117 @@ Jeśli to był wypadek i zdecydujesz się zatrzymać pliki, zostaną one zsynchr
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>Nie udało się zresetować stanu folderu</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Stary sync journal &apos;%1&apos; został znaleziony, lecz nie mógł być usunięty. Proszę się upewnić, że żaden program go obecnie nie używa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation>(kopia zapasowa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation>(kopia zapasowa %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>Niezdefiniowany stan</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>Poczekaj na rozpoczęcie synchronizacji.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>Przygotowuję do synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>Synchronizacja w toku</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Synchronizacja udana, nierozwiązane konflikty.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>Ostatnia synchronizacja zakończona powodzeniem.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>Błąd ustawień.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>Użytkownik anulował.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>Synchronizacja wstrzymana</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (Synchronizacja jest zatrzymana)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>Nie wybrano poprawnego folderu.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>Wybrana ścieżka nie istnieje!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>Wybrana ścieżka nie jest katalogiem!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Nie masz uprawnień, aby zapisywać w tym katalogu!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Istnieje już synchronizacja z serwera do tego lokalnego folderu. Proszę wybrać inny folder lokalny!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokalny folder %1 już zawiera folder użyty na potrzeby synchronizacji. Proszę wybrać inny folder lokalny.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokalny folder %1 już zawiera folder użyty na potrzeby synchronizacji. Proszę wybrać inny folder lokalny.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -1448,12 +1448,12 @@ Jeśli to był wypadek i zdecydujesz się zatrzymać pliki, zostaną one zsynchr
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>Dodaj folder połączenia synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>Dodaj połączenie synchronizacji</translation>
</message>
@@ -1514,17 +1514,17 @@ Jeśli to był wypadek i zdecydujesz się zatrzymać pliki, zostaną one zsynchr
<translation>Wybierz to, aby zsynchronizować całe konto</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>Ten katalog jest już synchronizowany.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Synchronizujesz już &lt;i&gt;%1&lt;/i&gt;, który jest folderem nadrzędnym &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -1532,17 +1532,17 @@ Jeśli to był wypadek i zdecydujesz się zatrzymać pliki, zostaną one zsynchr
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation>(eksperymentalne)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2151,72 +2151,72 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>Błąd zwrócony przez serwer: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;Błąd logowania&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
@@ -2379,7 +2379,7 @@ o dodatkowe uprawnienia podczas procesu aktualizacji.</translation>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2642,13 +2642,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2854,12 +2854,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3149,33 +3149,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>Ustawienia</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>Aktywność</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>Dodaj konto</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>Wyjdź %1</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation>Czy na pewno chcesz zamknąć %1?</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>Konto</translation>
</message>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index f3e27b7c9..59107ba1e 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>Conexão expirou</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>Erro desconhecido: a resposta da rede foi excluída</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>Resposta do servidor &quot;%1 %2&quot; to &quot;%3 %4&quot;</translation>
</message>
@@ -1068,36 +1068,36 @@ Utilitário de sincronização de arquivos na área de trabalho. </translation>
<translation>Não foi possível ler o sistema de arquivo de exclusão</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Uma nova pasta maior que %1 MB foi adicionada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>Uma pasta de um armazenamento externo foi adicionada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor, vá nas configurações para selecioná-lo se você deseja baixá-lo.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>A pasta %1 foi criada, mas foi excluída da sincronização anteriormente. Os dados dentro dela não serão sincronizados.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>A arquivo %1 foi criado, mas foi excluído da sincronização anteriormente. Ele não será sincronizado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1110,7 +1110,7 @@ Isso significa que o cliente de sincronização pode não fazer envios de altera
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1121,24 +1121,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a
Se você decidir excluir os arquivos, eles não estarão disponíveis para você, a menos que você seja o proprietário.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
<translation>Todos os arquivos na pasta de sincronização local &apos;%1&apos; foram excluídos. Essas exclusões serão sincronizadas com o servidor, tornando tais arquivos indisponíveis, a menos que restaurados.Tem certeza de que deseja sincronizar essas ações com o servidor?Se isso foi um acidente e você decidir manter seus arquivos, eles serão re-sincronizados a partir do servidor.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>Deseja Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>Remover todos os arquivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -1146,117 +1146,117 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>Não foi possível redefinir o estado da pasta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Uma velha revista de sincronização &apos;%1&apos; foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está a usá-la.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation> (backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation> (backup %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>À espera do início da sincronização.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronização.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>A sincronização está ocorrendo.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>A sincronização foi bem-sucedida, conflitos não resolvidos.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi feita com sucesso.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>Erro de Configuração.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>Usuário Abortou.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>Sincronização pausada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Pausa na Sincronização) </translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>Nenhuma pasta válida selecionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation>A pasta %1 é usada em uma conexão de sincronização de pasta!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>O caminho selecionado não existe!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>O caminho selecionado não é uma pasta!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Voce não tem permissão para escrita na pasta selecionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Já existe uma sincronização do servidor para esta pasta local. Por favor, escolha uma outra pasta local!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 já contém uma pasta utilizada numa ligação de sincronização de pasta. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 já está contida em uma pasta usada em uma conexão de sincronização de pastas. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation>%1 Por favor, escolha outro!</translation>
</message>
@@ -1448,12 +1448,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>Adicionar Conexão de Sincronização de pasta</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>Adicionar Conexão de Sincronização</translation>
</message>
@@ -1514,17 +1514,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Escolha esta opção para sincronizar a conta inteira</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>Esta pasta já está sendo sincronizada.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Você já está sincronizando &lt;i&gt;%1&lt;/i&gt;, que é uma pasta mãe de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Você já está sincronizando &lt;i&gt;%1&lt;/i&gt;, que é uma subpasta de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -1532,17 +1532,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation>Use arquivos virtuais em vez de baixar o conteúdo imediatamente%1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation> (experimental)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Arquivos virtuais não estão disponíveis para a pasta selecionada</translation>
</message>
@@ -2156,66 +2156,66 @@ foi baixado. A versão instalada é %3.&lt;/p&gt;</translation>
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>Erro retornado do servidor: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Ocorreu um erro ao acessar o ponto final do token: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Não foi possível analisar o JSON retornado do servidor: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation>Tipo de token não suportado: %1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation>A resposta do servidor não continha todos os campos esperados
:%1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation>Erro Desconhecido</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation>&lt;h1&gt;Erro de conexão&lt;/h1&gt;&lt;p&gt;Falhou ao recuperar informações do usuário&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation>Erro Oauth2! </translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation>A autenticação Oauth2 requer uma conexão segura.</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;Erro de Login&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation>Erro ao atualizar o token: %1 : %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
@@ -2224,7 +2224,7 @@ Received data: %2</source>
Dados recebidos: %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;Usuário errado&lt;/h1&gt;&lt;p&gt;Você fez logon com o usuário &lt;em&gt;%1&lt;/em&gt;, mas deve fazer login com o usuário &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Faça o logout de %3 em outra guia, então&lt;a href=&apos;%4&apos;&gt;clique aqui&lt;/a&gt; e faça o login como usuário%2&lt;/p&gt;</translation>
</message>
@@ -2386,7 +2386,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation>O arquivo %1 está atualmente em uso</translation>
</message>
@@ -2654,14 +2654,14 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation>Erro ao atualizar metadados : %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
- <translation>O arquivo está em uso </translation>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -2866,14 +2866,14 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation>Não foi possível atualizar o arquivo: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
- <translation type="unfinished"/>
+ <translation>O arquivo %1 está atualmente em uso </translation>
</message>
</context>
<context>
@@ -3161,33 +3161,33 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>Configurações</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>Atividade</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>Adicionar uma conta</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>Sair %1</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation>Você tem certeza que deseja sair %1?</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>Conta</translation>
</message>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index 52cf99498..f13d9dbf8 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>Время ожидания соединения превышено</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>Неизвестная ошибка: сетевой ответ был удален</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>Сервер ответил от &quot;%1 %2&quot; до &quot;%3 %4&quot;</translation>
</message>
@@ -1067,36 +1067,36 @@ File synchronization desktop utility.</source>
<translation>Невозможно прочесть системный файл исключений</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Был добавлен новый каталог размером более %1 МБ: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>Добавлен каталог из внешнего хранилища.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Пожалуйста, перейдите в настройки, чтобы выбрать его, если вы хотите его скачать.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Каталог %1 был создан, но ранее исключён из синхронизации. Данные внутри него не буду синхронизироваться.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Файл %1 был создан, но был ранее исключён из синхронизации. Он не будет синхронизироваться.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1109,7 +1109,7 @@ This means that the synchronization client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1120,7 +1120,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a
Если вы решили удалить файлы, они станут вам недоступны, крмое случая, когда вы сам владелец.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1129,17 +1129,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
Если это произошло случайно и вы решите сохранить файлы, они будут перезакачаны с сервера.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -1147,117 +1147,117 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>Невозможно сбросить состояние каталога</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Найден старый журнал синхронизации &apos;%1&apos;, и он не может быть удалён. Убедитесь что он не открыт в другом приложении.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation>(резервная копия)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation>(резервная копия %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>Неопределенное состояние.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>Ожидание запуска синхронизации.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>Подготовка к синхронизации.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>Идет синхронизация.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Синхронизация успешна, есть неразрешённые конфликты.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>Последняя синхронизация прошла успешно.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>Ошибка установки.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>Отмена пользователем.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>Синхронизация приостановлена.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation>%! (синхронизация приостановлена)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>Не выбран валидный каталог!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>Выбранный путь не существует!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>Выбранный путь не является каталогом!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>У вас недостаточно прав для записи в выбранный каталог!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Уже есть синхронизация с сервера в этот локальный каталог. Пожалуйста, выберите другой локальный каталог!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локальная директория %1 уже содержит папку, которая используется для синхронизации. Пожалуйста выберите другую!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локальная директория %1 уже содержит директорию, которая используется для синхронизации. Пожалуйста выберите другую!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -1449,12 +1449,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>Добавить папку для синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>Добавить подключение для синхронизации</translation>
</message>
@@ -1515,17 +1515,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>Нажмите здесь для синхронизации всей учётной записи</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>Этот каталог уже выбран для синхронизации.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Каталог &lt;i&gt;%1&lt;/i&gt; уже настроен для синхронизации, и он является родительским для каталога &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Вы уже синхронизируете &lt;i&gt;%1&lt;/i&gt;, а это подпапка для &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -1533,17 +1533,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation>Использовать виртуальные файлы вместо немедленного скачивания содержимого%1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation> (экспериментально)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Виртуальные файлы не доступны для выбранного каталога</translation>
</message>
@@ -2156,66 +2156,66 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>Сервер вернул ошибку: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>При доступе к конечной точке &apos;токена&apos; произошла ошибка: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Не удалось разобрать JSON, пришедший с сервера: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation>Неподдерживаемый тип токена: %1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation>Ответ от сервера не содержал в себе все ожидаемые поля
:%1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation>Неизвестная ошибка</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation>&lt;h1&gt;Ошибка входа&lt;/h1&gt;&lt;p&gt;Не удалось извлечь информацию о пользователе&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;Ошибка входа&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation>Ошибка при обновлении токена: %1 : %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
@@ -2224,7 +2224,7 @@ Received data: %2</source>
Полученные данные: %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;Неверный пользователь&lt;/h1&gt;&lt;p&gt;Вы вошли, как пользователь &lt;em&gt;%1&lt;/em&gt;, но нужно войти под пользователем &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Пожалуйста, выйдите из %3 в другой вкладке, а затем &lt;a href=&apos;%4&apos;&gt;кликните здесь&lt;/a&gt; и войдите, как пользователь %2&lt;/p&gt;</translation>
</message>
@@ -2387,7 +2387,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation>Файл %1 сейчас используется</translation>
</message>
@@ -2656,13 +2656,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2868,12 +2868,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation>Не удалось обновить файл : %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3163,33 +3163,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>Настройки</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>События</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>Добавить учетную запись</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>Закрыть %1</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation>Вы уверены, что хотите выйти из?</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>Уч.запись</translation>
</message>
diff --git a/translations/client_sq.ts b/translations/client_sq.ts
index 0bae13e17..96b421268 100644
--- a/translations/client_sq.ts
+++ b/translations/client_sq.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>Lidhjes i mbaroi koha</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>Gabim i panjohur: përgjigja e rrjetit qe fshirë</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>Shërbyesi u përgjigj &quot;%1 %2&quot; për &quot;%3 %4&quot;</translation>
</message>
@@ -1068,36 +1068,36 @@ Mjet njëkohësimi kartelash për desktop.</translation>
<translation>S’u lexua dot kartelë përjashtimi sistemi</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>U shtua një dosje më e madhe se %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>U shtua një dosje nga një depozitë e jashtme.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Ju lutemi, shkoni te rregullimet që ta përzgjidhni, nëse doni ta shkarkoni.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Dosja %1 qe krijuar, por qe përjashtuar më herët nga njëkohësimi. Të dhënat brenda saj nuk do të njëkohësohen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Dosja %1 qe krijuar, por qe përjashtuar më herët nga njëkohësimi. S’do të njëkohësohet.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1110,7 +1110,7 @@ Kjo do të thotë që klienti i njëkohësimeve mund të mos ngarkojë menjëher
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1121,7 +1121,7 @@ Nëse vendosni t’i mbani këto kartela, ato do të rinjëkohësohen me shërby
Nëse vendosni t’i fshini këto kartela, s’do të mund t’i keni, veç në mos qofshi i zoti.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1130,17 +1130,17 @@ Jeni i sigurt se doni të njëkohësohen këto veprime me shërbyesin?
Nëse ky qe aksident dhe vendosni t’i mbani kartelat tuaja, ato do të rinjëkohësohen me shërbyesin.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>Të hiqen Krejt Kartelat?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>Hiqi krejt kartelat</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>Mbaji kartelat</translation>
</message>
@@ -1148,117 +1148,117 @@ Nëse ky qe aksident dhe vendosni t’i mbani kartelat tuaja, ato do të rinjëk
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>Gjendja e dosjes s’u ricaktua dot</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>U gjet një regjistër i vjetër njëkohësimesh &apos;%1&apos;, por s’u hoq dot. Ju lutemi, sigurohuni që s’po e përdor ndonjë aplikacion.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation> (kopjeruajtje)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation> (kopjeruajtja %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>Gjendje e Papërkufizuar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>Po pritet të fillohet njëkohësimi.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>Po përgatitet për njëkohësim.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>Njëkohësimi po kryhet.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Njëkohësimi qe i suksesshëm, ka përplasje të pazgjidhura.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>Njëkohësimi i Fundit qe i suksesshëm.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>Gabim te Rregullimet.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>Ndërprerje Nga Përdoruesi.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>Njëkohësimi është ndalur.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Njëkohësimi është ndalur)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>S’është përzgjedhur dosje e vlefshme!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation>Dosja %1 është e përdorur në një lidhje njëkohësimi dosjesh!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>Shtegu i përzgjedhur s’ekziston!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>Shtegu i përzgjedhur s’ka dosje!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>S’keni leje për shkrim te dosja e përzgjedhur!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Ka tashmë një njëkohësim prej shërbyesi te kjo dosje vendore. Ju lutemi, përzgjidhni një tjetër dosje vendore!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Dosja vendore %1 përmban tashmë një dosje të përdorur në një lidhje njëkohësimi dosjeje. Ju lutemi, zgjidhni një tjetër!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Dosja vendore %1 përmbahet tashmë në një dosje të përdorur një lidhje njëkohësimi dosjeje. Ju lutemi, zgjidhni një tjetër!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation>%1 Ju lutemi, zgjidhni një tjetër!</translation>
</message>
@@ -1450,12 +1450,12 @@ Nëse ky qe aksident dhe vendosni t’i mbani kartelat tuaja, ato do të rinjëk
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>Shtoni Lidhje Njëkohësimi Dosjesh</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>Shtoni Lidhje Njëkohësimesh</translation>
</message>
@@ -1516,17 +1516,17 @@ Nëse ky qe aksident dhe vendosni t’i mbani kartelat tuaja, ato do të rinjëk
<translation>Zgjidhni këtë që të njëkohësohet krejt lënda e llogarisë</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>Kjo dosje është duke u njëkohësuar.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Po e njëkohësoni tashmë &lt;i&gt;%1&lt;/i&gt;, që është dosja mëmë e &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Po e njëkohësoni tashmë &lt;i&gt;%1&lt;/i&gt;, që është një nëndosje e &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
@@ -1534,17 +1534,17 @@ Nëse ky qe aksident dhe vendosni t’i mbani kartelat tuaja, ato do të rinjëk
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation>Përdor kartela virtuale, në vend të shkarkimit të menjëhershëm të lëndës%1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation> (eksperimentale)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation>S’ka kartela virtuale për dosjen e përzgjedhur</translation>
</message>
@@ -2157,66 +2157,66 @@ Kini parasysh se përdorimi i çfarëdo mundësie regjistrimi që nga rresht urd
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>Gabim i kthyer nga shërbyesi: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Pati një gabim në përdorimin e pikëmbarimit të &apos;tokenit&apos;: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>S’u përtyp dot JSON-i i kthyer nga shërbyesi: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation>Lloj token-i i pambuluar: %1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation>Përgjigja prej shërbyesit s’përmbante krejt fushat e pritura
:%1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation>Gabim i Panjohur</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation>&lt;h1&gt;Gabim Hyrjeje&lt;/h1&gt;&lt;p&gt;S’u arrit të merreshin të dhëna përdoruesi&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation>Gabim OAuth2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation>Mirëfilltësimi Oauth2 lyp një lidhje të siguruar.</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;Gabim Hyrjeje&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation>Gabim gjatë rifreskimit të token-it: %1 : %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
@@ -2225,7 +2225,7 @@ Received data: %2</source>
Të dhëna të marra: %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;Përdorues i gabuar&lt;/h1&gt;&lt;p&gt;U futët si përdoruesi &lt;em&gt;%1&lt;/em&gt;, por duhet të hyni si përdoruesi &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Ju lutemi, dilni prej %3 që nga një skedë tjetër, mandej &lt;a href=&apos;%4&apos;&gt;klikoni këtu&lt;/a&gt; dhe bëni hyrjen si përdoruesi %2&lt;/p&gt;</translation>
</message>
@@ -2388,7 +2388,7 @@ Gjatë procesit përditësuesi mund të kërkojë privilegje shtesë.</translati
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation>Kartela %1 është aktualisht në përdorim</translation>
</message>
@@ -2657,14 +2657,14 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation>Gabim në përditësim tejtëdhënash: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
- <translation>Kartela është aktualisht në përdorim</translation>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -2869,14 +2869,14 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation>S’u përditësua dot kartela : %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
- <translation type="unfinished"/>
+ <translation>Kartela %1 është aktualisht në përdorim</translation>
</message>
</context>
<context>
@@ -3164,33 +3164,33 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>Rregullime</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>Veprimtari</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>Shtoni llogari</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>Dilni nga %1</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation>Jeni i sigurt se doni të dilet nga %1?</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>Llogari</translation>
</message>
diff --git a/translations/client_th.ts b/translations/client_th.ts
index f0eee0495..245f12125 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -82,7 +82,7 @@
<location filename="../src/common/filesystembase.cpp" line="206"/>
<location filename="../src/common/filesystembase.cpp" line="211"/>
<source>Can&apos;t rename %1, the file is currently in use</source>
- <translation type="unfinished"/>
+ <translation>ไม่สามารถเปลี่ยนชื่อ %1 ได้เนื่องจากกำลังมีการใช้งานไฟล์นี้อยู่</translation>
</message>
<message>
<location filename="../src/common/filesystembase.cpp" line="395"/>
@@ -211,17 +211,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>หมดเวลาการเชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>ข้อผิดพลาดที่ไม่รู้จัก: การตอบกลับของเครือข่ายถูกลบแล้ว</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>เซิร์ฟเวอร์ตอบกลับ &quot;%1 %2&quot; ถึง &quot;%3 %4&quot;</translation>
</message>
@@ -1068,36 +1068,36 @@ File synchronization desktop utility.</source>
<translation>ไม่สามารถอ่าน ยกเว้นไฟล์ระบบ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>โฟลเดอร์ใหม่มีขนาดใหญ่กว่า %1 เมกะไบต์ ได้ถูกเพิ่ม: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>โฟลเดอร์ที่มีพื้นที่จัดเก็บข้อมูลภายนอกได้ถูกเพิ่ม
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>กรุณาไปในส่วนของการตั้งค่าเพื่อเลือก ถ้าคุณต้องการจะดาวน์โหลด</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>โฟลเดอร์ %1 ได้ถูกสร้างขึ้นแล้วแต่ยังไม่ได้ประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>ไฟล์ %1 ได้ถูกสร้างขึ้นแล้วแต่ยังไม่ได้ประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1108,7 +1108,7 @@ This means that the synchronization client might not upload local changes immedi
หมายความว่าการประสานข้อมูลของไคลเอ็นต์อาจยังไม่ได้อัปโหลดการเปลี่ยนแปลงในระบบทันทีและจะสแกนเฉพาะการเปลี่ยนแปลงในเครื่องและอัปโหลดไฟล์เหล่านั้นเป็นครั้งคราว (ทุกสองชั่วโมงตามค่าเริ่มต้น)</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1119,7 +1119,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a
หากคุณตัดสินใจลบไฟล์ก็จะทำให้ไม่มีใครสามารถใช้งานโฟลเดอร์นี้ได้เพราะคุณเป็นเจ้าของ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1129,17 +1129,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
ถ้าเรื่องนี้เป็นอุบัติเหตุและคุณตัดสินใจเก็บไฟล์ของคุณ ไฟล์ของคุณก็จะถูกประสานข้อมูลใหม่อีกครั้ง</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>ลบไฟล์ทั้งหมด?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>ลบไฟล์ทั้งหมด</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>เก็บไฟล์เอาไว้</translation>
</message>
@@ -1147,117 +1147,117 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>ไม่สามารถรีเซ็ตสถานะโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>บนบันทึกการประสานข้อมูลเก่า &apos;%1&apos; แต่ไม่สามารถลบออกได้ กรุณาตรวจสอบให้แน่ใจว่าไม่มีแอปฯ หรือการทำงานใดๆที่ใช้มันอยู่</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation>(สำรองข้อมูล)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation>(สำรองข้อมูล %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>กำลังรอเริ่มต้นการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>กำลังเตรียมการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>การประสานข้อมูลกำลังทำงาน</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>ประสานข้อมูลสำเร็จแต่ยังมีข้อขัดแย้งที่ยังไม่ได้รับการแก้ไข</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>ประสานข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>เกิดข้อผิดพลาดในการติดตั้ง</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>ยกเลิกผู้ใช้</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>การประสานข้อมูลถูกหยุดไว้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (การประสานข้อมูลถูกหยุดชั่วคราว)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>เลือกโฟลเดอร์ไม่ถูกต้อง!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>เส้นทางที่เลือกไม่มีอยู่!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>เส้นทางที่เลือกไม่ใช่โฟลเดอร์!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>คุณมีสิทธิ์เขียนโฟลเดอร์ที่เลือกนี้!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>โฟลเดอร์นี้ได้ถูกประสานข้อมูลกับเซิร์ฟเวอร์แล้ว โปรดเลือกโฟลเดอร์อื่น ๆ</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>เนื้อหาโฟลเดอร์ในเครื่อง %1 ได้ถูกใช้ไปแล้วในโฟลเดอร์ที่ประสานข้อมูล กรุณาเลือกอีกอันหนึ่ง!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>เนื้อหาของโฟลเดอร์ในเครื่อง %1 ไดถูกใช้ไปแล้วในโฟลเดอร์ที่ประสานข้อมูล กรุณาเลือกอีกอันหนึ่ง!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -1449,12 +1449,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>เพิ่มโฟลเดอร์ที่ต้องการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>เพิ่มการประสานข้อมูลให้ตรงกัน</translation>
</message>
@@ -1515,17 +1515,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>เลือกตัวเลือกนี้เพื่อประสานข้อมูลบัญชีทั้งหมด</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>โฟลเดอร์นี้ถูกประสานข้อมูลอยู่แล้ว</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>คุณประสานข้อมูล &lt;i&gt;%1&lt;/i&gt; อยู่แล้ว ซึ่งมีโฟลเดอร์หลักเป็น &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>คุณได้ประสานข้อมูล &lt;i&gt;%1&lt;/i&gt;ที่อยู่ภายในโฟลเดอร์ย่อยของ &lt;i&gt;%2&lt;/i&gt; แล้ว</translation>
</message>
@@ -1533,17 +1533,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation>ใช้ไฟล์เสมือนแทนการดาวน์โหลดเนื้อหาทันที %1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation>(โหมดเบต้า)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation>ไฟล์เสมือนไม่พร้อมใช้งานสำหรับโฟลเดอร์ที่เลือก</translation>
</message>
@@ -2156,65 +2156,65 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>เกิดข้อผิดพลาดจากเซิร์ฟเวอร์: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>เกิดข้อผิดพลาดในการเข้าถึง &apos;โทเค็น&apos; ปลายทาง: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>ไม่สามารถแยกวิเคราะห์ JSON ที่ส่งมาจากเซิร์ฟเวอร์: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation>ประเภทโทเค็นที่ไม่รองรับ: %1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation>ข้อมูลที่ตอบกลับจากเซิร์ฟเวอร์ไม่พบฟิลด์ที่ต้องการ: %1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation>ข้อผิดพลาดที่ไม่รู้จัก</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation>&lt;h1&gt;ข้อผิดพลาดในการเข้าสู่ระบบ&lt;/h1&gt;&lt;p&gt;เรียกข้อมูลผู้ใช้ไม่สำเร็จ&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;เข้าสู่ระบบล้มเหลว&lt;/h1&gt;%1&lt;p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation>เกิดข้อผิดพลาดขณะรีเฟรชโทเค็น: %1 : %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
@@ -2222,7 +2222,7 @@ Received data: %2</source>
ข้อมูลที่ได้รับแล้ว: %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;บัญผู้ใช้ไม่ถูกต้อง&lt;/h1&gt; &lt;p&gt;คุณลงชื่อเข้าใช้ด้วยบัญชีผู้ใช้ &lt;em&gt;%1&lt;/em&gt; คุณจะต้องลงชื่อเข้าใช้ด้วยบัญชี &lt;em&gt;%2&lt;/em&gt; &lt;br&gt;โปรดออกจากระบบ %3 ในแท็บอื่นแล้ว &lt;a href=&apos;%4&apos;&gt;คลิกที่นี่&lt;/a&gt; เพื่อเข้าสู่ระบบในฐานะผู้ใช้ &lt;/p&gt;</translation>
</message>
@@ -2384,9 +2384,9 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
- <translation type="unfinished"/>
+ <translation>ไฟล์ %1 กำลังถูกใช้งานอยู่</translation>
</message>
</context>
<context>
@@ -2651,13 +2651,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2778,7 +2778,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="228"/>
<source>Could not rename %1 to %2, the file is currently in use</source>
- <translation type="unfinished"/>
+ <translation>ไม่สามารถเปลี่ยนชื่อ %1 เป็น %2 ได้เนื่องจากกำลังมีการใช้งานไฟล์นี้อยู่</translation>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="257"/>
@@ -2863,12 +2863,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation>ไม่สามารถอัปเดตไฟล์: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2917,7 +2917,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/propagateuploadng.cpp" line="383"/>
<source>%1 the file is currently in use</source>
- <translation type="unfinished"/>
+ <translation>ไฟล์ %1 กำลังถูกใช้งานอยู่</translation>
</message>
<message>
<location filename="../src/libsync/propagateuploadng.cpp" line="478"/>
@@ -2955,7 +2955,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/propagateuploadtus.cpp" line="67"/>
<source>%1 the file is currently in use</source>
- <translation type="unfinished"/>
+ <translation>ไฟล์ %1 กำลังถูกใช้งานอยู่</translation>
</message>
<message>
<location filename="../src/libsync/propagateuploadtus.cpp" line="211"/>
@@ -2973,7 +2973,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/propagateuploadv1.cpp" line="137"/>
<source>%1 the file is currently in use</source>
- <translation type="unfinished"/>
+ <translation>ไฟล์ %1 กำลังถูกใช้งานอยู่</translation>
</message>
<message>
<location filename="../src/libsync/propagateuploadv1.cpp" line="222"/>
@@ -3158,33 +3158,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>ตั้งค่า</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>กิจกรรม</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>เพิ่มบัญชี</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>ออก %1</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation>แน่ใจหรือไม่ว่าคุณต้องการออกจาก %1?</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>บัญชี</translation>
</message>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index 8940085c4..64f7620f2 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>Bağlantı zaman aşımına uğradı</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>Bilinmeyen hata: ağdan gelen yanıt silindi</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>Sunucu &quot;%1 %2&quot; tarafından &quot;%3 %4&quot; tarafına cevap verdi.</translation>
</message>
@@ -1067,36 +1067,36 @@ File synchronization desktop utility.</source>
<translation>Sistem hariç tutulma dosyası okunamadı</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>%1 MB dan büyük yeni klasör eklendi: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>Harici depolama ünitesinden bir klasör eklendi.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>İndirmek isterseniz, lütfen &quot;Ayarlar&quot; bölümünden seçin.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>%1 klasörü yaratıldı ama daha önce senkronizasyondan hariç tutuldu. İçerik eşitlenmeyecek.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>%1 dosyası yaratıldı ama daha önce senkronizasyondan hariç tutuldu, İçerik eşitlenmeyecek.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1109,7 +1109,7 @@ Bu yüzden senkronizasyon yerel değişiklikler anlık olarak karşı tarafa yü
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1120,7 +1120,7 @@ Dosyalar silinmesin istiyorsanız, yetkiniz olduğu sürece sunucu ile tekrar se
Silmeye karar verdiyseniz, sahibi olana kadar dosyalar kullanım dışıdır.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1129,17 +1129,17 @@ Bu işlemlerin sunucuda da gerçekleşmesini istiyor musunuz?
Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, dosyalar sunucudan tekrar senkronize edilecektir.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -1147,117 +1147,117 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>Klasör durumu sıfırılanamadı</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Eski eşitleme günlüğü &apos;%1&apos; bulundu ancak kaldırılamadı. Başka bir uygulama tarafından kullanılmadığından emin olun.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation> (yedek)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation> (yedek %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>Tanımlanmamış Durum.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>Eşitlemenin başlanması bekleniyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>Eşitleme için hazırlanıyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>Eşitleme çalışıyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Senkronizasyon başarılıydı, çözüm gerektiren eşleşmeler var.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>Son Eşitleme başarılı oldu.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>Kurulum Hatası.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>Kullanıcı İptal Etti.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>Eşitleme duraklatıldı.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Eşitleme duraklatıldı)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>Geçerli klasör seçilmedi!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>Seçilen dosya yolu mevcut değil!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>Seçilen yol bir klasör değil!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Seçilen klasöre yazma izniniz yok!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Yerel klasörde bir sunucu senkronizasyonu zaten mevcut. Lütfen başka bir yerel klasör seçin!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>%1 yerel klasörü zaten bir eşitleme klasörü içermektedir. Lütfen farklı bir seçim yapın!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>%1 yerel klasörü zaten bir eşitleme klasörü içindedir. Lütfen farklı bir seçim yapın!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -1449,12 +1449,12 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>Klasör Eşitleme Bağlantısı Ekle</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>Eşitleme Bağlantısı Ekle</translation>
</message>
@@ -1515,17 +1515,17 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d
<translation>Tüm hesabı eşitlemek için bunu seçin</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>Bu klasör zaten eşitleniyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>&lt;i&gt;%1&lt;/i&gt; zaten eşitleniyor. Bu, &lt;i&gt;%2&lt;/i&gt; klasörünün üst klasörü.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>&lt;i&gt;%2&lt;/i&gt; klasörünün alt klasörü olan &lt;i&gt;%1&lt;/i&gt; klasörünü zaten eşitliyorsunuz.</translation>
</message>
@@ -1533,17 +1533,17 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation>Use virtual files instead of downloading content immediately%1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation> (experimental)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2155,66 +2155,66 @@ Günlüğe kaydetme komut satırı seçeneklerinin kullanılmasının bu ayarlar
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>Sunucudan hata döndü: &lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>&apos;token&apos; uç noktası erişimi sırasında hata meydana geldi: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>Sunucudan gelen JSON ayrıştırılamadı: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation>Unsupported token type: %1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation>The reply from the server did not contain all expected fields
:%1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation>Unknown Error</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;Sisteme Giriş Hatası&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation>Error while refreshing the token: %1 : %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
@@ -2223,7 +2223,7 @@ Received data: %2</source>
Received data: %2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;Yanlış kullanıcı&lt;/h1&gt;&lt;p&gt;Sisteme giriş yapmış olan kullanıcı&lt;em&gt;%1&lt;/em&gt;, ama giriş yapması gereken kullanıcı &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Lütfen, başka bir sekmedeki %3 üzerinden sistemden çıkın, sonra &lt;a href=&apos;%4&apos;&gt;buraya tıklayın &lt;/a&gt; ve %2 olarak giriş yapın&lt;/p&gt;</translation>
</message>
@@ -2385,7 +2385,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2654,13 +2654,13 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2866,12 +2866,12 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3161,33 +3161,33 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>Ayarlar</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>Etkinlik</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>Hesap ekle</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>%1&apos;tan çık</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation>%1 çıkmak istediğinizden emin misiniz?</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>Hesap</translation>
</message>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index 8a9c730eb..222442998 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>连接超时</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>未知错误:网络相应被删除</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>服务器返回&quot;%1 %2&quot; to &quot;%3 %4&quot; </translation>
</message>
@@ -1063,36 +1063,36 @@ File synchronization desktop utility.</source>
<translation>无法读取系统排除的文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>一个大于 %1 MB 的新文件夹 %2 已被添加。
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>一个来自外部存储的文件夹已被添加。
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>如果您想下载,请到设置页面选择它。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>%1 文件被创建但在之前的同步中被拒绝了.它将不会被同步.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1101,7 +1101,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1112,7 +1112,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a
如果您决定删除这些文件,它们将不再可用,除非您是其所有者。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1121,17 +1121,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
如果这是一个意外而您想要保留这些文件,他们会被重新从服务器同步过来。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>删除所有文件?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
@@ -1139,117 +1139,117 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>不能重置文件夹状态</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>一个旧的同步日志 &apos;%1&apos; 被找到,但是不能被移除。请确定没有应用程序正在使用它。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation> (备份)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation> (备份 %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>未知状态。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>等待启动同步。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>准备同步。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>同步正在运行。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>同步成功,但有未解决的冲突。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>最后一次同步成功。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>安装失败</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>用户撤销。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>同步已暂停。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同步已暂停)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>没有选择有效的文件夹!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>您选择的目录不存在!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>选择的路径不是一个文件夹!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>你没有写入所选文件夹的权限!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>已经有一个从服务器到此文件夹的同步设置。请选择其他本地文件夹!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>本地文件夹 %1 包含有正在使用的同步文件夹,请选择另一个!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>本地文件夹 %1 是正在使用的同步文件夹,请选择另一个!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -1441,12 +1441,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>添加同步文件夹</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>添加同步连接</translation>
</message>
@@ -1507,17 +1507,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation>选择此项以同步整个账户</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>文件夹已在同步中。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>你已经在同步 &lt;i&gt;%1&lt;/i&gt;,&lt;i&gt;%2&lt;/i&gt; 是它的一个子文件夹。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
@@ -1525,17 +1525,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
@@ -2143,72 +2143,72 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>来自服务器返回的错误&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>在&apos;token&apos; 结尾有个错误: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>不能解析来自服务器端的JSON:&lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;登录错误&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;错误用户&lt;/h1&gt;&lt;p&gt;你登陆的用户&lt;em&gt;%1&lt;/em&gt;,但必须以用户&lt;em&gt;%2&lt;/em&gt;的身份登录.&lt;br&gt;请在另一个标签 %3登出,然后&lt;a href=&apos;%4&apos;&gt;点击这&lt;/a&gt;并以用户%2登录&lt;/p&gt;</translation>
</message>
@@ -2370,7 +2370,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2632,13 +2632,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2844,12 +2844,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3139,33 +3139,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>设置</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>动态</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>添加账号</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>退出 %1</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>账户</translation>
</message>
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts
index 67f4ca9c8..180d03c36 100644
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -210,17 +210,17 @@
<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="292"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="291"/>
<source>Connection timed out</source>
<translation>連線逾時</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="294"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="293"/>
<source>Unknown error: network reply was deleted</source>
<translation>未知錯誤:網絡回覆已刪除</translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="416"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="415"/>
<source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
<translation>伺服器回覆 &quot;%1 %2&quot; 到 &quot;%3 %4&quot;</translation>
</message>
@@ -1067,36 +1067,36 @@ File synchronization desktop utility.</source>
<translation>無法讀取系統的排除檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1066"/>
+ <location filename="../src/gui/folder.cpp" line="1067"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>添加了大於%1 MB的新目錄:%2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1069"/>
+ <location filename="../src/gui/folder.cpp" line="1070"/>
<source>A folder from an external storage has been added.
</source>
<translation>已添加來自外部儲存空間的目錄。
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1070"/>
+ <location filename="../src/gui/folder.cpp" line="1071"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>如果您要下載它,請進入設定以選擇它。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
+ <location filename="../src/gui/folder.cpp" line="1130"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>目錄%1已創建,但先前已從同步中排除。其中的數據將不會同步。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1132"/>
+ <location filename="../src/gui/folder.cpp" line="1133"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>已創建檔案%1但先前已將其排除在同步之外。它不會同步。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1143"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -1109,7 +1109,7 @@ This means that the synchronization client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1219"/>
+ <location filename="../src/gui/folder.cpp" line="1220"/>
<source>All files in the sync folder '%1' folder were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
@@ -1120,7 +1120,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a
如果您決定刪除文件,除非您是所有者,否則您將無法使用它們。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1224"/>
+ <location filename="../src/gui/folder.cpp" line="1225"/>
<source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
Are you sure you want to sync those actions with the server?
If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
@@ -1129,17 +1129,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
如果這是偶然事件,並且您決定保留文件,則將從伺服器重新同步它們。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1228"/>
+ <location filename="../src/gui/folder.cpp" line="1229"/>
<source>Remove All Files?</source>
<translation>移除所有檔案?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1232"/>
+ <location filename="../src/gui/folder.cpp" line="1233"/>
<source>Remove all files</source>
<translation>移除所有檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1233"/>
+ <location filename="../src/gui/folder.cpp" line="1234"/>
<source>Keep files</source>
<translation>保留檔案</translation>
</message>
@@ -1147,117 +1147,117 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="395"/>
+ <location filename="../src/gui/folderman.cpp" line="397"/>
<source>Could not reset folder state</source>
<translation>無法重置資料夾狀態</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="396"/>
+ <location filename="../src/gui/folderman.cpp" line="398"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>發現較舊的同步處理日誌&apos;%1&apos;,但無法移除。請確認沒有應用程式正在使用它。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source> (backup)</source>
<translation>(備份)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1181"/>
+ <location filename="../src/gui/folderman.cpp" line="1183"/>
<source> (backup %1)</source>
<translation>(備份 %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1283"/>
+ <location filename="../src/gui/folderman.cpp" line="1285"/>
<source>Undefined State.</source>
<translation>未知狀態</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1286"/>
+ <location filename="../src/gui/folderman.cpp" line="1288"/>
<source>Waiting to start syncing.</source>
<translation>正在等待同步開始</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1289"/>
+ <location filename="../src/gui/folderman.cpp" line="1291"/>
<source>Preparing for sync.</source>
<translation>正在準備同步。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1292"/>
+ <location filename="../src/gui/folderman.cpp" line="1294"/>
<source>Sync is running.</source>
<translation>同步執行中</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1299"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>同步成功,未解決衝突。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1299"/>
+ <location filename="../src/gui/folderman.cpp" line="1301"/>
<source>Last Sync was successful.</source>
<translation>最後一次同步成功</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1305"/>
+ <location filename="../src/gui/folderman.cpp" line="1307"/>
<source>Setup Error.</source>
<translation>安裝失敗</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
+ <location filename="../src/gui/folderman.cpp" line="1310"/>
<source>User Abort.</source>
<translation>使用者中斷。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1311"/>
+ <location filename="../src/gui/folderman.cpp" line="1313"/>
<source>Sync is paused.</source>
<translation>同步已暫停</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1317"/>
+ <location filename="../src/gui/folderman.cpp" line="1319"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同步暫停)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1325"/>
+ <location filename="../src/gui/folderman.cpp" line="1327"/>
<source>No valid folder selected!</source>
<translation>沒有選擇有效的資料夾</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1333"/>
+ <location filename="../src/gui/folderman.cpp" line="1335"/>
<source>The folder %1 is used in a folder sync connection!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1342"/>
<source>The selected path does not exist!</source>
<translation>所選路徑不存在!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1344"/>
+ <location filename="../src/gui/folderman.cpp" line="1346"/>
<source>The selected path is not a folder!</source>
<translation>所選的路徑並非資料夾!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1350"/>
<source>You have no permission to write to the selected folder!</source>
<translation>您沒有權限來寫入被選取的資料夾!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1385"/>
+ <location filename="../src/gui/folderman.cpp" line="1387"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>從伺服器到此本地端目錄已經存在同步。 請選擇另一個本地端目錄!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1389"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>本地資料夾 %1 裡已經有被資料夾同步功能使用的資料夾,請選擇其他資料夾!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1395"/>
+ <location filename="../src/gui/folderman.cpp" line="1397"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>本地資料夾 %1 是被包含在一個已經被資料夾同步功能使用的資料夾,請選擇其他資料夾!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1402"/>
+ <location filename="../src/gui/folderman.cpp" line="1404"/>
<source>%1 Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -1449,12 +1449,12 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="565"/>
<source>Add Folder Sync Connection</source>
<translation>新增資料夾同步功能的連線</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="564"/>
+ <location filename="../src/gui/folderwizard.cpp" line="567"/>
<source>Add Sync Connection</source>
<translation>新增同步連線</translation>
</message>
@@ -1515,17 +1515,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<translation> 請選擇這個功能用來同步整個帳號</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="428"/>
+ <location filename="../src/gui/folderwizard.cpp" line="431"/>
<source>This folder is already being synced.</source>
<translation>這個資料夾已經被同步了。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="430"/>
+ <location filename="../src/gui/folderwizard.cpp" line="433"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>您已經同步了 &lt;i&gt;%1&lt;/i&gt;, 這個資料夾是 &lt;i&gt;%2&lt;/i&gt; 的母資料夾。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="432"/>
+ <location filename="../src/gui/folderwizard.cpp" line="435"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a subfolder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>您已經在同步&lt;i&gt;%1&lt;/i&gt;,它是的子文件夾&lt;i&gt;%2&lt;/i&gt;</translation>
</message>
@@ -1533,17 +1533,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source>Use virtual files instead of downloading content immediately%1</source>
<translation>使用虛擬文件,而不是立即下載內容%1</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="474"/>
+ <location filename="../src/gui/folderwizard.cpp" line="477"/>
<source> (experimental)</source>
<translation>(實驗性的)</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="508"/>
<source>Virtual files are not available for the selected folder</source>
<translation>虛擬文件不可用的於所選目錄</translation>
</message>
@@ -2156,66 +2156,66 @@ Note that using any logging command line options will override the settings.</so
<context>
<name>OCC::OAuth</name>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="253"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="258"/>
<source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
<translation>伺服器返回錯誤:&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="256"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="261"/>
<source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>訪問“令牌”端點時錯誤:&lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="259"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
<source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
<translation>無法解析從伺服器返回的JSON:&lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="262"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="267"/>
<source>Unsupported token type: %1</source>
<translation>不支持的令牌類型:%1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="264"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="269"/>
<source>The reply from the server did not contain all expected fields
:%1</source>
<translation>伺服器的回覆未包含所有預期字段
:%1</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="266"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="271"/>
<source>Unknown Error</source>
<translation>未知錯誤</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="290"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="295"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;Failed to retrieve user info&lt;/p&gt;</source>
<translation>&lt;h1&gt;登錄錯誤&lt;/h1&gt;&lt;p&gt;檢索使用者信息失敗&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="541"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="546"/>
<source>Oauth2 Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="542"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="547"/>
<source>Oauth2 authentication requires a secured connection.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="270"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="275"/>
<source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
<translation>&lt;h1&gt;登錄錯誤&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="323"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="326"/>
- <location filename="../src/libsync/creds/oauth.cpp" line="332"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="328"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="331"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
<source>Error while refreshing the token: %1 : %2</source>
<translation>刷新令牌時錯誤:%1:%2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="337"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="342"/>
<source>The reply from the server did not contain all expected fields
:%1
Received data: %2</source>
@@ -2224,7 +2224,7 @@ Received data: %2</source>
收到的數據:%2</translation>
</message>
<message>
- <location filename="../src/libsync/creds/oauth.cpp" line="376"/>
+ <location filename="../src/libsync/creds/oauth.cpp" line="381"/>
<source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
<translation>&lt;h1&gt;錯誤使用者&lt;/h1&gt;&lt;p&gt;您與使用者身份登錄&lt;em&gt;%1&lt;/em&gt;,與必須使用者登錄&lt;em&gt;%2&lt;/em&gt;。&lt;br&gt;請在另一個標籤中登出%3,然後&lt;a href=&apos;%4&apos;&gt;點擊這裡&lt;/a&gt;並以使用者%2身份登入&lt;/p&gt;</translation>
</message>
@@ -2387,7 +2387,7 @@ for additional privileges during the process.</source>
<context>
<name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="697"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="698"/>
<source>File %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -2656,13 +2656,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1021"/>
- <source>File is currently in use</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1017"/>
+ <source>%1 the folder is currently in use</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2868,12 +2868,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateUpdateMetaDataJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1161"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1160"/>
<source>Could not update file : %1</source>
<translation>無法更新檔案:%1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1164"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1163"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3163,33 +3163,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SettingsDialog</name>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="213"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="220"/>
<source>Settings</source>
<translation>設定</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="202"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="209"/>
<source>Activity</source>
<translation>活動</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="191"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="198"/>
<source>Add account</source>
<translation>增加帳號</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="226"/>
- <location filename="../src/gui/settingsdialog.cpp" line="229"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="233"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="236"/>
<source>Quit %1</source>
<translation>離開 %1</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="230"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="237"/>
<source>Are you sure you want to quit %1?</source>
<translation>您確定您要退出嗎 %1?</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="356"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="363"/>
<source>Account</source>
<translation>帳號</translation>
</message>