diff options
author | ownClouders <devops@owncloud.com> | 2021-09-07 06:18:07 +0300 |
---|---|---|
committer | ownClouders <devops@owncloud.com> | 2021-09-07 06:18:07 +0300 |
commit | 6052718c9a5e75b8e2c04265d2edddc2c2b4faba (patch) | |
tree | 404af2a7471fc8450ab939e471aeaf1a61c4a4a5 | |
parent | 264a2d495fa2ca26396c92657fb09c2e8dd22acf (diff) |
[tx] updated client translations from transifex [skip ci]
-rw-r--r-- | translations/client_ar.ts | 99 | ||||
-rw-r--r-- | translations/client_bg_BG.ts | 99 | ||||
-rw-r--r-- | translations/client_cs.ts | 99 | ||||
-rw-r--r-- | translations/client_de.ts | 99 | ||||
-rw-r--r-- | translations/client_de_CH.ts | 99 | ||||
-rw-r--r-- | translations/client_el.ts | 99 | ||||
-rw-r--r-- | translations/client_en.ts | 99 | ||||
-rw-r--r-- | translations/client_en_GB.ts | 99 | ||||
-rw-r--r-- | translations/client_es.ts | 99 | ||||
-rw-r--r-- | translations/client_fr.ts | 99 | ||||
-rw-r--r-- | translations/client_gl.ts | 99 | ||||
-rw-r--r-- | translations/client_he.ts | 99 | ||||
-rw-r--r-- | translations/client_it.ts | 99 | ||||
-rw-r--r-- | translations/client_nl.ts | 99 | ||||
-rw-r--r-- | translations/client_pl.ts | 99 | ||||
-rw-r--r-- | translations/client_pt_BR.ts | 99 | ||||
-rw-r--r-- | translations/client_ru.ts | 99 | ||||
-rw-r--r-- | translations/client_sq.ts | 99 | ||||
-rw-r--r-- | translations/client_th.ts | 99 | ||||
-rw-r--r-- | translations/client_tr.ts | 99 | ||||
-rw-r--r-- | translations/client_zh_CN.ts | 99 | ||||
-rw-r--r-- | translations/client_zh_TW.ts | 99 |
22 files changed, 1166 insertions, 1012 deletions
diff --git a/translations/client_ar.ts b/translations/client_ar.ts index d379ffc93..a1e187ced 100644 --- a/translations/client_ar.ts +++ b/translations/client_ar.ts @@ -1147,120 +1147,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <source>Could not reset folder state</source> <translation>تعذّرت إعادة تعيين حالة المجلد</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation> (النسخ الاحتياطي)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation> (النسخ الاحتياطي %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>حالة غير معرفة.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>الانتظار لبدء المزامنة.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>التحضير للمزامنة.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>المزامنة قيد التشغيل.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <source>Sync was successful, unresolved conflicts.</source> <translation>المزامنة ناجحة، ولم يتم حل التعارضات.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation>المزامنة الأخيرة تمت بنجاح.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>خطأ في الإعداد.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>إلغاء المستخدم.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>توقفت المزامنة مؤقتًا.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation>%1 (المزامنة متوقفة مؤقتًا)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>لم يتم تحديد مجلد صالح!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>The selected path does not exist!</source> <translation>المسار المحدد غير موجود!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>The selected path is not a folder!</source> <translation>المسار المحدد ليس مجلدًا!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <source>You have no permission to write to the selected folder!</source> <translation>ليس لديك الصلاحية للكتابة في المجلد المحدد!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1300,12 +1307,12 @@ 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/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>تم تمكين دعم الملف الظاهري.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>تم تسجيل الخروج</translation> </message> @@ -1320,112 +1327,112 @@ 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/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>البحث عن تغييرات في '%1' البعيد</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>البحث عن تغييرات في '%1' المحلي</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>توافق التغييرات</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>، '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>مزامنة %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>، </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>تنزيل %1/ثانية</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/ثانية</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/ثانية</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>تحميل %1/ثانية</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 من %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 متبقٍّ %1 من %2، ملف %3 من %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 من %2، ملف %3 من %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>ملف %1 من %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>جارٍ الانتظار...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>جارٍ انتظار %n مجلد آخر ...</numerusform><numerusform>جارٍ انتظار %n مجلد آخر ...</numerusform><numerusform>جارٍ انتظار %n مجلدين آخر ...</numerusform><numerusform>جارٍ انتظار %n مجلدات أخرى ...</numerusform><numerusform>جارٍ انتظار %n مجلدات أخرى ...</numerusform><numerusform>جارٍ انتظار %n مجلدات أخرى ...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>جارٍ تحضير المزامنة...</translation> </message> diff --git a/translations/client_bg_BG.ts b/translations/client_bg_BG.ts index 3a6962d94..af7d07411 100644 --- a/translations/client_bg_BG.ts +++ b/translations/client_bg_BG.ts @@ -1147,120 +1147,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <source>Could not reset folder state</source> <translation>Неуспешно изчистване на състоянието на папката</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation>(архив)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation>(архив %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>Неопределено Състояние</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>Изчакване за започване на синхронизацията.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>Подготовка за синхронизация</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>Синхронизирането работи.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Синхронизирането беше успешно, няма нерешени конфликти.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation>Последната синхронизация е беше успешна.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>Грешка в Настройките.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>Прекрати</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>Синхронизирането е на пауза.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation>%1 (Синхронизирането е на пауза)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>Няма маркирана валидна папка!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>The selected path does not exist!</source> <translation>Избраният път не съществува!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>The selected path is not a folder!</source> <translation>Избраният път не е папка!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <source>You have no permission to write to the selected folder!</source> <translation>Вие нямате права да записвате в избраната папка!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1300,12 +1307,12 @@ 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/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>Поддръжката на виртуални файлове е активирана.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>Излизане</translation> </message> @@ -1320,112 +1327,112 @@ 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/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>Проверка за промени в отдалечената „%1“</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>Проверка за промени в локалната „%1“</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>Запис на промените</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Синхронизиране на %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>теглене с %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>качване с %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 от %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>още %5, %1 от %2, файл %3 от %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 от %2, файл %3 от %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>файл %1 от %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>Изчакване...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Изчакване на %n други папка(и)...</numerusform><numerusform>Изчакване на %n други папка(и)...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>Подготовка за синхронизация...</translation> </message> diff --git a/translations/client_cs.ts b/translations/client_cs.ts index ce7bbb400..82e7e8548 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -1137,120 +1137,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <source>Could not reset folder state</source> <translation>Nelze obnovit stav adresáře</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' 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 '%1', 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation> (záloha)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation> (záloha %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>Nedefinovaný stav.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>Čeká na spuštění synchronizace.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>Příprava na synchronizaci.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>Synchronizace probíhá.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <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="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation>Poslední synchronizace byla úspěšná.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>Chyba nastavení.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>Zrušení uživatelem.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>Synchronizace pozastavena.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronizace je pozastavena)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>Nebyl vybrán platný adresář!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <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="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <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="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1290,12 +1297,12 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <translation>Chyba při načítání seznamu adresářů ze serveru.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>Virtuální soubory povoleny</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>Odhlášeno</translation> </message> @@ -1310,112 +1317,112 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <translation>Jsou zde nevyřešené konflikty. Klikněte pro detaily.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>Zjišťuji změny ve vzdáleném '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>Zjišťuji změny v místním '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>Srovnávám změny</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchronizuji %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>stahování %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>nahrávání %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 ze %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 zbývá, %1 ze %2, soubor %3 z %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 z %2, soubor %3 z %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>soubor %1 z %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>Chvíli strpení...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Čeká se na %n další adresář...</numerusform><numerusform>Čeká se na %n další adresáře...</numerusform><numerusform>Čeká se na %n dalších adresářů...</numerusform><numerusform>Čeká se na %n dalších adresářů...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>Synchronizace se připravuje...</translation> </message> diff --git a/translations/client_de.ts b/translations/client_de.ts index abe2f38bc..0b4232eb4 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -1147,120 +1147,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <source>Could not reset folder state</source> <translation>Konnte Ordner-Zustand nicht zurücksetzen</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Ein altes Synchronisations-Journal '%1' 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation>(Sicherung)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation>(Sicherung %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>Undefinierter Zustand.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>Wartet auf Beginn der Synchronisation</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>Synchronisation wird vorbereitet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>Synchronisation läuft.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synchronisation war erfolgreich, ungelöste Konflikte. </translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation>Die letzte Synchronisation war erfolgreich.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>Installationsfehler.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>Benutzer-Abbruch</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>Synchronisation wurde angehalten.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisation ist pausiert)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>Kein gültiger Ordner gewählt!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <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="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <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="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1300,12 +1307,12 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <translation>Fehler beim Empfang der Ordnerliste vom Server.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>Unterstützung für virtuelle Dateien ist aktiviert.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>Abgemeldet</translation> </message> @@ -1320,112 +1327,112 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <translation>Es existieren ungelöste Konflikte. Für Details klicken.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>Änderungen der entfernten Ressource '%1' werden geprüft</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>Änderungen der lokalen Ressource '%1' werden geprüft</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>Änderungen zusammenführen</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchronisiere %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>Download %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>Upload %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 von %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 übrig, %1 von %2, Datei %3 von %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 of %2, Datei %3 von %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>Datei %1 von %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>Warte...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Warte auf einen anderen Ordner</numerusform><numerusform>Warte auf %n andere Ordner</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>Bereite Synchronisation vor...</translation> </message> diff --git a/translations/client_de_CH.ts b/translations/client_de_CH.ts index e4e171150..154899fd1 100644 --- a/translations/client_de_CH.ts +++ b/translations/client_de_CH.ts @@ -1145,120 +1145,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <source>Could not reset folder state</source> <translation>Ordnerzustand konnte nicht zurückgesetzt werden</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Ein altes Synchronisations-Journal '%1' 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation>(Backup)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation>(Backup %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>Undefinierter Zustand.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>Warten auf Beginn der Synchronisation</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>Synchronisation wird vorbereitet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>Synchronisation läuft.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synchronisation war erfolgreich, ungelöste Konflikte. </translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation>Die letzte Synchronisation war erfolgreich.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>Installationsfehler.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>Benutzer-Abbruch</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>Synchronisation wurde angehalten.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisation ist pausiert)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>Keinen gültigen Ordner ausgewählt!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <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="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <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="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1298,12 +1305,12 @@ Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest, <translation>Fehler beim Herunterladen der Verzeichnisliste vom Server.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>Unterstützung für virtuelle Dateien ist aktiviert.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>austreten</translation> </message> @@ -1318,112 +1325,112 @@ Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest, <translation>Es existieren ungelöste Konflikte. Für Details klicken.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>Prüfe Änderungen der entfernten '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>Prüfe Änderungen der lokalen '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>Änderungen zusammenführen</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>,'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchronisiere %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>Download %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>Upload %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 von %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 übrig, %1 von %2, Datei %3 von %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 von %2, Datei %3 von %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>Datei %1 von %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>warten...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Warte auf ein Verzeichnis...</numerusform><numerusform>Warte auf %n andere Verzeichnisse...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>Synchronisation vorbereiten...</translation> </message> diff --git a/translations/client_el.ts b/translations/client_el.ts index de71b606b..390bc03ac 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -1147,120 +1147,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <source>Could not reset folder state</source> <translation>Δεν ήταν δυνατό να επαναφερθεί η κατάσταση του φακέλου</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation>(αντίγραφο ασφαλείας)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation>(αντίγραοφ ασφαλέιας %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>Απροσδιόριστη Κατάσταση.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>Αναμονή έναρξης συγχρονισμού.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>Προετοιμασία για συγχρονισμό.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>Ο συγχρονισμός εκτελείται.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Επιτυχημένος συγχρονισμός, ανεπίλυτες συγκρούσεις.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>Σφάλμα Ρύθμισης.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>Ματαίωση από Χρήστη.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>Παύση συγχρονισμού.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation>%1 (Παύση συγχρονισμού)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>Δεν επιλέχθηκε έγκυρος φάκελος!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>The selected path does not exist!</source> <translation>Η επιλεγμένη διαδρομή δεν υπάρχει!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>The selected path is not a folder!</source> <translation>Η επιλεγμένη διαδρομή δεν είναι φάκελος!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <source>You have no permission to write to the selected folder!</source> <translation>Δεν έχετε δικαιώματα εγγραφής στον επιλεγμένο φάκελο!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1300,12 +1307,12 @@ 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/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>Η υποστήριξη για το εικονικό αρχείο είναι ενεργοποιημένη.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>Αποσύνδεση</translation> </message> @@ -1320,112 +1327,112 @@ 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/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>Έλεγχος για αλλαγές στο απομακρυσμένο '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>Έλεγχος για αλλαγές στο τοπικό '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>Συνδυασμός αλλαγών</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Συγχρονισμός %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>λήψη %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>μεταφόρτωση %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 από %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>Απομένει %5, %1 από %2, αρχείο %3 από %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 από %2, αρχείο %3 από %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>αρχείο %1 από %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>Αναμονή...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Αναμονή για %n άλλο φάκελο...</numerusform><numerusform>Αναμονή για %n άλλους φακέλους...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>Προετοιμασία για συγχρονισμό...</translation> </message> diff --git a/translations/client_en.ts b/translations/client_en.ts index 0ae668a6b..918228f8c 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -1161,120 +1161,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <source>Could not reset folder state</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <source>Sync was successful, unresolved conflicts.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <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="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>The selected path does not exist!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>The selected path is not a folder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1314,12 +1321,12 @@ 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/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation type="unfinished"></translation> </message> @@ -1334,107 +1341,107 @@ 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/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1442,7 +1449,7 @@ If this was an accident and you decide to keep your files, they will be re-synce </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation type="unfinished"></translation> </message> diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index 14612c1a1..7ec99c974 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -1147,120 +1147,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <source>Could not reset folder state</source> <translation>Could not reset folder state</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>An old sync journal '%1' 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation> (backup)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation> (backup %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>Undefined State.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>Waiting to start syncing.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>Preparing for sync.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>Sync is running.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Sync was successful, unresolved conflicts.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation>Last sync was successful.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>Setup Error.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>User Abort.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>Sync is paused.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation>%1 (Sync is paused)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>No valid folder selected!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <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="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <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="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <source>You have no permission to write to the selected folder!</source> <translation>You don't have permission to write to the selected folder!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1300,12 +1307,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Error whilst loading the list of folders from the server.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>Virtual file support is enabled.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>Signed out</translation> </message> @@ -1320,112 +1327,112 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>There are unresolved conflicts. Click for details.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>Checking for changes in remote '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>Checking for changes in local '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>Reconciling changes</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Syncing %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>download %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>upload %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 of %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 left, %1 of %2, file %3 of %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 of %2, file %3 of %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>file %1 of %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>Waiting...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Waiting for %n other folder(s)...</numerusform><numerusform>Waiting for %n other folder(s)...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>Preparing to sync...</translation> </message> diff --git a/translations/client_es.ts b/translations/client_es.ts index df57a4dd0..387cdd3c9 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -1147,120 +1147,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <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="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' 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 '%1'; 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation>(copia de seguridad)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation>(copia de seguridad %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>Estado no definido.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>Esperando para comenzar la sincronización.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>Preparándose para sincronizar.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>Sincronización en funcionamiento.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <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="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <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="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>Error de configuración.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>Interrumpido por el usuario.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>La sincronización está en pausa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation>%1 (Sincronización en pausa)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>¡La carpeta seleccionada no es válida!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>The selected path does not exist!</source> <translation>La ruta seleccionada no existe!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <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="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1300,12 +1307,12 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados <translation>Error mientras se cargaba la lista de carpetas desde el servidor.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>El soporte al archivo virtual está activado.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>Cerrar sesión</translation> </message> @@ -1320,112 +1327,112 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados <translation>Hay conflictos sin resolver. Haz click para mas detalles.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>Buscando cambios en '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>Buscando cambios en local '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>Reconciliando cambios</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>descargando: %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>cargar %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 restantes, %1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>archivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>Esperando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Esperando por %n carpeta...</numerusform><numerusform>Esperando por %n otras carpetas...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 4cac3b988..089fb72b6 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -1148,120 +1148,127 @@ S'il s'agissait d'un accident et que vous choisissiez de conserve <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <source>Could not reset folder state</source> <translation>Impossible de réinitialiser l'état du dossier</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Un ancien fichier journal '%1' a été trouvé, mais ne peut être supprimé. Veuillez vous assurer qu’aucune application ne l'utilise en ce moment.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation>(sauvegarde)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation>(sauvegarde %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>Statut indéfini.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>En attente de synchronisation.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>Préparation de la synchronisation.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>Synchronisation en cours</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <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="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation>Synchronisation terminée avec succès</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>Erreur d'installation.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>Abandon par l'utilisateur.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>La synchronisation est en pause.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisation en pause)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>Aucun dossier valable sélectionné !</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <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="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>The selected path is not a folder!</source> <translation>Le chemin sélectionné n'est pas un dossier !</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <source>You have no permission to write to the selected folder!</source> <translation>Vous n'avez pas la permission d'écrire dans le dossier sélectionné !</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1301,12 +1308,12 @@ S'il s'agissait d'un accident et que vous choisissiez de conserve <translation>Une erreur est survenue lors du chargement de la liste des dossiers depuis le serveur.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>Le support des fichiers virtuels est activé.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>Session fermée</translation> </message> @@ -1321,112 +1328,112 @@ S'il s'agissait d'un accident et que vous choisissiez de conserve <translation>Il y a des conflits non résolus. Cliquez pour plus de détails.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>Vérification des changements distants '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>Vérification des changements locaux '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>Rapprochement des modifications</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchronisation de %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>réception %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>envoi %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 sur %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 restantes, %1 sur %2, fichier %3 sur %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 sur %2, fichier %3 sur %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>fichier %1 sur %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>En attente ...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>En attente de %n autre(s) dossier(s)</numerusform><numerusform>En attente de %n autre(s) dossier(s)</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>Préparation à la synchronisation</translation> </message> diff --git a/translations/client_gl.ts b/translations/client_gl.ts index adcdce45a..de8fdb08f 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -1148,120 +1148,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <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="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation>(copia de seguridade)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation>(copia de seguridade %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>Estado sen definir.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>Agardando para iniciar a sincronización.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>Preparando para sincronizar.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>Estase sincronizando.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <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="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation>A última sincronización fíxose correctamente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>Erro de configuración.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>Interrompido polo usuario.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>Sincronización en pausa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation>%1 (sincronización en pausa)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>Non seleccionou ningún cartafol correcto!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>The selected path does not exist!</source> <translation>A ruta seleccionada non existe!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <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="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1301,12 +1308,12 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza <translation>Produciuse un erro ao cargar a lista de cartafoles dende o servidor.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>Está activada a compatibilidade con ficheiro virtual.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>Desconectado</translation> </message> @@ -1321,112 +1328,112 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza <translation>Hai conflitos sen resolver. Prema para obter máis detalles.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>Comprobando os cambios no cartafol remoto «%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>Comprobando os cambios no cartafol local «%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>Reconciliando os cambios</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, «%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>«%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>descargar %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>enviar %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>Restan %5, %1 de %2, ficheiro %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, ficheiro %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>ficheiro %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>Agardando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Agardando por outro cartafol...</numerusform><numerusform>Agardando por outros %n cartafoles...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> diff --git a/translations/client_he.ts b/translations/client_he.ts index 1b5ca73e7..e277fc85f 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -1147,120 +1147,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <source>Could not reset folder state</source> <translation>לא ניתן לאפס את מצב התיקייה</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation> (גיבוי)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation> (גיבוי %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>מצב בלתי מוגדר.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>ממתין להתחלת סנכרון.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>מכין סנכרון.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>הסנכרון פועל כרגע.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <source>Sync was successful, unresolved conflicts.</source> <translation>הסנכרון עבר בהצלחה, קיימים קונפליקטים שלו יושרו.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation>הסנכרון האחרון הושלם בהצלחה.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>שגיאת התקנה.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>משתמש ביטל פעולה.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>סנכרון בהשהייה.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation>%1 (סנכרון בהשהייה)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>לא נבחרה תיקייה חוקית!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>The selected path does not exist!</source> <translation>הנתיב הנבחר אינו קיים!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>The selected path is not a folder!</source> <translation>הנתיב שנבחר אינו תיקייה!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <source>You have no permission to write to the selected folder!</source> <translation>אין לך הרשאות לכתיבה לתיקייה הנבחרת!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1300,12 +1307,12 @@ 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/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>הופעלה תמיכה בקובץ וירטואלי.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>יציאה</translation> </message> @@ -1320,112 +1327,112 @@ 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/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>בודק לשינויים ב- '%1' מרוחק</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>בודק לשינויים ב- '%1' מקומי</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>מסדיר שינויים</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>מסנכרן %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>בהורדה %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>בהעלאה %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 מתוך %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 נשארו, %1 מתוך %2, קובץ %3 מתוך %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 מתוך %2, קובץ %3 מתוך %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>קובץ %1 מתוך %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>המתנה...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>ממתין ל- %n תיקייה אחרת...</numerusform><numerusform>ממתין ל- %n תיקיות אחרות...</numerusform><numerusform>ממתין ל- %n תיקיות אחרות...</numerusform><numerusform>ממתין ל- %n תיקיות אחרות...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>מכין סנכרון...</translation> </message> diff --git a/translations/client_it.ts b/translations/client_it.ts index 88c927e7f..3a608eda8 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -1148,120 +1148,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <source>Could not reset folder state</source> <translation>Impossibile ripristinare lo stato della cartella</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' 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 '%1', ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation>(copia di sicurezza)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation>(copia di sicurezza %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>Stato non definito.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>In attesa di iniziare la sincronizzazione.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>Preparazione della sincronizzazione.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>La sincronizzazione è in corso.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <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="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation>L'ultima sincronizzazione è stata completata correttamente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>Errore di configurazione.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>Interrotto dall'utente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>La sincronizzazione è sospesa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation> %1 (La sincronizzazione è sospesa)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>Nessuna cartella valida selezionata!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>The selected path does not exist!</source> <translation>Il percorso selezionato non esiste!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <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="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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'altra cartella locale!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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'altra!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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'altra!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1301,12 +1308,12 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat <translation>Errore durante il caricamento dell'elenco delle cartelle dal server.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>Il supporto per file virtuali è abilitato.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>Disconnesso</translation> </message> @@ -1321,112 +1328,112 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat <translation>Ci sono conflitti irrisolti. Clicca per ulteriori dettagli. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>Controllo per cambiamenti in '%1' remoto</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>Controllo cambiamenti in '%1 ' locale</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>Riconciliazione dei cambiamenti</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizzazione di %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>ricezione %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>invio %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 di %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 rimanenti, %1 di %2, file %3 di %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 di %2, file %3 di %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>file %1 di %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>Attendere...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>In attesa di %n altra cartella...</numerusform><numerusform>In attesa di %n altre cartelle...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>Preparazione della sincronizzazione...</translation> </message> diff --git a/translations/client_nl.ts b/translations/client_nl.ts index dee6807a9..2b09746fb 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -1146,120 +1146,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <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="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Een oud synchronisatieverslag '%1' 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation>(backup)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation>(backup %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>Ongedefiniëerde staat</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>In afwachting van synchronisatie.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>Synchronisatie wordt voorbereid</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>Bezig met synchroniseren.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synchronisatie was succesvol, onopgeloste conflicten.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation>Laatste synchronisatie was geslaagd.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>Installatiefout.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>Afgebroken door gebruiker.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>Synchronisatie gepauzeerd.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisatie onderbroken)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>Geen geldige map geselecteerd!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>The selected path does not exist!</source> <translation>Het geselecteerde pad bestaat niet!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <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="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1300,12 +1307,12 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges <translation>Fout bij ophalen mappenlijst van de server.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>Ondersteuning voor virtuele bestanden zijn ingeschakeld.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>Afgemeld</translation> </message> @@ -1320,112 +1327,112 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges <translation>Er zijn onopgeloste conflicten. Klik voor details.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>Aan het controleren op wijzigingen in afstandelijke locatie '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>Aan het controleren op veranderingen in lokale '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>Wijzigingen doorvoeren</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchroniseren %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>download %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>upload %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 van %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 over, %1 van %2, bestand %3 van %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 van %2, bestand %3 van %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>bestand %1 van %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>Aan het wachten...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Wacht op %n andere map...</numerusform><numerusform>Wacht op %n andere mappen...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>Voorbereiden op sync...</translation> </message> diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 34ce65da7..c8faaa42b 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -1146,120 +1146,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <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="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Stary sync journal '%1' 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation>(kopia zapasowa)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation>(kopia zapasowa %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>Niezdefiniowany stan</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>Poczekaj na rozpoczęcie synchronizacji.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>Przygotowuję do synchronizacji</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>Synchronizacja w toku</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synchronizacja udana, nierozwiązane konflikty.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation>Ostatnia synchronizacja zakończona powodzeniem.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>Błąd ustawień.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>Użytkownik anulował.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>Synchronizacja wstrzymana</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation> %1 (Synchronizacja jest zatrzymana)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>Nie wybrano poprawnego folderu.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>The selected path does not exist!</source> <translation>Wybrana ścieżka nie istnieje!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <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="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1299,12 +1306,12 @@ Jeśli to był wypadek i zdecydujesz się zatrzymać pliki, zostaną one zsynchr <translation>Wystąpił błąd podczas pobierania listy folderów z serwera.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>Obsługa plików wirtualnych jest włączona.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>Odłączony</translation> </message> @@ -1319,112 +1326,112 @@ Jeśli to był wypadek i zdecydujesz się zatrzymać pliki, zostaną one zsynchr <translation>Istnieją nierozwiązane konflikty. Kliknij aby poznać szczegóły.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>Sprawdzanie zmian w lokalizacji zdalnej '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>Sprawdzanie zmian w lokalizacji lokalnej '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>Uzgodnienie zmian</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchronizowanie %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>pobieranie %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>wysyłanie %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 z %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>Plik %3 z %4, pozostało czasu %5 (%1 z %2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 z %2, plik %3 z %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>plik %1 z %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>Czekaj...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Oczekiwanie na %n inny folder...</numerusform><numerusform>Oczekiwanie na %n inne foldery...</numerusform><numerusform>Oczekiwanie na %n innych folderów...</numerusform><numerusform>Oczekiwanie na %n innych folderów...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>Przygotowanie do synchronizacji ...</translation> </message> diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index 63f6ed3bf..37e95bd89 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -1146,120 +1146,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <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="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' 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 '%1' 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation> (backup)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation> (backup %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>Estado indefinido.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>À espera do início da sincronização.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>Preparando para sincronização.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>A sincronização está ocorrendo.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <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="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <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="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>Erro de Configuração.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>Usuário Abortou.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>Sincronização pausada.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation>%1 (Pausa na Sincronização) </translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>Nenhuma pasta válida selecionada!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <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="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <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="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <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="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation>%1 Por favor, escolha outro!</translation> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1299,12 +1306,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Erro enquanto carregava a lista de pastas do servidor.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>O suporte a arquivos virtuais está ativado.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>Desconectado</translation> </message> @@ -1319,112 +1326,112 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Existem conflitos não resolvidos. Clique para detalhes.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>Verificando alterações remotamente '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>Verificação de alterações no local '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>Reconciliando mudanças</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>baixar %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>enviar %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation>Pasta local: %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 restando, %1 de %2, arquivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de%2, arquivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>arquivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>Esperando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Esperando por %n outra pasta...</numerusform><numerusform>Esperando por %n outras pastas...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> diff --git a/translations/client_ru.ts b/translations/client_ru.ts index 407332450..97e31c81d 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -1148,120 +1148,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <source>Could not reset folder state</source> <translation>Невозможно сбросить состояние каталога</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation>(резервная копия)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation>(резервная копия %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>Неопределенное состояние.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>Ожидание запуска синхронизации.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>Подготовка к синхронизации.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>Идет синхронизация.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Синхронизация успешна, есть неразрешённые конфликты.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation>Последняя синхронизация прошла успешно.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>Ошибка установки.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>Отмена пользователем.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>Синхронизация приостановлена.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation>%! (синхронизация приостановлена)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>Не выбран валидный каталог!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation>Каталог %1 используется в соединении синхронизации каталогов!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>The selected path does not exist!</source> <translation>Выбранный путь не существует!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>The selected path is not a folder!</source> <translation>Выбранный путь не является каталогом!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <source>You have no permission to write to the selected folder!</source> <translation>У вас недостаточно прав для записи в выбранный каталог!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation>%1 Пожалуйста, сделайте другой выбор!</translation> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1301,12 +1308,12 @@ 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/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>Поддержка виртуальных файлов включена.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>Вышли из аккаунта</translation> </message> @@ -1321,112 +1328,112 @@ 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/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>Проверяю измененеия в удалённом '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>Проверяю изменения в локальном '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>Согласование изменений</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Синхронизация %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>скачивание %1/с</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/с</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/с</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>загрузка %1/с</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation>Локальный каталог: %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 из %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>Осталось %5, %1 из %2, файл %3 из %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 из %2, файл %3 из %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>файл %1 из %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>Ожидание...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Ожидание %n директории...</numerusform><numerusform>Ожидание %n директорий...</numerusform><numerusform>Ожидание %n директорий...</numerusform><numerusform>Ожидание %n директорий...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>Подготовка к синхронизации...</translation> </message> diff --git a/translations/client_sq.ts b/translations/client_sq.ts index 96b421268..c32259d6b 100644 --- a/translations/client_sq.ts +++ b/translations/client_sq.ts @@ -1148,120 +1148,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <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="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' 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 '%1', 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation> (kopjeruajtje)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation> (kopjeruajtja %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>Gjendje e Papërkufizuar.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>Po pritet të fillohet njëkohësimi.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>Po përgatitet për njëkohësim.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>Njëkohësimi po kryhet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <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="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <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="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>Gabim te Rregullimet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>Ndërprerje Nga Përdoruesi.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>Njëkohësimi është ndalur.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation>%1 (Njëkohësimi është ndalur)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>S’është përzgjedhur dosje e vlefshme!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <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="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <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="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <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="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation>%1 Ju lutemi, zgjidhni një tjetër!</translation> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1301,12 +1308,12 @@ Nëse ky qe aksident dhe vendosni t’i mbani kartelat tuaja, ato do të rinjëk <translation>Gabim gjatë ngarkimit të listës së dosjeve prej shërbyesit.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>Mbulimi i kartelave virtuale është i aktivizuar.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>Dolët</translation> </message> @@ -1321,112 +1328,112 @@ Nëse ky qe aksident dhe vendosni t’i mbani kartelat tuaja, ato do të rinjëk <translation>Ka përplasje të pazgjidhura. Klikoni për hollës.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>Po kërkohet për ndryshime te shërbyesi i largët '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>Po kërkohet për ndryshime te shërbyesi vendor '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>Po pajtohen ndryshimet mes tyre</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Po njëkohësohet %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>shkarko %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>ngarko %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation>Dosje vendore: %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 nga %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>edhe %5, %1 nga %2, kartela %3 nga %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 nga %2, kartela %3 nga %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>kartela %1 nga %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>Po pritet…</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Po pritet për %n dosje tjetër…</numerusform><numerusform>Po pritet për %n dosje të tjera…</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>Po përgatitet për njëkohësim…</translation> </message> diff --git a/translations/client_th.ts b/translations/client_th.ts index 245f12125..8343a8e4d 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -1147,120 +1147,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <source>Could not reset folder state</source> <translation>ไม่สามารถรีเซ็ตสถานะโฟลเดอร์</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation>(สำรองข้อมูล)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation>(สำรองข้อมูล %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>กำลังรอเริ่มต้นการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>กำลังเตรียมการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>การประสานข้อมูลกำลังทำงาน</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <source>Sync was successful, unresolved conflicts.</source> <translation>ประสานข้อมูลสำเร็จแต่ยังมีข้อขัดแย้งที่ยังไม่ได้รับการแก้ไข</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation>ประสานข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>เกิดข้อผิดพลาดในการติดตั้ง</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>ยกเลิกผู้ใช้</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>การประสานข้อมูลถูกหยุดไว้ชั่วคราว</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation>%1 (การประสานข้อมูลถูกหยุดชั่วคราว)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>เลือกโฟลเดอร์ไม่ถูกต้อง!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>The selected path does not exist!</source> <translation>เส้นทางที่เลือกไม่มีอยู่!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>The selected path is not a folder!</source> <translation>เส้นทางที่เลือกไม่ใช่โฟลเดอร์!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <source>You have no permission to write to the selected folder!</source> <translation>คุณมีสิทธิ์เขียนโฟลเดอร์ที่เลือกนี้!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1300,12 +1307,12 @@ 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/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>เปิดใช้งานการรองรับไฟล์เสมือนแล้ว</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>ออกจากระบบ</translation> </message> @@ -1320,112 +1327,112 @@ 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/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>กำลังตรวจหาการเปลี่ยนแปลงในรีโมต '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>กำลังตรวจหาการเปลี่ยนแปลงในเครื่อง '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>คืนค่าการเปลี่ยนแปลง</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>กำลังประสานข้อมูล %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>หรือ</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>ดาวน์โหลด %1/วินาที</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/วินาที</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>อัปโหลด %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 ของ %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>เหลืออีก %5 ไฟล์, %1 ไฟล์จาก %2, %3 ไฟล์จาก %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 จาก %2, %3 จาก %4 ไฟล์</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>ไฟล์ %1 จาก %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>กรุณารอซักครู่...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>กำลังรออีก (%n) โฟลเดอร์...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>กำลังเตรียมพร้อมในการประสานข้อมูล</translation> </message> diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 64f7620f2..5d8b0850a 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -1147,120 +1147,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <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="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source> <translation>Eski eşitleme günlüğü '%1' 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation> (yedek)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation> (yedek %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>Tanımlanmamış Durum.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>Eşitlemenin başlanması bekleniyor.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>Eşitleme için hazırlanıyor.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>Eşitleme çalışıyor.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <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="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation>Son Eşitleme başarılı oldu.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>Kurulum Hatası.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>Kullanıcı İptal Etti.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>Eşitleme duraklatıldı.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation>%1 (Eşitleme duraklatıldı)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>Geçerli klasör seçilmedi!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <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="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <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="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1300,12 +1307,12 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <translation>Sunucudan klasörlerin listesi yüklenirken hata oluştu.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>Sanal dosya sistemi desteği etkinleştirildi.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>Oturum sonlandırıldı</translation> </message> @@ -1320,112 +1327,112 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <translation>Çözüm gereken eşleşmeler var. Detaylar için tıklayın.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>Uzaktaki '%1' için değişiklikler kontrol ediliyor.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>Yereldeki '%1' için değişiklikler kontrol ediliyor.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>Değişikliklerin bağlama kavuşturulması</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>%1 eşitleniyor</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>indirme %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/sn</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/sn</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>gönderme %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3/%4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>Kalan %5, %1/%2, dosya %3/%4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1/%2, %3/%4 dosya</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>dosya %1/%2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>Bekleniyor...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Diğer %n klasör bekleniyor...</numerusform><numerusform>Diğer %n klasör bekleniyor...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>Eşitleme için hazırlanıyor...</translation> </message> diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index 222442998..1a7c952ed 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -1139,120 +1139,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <source>Could not reset folder state</source> <translation>不能重置文件夹状态</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation> (备份)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation> (备份 %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>未知状态。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>等待启动同步。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>准备同步。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>同步正在运行。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <source>Sync was successful, unresolved conflicts.</source> <translation>同步成功,但有未解决的冲突。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation>最后一次同步成功。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>安装失败</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>用户撤销。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>同步已暂停。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation>%1 (同步已暂停)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>没有选择有效的文件夹!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>The selected path does not exist!</source> <translation>您选择的目录不存在!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>The selected path is not a folder!</source> <translation>选择的路径不是一个文件夹!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <source>You have no permission to write to the selected folder!</source> <translation>你没有写入所选文件夹的权限!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1292,12 +1299,12 @@ 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/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>虚拟文件功能已开启</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>已登出</translation> </message> @@ -1312,112 +1319,112 @@ 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/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>检查远端文件 '%1' 的变动</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>检查本地文件 '%1' 的变动</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>调整变更</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>正在同步 %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>下载 %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/秒</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/秒</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>上传 %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 / %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>剩余: %5,%1 / %2, 文件数量 %3 / %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 of %2, file %3 of %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>第 %1 个文件,共 %2 个</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>请稍等...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>等待 %n 个其他文件(文件夹)</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>准备同步...</translation> </message> diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 180d03c36..3b1b50a43 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -1147,120 +1147,127 @@ 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="397"/> + <location filename="../src/gui/folderman.cpp" line="405"/> <source>Could not reset folder state</source> <translation>無法重置資料夾狀態</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="398"/> + <location filename="../src/gui/folderman.cpp" line="406"/> <source>An old sync journal '%1' 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="1178"/> + <location filename="../src/gui/folderman.cpp" line="1186"/> <source> (backup)</source> <translation>(備份)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1183"/> + <location filename="../src/gui/folderman.cpp" line="1191"/> <source> (backup %1)</source> <translation>(備份 %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1285"/> + <location filename="../src/gui/folderman.cpp" line="1293"/> <source>Undefined State.</source> <translation>未知狀態</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1288"/> + <location filename="../src/gui/folderman.cpp" line="1296"/> <source>Waiting to start syncing.</source> <translation>正在等待同步開始</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1291"/> + <location filename="../src/gui/folderman.cpp" line="1299"/> <source>Preparing for sync.</source> <translation>正在準備同步。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1294"/> + <location filename="../src/gui/folderman.cpp" line="1302"/> <source>Sync is running.</source> <translation>同步執行中</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1299"/> + <location filename="../src/gui/folderman.cpp" line="1307"/> <source>Sync was successful, unresolved conflicts.</source> <translation>同步成功,未解決衝突。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1301"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Last Sync was successful.</source> <translation>最後一次同步成功</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1307"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Setup Error.</source> <translation>安裝失敗</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1310"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>User Abort.</source> <translation>使用者中斷。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1313"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Sync is paused.</source> <translation>同步已暫停</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1327"/> <source>%1 (Sync is paused)</source> <translation>%1 (同步暫停)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1335"/> <source>No valid folder selected!</source> <translation>沒有選擇有效的資料夾</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>The selected path does not exist!</source> <translation>所選路徑不存在!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1346"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>The selected path is not a folder!</source> <translation>所選的路徑並非資料夾!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1358"/> <source>You have no permission to write to the selected folder!</source> <translation>您沒有權限來寫入被選取的資料夾!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1395"/> <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="1391"/> + <location filename="../src/gui/folderman.cpp" line="1399"/> <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="1397"/> + <location filename="../src/gui/folderman.cpp" line="1405"/> <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="1404"/> + <location filename="../src/gui/folderman.cpp" line="1412"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> + <message> + <location filename="../src/gui/folderman.cpp" line="1488"/> + <source>Multiple accounts are sharing the folder %1. +This configuration is know to lead to dataloss and is no longer supported. +Please consider removing this folder from the account and adding it again.</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::FolderStatusDelegate</name> @@ -1300,12 +1307,12 @@ 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/folderstatusmodel.cpp" line="214"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="221"/> <source>Virtual file support is enabled.</source> <translation>虛擬檔案支持已啟用。</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="241"/> <source>Signed out</source> <translation>已登出</translation> </message> @@ -1320,112 +1327,112 @@ 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/folderstatusmodel.cpp" line="880"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="887"/> <source>Checking for changes in remote '%1'</source> <translation>檢查遠端'%1'中的更改</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> <source>Checking for changes in local '%1'</source> <translation>檢查本地端'%1'中的更改</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="891"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="898"/> <source>Reconciling changes</source> <translation>協調變更</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="926"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="929"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="936"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="953"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="960"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>同步 %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="955"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="962"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="966"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>下載 %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="961"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="968"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="971"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="969"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>上傳 %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="259"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="266"/> <source>Local folder: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 的 %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="998"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1005"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>還剩%5,%2的%1,%4檔案%3</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1006"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 的 %2, 檔案 %3 的 %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1013"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>file %1 of %2</source> <translation>檔案 %1 的 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1059"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/> <source>Waiting...</source> <translation>等待中...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1061"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1068"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>正在等候 %n 的資料夾(可能不只一個)</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1067"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1074"/> <source>Preparing to sync...</source> <translation>正在準備同步...</translation> </message> |