diff options
author | ownClouders <devops@owncloud.com> | 2022-03-19 06:06:18 +0300 |
---|---|---|
committer | ownClouders <devops@owncloud.com> | 2022-03-19 06:06:18 +0300 |
commit | adefaabde17f2217b19c27e63a83556d502f34f5 (patch) | |
tree | 8d673094d20ffd8835d36f06905d5f489054ee12 | |
parent | 53dc87ecf065d13496195e90511ef267bf903737 (diff) |
[tx] updated client translations from transifex [skip ci]
-rw-r--r-- | translations/client_ar.ts | 83 | ||||
-rw-r--r-- | translations/client_bg_BG.ts | 83 | ||||
-rw-r--r-- | translations/client_cs.ts | 83 | ||||
-rw-r--r-- | translations/client_de-informal.ts | 83 | ||||
-rw-r--r-- | translations/client_de.ts | 83 | ||||
-rw-r--r-- | translations/client_de_CH.ts | 83 | ||||
-rw-r--r-- | translations/client_el.ts | 83 | ||||
-rw-r--r-- | translations/client_en.ts | 81 | ||||
-rw-r--r-- | translations/client_en_GB.ts | 83 | ||||
-rw-r--r-- | translations/client_es.ts | 83 | ||||
-rw-r--r-- | translations/client_fr.ts | 83 | ||||
-rw-r--r-- | translations/client_gl.ts | 83 | ||||
-rw-r--r-- | translations/client_he.ts | 83 | ||||
-rw-r--r-- | translations/client_it.ts | 83 | ||||
-rw-r--r-- | translations/client_ko.ts | 83 | ||||
-rw-r--r-- | translations/client_nl.ts | 83 | ||||
-rw-r--r-- | translations/client_pt_BR.ts | 83 | ||||
-rw-r--r-- | translations/client_ru.ts | 109 | ||||
-rw-r--r-- | translations/client_sq.ts | 85 | ||||
-rw-r--r-- | translations/client_th.ts | 83 | ||||
-rw-r--r-- | translations/client_tr.ts | 83 | ||||
-rw-r--r-- | translations/client_zh_CN.ts | 83 | ||||
-rw-r--r-- | translations/client_zh_TW.ts | 83 |
23 files changed, 1141 insertions, 794 deletions
diff --git a/translations/client_ar.ts b/translations/client_ar.ts index 22a284dcb..8d474547b 100644 --- a/translations/client_ar.ts +++ b/translations/client_ar.ts @@ -1473,12 +1473,12 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>أضف اتصال مزامنة المجلد</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>أضف اتصال المزامنة</translation> </message> @@ -1539,17 +1539,22 @@ Please consider removing this folder from the account and adding it again.</sour <translation>اختر هذا لمزامنة الحساب بالكامل</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>تتم مزامنة هذا المجلد بالفعل.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>تقوم الآن بمزامنة <i>%1</i> بالفعل، وهو المجلد الأصلي لـ <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>تقوم الآن بمزامنة <i>%1</i> بالفعل، وهو المجلد الفرعي لـ <i>%2</i>.</translation> </message> @@ -1557,17 +1562,17 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>استخدم الملفات الظاهرية بدلاً من تنزيل المحتوى فورًا٪1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation>(تجريبي)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation>الملفات الظاهرية غير متوفرة للمجلد المحدد</translation> </message> @@ -1580,9 +1585,19 @@ Please consider removing this folder from the account and adding it again.</sour <translation><b>تحذير:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>تحذير:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2013,53 +2028,53 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>يتوفر إصدار جديد</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>يتوفر إصدار جديد من عميل %1.</p><p><b>%2</b> متوفر للتنزيل. الإصدار المثبت هو %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>تجاوز هذا الإصدار</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>التجاهل هذه المرة</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>الحصول على التحديث</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>فشل التحديث</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p>يتوفر إصدار جديد من عميل %1، لكن فشلت عملية التحديث.</p><p><b>%2</b> متوفر للتنزيل. الإصدار المثبت هو %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>الطلب مرة أخرى لاحقًا</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>إعادة التشغيل والتحديث</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>التحديث يدويًا</translation> </message> @@ -2265,64 +2280,64 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>تحديث %1 جديد جاهز</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>يوجد تحديث جديد لـ %1 على وشك التثبيت. قد تطلب أداة التثبيت امتيازات إضافية في أثناء العملية.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>تعذّر تنزيل التحديث. يُرجى النقر <a href='%1'>هنا</a> لتنزيل التحديث يدويًا.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>تعذّر البحث عن تحديثات جديدة.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>تنزيل %1. يُرجى الانتظار…</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 متوفر. أعد تشغيل التطبيق لبدء التحديث.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>%1 جديد متوفر. يُرجى استخدام أداة تحديث النظام لتثبيته.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>جارٍ فحص خادم التحديث...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>حالة التحديث غير معروفة: لم يتم البحث عن وجود تحديثات جديدة.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>لا توجد تحديثات متوفرة. لديك أحدث إصدار.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>التحقق من وجود تحديث</translation> </message> diff --git a/translations/client_bg_BG.ts b/translations/client_bg_BG.ts index f31688682..e6790aa13 100644 --- a/translations/client_bg_BG.ts +++ b/translations/client_bg_BG.ts @@ -1473,12 +1473,12 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Добавяне на синхронизираща връзка за папка</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Добавяне на връзка за синхронизиране</translation> </message> @@ -1539,17 +1539,22 @@ Please consider removing this folder from the account and adding it again.</sour <translation>Изберете за да синхронизирате целия профил</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>Тази папка вече е сред тези, които се синхронизират.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Вече синхронизирате <i>%1</i>, която е родителска папка на <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1557,17 +1562,17 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation>(експериментален)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation>Виртуалните файлове не са налични за избраната папка</translation> </message> @@ -1580,9 +1585,19 @@ Please consider removing this folder from the account and adding it again.</sour <translation><b>Внимание:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>Внимание:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2012,53 +2027,53 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>Има Нова Версия</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>Нова версия на %1 е на разположение .</p><p><b>%2</b> е готова за изтегляне. Инсталираната версия е %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>Прескочи тази версия</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>Прескочи този път</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>Обнови</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>Актуализацията не е успешна</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p>Налична е нова версия на %1 Клиент, но процесът на актуализиране не бе успешен.</p><p><b>%2</b> беше изтеглена. Инсталираната версия е %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>Попитай отново по-късно</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>Рестарт и обновяване</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>Обновете ръчно</translation> </message> @@ -2263,64 +2278,64 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>Новото %1 Обновление е готово</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>Новото обновление за %1 е на път да бъде инсталирано. При обновяването могат да бъдат поискани допълнителни превилегии по време на процеса.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Неуспешно изтегляне на обновлението. Моля, щракнете <a href='%1'>тук</a> за да го изтеглите ръчно.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>Неуспешна проверка за обновления.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>Изтегля се %1. Изчакайте...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 е налично. Рестартирайте приложението за да стартирате актуализацията.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>Ново %1 е налично. Моля, използвайте инструмента за актуализиране на системата за да го инсталирате.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>Проверява се сървърът за обновления...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Статус на обновяването неизвестен: Проверката за обновление не е извършена.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Няма нови обновления. Инсталацията е с най-новата версия.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>Провери за Обновления</translation> </message> diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 2c9721ff8..d6828c8c0 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -1463,12 +1463,12 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Přidat synchronizaci adresáře</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Přidat synchronizační připojení</translation> </message> @@ -1529,17 +1529,22 @@ Please consider removing this folder from the account and adding it again.</sour <translation>Zvolte toto k provedení synchronizace celého účtu</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>Tento adresář je již synchronizován.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Již synchronizujete adresář <i>%1</i>, který je adresáři <i>%2</i> nadřazený.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Již synchronizujete adresář <i>%1</i>, který je podsložkou <i>%2</i> .</translation> </message> @@ -1547,17 +1552,17 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Použijte virtuální soubory namísto přímého stahování obsahu %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation>(experimentální)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation>Virtuální soubory nejsou dostupné pro zvolenou složku</translation> </message> @@ -1570,9 +1575,19 @@ Please consider removing this folder from the account and adding it again.</sour <translation><b>Varování:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>Varování:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -1999,53 +2014,53 @@ Poznámka: Spouštění aplikace s parametrem přepíše toto nastavení.</trans <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>Je dostupná nová verze</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>Je k dispozici nová verze klienta %1.</p><p><b>%2</b> je k dispozici ke stažení. Momentálně je nainstalována verze %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>Přeskoč tuto verzi</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>Tentokrát přeskočit</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>Získat aktualizaci</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>Aktualizace selhala</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p>Je k dispozici nová verze aplikace (%1), ale její aktualizace selhala.</p><p><b>%2</b> byla stažena. Nainstalovaná verze je %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>Zeptej se příště</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>Restartovat a aktualizovat</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>Ruční aktualizace</translation> </message> @@ -2251,64 +2266,64 @@ Poznámka: Spouštění aplikace s parametrem přepíše toto nastavení.</trans <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>Je připravena nová aktualizace %1</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>Bude instalována nová aktualizace pro %1. V průběhu aktualizace můžete být požádáni o dodatečná oprávnění.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Nemohu stáhnout aktualizaci. Klikněte prosím na <a href='%1'>tento odkaz</a> pro ruční stažení aktualizace.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>Nemohu zkontrolovat aktualizace.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>Stahování %1. Prosím čekejte...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 dostupná. Restartujte aplikaci pro zahájení aktualizace.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>Nová %1 dostupná. Prosím, použijte aktualizační nástroje systému k její instalaci.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>Kontroluji aktualizační server...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Stav aktualizace neznámý: Nové aktualizace nebyly zkontrolovány.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Žádne aktualizace nejsou k dispozici. Používáte aktuální verzi.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>Ověřit aktualizace</translation> </message> diff --git a/translations/client_de-informal.ts b/translations/client_de-informal.ts index 46696ee0f..5d927ecc7 100644 --- a/translations/client_de-informal.ts +++ b/translations/client_de-informal.ts @@ -1474,12 +1474,12 @@ Ziehen Sie in Erwägung, diesen Ordner aus dem Konto zu entfernen und erneut hin <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Synchronisiertes Verzeichnis hinzufügen</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Füge eine Verzeichnis Sychronisation hinzu</translation> </message> @@ -1540,17 +1540,22 @@ Ziehen Sie in Erwägung, diesen Ordner aus dem Konto zu entfernen und erneut hin <translation>Wähle dies, um das gesamte Konto zu synchronisieren</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>Dieser Ordner wird bereits synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Du synchronisierst bereits <i>%1</i>, das ein übergeordneten Ordner von <i>%2</i> ist.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Der sync von <i>%1</i> läuft schon, als Unterverzeichnis von <i>%2</i>.</translation> </message> @@ -1558,17 +1563,17 @@ Ziehen Sie in Erwägung, diesen Ordner aus dem Konto zu entfernen und erneut hin <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Virtuelle Dateien verwenden, anstatt die Dateien gleich herunter zu laden%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation>(experimentell)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation>Virtuelle Dateien sind für den gewählten Ordner nicht verügbar</translation> </message> @@ -1581,9 +1586,19 @@ Ziehen Sie in Erwägung, diesen Ordner aus dem Konto zu entfernen und erneut hin <translation><b>Warnung:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>Warnung:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2013,53 +2028,53 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>Eine neue Version ist verfügbar.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>Eine neue Version des %1 Clients ist verfügbar.</p><p><b>%2</b> steht zum Herunterladen bereit. Die installierte Version ist %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>Diese Version auslassen</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>Dieses Mal überspringen</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>Update durchführen</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>Update fehlgeschlagen</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p>Eine neue Version des %1 Clients ist verfügbar, aber der Aktualisierungs-Prozess ist fehlgeschlagen.</p><p><b>%2</b> wurde heruntergeladen. Die installierte Version ist %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>Später noch einmal fragen</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>Neustarten und aktualisieren</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>Manuell aktualisieren</translation> </message> @@ -2264,63 +2279,63 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>Neues %1 Update verfügbar</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>Ein neues Update für %1 wird installiert. Während des Updatevorganges werden Sie eventuell gefragt zusätzliche Rechte im Rahmen des Updatevorganges zu gewähren.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Aktualisierung kann nicht herunter geladen werden. Bitte klicke <a href='%1'>hier</a> um die Aktualisierung manuell herunter zu laden.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>Auf neue Aktualisierungen kann nicht geprüft werden.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>Herunterladen von %1. Bitte warten…</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 ist verfügbar. Anwendung zum Start der Aktualisierung neu starten.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation>Neue %1 verfügbar. Bitte clicken Sie <a href='%2'>hier</a> um das neue AppImage manuell downzuloaden.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>Aktualisierung von %1 verfügbar. Bitte nutzen Sie zur Installation das Systemaktualisierungstool.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>Update-Server wird überprüft…</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Updatestatus unbekannt: Auf neue Updates wurde nicht geprüft.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Keine Updates verfügbar. Ihre Installation ist die aktuelle Version.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>Aktualisierungsüberprüfung</translation> </message> diff --git a/translations/client_de.ts b/translations/client_de.ts index c095547b8..c5b8798dd 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -1476,12 +1476,12 @@ Ziehen Sie in Erwägung, diesen Ordner aus dem Konto zu entfernen und erneut hin <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Ordner-Synchronisation hinzufügen</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Synchronisation hinzufügen</translation> </message> @@ -1542,17 +1542,22 @@ Ziehen Sie in Erwägung, diesen Ordner aus dem Konto zu entfernen und erneut hin <translation>Wählen Sie dies, um das gesamte Konto zu synchronisieren</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>Dieser Ordner wird bereits synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Sie synchronisieren bereits <i>%1</i>, das ein übergeordneten Ordner von <i>%2</i> ist.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Sie synchronisieren bereits <i>%1</i>, das ein untergeordneter Ordner von <i>%2</i> ist.</translation> </message> @@ -1560,17 +1565,17 @@ Ziehen Sie in Erwägung, diesen Ordner aus dem Konto zu entfernen und erneut hin <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Virtuelle Dateien verwenden, anstatt die Dateien herunter zu laden%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation>(Experimentell)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation>Virtuelle Dateien sind für den ausgewählten Ordner nicht verfügbar</translation> </message> @@ -1583,9 +1588,19 @@ Ziehen Sie in Erwägung, diesen Ordner aus dem Konto zu entfernen und erneut hin <translation><b>Warnung:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>Warnung:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2015,53 +2030,53 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>Eine neue Version ist verfügbar.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>Eine neue Version des %1 Clients ist verfügbar.</p><p><b>%2</b> steht zum Herunterladen bereit. Die installierte Version ist %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>Diese Version auslassen</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>Dieses Mal überspringen</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>Update durchführen</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>Update fehlgeschlagen</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p>Eine neue Version des %1 Clients ist verfügbar, aber der Aktualisierungs-Prozess ist fehlgeschlagen.</p><p><b>%2</b> wurde heruntergeladen. Die installierte Version ist %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>Später noch einmal fragen</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>Neustarten und aktualisieren</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>Manuell aktualisieren</translation> </message> @@ -2267,63 +2282,63 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>Neues %1 Update verfügbar</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>Ein neues Update für %1 wird installiert. Während des Updatevorganges werden Sie eventuell gefragt zusätzliche Rechte im Rahmen des Updatevorganges zu gewähren.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Aktualisierung kann nicht herunter geladen werden. Bitte klicken Sie <a href='%1'>hier</a> um die Aktualisierung manuell herunter zu laden.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>Auf neue Aktualisierungen kann nicht geprüft werden.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>Herunterladen von %1. Bitte warten…</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 ist verfügbar. Anwendung zum Start der Aktualisierung neu starten.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation>Neue %1 verfügbar. Bitte clicken Sie <a href='%2'>hier</a> um das neue AppImage manuell downzuloaden.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>Aktualisierung von %1 verfügbar. Bitte nutzen Sie zur Installation das Systemaktualisierungstool.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>Aktualisierungsserver wird überprüft …</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Updatestatus unbekannt: Auf neue Updates wurde nicht geprüft.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Keine Aktualisierungen verfügbar. Ihre Installation ist die aktuelle Version.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>Aktualitätsprüfung</translation> </message> diff --git a/translations/client_de_CH.ts b/translations/client_de_CH.ts index 4bcbdcd10..994522101 100644 --- a/translations/client_de_CH.ts +++ b/translations/client_de_CH.ts @@ -1471,12 +1471,12 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Synchronisiertes Verzeichnis hinzufügen</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Füge eine Verzeichnis Sychronisation hinzu</translation> </message> @@ -1537,17 +1537,22 @@ Please consider removing this folder from the account and adding it again.</sour <translation>Wähle dies, um das gesamte Konto zu synchronisieren</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>Dieser Ordner wird bereits synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Du synchronisierst bereits <i>%1</i>, das ein übergeordneten Ordner von <i>%2</i> ist.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Der sync von <i>%1</i> läuft schon, als Unterverzeichnis von <i>%2</i>.</translation> </message> @@ -1555,17 +1560,17 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Virtuelle Dateien verwenden, anstatt die Dateien gleich herunter zu laden%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation>(experimentell)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> @@ -1578,9 +1583,19 @@ Please consider removing this folder from the account and adding it again.</sour <translation><b>Warnung:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>Warnung:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2009,53 +2024,53 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>Eine neue Version ist verfügbar.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>Eine neue Version des %1 Clients ist verfügbar.</p><p><b>%2</b> steht zum Herunterladen bereit. Die installierte Version ist %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>Diese Version auslassen</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>Dieses Mal überspringen</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>Update durchführen</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>Update fehlgeschlagen</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p>Eine neue Version des %1 Clients ist verfügbar, aber der Aktualisierungs-Prozess ist fehlgeschlagen.</p><p><b>%2</b> wurde heruntergeladen. Die installierte Version ist %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>Später noch einmal fragen</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>Neustarten und aktualisieren</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>Manuell aktualisieren</translation> </message> @@ -2260,63 +2275,63 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>Neues %1 Update verfügbar</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>Ein neues Update für %1 wird installiert. Während des Updatevorganges werden Sie eventuell gefragt zusätzliche Rechte im Rahmen des Updatevorganges zu gewähren.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Aktualisierung kann nicht herunter geladen werden. Bitte klicke <a href='%1'>hier</a> um die Aktualisierung manuell herunter zu laden.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>Auf neue Aktualisierungen kann nicht geprüft werden.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>Herunterladen von %1. Bitte warten…</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 ist verfügbar. Anwendung zum Start der Aktualisierung neu starten.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>Aktualisierung von %1 verfügbar. Bitte nutzen Sie zur Installation das Systemaktualisierungstool.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>Update-Server wird überprüft…</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Updatestatus unbekannt: Auf neue Updates wurde nicht geprüft.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Keine Updates verfügbar. Ihre Installation ist die aktuelle Version.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>Aktualisierungsüberprüfung</translation> </message> diff --git a/translations/client_el.ts b/translations/client_el.ts index 102937c35..504ac0581 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -1473,12 +1473,12 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Προσθήκη Σύνδεσης Συγχρονισμού Φακέλου</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Προσθήκη Σύνδεσης Συγχρονισμού</translation> </message> @@ -1539,17 +1539,22 @@ Please consider removing this folder from the account and adding it again.</sour <translation>Επιλέξτε να συγχρονίσετε ολόκληρο το λογαριασμό</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>Αυτός ο φάκελος συγχρονίζεται ήδη.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Ο φάκελος <i>%1</i>, ο οποίος είναι γονεϊκός φάκελος του <i>%2</i>, συγχρονίζεται ήδη.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1557,17 +1562,17 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation> (πειραματικό)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> @@ -1580,9 +1585,19 @@ Please consider removing this folder from the account and adding it again.</sour <translation><b>Προειδοποίηση:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>Προειδοποίηση:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2012,53 +2027,53 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>Νέα Έκδοση Διαθέσιμη </translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>Μια νέα έκδοση του %1 Δέκτη είναι διαθέσιμη.</p><p><b>%2</b> είναι διαθέσιμη για λήψη. Η εγκατεστημένη έκδοση είναι %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>Παράλειψη αυτής της έκδοσης</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>Παράλειψη αυτή τη φορά</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>Λήψη ενημέρωσης</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>Απέτυχε η ενημέρωση</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p>Μια νέα έκδοση του πελάτη %1 είναι διαθέσιμη αλλά η διαδικασία ενημέρωσης απέτυχε.</p><p>Το <b>%2</b> έχει ληφθεί. Η εγκατεστημένη έκδοση είναι %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>Να γίνει ερώτηση ξανά αργότερα</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>Επανεκκίνηση και ενημέρωση</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>Χειροκίνητη ενημέρωση</translation> </message> @@ -2263,64 +2278,64 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>Νέα %1 Ενημέρωση Έτοιμη</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>Μια νέα ενημέρωση για %1 πρόκειται να εγκατασταθεί. Ο βοηθός ενημέρωσης μπορεί να ζητήσει επιπλέον παραχωρήσεις δικαιωμάτων κατά τη διαδικασία.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Αδυναμία λήψης της ενημέρωσης. Παρακαλώ κλικάρετε <a href='%1'>εδώ</a> για να κατεβάσετε την ενημέρωση χειροκίνητα.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>Αδυναμία ελέγχου για νέες ενημερώσεις.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>Γίνεται λήψη %1. Παρακαλούμε περιμένετε...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 διαθέσιμη. Κάντε επανεκκίνηση της εφαρμογής για να ξεκινήσετε την ενημέρωση.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>Υπάρχει διαθέσιμο νέο %1. Χρησιμοποιήστε το εργαλείο ενημέρωσης του συστήματος για να το εγκαταστήσετε.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>Έλεγχος διακομιστή ενημερώσεων...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Η κατάσταση ενημέρωσης είναι άγνωστη: Δεν έγινε έλεγχος για για νέες ενημερώσεις.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Δεν υπάρχουν ενημερώσεις διαθέσιμες. Η εγκατάστασή σας βρίσκεται στην τελευταία έκδοση.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>Έλεγχος για ενημερώσεις</translation> </message> diff --git a/translations/client_en.ts b/translations/client_en.ts index 124138068..c5e185b86 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -1493,12 +1493,12 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation type="unfinished"></translation> </message> @@ -1559,17 +1559,22 @@ Please consider removing this folder from the account and adding it again.</sour <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"></translation> </message> @@ -1577,17 +1582,17 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"></translation> </message> @@ -1600,8 +1605,18 @@ Please consider removing this folder from the account and adding it again.</sour <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> <translation type="unfinished"></translation> </message> </context> @@ -2027,53 +2042,53 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation type="unfinished"></translation> </message> @@ -2278,63 +2293,63 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index 272b6bee9..1c7e2ef7c 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -1473,12 +1473,12 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Add Folder Sync Connection</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Add Sync Connection</translation> </message> @@ -1539,17 +1539,22 @@ Please consider removing this folder from the account and adding it again.</sour <translation>Choose this to sync the entire account</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>This folder is already being synced.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1557,17 +1562,17 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> @@ -1580,9 +1585,19 @@ Please consider removing this folder from the account and adding it again.</sour <translation><b>Warning:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>Warning:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2009,53 +2024,53 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>New Version Available</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>Skip this version</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>Skip this time</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>Get update</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation type="unfinished"/> </message> @@ -2260,64 +2275,64 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>New %1 Update Ready</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>Could not check for new updates.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>Checking update server...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Update status is unknown: Did not check for new updates.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>No updates available. Your installation is at the latest version.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>Update Check</translation> </message> diff --git a/translations/client_es.ts b/translations/client_es.ts index 8781a7574..0fd4fabd7 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -1476,12 +1476,12 @@ Por favor, considere eliminar esta carpeta desde la cuenta y añadirla de nuevo. <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Añadir conexión de sincronización de carpetas</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Añadir Sincronización de Conexión</translation> </message> @@ -1542,17 +1542,22 @@ Por favor, considere eliminar esta carpeta desde la cuenta y añadirla de nuevo. <translation>Elija esto para sincronizar la cuenta entera</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>Este directorio ya se ha sincronizado.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Ya ha sincronizado <i>%1</i>, el cual es la carpeta de <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Ya estás sincronizando <i>%1</i>, el cual es un subdirectorio de <i>%2</i>.</translation> </message> @@ -1560,17 +1565,17 @@ Por favor, considere eliminar esta carpeta desde la cuenta y añadirla de nuevo. <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Usar archivos virtuales en lugar de descargar inmediatamente el contenido %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation> (experimental)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation>Archivos Virtuales no está disponible para la carpeta seleccionada</translation> </message> @@ -1583,9 +1588,19 @@ Por favor, considere eliminar esta carpeta desde la cuenta y añadirla de nuevo. <translation><b>Advertencia:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>Advertencia:</b> </translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2016,53 +2031,53 @@ Tenga en cuenta que el uso de cualquier opción de línea de comando de registro <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>Nueva versión disponible</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>Una nueva versión del programa cliente de %1 está disponible.</p><p><b>%2</b> está disponible para descargar. La versión instalada es la %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>Saltarse esta versión</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>Omitir esta vez</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>Actualizar</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>La actualización ha fallado</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p>Una nueva versión de %1 Client está disponible pero el proceso de actualización falló.</p><p><b>%2</b> ha sido descargado. La versión instalada es %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>Preguntar de nuevo más tarde </translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>Reiniciar y actualizar</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>Actualizar manualmente</translation> </message> @@ -2267,63 +2282,63 @@ Tenga en cuenta que el uso de cualquier opción de línea de comando de registro <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>Nueva %1 actualización está lista</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>Se instalará una nueva actualización de %1. Durante esta actualización puede que se soliciten privilegios adicionales.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>No se puede descargar la actualización. Por favor, haga clic <a href='%1'>aquí</a> para iniciar una descarga manual.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>No se puede comprobar si hay actualizaciones.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>Descargando %1. Por favor espere...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 disponible. Reinicie la aplicación para iniciar la actualización.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation>Nueva versión %1 disponible. Por favor, haga clic <a href='%2'>aquí</a> para descargar la nueva AppImage manualmente.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>Nueva %1 disponible. Por favor utilice la herramienta de actualización de su sistema para instalarlo.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>Consultando al servidor de actualizaciones...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Estado de actualización desconocido: no se buscaron nuevas actualizaciones.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>No hay actualizaciones disponibles. Tiene la última versión.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>Comprobar si hay actualizaciones</translation> </message> diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 95ec364f7..19569eefb 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -1474,12 +1474,12 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Ajouter une synchronisation de dossier</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Ajouter une Synchronisation</translation> </message> @@ -1540,17 +1540,22 @@ Please consider removing this folder from the account and adding it again.</sour <translation>Sélectionnez ceci pour synchroniser l'ensemble du compte</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>Ce dossier est déjà en cours de synchronisation.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Vous synchronisez déja <i>%1</i>, qui est un dossier parent de <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Vous synchronisez déjà <i>%1</i>, qui est un sous-dossier de <i>%2</i>.</translation> </message> @@ -1558,17 +1563,17 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Utilisez des fichiers virtuels au lieu de télécharger du contenu immédiatement%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation> (expérimental)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation>Les fichiers virtuels ne sont pas disponibles pour le dossier sélectionné</translation> </message> @@ -1581,9 +1586,19 @@ Please consider removing this folder from the account and adding it again.</sour <translation><b>Avertissement :</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>Avertissement :</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2014,53 +2029,53 @@ Veuillez noter qu’utiliser les options de journalisation en ligne de commande <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>Nouvelle version disponible</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>Une nouvelle version du client %1 est disponible.</p><p><b>%2</b> est disponible au téléchargement. La version actuellement installée est %3.<p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>Ignorer cette version</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>Ignorer pour cette fois</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>Télécharger la version</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>La mise à jour a échoué</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p> Une nouvelle version du Client %1 est disponible mais la mise à jour a échoué. </p><p><b>%2</b> a été téléchargé. La version installée est %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>Redemander plus tard</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>Redémarrer et mettre à jour</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>Mettre à jour manuellement</translation> </message> @@ -2266,64 +2281,64 @@ Veuillez noter qu’utiliser les options de journalisation en ligne de commande <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>Une nouvelle mise à jour de %1 est disponible</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>Une mise à jour de %1 est sur le point d'être installée. L'assistant de mise à jour peut vous demandez des autorisations supplémentaires afin de procéder à l'installation.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Impossible de télécharger la mise à jour. Veuillez la <a href='%1'>télécharger manuellement</a>.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>Impossible de vérifier la présence de nouvelles mises à jour.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>Téléchargement %1 en cours. Veuillez patienter…</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 disponible. Veuillez redémarrer l’application afin de démarrer la mise à jour.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>Nouvel(le) %1 disponible. Veuillez utiliser l’outils de mise à jour système afin de l’installer.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>Interrogation du serveur de mises à jour...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>L'état du processus de mise à jour est inconnu. Impossible de vérifier la présence de mises à jour.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Aucune mise à jour disponible. Votre installation est à jour.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>Recherche de mise à jour</translation> </message> diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 10b908833..65fd51d19 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -1474,12 +1474,12 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Engadir a conexión da sincronización do cartafol</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Engadir a conexión da sincronización</translation> </message> @@ -1540,17 +1540,22 @@ Please consider removing this folder from the account and adding it again.</sour <translation>Escolla isto para sincronizar toda a conta</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>Este cartafol xa está sincronizado.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Xa está a sincronizar <i>%1</i>, que é o cartafol pai de <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Xa está a sincronizar <i>%1</i>, que é un subcartafol de <i>%2</i>.</translation> </message> @@ -1558,17 +1563,17 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Usar ficheiros virtuais, no canto de descargar o contido inmediatamente%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation> (experimental)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation>Os ficheiros virtuais non están dispoñíbeis para o cartafol seleccionado</translation> </message> @@ -1581,9 +1586,19 @@ Please consider removing this folder from the account and adding it again.</sour <translation><b>Aviso:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>Aviso:</b> </translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2014,53 +2029,53 @@ Teña en conta que o uso de calquera opción de rexistro por liña de ordes anul <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>Hai dispoñíbel unha nova versión</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>Hai dispoñíbel unha nova versión do cliente %1.</p><p>Pode descargar a versión <b>%2</b>. A versión instalada é a %3</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>Omitir esta versión</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>Omitir polo de agora</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>Obter a actualización</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>Produciuse un fallo na actualización</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p>Está dispoñible unha nova versión do cliente %1 pero fallou o proceso de actualización.</p><p>Descargouse <b>%2</b>. A versión instalada é %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>Preguntar máis tarde</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>Reiniciar e actualizar</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>Actualizar manualmente</translation> </message> @@ -2266,64 +2281,64 @@ Teña en conta que o uso de calquera opción de rexistro por liña de ordes anul <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>Preparada a nova actualización %1</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>Está a piques de instalarse unha nova actualización para %1. O proceso de actualización pode pedir privilexios adicionais durante o procedemento.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Non foi posíbel descargar a actualización. Prema <a href='%1'>aquí</a> para descargar manualmente a actualización.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>Non foi posíbel comprobar se hai novas actualizacións.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>Descargando %1. Agarde...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 está dispoñíbel. Reinicie a aplicación para iniciar a actualización. </translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>Un novo %1 está dispoñibel. Empregue a ferramenta de actualización do seu sistema para instalalo.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>Comprobando o servidor de actualizacións...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>O estado da actualización é descoñecido: non se comprobaron as actualizacións.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Non hai actualizacións dispoñíbeis. A instalación xa está na versión máis recente.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>Comprobar actualizacións</translation> </message> diff --git a/translations/client_he.ts b/translations/client_he.ts index e5964c1d6..b1002998d 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -1473,12 +1473,12 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>הוספת חיבור סנכרון לתיקייההוספת חיבור סנכרון תיקייה</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>הוספת חיבור לסנכרון</translation> </message> @@ -1539,17 +1539,22 @@ Please consider removing this folder from the account and adding it again.</sour <translation>בחירה בסנכרון זה עבור כל החשבון</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>התיקייה כבר תחת סנכרון.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>הנך מסנכרן/ת כבר את <i>%1</i>, שהנה תיקיית אב של <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>המערכת מסנכרנת כבר את <i>%1</i>, תיקיית משנה של <i>%2</i>.</translation> </message> @@ -1557,17 +1562,17 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>שימוש בקבצים וירטואליים במקום הורדה מיידית של תוכן %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation>(ניסיוני)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation>קבצים וירטואליים אינם זמינים לתיקייה הנבחרת</translation> </message> @@ -1580,9 +1585,19 @@ Please consider removing this folder from the account and adding it again.</sour <translation><b>אזהרה:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>אזהרה:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2013,53 +2028,53 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>גרסה חדשה זמינה</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>הגרסה החדשה של לקוח %1 זמינה.</p><p><b>%2</b> זמינה להורדה. הגרסה המותקנת הנה %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>דלוג על גרסה זו</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>דלוג בפעם זו</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>הורדת העדכון</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>עדכון נכשל</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p>גרסה חדשה של לקוח %1 זמין אבל תהליך העדכון נכשל.</p><p><b>%2</b> ירד. הגרסה המותקנת הנה %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>יש לבקש שוב מאוחר יותר</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>יש להתחיל מחדש ולעדכן</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>יש לעדכן באופן ידני</translation> </message> @@ -2265,64 +2280,64 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>עדכון %1 חדש מוכן</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>עדכון חדש עבור %1 עומד להיות מותקן. יישום העדכון יכול לבקש הרשאות נוספות במהלך התהליך.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>לא ניתן להוריד עדכון. יש ללחוץ <a href='%1'>כאן</a> להורדה של העדכון באופן ידני.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>לא ניתן לבדוק עדכונים חדשים.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>מוריד %1. יש להמתין בבקשה...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 זמין. יש להפעיל מחדש את היישום להתחלת העדכון.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>זמין %1 חדש. יש להשתמש בבקשה בכלי עדכון מערכת להתקנה שלו.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>שרת עדכונים בבדיקה...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>מצב העדכון לא ידוע: לא בוצעה בדיקה לעדכונים חדשים.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>אין עדכונים זמינים. ההתקנה שלך עם הגרסה האחרונה.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>בדיקת עדכונים</translation> </message> diff --git a/translations/client_it.ts b/translations/client_it.ts index e0ba098c9..3e12ac2e9 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -1474,12 +1474,12 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Aggiungi connessioni di sincronizzazione cartelle</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Aggiungi connessione di sincronizzazione</translation> </message> @@ -1540,17 +1540,22 @@ Please consider removing this folder from the account and adding it again.</sour <translation>Selezionala per sincronizzare l'intero account</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>Questa cartella è già sincronizzata.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Stai già sincronizzando <i>%1</i>, che è la cartella superiore di <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Stai già sincronizzando <i>%1</i>, che è una sottocartella di <i>%2</i>.</translation> </message> @@ -1558,17 +1563,17 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Usa i file virtuali invece di scaricare il contenuto immediatamente %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation>(sperimentale)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> @@ -1581,9 +1586,19 @@ Please consider removing this folder from the account and adding it again.</sour <translation><b>Avviso:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>Avviso:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2012,53 +2027,53 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>Nuova versione disponibile</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>Una nuova versione del client %1 è disponibile.</p><p><b>%2</b> è disponibile per lo scaricamento. La versione installata è %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>Salta questa versione</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>Salta questa volta</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>Ottieni l'aggiornamento</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>Aggiornamento non riuscito</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p>Una nuova versione di %1 Client è disponibile ma l'aggiornamento è fallito. </p><p><b>%2</b> è stato scaricato. La versione installata e %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>Chiedi ancora più tardi</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>Riavvia e aggiorna</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>Aggiorna manualmente</translation> </message> @@ -2263,63 +2278,63 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>Un nuovo aggiornamento di %1 è pronto</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>Un nuovo aggiornamento di %1 sta per essere installato. L'aggiornamento potrebbe richiedere privilegi aggiuntivi durante l'avanzamento.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Impossibile scaricare l'aggiornamento. Fai clic <a href='%1'>qui</a> per scaricare l'aggiornamento manualmente.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>Impossibile verificare la presenza di nuovi aggiornamenti.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>Scaricando %1. Attendi...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 è disponibile. Riavvia l'applicazione per iniziare l'aggiornamento.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>Controllo server degli aggiornamenti...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Lo stato di aggiornamento è sconosciuto. Non è possibile verificare la presenza di nuovi aggiornamenti.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Non ci sono aggiornamenti disponibili. La tua installazione è aggiornata all'ultima versione.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>Controllo aggiornamenti</translation> </message> diff --git a/translations/client_ko.ts b/translations/client_ko.ts index b5955eb05..b86e6e39c 100644 --- a/translations/client_ko.ts +++ b/translations/client_ko.ts @@ -1466,12 +1466,12 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>폴더 동기화 연결 추가</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>동기화 연결 추가</translation> </message> @@ -1532,17 +1532,22 @@ Please consider removing this folder from the account and adding it again.</sour <translation>모든 계정을 동기화하려면 선택하십시오</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>이 폴더가 이미 동기화 중입니다.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>이미 <i>%2</i>의 부모 폴더 <i>%1</i>을(를) 동기화하고 있습니다.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>이미 <i>%2</i>의 하위 폴더인 <i>%1</i>을(를) 동기화하고 있습니다.</translation> </message> @@ -1550,17 +1555,17 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation> (실험 기능)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation>선택 폴더에서 가상 파일을 이용할 수 없습니다</translation> </message> @@ -1573,9 +1578,19 @@ Please consider removing this folder from the account and adding it again.</sour <translation><b>경고:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>경고:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2000,53 +2015,53 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>새 버전 사용 가능</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>%1 클라이언트의 새 버전을 사용할 수 있습니다.</p><p><b>%2</b>을(를) 다운로드할 수 있습니다. 설치된 버전은 %3입니다.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>이 버전 건너뛰기</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>이번에만 건너뛰기</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>업데이트하기</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>업데이트 실패</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>나중에 다시 묻기</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>재시작 및 업데이트</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>수동 업데이트</translation> </message> @@ -2252,64 +2267,64 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>새 %1 업데이트 준비됨</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>%1의 새 버전을 설치하려고 합니다. 설치 과정 중 업데이터에서 추가 권한을 요청할 수 있습니다.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>업데이트를 다운로드할 수 없습니다. <a href='%1'>여기</a>에서 업데이트를 직접 다운로드하십시오.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>새로운 업데이트를 확인할 수 없습니다.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>%1 다운로드 중. 기다리기 바람...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 이용 가능. 업데이트하려면 응용프로그램을 재 시작하십시오.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>%1 새로 이용 가능. 설치하려면 시스템의 업데이트 도구를 이용하십시오.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>업데이트 서버 확인 중...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>업데이트 상태를 알 수 없습니다: 새 업데이트를 확인하지 않았습니다.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>사용 가능한 업데이트가 없습니다. 최신 버전을 사용하고 있습니다.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>업데이트 확인</translation> </message> diff --git a/translations/client_nl.ts b/translations/client_nl.ts index 05038775f..886b6efa5 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -1473,12 +1473,12 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Voeg map-synchronisatie verbinding toe</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Sync verbinding toevoegen</translation> </message> @@ -1539,17 +1539,22 @@ Please consider removing this folder from the account and adding it again.</sour <translation>Kies dit om uw volledige account te synchroniseren</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>Deze map is al gesynchroniseerd.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>U synchroniseert <i>%1</i> al, dat is de bovenliggende map van <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Je bent <i>%1</i> al aan het synchroniseren, wat een submap is van <i>%2</i>.</translation> </message> @@ -1557,17 +1562,17 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Gebruik virtuele bestanden in plaats van het meteen downloaden van de inhoud%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation> (experimenteel)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation>Virtuele bestanden zijn niet beschikbaar voor de geselecteerde map.</translation> </message> @@ -1580,9 +1585,19 @@ Please consider removing this folder from the account and adding it again.</sour <translation><b>Waarschuwing:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>Waarschuwing:</b> </translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2018,53 +2033,53 @@ Let op dat het gebruik van command line logopties deze instelling zullen oversch <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>Nieuwe versie beschikbaar</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>Er is een nieuwe versie van de %1 Client beschikbaar.</p><p><b>%2</b> is beschikbaar voor download. De geïnstalleerde versie is %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>Deze versie overslaan.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>Deze keer overslaan</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>Ophalen update</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>Bijwerken mislukt</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p>Een nieuwe versie van de %1 Applicatie is beschikbaar maar het updateproces is mislukt.</p><p><b>%2</b> is gedownload. De geïnstalleerde versie is %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>Vraag later opnieuw</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>Herstarten en bijwerken</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>Handmatig bijwerken</translation> </message> @@ -2270,64 +2285,64 @@ Let op dat het gebruik van command line logopties deze instelling zullen oversch <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>Nieuwe %1 update is klaar</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>Er wordt een nieuwe update voor %1 geïnstalleerd. De updater kan vragen om extra autorisaties tijdens installatie.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Kon de download niet bijwerken. Klik <a href='%1'>hier</a> om de download handmatig bij te werken.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>Kon niet controleren op updates.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>%1 is aan het downloaden. Even geduld...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 is beschikbaar. Herstart de applicatie om de update te starten.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>Nieuwe %1 beschikbaar. Gebruik de systeemupdate tool om te installeren.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>Controleren updateserver...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Update status is onbekend: niet gecontroleerd op nieuwe updates.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Geen updates beschikbaar. Uw installatie is al de laatste versie.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>Controle update</translation> </message> diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index f2a1f1c10..c695caf6e 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -1474,12 +1474,12 @@ Considere remover esta pasta da conta e adicioná-la novamente.</translation> <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Adicionar Conexão de Sincronização de pasta</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Adicionar Conexão de Sincronização</translation> </message> @@ -1540,17 +1540,22 @@ Considere remover esta pasta da conta e adicioná-la novamente.</translation> <translation>Escolha esta opção para sincronizar a conta inteira</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>Esta pasta já está sendo sincronizada.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Você já está sincronizando <i>%1</i>, que é uma pasta mãe de <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Você já está sincronizando <i>%1</i>, que é uma subpasta de <i>%2</i>.</translation> </message> @@ -1558,17 +1563,17 @@ Considere remover esta pasta da conta e adicioná-la novamente.</translation> <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Use arquivos virtuais em vez de baixar o conteúdo imediatamente%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation> (experimental)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation>Arquivos virtuais não estão disponíveis para a pasta selecionada</translation> </message> @@ -1581,9 +1586,19 @@ Considere remover esta pasta da conta e adicioná-la novamente.</translation> <translation><b>Alerta:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>Alerta:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2014,54 +2029,54 @@ Observe que o uso de qualquer opção de linha de comando de registro substituir <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>Nova Versão Disponínel</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>Uma nova versão %1 de Ciente está disponível.</p><p><b>%2</b> está disponível para baixar. A versão instalada é a %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>Pule esta versão</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>Pular desta vez</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>Atualizar</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>Atualização Falhou</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p>Uma nova versão do %1 Cliente está disponível, mas o processo de atualização falhou.</p><p><b>%2</b> foi baixado. A versão instalada é %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>Pergunte novamente mais tarde</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>Reinicie e atualize</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>Atualizar manualmente</translation> </message> @@ -2267,63 +2282,63 @@ foi baixado. A versão instalada é %3.</p></translation> <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>Nova Atualização %1 Pronta</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>Uma nova atualização para %1 está para ser instalada. O atualizador pode solicitar por privilégios adicionais durante o processo.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Não foi possível baixar atualização. Por favor, clique <a href='%1'>aqui</ a> para baixar a atualização manualmente.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>Não foi possível verificar a existência de novas atualizações.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>Baixando %1. Favor aguardar...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 disponível. Reinicie o aplicativo para iniciar a atualização.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation>Novo %1 disponível. Por favor click <a href='%2'>aqui</a> para baixar o novo AppImage manualmente.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>Novo %1 disponível. Por favor, use a ferramenta de atualização do sistema para instalar.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>Verificando servidor de atualização...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Status de atualização é desconhecida: Não verifique para novas atualizações.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Não há atualizações disponíveis. Sua instalação é a versão mais recente.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>Verificação de Atualização</translation> </message> diff --git a/translations/client_ru.ts b/translations/client_ru.ts index 7bf92c9fd..6a0ef03d8 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -4,12 +4,12 @@ <message> <location filename="../src/gui/commonstrings.cpp" line="27"/> <source>file manager</source> - <translation type="unfinished"/> + <translation>файловый менеджер</translation> </message> <message> <location filename="../src/gui/commonstrings.cpp" line="33"/> <source>Show in %1</source> - <translation type="unfinished"/> + <translation>Показать в %1</translation> </message> <message> <location filename="../src/gui/commonstrings.cpp" line="38"/> @@ -24,7 +24,7 @@ <message numerus="yes"> <location filename="../src/gui/commonstrings.cpp" line="48"/> <source>%n Filter(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n фильтр</numerusform><numerusform>%n фильтра</numerusform><numerusform>%n фильтров</numerusform><numerusform>%n фильтр(ов)</numerusform></translation> </message> </context> <context> @@ -130,7 +130,7 @@ <message> <location filename="../src/libsync/filesystem.cpp" line="175"/> <source>Could not remove folder</source> - <translation type="unfinished"/> + <translation>Не удалось удалить каталог</translation> </message> </context> <context> @@ -1021,12 +1021,12 @@ File synchronization desktop utility.</source> <message> <location filename="../src/gui/folder.cpp" line="195"/> <source>%1 failed to open the database.</source> - <translation type="unfinished"/> + <translation>%1 не удалось открыть базу данных.</translation> </message> <message> <location filename="../src/gui/folder.cpp" line="206"/> <source>%1 is not writable.</source> - <translation type="unfinished"/> + <translation>%1 не доступно для записи.</translation> </message> <message numerus="yes"> <location filename="../src/gui/folder.cpp" line="473"/> @@ -1284,7 +1284,9 @@ If this was an accident and you decide to keep your files, they will be re-synce <source>Multiple accounts are sharing the folder %1. This configuration is know to lead to dataloss and is no longer supported. Please consider removing this folder from the account and adding it again.</source> - <translation type="unfinished"/> + <translation>Несколько учётных записей дают доступ к каталогу %1. +Такая конфигурация может приводить к потере данных и более не поддерживается +Пожалуйста, постарайтесь удалить этот каталог из учётной записи и добавить его заново.</translation> </message> </context> <context> @@ -1474,12 +1476,12 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Добавить папку для синхронизации</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Добавить подключение для синхронизации</translation> </message> @@ -1540,17 +1542,22 @@ Please consider removing this folder from the account and adding it again.</sour <translation>Нажмите здесь для синхронизации всей учётной записи</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>Этот каталог уже выбран для синхронизации.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Каталог <i>%1</i> уже настроен для синхронизации, и он является родительским для каталога <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Вы уже синхронизируете <i>%1</i>, а это подпапка для <i>%2</i>.</translation> </message> @@ -1558,17 +1565,17 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Использовать виртуальные файлы вместо немедленного скачивания содержимого%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation> (экспериментально)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation>Виртуальные файлы не доступны для выбранного каталога</translation> </message> @@ -1581,9 +1588,19 @@ Please consider removing this folder from the account and adding it again.</sour <translation><b>Предупреждение:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>Предупреждение:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -1993,7 +2010,7 @@ Note that using any logging command line options will override the settings.</so <message> <location filename="../src/gui/models/models.cpp" line="93"/> <source>%1 Filter:</source> - <translation type="unfinished"/> + <translation>%1 Фильтр:</translation> </message> <message> <location filename="../src/gui/models/models.cpp" line="114"/> @@ -2008,59 +2025,59 @@ Note that using any logging command line options will override the settings.</so <message> <location filename="../src/gui/issueswidget.cpp" line="349"/> <source>Status Filter:</source> - <translation type="unfinished"/> + <translation>Фильтр состояния:</translation> </message> </context> <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>Доступна новая версия</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>Доступна новая версия приложения %1.</p><p><b>%2</b> доступна для загрузки. Установленная версия: %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>Пропустить эту версию</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>Пропустить в этот раз</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>Получить обновление</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>Обновление не удалось</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p>Доступна новая версия клиента %1, но процесс обновления не удался. </p><p>Было скачано <b>%2</b>. Установленная версия — %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>Попросить снова позже</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>Перезапустить и продолжить</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>Обновить вручную</translation> </message> @@ -2266,64 +2283,64 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>Доступно обновление %1</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>Новое обновление %1 в процессе установки. Установщик может запросить дополнительные разрешения во время обновления.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Не удалось загрузить обновление. Для скачивания файлов вручную, нажмите <a href='%1'>здесь</a></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>Не удалось проверить наличие новых обновлений.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>Скачивается %1. Пожалуйста, подождите…</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>Доступно %1. Перезапустите приложение, чтобы начать обновление.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> - <translation type="unfinished"/> + <translation>Доступно обновление %1. Пожалуйста, нажмите <a href='%2'>здесь</a> чтобы скачать вручную новый AppImage.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>Доступна новая версия %1. Для установки пожалуйста используйте системные средства обновления.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>Проверка наличия обновлений на сервере...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Статус обновления неизвестен: Не удалось проверить наличие обновлений.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Обновлений в настоящий момент нет. У вас установлена самая последняя версия программы.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>Проверка Обновлений</translation> </message> @@ -2736,7 +2753,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/propagatedownload.cpp" line="707"/> <source>Broken webserver returned empty content length for non-empty file on resume</source> - <translation type="unfinished"/> + <translation>Сломанный вебсервер при возобновлении вернул пустую длину содержимого для не-пустого файла</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="714"/> @@ -4437,7 +4454,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="472"/> <source>Start a &clean sync (Create a backup and erases the local folder!)</source> - <translation type="unfinished"/> + <translation>Начать чистую синхронизацию (создать резервную копию и очистить локальный каталог!)</translation> </message> </context> <context> diff --git a/translations/client_sq.ts b/translations/client_sq.ts index 3a1f7d8a5..baca37af7 100644 --- a/translations/client_sq.ts +++ b/translations/client_sq.ts @@ -24,7 +24,7 @@ <message numerus="yes"> <location filename="../src/gui/commonstrings.cpp" line="48"/> <source>%n Filter(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n Filtër</numerusform><numerusform>%n Filtra</numerusform></translation> </message> </context> <context> @@ -1476,12 +1476,12 @@ Ju lutemi, shihni mundësinë e heqjes së kësaj dosjeje nga llogaria dhe të s <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Shtoni Lidhje Njëkohësimi Dosjesh</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Shtoni Lidhje Njëkohësimesh</translation> </message> @@ -1542,17 +1542,22 @@ Ju lutemi, shihni mundësinë e heqjes së kësaj dosjeje nga llogaria dhe të s <translation>Zgjidhni këtë që të njëkohësohet krejt lënda e llogarisë</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>Kjo dosje është duke u njëkohësuar.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Po e njëkohësoni tashmë <i>%1</i>, që është dosja mëmë e <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Po e njëkohësoni tashmë <i>%1</i>, që është një nëndosje e <i>%2</i>.</translation> </message> @@ -1560,17 +1565,17 @@ Ju lutemi, shihni mundësinë e heqjes së kësaj dosjeje nga llogaria dhe të s <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Përdor kartela virtuale, në vend të shkarkimit të menjëhershëm të lëndës%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation> (eksperimentale)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation>S’ka kartela virtuale për dosjen e përzgjedhur</translation> </message> @@ -1583,9 +1588,19 @@ Ju lutemi, shihni mundësinë e heqjes së kësaj dosjeje nga llogaria dhe të s <translation><b>Kujdes:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>Kujdes:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2016,53 +2031,53 @@ Kini parasysh se përdorimi i çfarëdo mundësie regjistrimi që nga rresht urd <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>Ka Gati Version të Ri</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>Ka të gatshëm një version të ri të Klientit %1.</p><p><b>%2</b> është gati për shkarkim. Versioni i instaluar është %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>Anashkaloje këtë version</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>Anashkaloje këtë herë</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>Merre përditësimin</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>Përditësimi Dështoi</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p>Ka të gatshëm një version të ri të Klientit %1, por procesi i përditësimit dështoi</p><p><b>%2</b> është shkarkuar. Versioni i instaluar është %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>Ripyet më vonë</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>Rinise dhe përditësoje</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>Përditësojeni dorazi</translation> </message> @@ -2268,64 +2283,64 @@ Kini parasysh se përdorimi i çfarëdo mundësie regjistrimi që nga rresht urd <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>Përditësim i Ri %1 Gati</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>Ju ndan një hap nga instalimi i një përditësimi të ri për %1. Gjatë procesit përditësuesi mund të kërkojë privilegje shtesë.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>S’u shkarkua dot përditësimi. Ju lutemi, klikoni <a href='%1'>këtu</a> që ta shkarkoni përditësimin dorazi.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>S’u kontrollua dot për përditësime të reja.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>Po shkarkohet %1. Ju lutemi, pritni…</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 i gatshëm. Rinisni aplikacionin që të nisë përditësimi.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation>Ka gati %1 të ri. Ju lutemi, klikoni <a href='%2'>këtu</a> që të shkarkoni dorazi AppImage-in e ri.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>%1 i ri i gatshëm. Ju lutemi, për ta instaluar, përdorni mjetin e sistemit për përditësime.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>Po kontrollohet shërbyesi i përditësimeve…</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Gjendja e përditësimit është e panjohur: S’u kontrollua për përditësime të rinj.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>S’ka përditësime gati. Instalimi juaj është versioni më i ri.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>Kontroll Përditësimesh</translation> </message> diff --git a/translations/client_th.ts b/translations/client_th.ts index 300b864df..bd3f3fba3 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -1473,12 +1473,12 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>เพิ่มโฟลเดอร์ที่ต้องการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>เพิ่มการประสานข้อมูลให้ตรงกัน</translation> </message> @@ -1539,17 +1539,22 @@ Please consider removing this folder from the account and adding it again.</sour <translation>เลือกตัวเลือกนี้เพื่อประสานข้อมูลบัญชีทั้งหมด</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>โฟลเดอร์นี้ถูกประสานข้อมูลอยู่แล้ว</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>คุณประสานข้อมูล <i>%1</i> อยู่แล้ว ซึ่งมีโฟลเดอร์หลักเป็น <i>%2</i></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>คุณได้ประสานข้อมูล <i>%1</i>ที่อยู่ภายในโฟลเดอร์ย่อยของ <i>%2</i> แล้ว</translation> </message> @@ -1557,17 +1562,17 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>ใช้ไฟล์เสมือนแทนการดาวน์โหลดเนื้อหาทันที %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation>(โหมดเบต้า)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation>ไฟล์เสมือนไม่พร้อมใช้งานสำหรับโฟลเดอร์ที่เลือก</translation> </message> @@ -1580,9 +1585,19 @@ Please consider removing this folder from the account and adding it again.</sour <translation><b>คําเตือน:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>คําเตือน:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2013,53 +2028,53 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>มีเวอร์ชันใหม่ที่สามารถใช้งานได้</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>%1 มีเวอร์ชันใหม่ของไคลเอ็นต์แล้ว</p><p><b>%2</b> สามารถดาวน์โหลดได้ เวอร์ชันที่ติดตั้งคือ %3</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>ข้ามเวอร์ชันนี้</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>ข้ามเวลานี้</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>ได้รับการอัปเดต</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>อัปเดตล้มเหลว</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p>มีไคลเอ็นต์เวอร์ชันใหม่พร้อมใช้งาน %1 แต่กระบวนการอัปเดตล้มเหลว</p><p><b>%2</b>ได้ถูกดาวน์โหลดแล้ว เวอร์ชันที่ติดตั้งคือ %3</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>ถามอีกครั้งในภายหลัง</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>รีสตาร์ทและอัปเดต</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>อัปเดตด้วยตนเอง</translation> </message> @@ -2264,63 +2279,63 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>มี %1 พร้อมอัปเดตใหม่</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>มีการอัปเดตใหม่สำหรับ %1 มันเกี่ยวกับการติดตั้ง การอัปเดตอาจจะถามสิทธิประโยชน์เพิ่มเติมในระหว่างกระบวนการ</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>ไม่สามารถดาวน์โหลดการอัปเดต กรุณาคลิก<a href='%1'>ที่นี่</a> เพื่อดาวน์โหลดการอัปเดตด้วยตนเอง</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>ไม่สามารถตรวจสอบการอัปเดตใหม่</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>กำลังดาวน์โหลด %1 โปรดรอ...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 พร้อมใช้งานแล้ว รีสตาร์ทแอปพลิเคชันเพื่อเริ่มการอัปเดต</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation>ตอนนี้มี %1 พร้อมใช้งานแล้ว โปรด<a href='%2'>คลิกที่นี่</a>เพื่อดาวน์โหลด AppImage ด้วยตนเอง</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>ตรวจพบ %1 อัปเดต โปรดใช้เครื่องมืออัปเดตระบบเพื่อติดตั้ง</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>กำลังตรวจสอบการอัปเดตเซิร์ฟเวอร์...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>สถานะการอัปเดตที่ไม่รู้จัก: จะไม่มีการตรวจสอบการอัปเดตใหม่</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>ไม่พบการอัปเดต ตัวที่ติดตั้งเป็นเวอร์ชั่นล่าสุด</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>ตรวจสอบการอัปเดต</translation> </message> diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 55e3959bf..1e8869b81 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -1473,12 +1473,12 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>Klasör Eşitleme Bağlantısı Ekle</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>Eşitleme Bağlantısı Ekle</translation> </message> @@ -1539,17 +1539,22 @@ Please consider removing this folder from the account and adding it again.</sour <translation>Tüm hesabı eşitlemek için bunu seçin</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>Bu klasör zaten eşitleniyor.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation><i>%1</i> zaten eşitleniyor. Bu, <i>%2</i> klasörünün üst klasörü.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation><i>%2</i> klasörünün alt klasörü olan <i>%1</i> klasörünü zaten eşitliyorsunuz.</translation> </message> @@ -1557,17 +1562,17 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Use virtual files instead of downloading content immediately%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation> (experimental)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> @@ -1580,9 +1585,19 @@ Please consider removing this folder from the account and adding it again.</sour <translation><b>Uyarı:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>Uyarı:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2012,53 +2027,53 @@ Günlüğe kaydetme komut satırı seçeneklerinin kullanılmasının bu ayarlar <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>Yeni Sürüm Mevcut</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>%1 İstemcisi yeni sürümü mevcut.</p><p><b>%2</b> artık indirilebilir. Kurulu sürüm %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>Bu sürümü atla</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>Bu kez atla</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>Güncellemeyi al</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>Güncelleme Başarısız</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p>%1 İstemcisinin yeni bir sürümü mevcut ancak güncelleme başarısız oldu.</p><p><b>%2</b> indirildi. Yüklü sürüm %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>Sonra tekrar deneyin</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>Yeniden başlat ve güncelle</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>Elle güncelle</translation> </message> @@ -2264,63 +2279,63 @@ Günlüğe kaydetme komut satırı seçeneklerinin kullanılmasının bu ayarlar <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>Yeni %1 Güncellemesi Hazır</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>%1 için yeni bir güncelleme yüklenmek üzere. İşlem sürerken güncelleyici başka yetkiler isteyebilir.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>Güncelleme indirilemedi. Lütfen güncellemeyi elle indirmek için <a href='%1'>buraya</a> tıklayın.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>Yeni güncellemeler denetlenemedi.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>%1 yükleniyor. Lütfen bekleyin...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 sürümü mevcut. Güncellemeyi başlatmak için uygulamayı yeniden başlatın.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>Yeni %1 sürümü mevcut. Lütfen kurulum için sistem güncelleştirme aracını kullanın.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>Güncelleme sunucusu denetleniyor...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>Güncelleme durumu bilinmiyor: Yeni güncellemeler denetlenemedi.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>Güncelleme yok. Kurulumunuz son sürümde.</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>Güncelleme Denetimi</translation> </message> diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index d9550efea..62f9e510d 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -1465,12 +1465,12 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>添加同步文件夹</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>添加同步连接</translation> </message> @@ -1531,17 +1531,22 @@ Please consider removing this folder from the account and adding it again.</sour <translation>选择此项以同步整个账户</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>文件夹已在同步中。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>你已经在同步 <i>%1</i>,<i>%2</i> 是它的一个子文件夹。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1549,17 +1554,17 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation>(试验性)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation>所选文件夹没有虚拟文件</translation> </message> @@ -1572,9 +1577,19 @@ Please consider removing this folder from the account and adding it again.</sour <translation><b>警告:</b>%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>警告:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2003,53 +2018,53 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>新版本可用</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>新版本的 %1 客户端可用。</p><p><b>%2</b> 已经开放下载。已安装的版本是 %3。</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>跳过这个版本</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>本次跳过</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>获取更新</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>更新失败</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p>新版本的 %1 的客户端可用,但是更新失败</p><p><b>%2</b> 已经下载完毕. 已安装的版本是 %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>以后询问我</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>重启以更新</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>手动更新</translation> </message> @@ -2255,63 +2270,63 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>新的 %1 更新就绪</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>新版本&1已经可以更新。更新过程会请求额外的权限。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>无法下载更新,请点击<a href='%1'>此处</a>手动下载更新。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>无法检查新更新。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>正在下载文件 %1,请稍候....</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 是可用的,请重启软件来开始升级</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>新的 %1 是可用的,请使用升级工具来安装它</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>检查更新服务器</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>还没有检查过更新。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>没有可用更新。您的安装已为最新版本。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>检查更新</translation> </message> diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 7ecaa7bf9..e7986a54c 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -1473,12 +1473,12 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="566"/> + <location filename="../src/gui/folderwizard.cpp" line="574"/> <source>Add Folder Sync Connection</source> <translation>新增資料夾同步功能的連線</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="568"/> + <location filename="../src/gui/folderwizard.cpp" line="576"/> <source>Add Sync Connection</source> <translation>新增同步連線</translation> </message> @@ -1539,17 +1539,22 @@ Please consider removing this folder from the account and adding it again.</sour <translation> 請選擇這個功能用來同步整個帳號</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="431"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>This folder is already being synced.</source> <translation>這個資料夾已經被同步了。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="433"/> + <location filename="../src/gui/folderwizard.cpp" line="438"/> + <source>This folder can't be synced. Please choose another one.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>您已經同步了 <i>%1</i>, 這個資料夾是 <i>%2</i> 的母資料夾。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="435"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>您已經在同步<i>%1</i>,它是的子文件夾<i>%2</i></translation> </message> @@ -1557,17 +1562,17 @@ Please consider removing this folder from the account and adding it again.</sour <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>使用虛擬文件,而不是立即下載內容%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="477"/> + <location filename="../src/gui/folderwizard.cpp" line="485"/> <source> (experimental)</source> <translation>(實驗性的)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="509"/> + <location filename="../src/gui/folderwizard.cpp" line="517"/> <source>Virtual files are not available for the selected folder</source> <translation>虛擬文件不可用的於所選目錄</translation> </message> @@ -1580,9 +1585,19 @@ Please consider removing this folder from the account and adding it again.</sour <translation><b>警告:</b> %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="52"/> - <source><b>Warning:</b></source> - <translation><b>警告:</b></translation> + <location filename="../src/gui/folderwizard.cpp" line="50"/> + <source><b>Error:</b> %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Error:</b><ul>%1</ul></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/folderwizard.cpp" line="56"/> + <source><b>Warning:</b><ul>%1</ul></source> + <translation type="unfinished"/> </message> </context> <context> @@ -2013,53 +2028,53 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::NSISUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="393"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="401"/> <source>New Version Available</source> <translation>有新版本</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="399"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="407"/> <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source> <translation><p>%1 客戶端有新版本了。</p><p><b>%2</b> 可供下載, 目前安裝的版本是 %3.</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="412"/> - <location filename="../src/gui/updater/ocupdater.cpp" line="463"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="420"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="471"/> <source>Skip this version</source> <translation>跳過這個版本</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="413"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="421"/> <source>Skip this time</source> <translation>跳過這次更新</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="414"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="422"/> <source>Get update</source> <translation>取得更新</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="444"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="452"/> <source>Update Failed</source> <translation>更新失敗</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="450"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="458"/> <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3.</p></source> <translation><p>%1 客戶端的新版本可用的,但更新處理失敗。</p><p><b>%2</b>已下載。 安裝的版本為%3。</p></translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="464"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="472"/> <source>Ask again later</source> <translation>稍後再問</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="465"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="473"/> <source>Restart and update</source> <translation>重啟並更新</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="466"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="474"/> <source>Update manually</source> <translation>手動更新</translation> </message> @@ -2265,64 +2280,64 @@ Note that using any logging command line options will override the settings.</so <context> <name>OCC::OCUpdater</name> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="108"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="114"/> <source>New %1 Update Ready</source> <translation>新 %1 更新已經就緒</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="109"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="115"/> <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process.</source> <translation>一個新的 %1 更新已經安裝完成。更新也許會詢問 要求給予權限在安裝的過程中。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="152"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="158"/> <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source> <translation>無法下載更新檔,請點選連結 <a href='%1'>按這裡</a> 手動下載更新檔。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> <source>Could not check for new updates.</source> <translation>無法檢查是否有新更新檔。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="148"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="154"/> <source>Downloading %1. Please wait...</source> <translation>正在下載 %1 請稍候...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="150"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="156"/> <source>%1 available. Restart application to start the update.</source> <translation>%1 可用的重啟應用程式開始更新</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="160"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="166"/> <source>New %1 available. Please click <a href='%2'>here</a> to download the new AppImage manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="163"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="169"/> <source>New %1 available. Please use the system's update tool to install it.</source> <translation>新的%1可用的。 請使用系統的更新工具進行安裝。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="165"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> <source>Checking update server...</source> <translation>檢查更新伺服器中...</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="167"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="173"/> <source>Update status is unknown: Did not check for new updates.</source> <translation>無法取得更新狀態: 無法檢查是否有新更新檔。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="171"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="177"/> <source>No updates available. Your installation is at the latest version.</source> <translation>目前沒有可用的更新檔,您安裝的版本是最新的了。</translation> </message> <message> - <location filename="../src/gui/updater/ocupdater.cpp" line="190"/> + <location filename="../src/gui/updater/ocupdater.cpp" line="196"/> <source>Update Check</source> <translation>更新檢查</translation> </message> |