diff options
-rw-r--r-- | translations/client_ar.ts | 72 | ||||
-rw-r--r-- | translations/client_bg_BG.ts | 72 | ||||
-rw-r--r-- | translations/client_cs.ts | 72 | ||||
-rw-r--r-- | translations/client_de.ts | 74 | ||||
-rw-r--r-- | translations/client_de_CH.ts | 72 | ||||
-rw-r--r-- | translations/client_el.ts | 72 | ||||
-rw-r--r-- | translations/client_en.ts | 72 | ||||
-rw-r--r-- | translations/client_en_GB.ts | 72 | ||||
-rw-r--r-- | translations/client_es.ts | 72 | ||||
-rw-r--r-- | translations/client_fr.ts | 72 | ||||
-rw-r--r-- | translations/client_gl.ts | 72 | ||||
-rw-r--r-- | translations/client_he.ts | 72 | ||||
-rw-r--r-- | translations/client_it.ts | 72 | ||||
-rw-r--r-- | translations/client_nl.ts | 72 | ||||
-rw-r--r-- | translations/client_pl.ts | 72 | ||||
-rw-r--r-- | translations/client_pt_BR.ts | 72 | ||||
-rw-r--r-- | translations/client_ru.ts | 72 | ||||
-rw-r--r-- | translations/client_sq.ts | 72 | ||||
-rw-r--r-- | translations/client_th.ts | 72 | ||||
-rw-r--r-- | translations/client_tr.ts | 72 | ||||
-rw-r--r-- | translations/client_zh_CN.ts | 72 | ||||
-rw-r--r-- | translations/client_zh_TW.ts | 72 |
22 files changed, 793 insertions, 793 deletions
diff --git a/translations/client_ar.ts b/translations/client_ar.ts index b249bcfb7..fe6020f73 100644 --- a/translations/client_ar.ts +++ b/translations/client_ar.ts @@ -923,7 +923,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation type="unfinished"/> </message> @@ -1147,122 +1147,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <source>Could not reset folder state</source> <translation>تعذّرت إعادة تعيين حالة المجلد</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation> (النسخ الاحتياطي)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation> (النسخ الاحتياطي %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>حالة غير معرفة.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>الانتظار لبدء المزامنة.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>التحضير للمزامنة.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>المزامنة قيد التشغيل.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Sync was successful, unresolved conflicts.</source> <translation>المزامنة ناجحة، ولم يتم حل التعارضات.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation>المزامنة الأخيرة تمت بنجاح.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>خطأ في الإعداد.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>إلغاء المستخدم.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>توقفت المزامنة مؤقتًا.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%1 (المزامنة متوقفة مؤقتًا)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>لم يتم تحديد مجلد صالح!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <source>The selected path does not exist!</source> <translation>المسار المحدد غير موجود!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <source>The selected path is not a folder!</source> <translation>المسار المحدد ليس مجلدًا!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <source>You have no permission to write to the selected folder!</source> <translation>ليس لديك الصلاحية للكتابة في المجلد المحدد!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4508,53 +4508,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>خطأ</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>معلومات</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>نجاح</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>تعارض</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> diff --git a/translations/client_bg_BG.ts b/translations/client_bg_BG.ts index 1497340c4..382f1c8bf 100644 --- a/translations/client_bg_BG.ts +++ b/translations/client_bg_BG.ts @@ -923,7 +923,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation type="unfinished"/> </message> @@ -1147,122 +1147,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <source>Could not reset folder state</source> <translation>Неуспешно изчистване на състоянието на папката</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation>(архив)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation>(архив %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>Неопределено Състояние</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>Изчакване за започване на синхронизацията.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>Подготовка за синхронизация</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>Синхронизирането работи.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Синхронизирането беше успешно, няма нерешени конфликти.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation>Последната синхронизация е беше успешна.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>Грешка в Настройките.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>Прекрати</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>Синхронизирането е на пауза.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%1 (Синхронизирането е на пауза)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>Няма маркирана валидна папка!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <source>The selected path does not exist!</source> <translation>Избраният път не съществува!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <source>The selected path is not a folder!</source> <translation>Избраният път не е папка!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <source>You have no permission to write to the selected folder!</source> <translation>Вие нямате права да записвате в избраната папка!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4504,53 +4504,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>Грешка</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>Информация</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>Успех</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>Конфликт</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 399ba6af0..5cbbbc0c7 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -919,7 +919,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation type="unfinished"/> </message> @@ -1137,122 +1137,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <source>Could not reset folder state</source> <translation>Nelze obnovit stav adresáře</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation> (záloha)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation> (záloha %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>Nedefinovaný stav.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>Čeká na spuštění synchronizace.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>Příprava na synchronizaci.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>Synchronizace probíhá.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <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="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation>Poslední synchronizace byla úspěšná.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>Chyba nastavení.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>Zrušení uživatelem.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>Synchronizace pozastavena.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronizace je pozastavena)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>Nebyl vybrán platný adresář!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <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="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <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="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <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="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4488,53 +4488,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation>Kritická chyba</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>Úspěch</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>Konflikt</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation>Na černé listině</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> diff --git a/translations/client_de.ts b/translations/client_de.ts index 1cf76db29..ce8be92f8 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -923,7 +923,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation type="unfinished"/> </message> @@ -1147,122 +1147,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <source>Could not reset folder state</source> <translation>Konnte Ordner-Zustand nicht zurücksetzen</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation>(Sicherung)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation>(Sicherung %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>Undefinierter Zustand.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>Wartet auf Beginn der Synchronisation</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>Synchronisation wird vorbereitet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>Synchronisation läuft.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synchronisation war erfolgreich, ungelöste Konflikte. </translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation>Die letzte Synchronisation war erfolgreich.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>Installationsfehler.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>Benutzer-Abbruch</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>Synchronisation wurde angehalten.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisation ist pausiert)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>Kein gültiger Ordner gewählt!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <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="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <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="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <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="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -3635,7 +3635,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <message> <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> <source>Create and copy public link to clipboard</source> - <translation type="unfinished"/> + <translation>Neuen öffentlichen Link erstellen und in die Zwischenablage kopieren</translation> </message> <message> <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> @@ -4504,53 +4504,53 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation>Schwerer Fehler</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>Erfolg</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>Konflikt</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation>Zur schwarzen Liste hinzugefügt</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> diff --git a/translations/client_de_CH.ts b/translations/client_de_CH.ts index aa0112b19..61f7cbc07 100644 --- a/translations/client_de_CH.ts +++ b/translations/client_de_CH.ts @@ -921,7 +921,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation type="unfinished"/> </message> @@ -1145,122 +1145,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <source>Could not reset folder state</source> <translation>Ordnerzustand konnte nicht zurückgesetzt werden</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation>(Backup)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation>(Backup %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>Undefinierter Zustand.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>Warten auf Beginn der Synchronisation</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>Synchronisation wird vorbereitet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>Synchronisation läuft.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synchronisation war erfolgreich, ungelöste Konflikte. </translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation>Die letzte Synchronisation war erfolgreich.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>Installationsfehler.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>Benutzer-Abbruch</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>Synchronisation wurde angehalten.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisation ist pausiert)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>Keinen gültigen Ordner ausgewählt!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <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="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <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="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <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="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4500,53 +4500,53 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>Erfolg</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>Konflikt</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> diff --git a/translations/client_el.ts b/translations/client_el.ts index 9a56145de..e4dc102b9 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -923,7 +923,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation type="unfinished"/> </message> @@ -1147,122 +1147,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <source>Could not reset folder state</source> <translation>Δεν ήταν δυνατό να επαναφερθεί η κατάσταση του φακέλου</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation>(αντίγραφο ασφαλείας)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation>(αντίγραοφ ασφαλέιας %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>Απροσδιόριστη Κατάσταση.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>Αναμονή έναρξης συγχρονισμού.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>Προετοιμασία για συγχρονισμό.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>Ο συγχρονισμός εκτελείται.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Επιτυχημένος συγχρονισμός, ανεπίλυτες συγκρούσεις.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>Σφάλμα Ρύθμισης.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>Ματαίωση από Χρήστη.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>Παύση συγχρονισμού.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%1 (Παύση συγχρονισμού)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>Δεν επιλέχθηκε έγκυρος φάκελος!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <source>The selected path does not exist!</source> <translation>Η επιλεγμένη διαδρομή δεν υπάρχει!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <source>The selected path is not a folder!</source> <translation>Η επιλεγμένη διαδρομή δεν είναι φάκελος!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <source>You have no permission to write to the selected folder!</source> <translation>Δεν έχετε δικαιώματα εγγραφής στον επιλεγμένο φάκελο!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4504,53 +4504,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation>Μοιραίο Σφάλμα</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>Σφάλμα</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>Πληροφορίες</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>Επιτυχία</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>Διένεξη</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> diff --git a/translations/client_en.ts b/translations/client_en.ts index eeef29c67..41bc5632a 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -927,7 +927,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation type="unfinished"></translation> </message> @@ -1161,122 +1161,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <source>Could not reset folder state</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Sync was successful, unresolved conflicts.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <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="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <source>The selected path does not exist!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <source>The selected path is not a folder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <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="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4513,53 +4513,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"></translation> </message> diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index 4fe2693a3..cf49a3738 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -923,7 +923,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation type="unfinished"/> </message> @@ -1147,122 +1147,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <source>Could not reset folder state</source> <translation>Could not reset folder state</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation> (backup)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation> (backup %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>Undefined State.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>Waiting to start syncing.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>Preparing for sync.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>Sync is running.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Sync was successful, unresolved conflicts.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation>Last sync was successful.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>Setup Error.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>User Abort.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>Sync is paused.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%1 (Sync is paused)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>No valid folder selected!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <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="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <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="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <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="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4493,53 +4493,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>Success</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>Conflict</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es.ts b/translations/client_es.ts index 85c9a9442..fda790aff 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -923,7 +923,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation type="unfinished"/> </message> @@ -1147,122 +1147,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <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="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation>(copia de seguridad)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation>(copia de seguridad %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>Estado no definido.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>Esperando para comenzar la sincronización.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>Preparándose para sincronizar.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>Sincronización en funcionamiento.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <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="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <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="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>Error de configuración.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>Interrumpido por el usuario.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>La sincronización está en pausa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%1 (Sincronización en pausa)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>¡La carpeta seleccionada no es válida!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <source>The selected path does not exist!</source> <translation>La ruta seleccionada no existe!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <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="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <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="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4506,53 +4506,53 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation>Error fatal.</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>Información</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>Éxito</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>Conflicto</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> diff --git a/translations/client_fr.ts b/translations/client_fr.ts index f7f44408b..16c25fe51 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -923,7 +923,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation type="unfinished"/> </message> @@ -1148,122 +1148,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <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="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation>(sauvegarde)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation>(sauvegarde %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>Statut indéfini.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>En attente de synchronisation.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>Préparation de la synchronisation.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>Synchronisation en cours</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <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="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation>Synchronisation terminée avec succès</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>Erreur d'installation.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>Abandon par l'utilisateur.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>La synchronisation est en pause.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisation en pause)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>Aucun dossier valable sélectionné !</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <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="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <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="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <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="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4510,53 +4510,53 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation>Erreur fatale</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>Succès</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>Conflit</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 6bb3ac054..ca2ee777b 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -923,7 +923,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation type="unfinished"/> </message> @@ -1148,122 +1148,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <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="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation>(copia de seguridade)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation>(copia de seguridade %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>Estado sen definir.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>Agardando para iniciar a sincronización.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>Preparando para sincronizar.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>Estase sincronizando.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <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="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation>A última sincronización fíxose correctamente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>Erro de configuración.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>Interrompido polo usuario.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>Sincronización en pausa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%1 (sincronización en pausa)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>Non seleccionou ningún cartafol correcto!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <source>The selected path does not exist!</source> <translation>A ruta seleccionada non existe!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <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="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <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="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4509,53 +4509,53 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation>Produciuse un erro fatal</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>Información</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>Correcto</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>Conflito</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation>Na lista negra</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> diff --git a/translations/client_he.ts b/translations/client_he.ts index ddb9b5ac2..7c84352ee 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -923,7 +923,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation type="unfinished"/> </message> @@ -1147,122 +1147,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <source>Could not reset folder state</source> <translation>לא ניתן לאפס את מצב התיקייה</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation> (גיבוי)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation> (גיבוי %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>מצב בלתי מוגדר.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>ממתין להתחלת סנכרון.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>מכין סנכרון.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>הסנכרון פועל כרגע.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Sync was successful, unresolved conflicts.</source> <translation>הסנכרון עבר בהצלחה, קיימים קונפליקטים שלו יושרו.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation>הסנכרון האחרון הושלם בהצלחה.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>שגיאת התקנה.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>משתמש ביטל פעולה.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>סנכרון בהשהייה.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%1 (סנכרון בהשהייה)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>לא נבחרה תיקייה חוקית!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <source>The selected path does not exist!</source> <translation>הנתיב הנבחר אינו קיים!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <source>The selected path is not a folder!</source> <translation>הנתיב שנבחר אינו תיקייה!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <source>You have no permission to write to the selected folder!</source> <translation>אין לך הרשאות לכתיבה לתיקייה הנבחרת!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4508,53 +4508,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation>שגיאה מכרעת</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>שגיאה</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>מידע</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>התנגשות</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> diff --git a/translations/client_it.ts b/translations/client_it.ts index 094377f7a..c8f5aad94 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -923,7 +923,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation type="unfinished"/> </message> @@ -1148,122 +1148,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <source>Could not reset folder state</source> <translation>Impossibile ripristinare lo stato della cartella</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation>(copia di sicurezza)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation>(copia di sicurezza %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>Stato non definito.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>In attesa di iniziare la sincronizzazione.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>Preparazione della sincronizzazione.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>La sincronizzazione è in corso.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <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="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation>L'ultima sincronizzazione è stata completata correttamente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>Errore di configurazione.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>Interrotto dall'utente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>La sincronizzazione è sospesa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation> %1 (La sincronizzazione è sospesa)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>Nessuna cartella valida selezionata!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <source>The selected path does not exist!</source> <translation>Il percorso selezionato non esiste!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <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="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <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="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4503,53 +4503,53 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation>Errore grave</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>Informazioni</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>Riuscito</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>Conflitto</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation>Sulla lista nera</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> diff --git a/translations/client_nl.ts b/translations/client_nl.ts index e00074143..5a05826b3 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -923,7 +923,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation type="unfinished"/> </message> @@ -1146,122 +1146,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <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="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation>(backup)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation>(backup %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>Ongedefiniëerde staat</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>In afwachting van synchronisatie.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>Synchronisatie wordt voorbereid</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>Bezig met synchroniseren.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synchronisatie was succesvol, onopgeloste conflicten.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation>Laatste synchronisatie was geslaagd.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>Installatiefout.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>Afgebroken door gebruiker.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>Synchronisatie gepauzeerd.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisatie onderbroken)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>Geen geldige map geselecteerd!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <source>The selected path does not exist!</source> <translation>Het geselecteerde pad bestaat niet!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <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="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <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="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4514,53 +4514,53 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation>Fatale fout</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>Fout</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>Succes</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>Conflict</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> diff --git a/translations/client_pl.ts b/translations/client_pl.ts index bee6fdff4..26349432d 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -924,7 +924,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation type="unfinished"/> </message> @@ -1146,122 +1146,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <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="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation>(kopia zapasowa)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation>(kopia zapasowa %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>Niezdefiniowany stan</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>Poczekaj na rozpoczęcie synchronizacji.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>Przygotowuję do synchronizacji</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>Synchronizacja w toku</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synchronizacja udana, nierozwiązane konflikty.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation>Ostatnia synchronizacja zakończona powodzeniem.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>Błąd ustawień.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>Użytkownik anulował.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>Synchronizacja wstrzymana</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation> %1 (Synchronizacja jest zatrzymana)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>Nie wybrano poprawnego folderu.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <source>The selected path does not exist!</source> <translation>Wybrana ścieżka nie istnieje!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <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="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <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="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4492,53 +4492,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation>Błąd systemu</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>Błąd</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>Sukces</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>Konflikt</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index c61ad1b0d..533e86eab 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -924,7 +924,7 @@ Utilitário de sincronização de arquivos na área de trabalho. </translation> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation>Falha ao analisar as credenciais %1</translation> </message> @@ -1146,122 +1146,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <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="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation> (backup)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation> (backup %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>Estado indefinido.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>À espera do início da sincronização.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>Preparando para sincronização.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>A sincronização está ocorrendo.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <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="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <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="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>Erro de Configuração.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>Usuário Abortou.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>Sincronização pausada.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%1 (Pausa na Sincronização) </translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>Nenhuma pasta válida selecionada!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <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="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <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="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <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="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <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="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation>%1 Por favor, escolha outro!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4508,53 +4508,53 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation>Indefinido</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation>Erro Fatal</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>Informação</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>Sucesso</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>Conflito</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation>Erro Ignorado</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation>Restaurado</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation>Lista Negra</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation>Excluído</translation> </message> diff --git a/translations/client_ru.ts b/translations/client_ru.ts index 77ee8cdc9..be54ef499 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -924,7 +924,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation>Не удалось разобрать учётные данные %1</translation> </message> @@ -1148,122 +1148,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <source>Could not reset folder state</source> <translation>Невозможно сбросить состояние каталога</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation>(резервная копия)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation>(резервная копия %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>Неопределенное состояние.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>Ожидание запуска синхронизации.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>Подготовка к синхронизации.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>Идет синхронизация.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Синхронизация успешна, есть неразрешённые конфликты.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation>Последняя синхронизация прошла успешно.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>Ошибка установки.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>Отмена пользователем.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>Синхронизация приостановлена.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%! (синхронизация приостановлена)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>Не выбран валидный каталог!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <source>The folder %1 is used in a folder sync connection!</source> <translation>Каталог %1 используется в соединении синхронизации каталогов!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <source>The selected path does not exist!</source> <translation>Выбранный путь не существует!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <source>The selected path is not a folder!</source> <translation>Выбранный путь не является каталогом!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <source>You have no permission to write to the selected folder!</source> <translation>У вас недостаточно прав для записи в выбранный каталог!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation>%1 Пожалуйста, сделайте другой выбор!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4509,53 +4509,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation>Неисправимая ошибка</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>Инфо</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>Успешно</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>Конфликт</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> diff --git a/translations/client_sq.ts b/translations/client_sq.ts index e9558d921..169e1160c 100644 --- a/translations/client_sq.ts +++ b/translations/client_sq.ts @@ -924,7 +924,7 @@ Mjet njëkohësimi kartelash për desktop.</translation> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation>S’u arrit të përtypen kredencialet %1</translation> </message> @@ -1148,122 +1148,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <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="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation> (kopjeruajtje)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation> (kopjeruajtja %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>Gjendje e Papërkufizuar.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>Po pritet të fillohet njëkohësimi.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>Po përgatitet për njëkohësim.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>Njëkohësimi po kryhet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <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="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <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="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>Gabim te Rregullimet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>Ndërprerje Nga Përdoruesi.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>Njëkohësimi është ndalur.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%1 (Njëkohësimi është ndalur)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>S’është përzgjedhur dosje e vlefshme!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <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="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <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="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <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="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <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="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <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="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4511,53 +4511,53 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation>I papërcaktuar</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation>Gabim Fatal</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>Gabim</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>Të dhëna</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>Sukses</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>Përplasje</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation>Gabimi u Shpërfill</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> diff --git a/translations/client_th.ts b/translations/client_th.ts index 5e583cfdf..2200de34e 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -924,7 +924,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation type="unfinished"/> </message> @@ -1147,122 +1147,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <source>Could not reset folder state</source> <translation>ไม่สามารถรีเซ็ตสถานะโฟลเดอร์</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation>(สำรองข้อมูล)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation>(สำรองข้อมูล %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>กำลังรอเริ่มต้นการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>กำลังเตรียมการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>การประสานข้อมูลกำลังทำงาน</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Sync was successful, unresolved conflicts.</source> <translation>ประสานข้อมูลสำเร็จแต่ยังมีข้อขัดแย้งที่ยังไม่ได้รับการแก้ไข</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation>ประสานข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>เกิดข้อผิดพลาดในการติดตั้ง</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>ยกเลิกผู้ใช้</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>การประสานข้อมูลถูกหยุดไว้ชั่วคราว</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%1 (การประสานข้อมูลถูกหยุดชั่วคราว)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>เลือกโฟลเดอร์ไม่ถูกต้อง!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <source>The selected path does not exist!</source> <translation>เส้นทางที่เลือกไม่มีอยู่!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <source>The selected path is not a folder!</source> <translation>เส้นทางที่เลือกไม่ใช่โฟลเดอร์!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <source>You have no permission to write to the selected folder!</source> <translation>คุณมีสิทธิ์เขียนโฟลเดอร์ที่เลือกนี้!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4501,53 +4501,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation>ข้อผิดพลาดร้ายแรง</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>ข้อผิดพลาด</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>ข้อมูล</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>เสร็จสิ้น</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>ปัญหา</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 6e903de56..c9c314af8 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -923,7 +923,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation type="unfinished"/> </message> @@ -1147,122 +1147,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <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="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation> (yedek)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation> (yedek %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>Tanımlanmamış Durum.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>Eşitlemenin başlanması bekleniyor.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>Eşitleme için hazırlanıyor.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>Eşitleme çalışıyor.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <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="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation>Son Eşitleme başarılı oldu.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>Kurulum Hatası.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>Kullanıcı İptal Etti.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>Eşitleme duraklatıldı.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%1 (Eşitleme duraklatıldı)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>Geçerli klasör seçilmedi!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <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="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <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="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <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="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4506,53 +4506,53 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation>Ölümcül Hata</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>Hata</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>Bilgi</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>Başarılı</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>Çakışma</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation>Kara listede</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index 8b036f900..2ce209018 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -919,7 +919,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation type="unfinished"/> </message> @@ -1139,122 +1139,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <source>Could not reset folder state</source> <translation>不能重置文件夹状态</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation> (备份)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation> (备份 %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>未知状态。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>等待启动同步。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>准备同步。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>同步正在运行。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Sync was successful, unresolved conflicts.</source> <translation>同步成功,但有未解决的冲突。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation>最后一次同步成功。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>安装失败</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>用户撤销。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>同步已暂停。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%1 (同步已暂停)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>没有选择有效的文件夹!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <source>The selected path does not exist!</source> <translation>您选择的目录不存在!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <source>The selected path is not a folder!</source> <translation>选择的路径不是一个文件夹!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <source>You have no permission to write to the selected folder!</source> <translation>你没有写入所选文件夹的权限!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4484,53 +4484,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation>致命错误</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>错误</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>信息</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>成功</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>冲突</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 0b31be80b..224ddfb46 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -923,7 +923,7 @@ File synchronization desktop utility.</source> <context> <name>OCC::CredentialJob</name> <message> - <location filename="../src/libsync/creds/credentialmanager.cpp" line="199"/> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="204"/> <source>Failed to parse credentials %1</source> <translation type="unfinished"/> </message> @@ -1147,122 +1147,122 @@ 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="417"/> + <location filename="../src/gui/folderman.cpp" line="427"/> <source>Could not reset folder state</source> <translation>無法重置資料夾狀態</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="418"/> + <location filename="../src/gui/folderman.cpp" line="428"/> <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="1198"/> + <location filename="../src/gui/folderman.cpp" line="1208"/> <source> (backup)</source> <translation>(備份)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1203"/> + <location filename="../src/gui/folderman.cpp" line="1213"/> <source> (backup %1)</source> <translation>(備份 %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1305"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Undefined State.</source> <translation>未知狀態</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1308"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Waiting to start syncing.</source> <translation>正在等待同步開始</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1311"/> + <location filename="../src/gui/folderman.cpp" line="1321"/> <source>Preparing for sync.</source> <translation>正在準備同步。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1314"/> + <location filename="../src/gui/folderman.cpp" line="1324"/> <source>Sync is running.</source> <translation>同步執行中</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1319"/> + <location filename="../src/gui/folderman.cpp" line="1329"/> <source>Sync was successful, unresolved conflicts.</source> <translation>同步成功,未解決衝突。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1321"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Last Sync was successful.</source> <translation>最後一次同步成功</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1327"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Setup Error.</source> <translation>安裝失敗</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1330"/> + <location filename="../src/gui/folderman.cpp" line="1340"/> <source>User Abort.</source> <translation>使用者中斷。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1333"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>Sync is paused.</source> <translation>同步已暫停</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1349"/> <source>%1 (Sync is paused)</source> <translation>%1 (同步暫停)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1357"/> <source>No valid folder selected!</source> <translation>沒有選擇有效的資料夾</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1355"/> + <location filename="../src/gui/folderman.cpp" line="1365"/> <source>The folder %1 is used in a folder sync connection!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1362"/> + <location filename="../src/gui/folderman.cpp" line="1372"/> <source>The selected path does not exist!</source> <translation>所選路徑不存在!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1366"/> + <location filename="../src/gui/folderman.cpp" line="1376"/> <source>The selected path is not a folder!</source> <translation>所選的路徑並非資料夾!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1370"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <source>You have no permission to write to the selected folder!</source> <translation>您沒有權限來寫入被選取的資料夾!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1407"/> + <location filename="../src/gui/folderman.cpp" line="1417"/> <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="1411"/> + <location filename="../src/gui/folderman.cpp" line="1421"/> <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="1417"/> + <location filename="../src/gui/folderman.cpp" line="1427"/> <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="1424"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>%1 Please pick another one!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1500"/> + <location filename="../src/gui/folderman.cpp" line="1510"/> <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> @@ -4508,53 +4508,53 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>SyncFileItem::Status</name> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="83"/> + <location filename="../src/libsync/syncfileitem.cpp" line="82"/> <source>Undefined</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="85"/> + <location filename="../src/libsync/syncfileitem.cpp" line="84"/> <source>Fatal Error</source> <translation>嚴重錯誤</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="87"/> - <location filename="../src/libsync/syncfileitem.cpp" line="99"/> + <location filename="../src/libsync/syncfileitem.cpp" line="86"/> + <location filename="../src/libsync/syncfileitem.cpp" line="98"/> <source>Error</source> <translation>錯誤</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="89"/> + <location filename="../src/libsync/syncfileitem.cpp" line="88"/> <source>Info</source> <translation>信息</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="91"/> + <location filename="../src/libsync/syncfileitem.cpp" line="90"/> <source>Success</source> <translation>成功</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="93"/> + <location filename="../src/libsync/syncfileitem.cpp" line="92"/> <source>Conflict</source> <translation>衝突</translation> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="95"/> + <location filename="../src/libsync/syncfileitem.cpp" line="94"/> <source>Error Ignored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="97"/> + <location filename="../src/libsync/syncfileitem.cpp" line="96"/> <source>Restored</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="101"/> + <location filename="../src/libsync/syncfileitem.cpp" line="100"/> <source>Blacklisted</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncfileitem.cpp" line="103"/> + <location filename="../src/libsync/syncfileitem.cpp" line="102"/> <source>Excluded</source> <translation type="unfinished"/> </message> |