From a51719777e0526b36ec8b5aa74969b5ccee9607d Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Mon, 18 Dec 2023 02:34:05 +0000 Subject: [PATCH 01/22] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- translations/client_gl.ts | 2 +- translations/client_tr.ts | 6 +++--- translations/client_uk.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 3a79dea68e885..823002c4c90b5 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -6143,7 +6143,7 @@ O servidor respondeu co erro: %2 Open local or group folders - + Abrir cartafoles locais ou de grupo diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 538f314420b78..0e1246a2068a7 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -3710,7 +3710,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş file id - dosya kodu + dosya kimliği @@ -4147,7 +4147,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş Missing File ID from server - Sunucudan Dosya Kodu alınamadı + Sunucudan dosya kimliği alınamadı @@ -6142,7 +6142,7 @@ Sunucunun verdiği hata yanıtı: %2 Open local or group folders - + Yerel ya da grup klasörlerini aç diff --git a/translations/client_uk.ts b/translations/client_uk.ts index fddc802a7751c..0f782c60a0249 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -6143,7 +6143,7 @@ Server replied with error: %2 Open local or group folders - + Відкрити каталоги на пристрої або групові каталоги From ee982a10b90e2a91855adcebb43b92455a02b50b Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sun, 24 Dec 2023 02:43:52 +0000 Subject: [PATCH 02/22] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- translations/client_tr.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 0e1246a2068a7..bbf08544c3737 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -1632,7 +1632,7 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur. Could not generate the metadata for encryption, Unlocking the folder. This can be an issue with your OpenSSL libraries. - Şifreleme için üst veri üretilemedi. Klasörün kilidi açılıyor. + Şifreleme için üst veri oluşturulamadı. Klasörün kilidi açılıyor. Bu durum OpenSLL kitaplıkları ile ilgili bir sorun olabilir. From 4f418e807ddad5d27c7411c3ae13b89c2ab75daf Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Wed, 27 Dec 2023 02:35:58 +0000 Subject: [PATCH 03/22] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- translations/client_cs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 220f2ebdc8848..ee2a57ca2c1bf 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -6141,7 +6141,7 @@ Server odpověděl chybou: %2 Open local or group folders - + Otevřít místní nebo skupinové složky From 983f960be0d7d8b14637e5464c21db12a4fc7950 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Thu, 4 Jan 2024 02:39:05 +0000 Subject: [PATCH 04/22] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- translations/client_eu.ts | 54 +++++++++++++++++++-------------------- translations/client_fr.ts | 2 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/translations/client_eu.ts b/translations/client_eu.ts index 1143edc67303f..f72633e60fb4a 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -1939,7 +1939,7 @@ Honek esan nahi du sinkronizazio bezeroak agian ez duela berehalakoan igoko toki Virtual file download failed with code "%1", status "%2" and error message "%3" - + Fitxategi birtuala deskargatzeak huts egin du "%1" kodea, "%2" egoera eta "%3" errore mezuarekin @@ -2536,7 +2536,7 @@ Istripua izan bada eta zure fitxategiak mantentzea erabakitzen baduzu, zerbitzar Show sync folders in &Explorer's navigation pane - + Erakutsi sinkronizatutako karpetak arakatzailearen &nabigazio panelean @@ -2562,7 +2562,7 @@ Istripua izan bada eta zure fitxategiak mantentzea erabakitzen baduzu, zerbitzar Info - + Informazioa @@ -2572,12 +2572,12 @@ Istripua izan bada eta zure fitxategiak mantentzea erabakitzen baduzu, zerbitzar Desktop client x.x.x - + Mahaigaineko x.x.x bezeroa Update channel - + Eguneratze-kanala @@ -2604,22 +2604,22 @@ Istripua izan bada eta zure fitxategiak mantentzea erabakitzen baduzu, zerbitzar &Automatically check for updates - + &Automatikoki eguneraketak bilatu Check Now - + Begiratu orain Usage Documentation - + Erabilera dokumentazioa Legal Notice - + Lege oharra @@ -2634,22 +2634,22 @@ Istripua izan bada eta zure fitxategiak mantentzea erabakitzen baduzu, zerbitzar Use &monochrome icons - + Erabili ikono &monokromoak &Launch on system startup - + &Abiarazi sistema pizterakoan Show server &notifications - + Erakutsi zerbitzariko &jakinarazpenak Show call notifications - + Erakutsi jakinarazpen guztiak @@ -3073,7 +3073,7 @@ Kontuan izan erregistro-komando lerroaren edozein aukera erabiliz ezarpen hau ga No proxy - + Proxyrik ez @@ -3088,7 +3088,7 @@ Kontuan izan erregistro-komando lerroaren edozein aukera erabiliz ezarpen hau ga Manually specify proxy - + Proxya eskuz zehaztu @@ -4857,7 +4857,7 @@ Zerbitzariak errorearekin erantzun du: %2 See below for warnings - Ikusi azpian oharrentzako + Begiratu behean abisurik dagoen @@ -4941,7 +4941,7 @@ Zerbitzariak errorearekin erantzun du: %2 <p>%1 Desktop Client</p><p>Version %1. For more information please click <a href='%2'>here</a>.</p> Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name) - + <p>%1 Mahaigaineko bezeroa</p><p>%1 bertsioa. Infomazio gehiago jasotzeko egin klik <a href='%2'>hemen</a>.</p> @@ -4958,7 +4958,7 @@ Zerbitzariak errorearekin erantzun du: %2 <p>%1 desktop client %2</p> Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name) - + <p>%1 mahaigaineko bezeroa %2</p> @@ -5142,37 +5142,37 @@ Zerbitzariak errorearekin erantzun du: %2 Download error - + Deskarga errorea Error downloading - + Errorea deskargatzean could not be downloaded - + ezin izan da deskargatu > More details - + > Xehetasun gehiago More details - + Xehetasun gehiago Error downloading %1 - + Errorea %1 deskargatzean %1 could not be downloaded. - + Ezin izan da %1 deskargatu. @@ -6143,7 +6143,7 @@ Zerbitzariak errorearekin erantzun du: %2 Open local or group folders - + Ireki karpeta lokalak edo taldeenak @@ -6189,7 +6189,7 @@ Zerbitzariak errorearekin erantzun du: %2 <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> - + <p><small><a href="%1">%2</a> Git berrikuspenetik eraikia %3, %4 gainean Qt %5, %6 erabiliz</small></p> diff --git a/translations/client_fr.ts b/translations/client_fr.ts index a35dd0e17648e..7f95a491b4e66 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -5004,7 +5004,7 @@ Le serveur a répondu avec l'erreur : %2 Resolve conflict - Conflit résolu + Résoudre le conflit From 4714e014774f40dc167ad7bd476299535c5057e4 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Fri, 5 Jan 2024 02:41:26 +0000 Subject: [PATCH 05/22] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- translations/client_uk.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 0f782c60a0249..35c8b7a87f4b0 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -5826,7 +5826,7 @@ Server replied with error: %2 Open group folder "%1" - Відкрити папку групи "%1" + Відкрити груповий каталог "%1" @@ -6263,7 +6263,7 @@ Server replied with error: %2 downloading - зкачування + звантаження From 452cf435fc8b43c91167270784ab09b5f1360948 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Thu, 4 Jan 2024 15:48:21 +0100 Subject: [PATCH 06/22] add more info before we try to load translations and/or fail Signed-off-by: Matthieu Gallien --- src/gui/application.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/gui/application.cpp b/src/gui/application.cpp index 668d09aebcc28..177dc5dcfe672 100644 --- a/src/gui/application.cpp +++ b/src/gui/application.cpp @@ -961,8 +961,14 @@ void Application::setupTranslations() for (QString lang : qAsConst(uiLanguages)) { lang.replace(QLatin1Char('-'), QLatin1Char('_')); // work around QTBUG-25973 lang = substLang(lang); - const QString trPath = applicationTrPath(); + const auto trPath = applicationTrPath(); + const auto trFolder = QDir{trPath}; + if (!trFolder.exists()) { + qCWarning(lcApplication()) << trPath << "folder containing translations is missing. Impossible to load translations"; + break; + } const QString trFile = QLatin1String("client_") + lang; + qCDebug(lcApplication()) << "trying to load" << lang << "in" << trFile << "from" << trPath; if (translator->load(trFile, trPath) || lang.startsWith(QLatin1String("en"))) { // Permissive approach: Qt and keychain translations // may be missing, but Qt translations must be there in order @@ -992,6 +998,10 @@ void Application::setupTranslations() if (!qtkeychainTranslator->isEmpty()) installTranslator(qtkeychainTranslator); break; + } else { + qCWarning(lcApplication()) << "translation catalog failed to load"; + const auto folderContent = trFolder.entryList(); + qCDebug(lcApplication()) << "folder content" << folderContent.join(QStringLiteral(", ")); } if (property("ui_lang").isNull()) { setProperty("ui_lang", "C"); From 7bff44daa1273b348ab66dd4c2d76c06e6749c97 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Thu, 4 Jan 2024 17:33:47 +0100 Subject: [PATCH 07/22] get the appimage path to translations instead of looking at the host Signed-off-by: Matthieu Gallien --- src/gui/application.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/application.cpp b/src/gui/application.cpp index 177dc5dcfe672..a692cb6b7903d 100644 --- a/src/gui/application.cpp +++ b/src/gui/application.cpp @@ -113,7 +113,11 @@ namespace { #elif defined(Q_OS_MAC) return QApplication::applicationDirPath() + QLatin1String("/../Resources/Translations"); // path defaults to app dir. #elif defined(Q_OS_UNIX) - return QString::fromLatin1(SHAREDIR "/" APPLICATION_EXECUTABLE "/i18n/"); + if (qEnvironmentVariableIsSet("APPIMAGE")) { + return QApplication::applicationDirPath() + QLatin1String("/../share/" APPLICATION_EXECUTABLE "/i18n/"); + } else { + return QString::fromLatin1(SHAREDIR "/" APPLICATION_EXECUTABLE "/i18n/"); + } #endif } } From ae8eb229eca7b2afdc0ced8f645d17a0c040437b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6?= Date: Tue, 26 Dec 2023 09:36:50 +0100 Subject: [PATCH 08/22] chore: update workflows from templates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ --- .github/workflows/fixup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fixup.yml b/.github/workflows/fixup.yml index 8348f897d0148..9548d19f2d5cd 100644 --- a/.github/workflows/fixup.yml +++ b/.github/workflows/fixup.yml @@ -7,7 +7,7 @@ name: Block fixup and squash commits on: pull_request: - types: [opened, synchronize, reopened] + types: [opened, ready_for_review, reopened, synchronize] permissions: contents: read From 761bdb09ee9eadee297cfd2695692259d06c7b87 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 23:15:43 +0000 Subject: [PATCH 09/22] Build(deps): Bump cpp-linter/cpp-linter-action from 2.7.2 to 2.7.5 Bumps [cpp-linter/cpp-linter-action](https://github.com/cpp-linter/cpp-linter-action) from 2.7.2 to 2.7.5. - [Release notes](https://github.com/cpp-linter/cpp-linter-action/releases) - [Commits](https://github.com/cpp-linter/cpp-linter-action/compare/v2.7.2...v2.7.5) --- updated-dependencies: - dependency-name: cpp-linter/cpp-linter-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/clang-format.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index 5187d7b68129f..66b447b8a8f3c 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - uses: cpp-linter/cpp-linter-action@v2.7.2 + - uses: cpp-linter/cpp-linter-action@v2.7.5 id: linter env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From c7dd7dc841ee5a88fa35dc868277ae023cc5ad00 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sat, 6 Jan 2024 02:42:15 +0000 Subject: [PATCH 10/22] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- translations/client_ar.ts | 12 ++++++------ translations/client_bg.ts | 12 ++++++------ translations/client_br.ts | 12 ++++++------ translations/client_ca.ts | 12 ++++++------ translations/client_cs.ts | 12 ++++++------ translations/client_da.ts | 12 ++++++------ translations/client_de.ts | 12 ++++++------ translations/client_el.ts | 12 ++++++------ translations/client_en_GB.ts | 12 ++++++------ translations/client_eo.ts | 12 ++++++------ translations/client_es.ts | 12 ++++++------ translations/client_es_CL.ts | 12 ++++++------ translations/client_es_CO.ts | 12 ++++++------ translations/client_es_CR.ts | 12 ++++++------ translations/client_es_DO.ts | 12 ++++++------ translations/client_es_EC.ts | 12 ++++++------ translations/client_es_GT.ts | 12 ++++++------ translations/client_es_HN.ts | 12 ++++++------ translations/client_es_MX.ts | 12 ++++++------ translations/client_es_SV.ts | 12 ++++++------ translations/client_et.ts | 12 ++++++------ translations/client_eu.ts | 12 ++++++------ translations/client_fa.ts | 12 ++++++------ translations/client_fi.ts | 12 ++++++------ translations/client_fr.ts | 12 ++++++------ translations/client_gl.ts | 12 ++++++------ translations/client_he.ts | 12 ++++++------ translations/client_hr.ts | 12 ++++++------ translations/client_hu.ts | 12 ++++++------ translations/client_is.ts | 12 ++++++------ translations/client_it.ts | 12 ++++++------ translations/client_ja.ts | 12 ++++++------ translations/client_ko.ts | 12 ++++++------ translations/client_lt_LT.ts | 12 ++++++------ translations/client_lv.ts | 12 ++++++------ translations/client_mk.ts | 12 ++++++------ translations/client_nb_NO.ts | 12 ++++++------ translations/client_nl.ts | 12 ++++++------ translations/client_oc.ts | 12 ++++++------ translations/client_pl.ts | 12 ++++++------ translations/client_pt.ts | 12 ++++++------ translations/client_pt_BR.ts | 12 ++++++------ translations/client_ro.ts | 12 ++++++------ translations/client_ru.ts | 12 ++++++------ translations/client_sc.ts | 12 ++++++------ translations/client_sk.ts | 12 ++++++------ translations/client_sl.ts | 12 ++++++------ translations/client_sr.ts | 12 ++++++------ translations/client_sv.ts | 12 ++++++------ translations/client_th.ts | 12 ++++++------ translations/client_tr.ts | 12 ++++++------ translations/client_uk.ts | 12 ++++++------ translations/client_zh_CN.ts | 12 ++++++------ translations/client_zh_HK.ts | 12 ++++++------ translations/client_zh_TW.ts | 12 ++++++------ 55 files changed, 330 insertions(+), 330 deletions(-) diff --git a/translations/client_ar.ts b/translations/client_ar.ts index d78cda9273ac9..206e5b8f6329d 100644 --- a/translations/client_ar.ts +++ b/translations/client_ar.ts @@ -989,34 +989,34 @@ This action will abort any currently running synchronization. استمرار - + %1 accounts number of accounts imported %1 حساب - + 1 account حساب واحد 1 - + %1 folders number of folders imported %1 مجلد - + 1 folder مجلد واحد 1 - + Legacy import استيراد القديمة - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_bg.ts b/translations/client_bg.ts index 7e0e66770e888..6ee199321ac49 100644 --- a/translations/client_bg.ts +++ b/translations/client_bg.ts @@ -990,34 +990,34 @@ This action will abort any currently running synchronization. Продължи - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_br.ts b/translations/client_br.ts index 3a96f2f5fae9b..abb79a26898ef 100644 --- a/translations/client_br.ts +++ b/translations/client_br.ts @@ -985,34 +985,34 @@ This action will abort any currently running synchronization. - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_ca.ts b/translations/client_ca.ts index 3b6ac8b7169b0..69799eebd5e20 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -990,34 +990,34 @@ Aquesta acció anul·larà qualsevol sincronització en execució. Continua - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_cs.ts b/translations/client_cs.ts index ee2a57ca2c1bf..7d557f6a671bb 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -993,34 +993,34 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.Pokračovat - + %1 accounts number of accounts imported %1 účtů - + 1 account 1 účet - + %1 folders number of folders imported %1 složek - + 1 folder 1 složka - + Legacy import Import ze starého - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_da.ts b/translations/client_da.ts index 8456611c4cb58..a1b339f42a882 100644 --- a/translations/client_da.ts +++ b/translations/client_da.ts @@ -989,34 +989,34 @@ Denne handling vil annullere alle i øjeblikket kørende synkroniseringer.Fortsæt - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_de.ts b/translations/client_de.ts index 787aff7fd7275..6643f4bac1894 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -993,34 +993,34 @@ Diese Aktion bricht jede derzeit laufende Synchronisierung ab. Fortsetzen - + %1 accounts number of accounts imported %1 Konten - + 1 account 1 Konto - + %1 folders number of folders imported %1 Ordner - + 1 folder 1 Ordner - + Legacy import Import früherer Konfiguration - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_el.ts b/translations/client_el.ts index e04900ec24d53..411115bc40c2e 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -985,34 +985,34 @@ This action will abort any currently running synchronization. Συνέχεια - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index f7bc4a6a193af..bf833a776cfa0 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -994,34 +994,34 @@ This action will abort any currently running synchronization. Continue - + %1 accounts number of accounts imported %1 accounts - + 1 account 1 account - + %1 folders number of folders imported %1 folders - + 1 folder 1 folder - + Legacy import Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_eo.ts b/translations/client_eo.ts index d2f6d66699cb3..09010478da6f3 100644 --- a/translations/client_eo.ts +++ b/translations/client_eo.ts @@ -984,34 +984,34 @@ This action will abort any currently running synchronization. Daŭrigi - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_es.ts b/translations/client_es.ts index d5045f486ad44..e6563ae79752a 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -995,34 +995,34 @@ Además, esta acción interrumpirá cualquier sincronización en curso.Continuar - + %1 accounts number of accounts imported %1 cuentas - + 1 account 1 cuenta - + %1 folders number of folders imported %1 carpetas - + 1 folder 1 carpeta - + Legacy import Importación legada - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_es_CL.ts b/translations/client_es_CL.ts index 139d45234a0ec..e885c9def59a2 100644 --- a/translations/client_es_CL.ts +++ b/translations/client_es_CL.ts @@ -984,34 +984,34 @@ This action will abort any currently running synchronization. - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_es_CO.ts b/translations/client_es_CO.ts index 61d6f787300f4..114bb582f6984 100644 --- a/translations/client_es_CO.ts +++ b/translations/client_es_CO.ts @@ -984,34 +984,34 @@ This action will abort any currently running synchronization. - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_es_CR.ts b/translations/client_es_CR.ts index 89d1cf23d4bad..a6fe5ad398e80 100644 --- a/translations/client_es_CR.ts +++ b/translations/client_es_CR.ts @@ -984,34 +984,34 @@ This action will abort any currently running synchronization. - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_es_DO.ts b/translations/client_es_DO.ts index 28d99307cc1fc..e453511e6865d 100644 --- a/translations/client_es_DO.ts +++ b/translations/client_es_DO.ts @@ -984,34 +984,34 @@ This action will abort any currently running synchronization. - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_es_EC.ts b/translations/client_es_EC.ts index 889e6469c0274..7a5d4adbe8920 100644 --- a/translations/client_es_EC.ts +++ b/translations/client_es_EC.ts @@ -991,34 +991,34 @@ This action will abort any currently running synchronization. Continuar - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_es_GT.ts b/translations/client_es_GT.ts index cc459308974aa..793bc680aae51 100644 --- a/translations/client_es_GT.ts +++ b/translations/client_es_GT.ts @@ -984,34 +984,34 @@ This action will abort any currently running synchronization. - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_es_HN.ts b/translations/client_es_HN.ts index cff5be619303c..cb0a0afa4c3f7 100644 --- a/translations/client_es_HN.ts +++ b/translations/client_es_HN.ts @@ -984,34 +984,34 @@ This action will abort any currently running synchronization. - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_es_MX.ts b/translations/client_es_MX.ts index cf18a5cd299de..817b3cd01baf0 100644 --- a/translations/client_es_MX.ts +++ b/translations/client_es_MX.ts @@ -984,34 +984,34 @@ This action will abort any currently running synchronization. - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_es_SV.ts b/translations/client_es_SV.ts index ae033cb6b5f2c..e1e8fd2cc4f63 100644 --- a/translations/client_es_SV.ts +++ b/translations/client_es_SV.ts @@ -984,34 +984,34 @@ This action will abort any currently running synchronization. - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_et.ts b/translations/client_et.ts index c67978ec05a85..a83d491f394cc 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -984,34 +984,34 @@ This action will abort any currently running synchronization. - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_eu.ts b/translations/client_eu.ts index f72633e60fb4a..6f85662600451 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -994,34 +994,34 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du. Jarraitu - + %1 accounts number of accounts imported %1 kontu - + 1 account Kontu 1 - + %1 folders number of folders imported %1 karpeta - + 1 folder Karpeta 1 - + Legacy import Zaharkitutako inportazioa - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_fa.ts b/translations/client_fa.ts index 2c6f38b3451b1..b1291dbaeb64f 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -991,34 +991,34 @@ This action will abort any currently running synchronization. Continue - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_fi.ts b/translations/client_fi.ts index d928a913a240a..83f65e2e0a55e 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -988,34 +988,34 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit. Jatka - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 7f95a491b4e66..4b008214f75b4 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -992,34 +992,34 @@ Vous prenez vos propres risques. Continuer - + %1 accounts number of accounts imported %1 comptes - + 1 account 1 compte - + %1 folders number of folders imported %1 dossiers - + 1 folder 1 dossier - + Legacy import Importation héritée - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 823002c4c90b5..19c5a9ff3be31 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -994,34 +994,34 @@ Esta acción interromperá calquera sincronización que estea a executarse actua Continuar - + %1 accounts number of accounts imported %1 contas - + 1 account 1 conta - + %1 folders number of folders imported %1 cartafoles - + 1 folder 1 cartafol - + Legacy import Importar estilo antigo - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_he.ts b/translations/client_he.ts index 2d56ec4336a98..389e401423d2c 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -985,34 +985,34 @@ This action will abort any currently running synchronization. המשך - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_hr.ts b/translations/client_hr.ts index bd2904bac68d5..7b034b5401618 100644 --- a/translations/client_hr.ts +++ b/translations/client_hr.ts @@ -989,34 +989,34 @@ Ova će radnja prekinuti bilo koju trenutačnu sinkronizaciju. Nastavi - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_hu.ts b/translations/client_hu.ts index 60ec4e7693def..597b714454095 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -991,34 +991,34 @@ Ez a művelet megszakítja a jelenleg futó szinkronizálást. Folytatás - + %1 accounts number of accounts imported %1 fiók - + 1 account 1 fiók - + %1 folders number of folders imported %1 mappa - + 1 folder 1 mappa - + Legacy import Importálás örökölt kliensből - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_is.ts b/translations/client_is.ts index 53b6f72b9c5db..cfeb6b7e5f3a6 100644 --- a/translations/client_is.ts +++ b/translations/client_is.ts @@ -991,34 +991,34 @@ gagnageymslur: Halda áfram - + %1 accounts number of accounts imported %1 notandaaðgangar - + 1 account 1 notandaaðgangur - + %1 folders number of folders imported %1 möppur - + 1 folder 1 mappa - + Legacy import Eldri gerð innflutnings - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_it.ts b/translations/client_it.ts index a1849e193b9e6..34edb54c0a152 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -992,34 +992,34 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione Continua - + %1 accounts number of accounts imported %1 account - + 1 account 1 account - + %1 folders number of folders imported %1 cartelle - + 1 folder 1 cartella - + Legacy import Importazione obsoleta - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_ja.ts b/translations/client_ja.ts index 2285a67b657d5..51ffd1f7ae045 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -989,34 +989,34 @@ This action will abort any currently running synchronization. 続ける - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_ko.ts b/translations/client_ko.ts index 80bf15d39f9bc..cac22ba6124c7 100644 --- a/translations/client_ko.ts +++ b/translations/client_ko.ts @@ -991,34 +991,34 @@ This action will abort any currently running synchronization. 계속 - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts index c4dfbc0b3a867..e8aa5ee5d24b0 100644 --- a/translations/client_lt_LT.ts +++ b/translations/client_lt_LT.ts @@ -985,34 +985,34 @@ This action will abort any currently running synchronization. Tęsti - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_lv.ts b/translations/client_lv.ts index cadd0f7fdeb64..fe27f061a1504 100644 --- a/translations/client_lv.ts +++ b/translations/client_lv.ts @@ -994,34 +994,34 @@ Vienīgā priekšrocība, izslēdzot virtuālo datņu atbalstu, ir tas, ka atkal Turpināt - + %1 accounts number of accounts imported %1 konti - + 1 account 1 konts - + %1 folders number of folders imported %1 mapes - + 1 folder 1 mape - + Legacy import Mantojuma imports - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_mk.ts b/translations/client_mk.ts index d2f76524412a2..96a3c459db152 100644 --- a/translations/client_mk.ts +++ b/translations/client_mk.ts @@ -984,34 +984,34 @@ This action will abort any currently running synchronization. Продолжи - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index 0c2cc7ec39e2a..bbf169fd97050 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -992,34 +992,34 @@ Denne handlingen vil avbryte enhver synkronisering som kjører. Fortsett - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_nl.ts b/translations/client_nl.ts index a2c3a9399fef9..3298d3cd58d77 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -988,34 +988,34 @@ Dit zal alle synchronisaties, die op dit moment bezig zijn, afbreken.Doorgaan - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_oc.ts b/translations/client_oc.ts index a726144b057f4..8881a1dcb121f 100644 --- a/translations/client_oc.ts +++ b/translations/client_oc.ts @@ -984,34 +984,34 @@ This action will abort any currently running synchronization. Contunhar - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_pl.ts b/translations/client_pl.ts index a6d7e27a7e05d..fd26263ae1ccc 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -994,34 +994,34 @@ Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.Kontynuuj - + %1 accounts number of accounts imported %1 kont - + 1 account 1 konto - + %1 folders number of folders imported %1 katalogów - + 1 folder 1 katalog - + Legacy import Import ze starszej wersji - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_pt.ts b/translations/client_pt.ts index 340d5c3c1dbeb..ee689ff5d238f 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -985,34 +985,34 @@ This action will abort any currently running synchronization. Continuar - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index b4fb8f1b5ed11..b3567b1423ef2 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -991,34 +991,34 @@ Esta ação irá cancelar qualquer sincronização atualmente em execução.Continuar - + %1 accounts number of accounts imported %1 contas - + 1 account 1 conta - + %1 folders number of folders imported %1 pastas - + 1 folder 1 pasta - + Legacy import Importação legada - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_ro.ts b/translations/client_ro.ts index 9fcdbd2d9186d..e89052671173f 100644 --- a/translations/client_ro.ts +++ b/translations/client_ro.ts @@ -989,34 +989,34 @@ Această acțiune va opri toate sincronizările în derulare din acest moment.Continuare - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_ru.ts b/translations/client_ru.ts index f27c10b8503cd..07ef70e2799fe 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -992,34 +992,34 @@ This action will abort any currently running synchronization. Продолжить - + %1 accounts number of accounts imported учётных записей: %1 - + 1 account одна учётная запись - + %1 folders number of folders imported папок: %1 - + 1 folder одна папка - + Legacy import Импорт из устаревшей версии - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_sc.ts b/translations/client_sc.ts index 8d30f52455f44..70489a8e169c0 100644 --- a/translations/client_sc.ts +++ b/translations/client_sc.ts @@ -989,34 +989,34 @@ Custa atzione at a firmare cale si siat sincronizatzione immoe in esecutzione.Sighi - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_sk.ts b/translations/client_sk.ts index 19ee9ee14495e..98ee014819a14 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -989,34 +989,34 @@ Táto akcia zruší všetky prebiehajúce synchronizácie. Pokračovať - + %1 accounts number of accounts imported %1 účty - + 1 account 1 účet - + %1 folders number of folders imported %1 priečinkov - + 1 folder 1 priečinok - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_sl.ts b/translations/client_sl.ts index 7637c2a76d047..ea18b7f9abbc8 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -989,34 +989,34 @@ S tem dejanjem prav tako prekinete vsa trenutna usklajevanja v izvajanju.Nadaljuj - + %1 accounts number of accounts imported %1 računov - + 1 account 1 račun - + %1 folders number of folders imported %1 map - + 1 folder 1 mapa - + Legacy import Opuščeno uvažanje - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_sr.ts b/translations/client_sr.ts index 20db6cbc01bfb..2670ff228aad5 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -994,34 +994,34 @@ This action will abort any currently running synchronization. Настави - + %1 accounts number of accounts imported %1 налога - + 1 account 1 налог - + %1 folders number of folders imported %1 фолдера - + 1 folder 1 фолдер - + Legacy import Увоз старе верзије - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_sv.ts b/translations/client_sv.ts index a3180344e6923..914df34cba33b 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -994,34 +994,34 @@ Den här åtgärden avbryter alla synkroniseringar som körs. Fortsätt - + %1 accounts number of accounts imported %1 konton - + 1 account 1 konto - + %1 folders number of folders imported %1 mappar - + 1 folder 1 mapp - + Legacy import Äldre import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_th.ts b/translations/client_th.ts index 4e71374e0a5d7..fd5227b0f269e 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -988,34 +988,34 @@ This action will abort any currently running synchronization. ดำเนินการต่อ - + %1 accounts number of accounts imported - + 1 account - + %1 folders number of folders imported - + 1 folder - + Legacy import - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_tr.ts b/translations/client_tr.ts index bbf08544c3737..54a81b2c12a5c 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -994,34 +994,34 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur.Sürdür - + %1 accounts number of accounts imported %1 hesap - + 1 account 1 hesap - + %1 folders number of folders imported %1 klasör - + 1 folder 1 klasör - + Legacy import Eskileri içe aktarma - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 35c8b7a87f4b0..de6aa477f52f3 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -994,34 +994,34 @@ This action will abort any currently running synchronization. Продовжити - + %1 accounts number of accounts imported %1 облікових записів - + 1 account 1 обліковий запис - + %1 folders number of folders imported %1 каталогів - + 1 folder 1 каталог - + Legacy import Імпорт застарілих записів - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index 96ff036520c9f..db44a39fab933 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -988,34 +988,34 @@ This action will abort any currently running synchronization. 继续 - + %1 accounts number of accounts imported %1 个账户 - + 1 account 1 个账户 - + %1 folders number of folders imported %1 个文件夹 - + 1 folder 1 个文件夹 - + Legacy import 旧版导入 - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_zh_HK.ts b/translations/client_zh_HK.ts index 1c2b464536cdc..ea5acc0eee0f7 100644 --- a/translations/client_zh_HK.ts +++ b/translations/client_zh_HK.ts @@ -997,34 +997,34 @@ This action will abort any currently running synchronization. 繼續 - + %1 accounts number of accounts imported %1 個賬戶 - + 1 account 1 個賬戶 - + %1 folders number of folders imported %n 個資料夾 - + 1 folder 1 個資料夾 - + Legacy import 舊版匯入 - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 0fb4bc57406e6..778082b94ae6b 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -994,34 +994,34 @@ This action will abort any currently running synchronization. 繼續 - + %1 accounts number of accounts imported %1 個帳號 - + 1 account 1 個帳號 - + %1 folders number of folders imported %1 個資料夾 - + 1 folder 1 個資料夾 - + Legacy import 舊版匯入 - + Imported %1 and %2 from a legacy desktop client. %3 number of accounts and folders imported. list of users. From d45ad024309e065aec0e51376bd4eb03dec3a79f Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sun, 7 Jan 2024 02:41:07 +0000 Subject: [PATCH 11/22] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- translations/client_fr.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 4b008214f75b4..621ea157ced53 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -2253,7 +2253,7 @@ S'il s'agissait d'un accident et que vous choisissiez de conserve %5 left, %1 of %2, file %3 of %4 - %5 restants, %1 sur %2, fichier %3 sur %4 + %5 restantes, %1 sur %2, fichier %3 sur %4 From f797d22f043a9106403f392d3ea2a657811b1f6e Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Wed, 10 Jan 2024 02:38:46 +0000 Subject: [PATCH 12/22] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- translations/client_es.ts | 2 +- translations/client_ko.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/client_es.ts b/translations/client_es.ts index e6563ae79752a..4a08e5a47f377 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -6145,7 +6145,7 @@ El servidor respondió con el error: %2 Open local or group folders - + Abrir carpetas locales o de grupo diff --git a/translations/client_ko.ts b/translations/client_ko.ts index cac22ba6124c7..d6859773ded98 100644 --- a/translations/client_ko.ts +++ b/translations/client_ko.ts @@ -5671,7 +5671,7 @@ Server replied with error: %2 File drop (upload only) - 파일 드롭 (업로드 전용) + 업로드만 허용 From df5094d299cb76364ea3a4d346d351ab0cab766b Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Fri, 12 Jan 2024 02:34:46 +0000 Subject: [PATCH 13/22] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- translations/client_uk.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/client_uk.ts b/translations/client_uk.ts index de6aa477f52f3..fe10fbc2c37ae 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -6143,7 +6143,7 @@ Server replied with error: %2 Open local or group folders - Відкрити каталоги на пристрої або групові каталоги + Перейти до каталогів на пристрої або групових каталогів From 419b0152790251bedade007fb87ec388921c8175 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sat, 13 Jan 2024 02:41:22 +0000 Subject: [PATCH 14/22] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- translations/client_uk.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/client_uk.ts b/translations/client_uk.ts index fe10fbc2c37ae..5f782a806ab82 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -3311,7 +3311,7 @@ Note that using any logging command line options will override this setting. Connection failed - Збій підключення + Не вдалося встановити з'єднання From 416bf8a109ea440a733aca26252bcc9467d987f5 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sun, 14 Jan 2024 02:37:40 +0000 Subject: [PATCH 15/22] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- translations/client_ko.ts | 24 ++++++++++++------------ translations/client_oc.ts | 2 +- translations/client_uk.ts | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/translations/client_ko.ts b/translations/client_ko.ts index d6859773ded98..ab97e9d595c06 100644 --- a/translations/client_ko.ts +++ b/translations/client_ko.ts @@ -2559,7 +2559,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Info - + 정보 @@ -2574,7 +2574,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Update channel - + 업데이트 채널 @@ -2601,22 +2601,22 @@ If this was an accident and you decide to keep your files, they will be re-synce &Automatically check for updates - + 업데이트를 &자동으로 확인 Check Now - + 지금 확인하기 Usage Documentation - + 도움말 Legal Notice - + 법적 고지 @@ -2631,22 +2631,22 @@ If this was an accident and you decide to keep your files, they will be re-synce Use &monochrome icons - + &흑백 아이콘 사용 &Launch on system startup - + &시스템 시동 후 앱 자동으로 시작 Show server &notifications - + 서버 &알림 표시 Show call notifications - + 통화 알림 표시 @@ -3070,7 +3070,7 @@ Note that using any logging command line options will override this setting. No proxy - + 프록시 없음 @@ -3085,7 +3085,7 @@ Note that using any logging command line options will override this setting. Manually specify proxy - + 프록시 수동으로 지정 diff --git a/translations/client_oc.ts b/translations/client_oc.ts index 8881a1dcb121f..f80fcf0909496 100644 --- a/translations/client_oc.ts +++ b/translations/client_oc.ts @@ -1227,7 +1227,7 @@ This action will abort any currently running synchronization. Rename file - + Renomenar lo fichièr diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 5f782a806ab82..9d884ebc8c410 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -2496,7 +2496,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Notify when synchronised folders grow larger than specified limit - Сповіщати, коли каталоги, що синхронізуються, збільшуються у розмірі понад встановлене обмеженння. + Сповіщати, коли каталоги, що синхронізуються, збільшуються у розмірі понад встановлене обмеженння @@ -2536,7 +2536,7 @@ If this was an accident and you decide to keep your files, they will be re-synce Show sync folders in &Explorer's navigation pane - Показувати каталоги для синхронізації на панелі &Оглядача + Показувати каталоги для синхронізації на панелі &файлового менеджера @@ -3231,7 +3231,7 @@ Note that using any logging command line options will override this setting. No updates available. Your installation is at the latest version. - У вас встановленно останню версію. + Відсутні оновлення. У вас встановлено останню версію @@ -4278,7 +4278,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss General - Загалом + Загальні From 049d3e9df34a380a6786b2e4928d792b688ba5b0 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Wed, 17 Jan 2024 02:37:15 +0000 Subject: [PATCH 16/22] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- translations/client_zh_HK.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/client_zh_HK.ts b/translations/client_zh_HK.ts index ea5acc0eee0f7..87366bffa93a1 100644 --- a/translations/client_zh_HK.ts +++ b/translations/client_zh_HK.ts @@ -314,7 +314,7 @@ Unknown error: network reply was deleted - 未知錯誤：網路回覆被刪除 + 錯誤不詳：網路回覆被刪除 @@ -886,7 +886,7 @@ This action will abort any currently running synchronization. Unknown account state - 未知的帳號狀態 + 帳號狀態不詳 @@ -3227,7 +3227,7 @@ Note that using any logging command line options will override this setting. Update status is unknown: Did not check for new updates. - 無法取得更新狀態： 無法檢查是否有新更新檔。 + 更新狀態不詳： 無法檢查是否有新更新檔。 From 2eaecb6400b08677d0558eac0f251ecb09ffef15 Mon Sep 17 00:00:00 2001 From: alex-z Date: Fri, 15 Dec 2023 12:09:16 +0100 Subject: [PATCH 17/22] File locking. Manual lock should never be modified without user intervention. Set token lock instead of user lock when locking office files automatically. Signed-off-by: alex-z --- src/gui/editlocallyjob.cpp | 3 ++- src/gui/folder.cpp | 9 ++++--- src/gui/socketapi/socketapi.cpp | 9 ++++++- src/libsync/account.cpp | 5 ++-- src/libsync/account.h | 3 ++- src/libsync/capabilities.cpp | 5 ++++ src/libsync/capabilities.h | 1 + src/libsync/lockfilejobs.cpp | 15 ++++++++++-- src/libsync/lockfilejobs.h | 2 ++ test/testlockfile.cpp | 42 ++++++++++++++++++++++----------- 10 files changed, 70 insertions(+), 24 deletions(-) diff --git a/src/gui/editlocallyjob.cpp b/src/gui/editlocallyjob.cpp index a7547b0fddf68..d20a9bb699c57 100644 --- a/src/gui/editlocallyjob.cpp +++ b/src/gui/editlocallyjob.cpp @@ -650,7 +650,8 @@ void EditLocallyJob::lockFile() _folderForFile->remotePathTrailingSlash(), _folderForFile->path(), _folderForFile->journalDb(), - SyncFileItem::LockStatus::LockedItem); + SyncFileItem::LockStatus::LockedItem, + SyncFileItem::LockOwnerType::TokenLock); } void EditLocallyJob::disconnectFolderSignals() diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp index 21f3423460326..ace5524cb3d91 100644 --- a/src/gui/folder.cpp +++ b/src/gui/folder.cpp @@ -649,7 +649,7 @@ void Folder::slotFilesLockReleased(const QSet &files) } const auto canUnlockFile = isFileRecordValid && rec._lockstate._locked - && rec._lockstate._lockOwnerType == static_cast(SyncFileItem::LockOwnerType::UserLock) + && rec._lockstate._lockOwnerType == static_cast(SyncFileItem::LockOwnerType::TokenLock) && rec._lockstate._lockOwnerId == _accountState->account()->davUser(); if (!canUnlockFile) { @@ -668,11 +668,13 @@ void Folder::slotFilesLockReleased(const QSet &files) disconnect(_officeFileLockReleaseUnlockFailure); qCWarning(lcFolder) << "Failed to unlock a file:" << remoteFilePath << message; }); + const auto lockOwnerType = static_cast(rec._lockstate._lockOwnerType); _accountState->account()->setLockFileState(remoteFilePath, remotePathTrailingSlash(), path(), journalDb(), - SyncFileItem::LockStatus::UnlockedItem); + SyncFileItem::LockStatus::UnlockedItem, + lockOwnerType); } } @@ -719,7 +721,8 @@ void Folder::slotLockedFilesFound(const QSet &files) remotePathTrailingSlash(), path(), journalDb(), - SyncFileItem::LockStatus::LockedItem); + SyncFileItem::LockStatus::LockedItem, + SyncFileItem::LockOwnerType::TokenLock); } } diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp index e2e3c1a463fe3..1df11cf555080 100644 --- a/src/gui/socketapi/socketapi.cpp +++ b/src/gui/socketapi/socketapi.cpp @@ -1091,11 +1091,18 @@ void SocketApi::setFileLock(const QString &localFile, const SyncFileItem::LockSt return; } + const auto record = fileData.journalRecord(); + if (static_cast(record._lockstate._lockOwnerType) != SyncFileItem::LockOwnerType::UserLock) { + qCDebug(lcSocketApi) << "Only user lock state or non-locked files can be affected manually!"; + return; + } + shareFolder->accountState()->account()->setLockFileState(fileData.serverRelativePath, shareFolder->remotePathTrailingSlash(), shareFolder->path(), shareFolder->journalDb(), - lockState); + lockState, + SyncFileItem::LockOwnerType::UserLock); shareFolder->journalDb()->schedulePathForRemoteDiscovery(fileData.serverRelativePath); shareFolder->scheduleThisFolderSoon(); diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp index bea76c53b9069..15712b11e165f 100644 --- a/src/libsync/account.cpp +++ b/src/libsync/account.cpp @@ -959,7 +959,8 @@ void Account::setLockFileState(const QString &serverRelativePath, const QString &remoteSyncPathWithTrailingSlash, const QString &localSyncPath, SyncJournalDb * const journal, - const SyncFileItem::LockStatus lockStatus) + const SyncFileItem::LockStatus lockStatus, + const SyncFileItem::LockOwnerType lockOwnerType) { auto& lockStatusJobInProgress = _lockStatusChangeInprogress[serverRelativePath]; if (lockStatusJobInProgress.contains(lockStatus)) { @@ -967,7 +968,7 @@ void Account::setLockFileState(const QString &serverRelativePath, return; } lockStatusJobInProgress.push_back(lockStatus); - auto job = std::make_unique(sharedFromThis(), journal, serverRelativePath, remoteSyncPathWithTrailingSlash, localSyncPath, lockStatus); + auto job = std::make_unique(sharedFromThis(), journal, serverRelativePath, remoteSyncPathWithTrailingSlash, localSyncPath, lockStatus, lockOwnerType); connect(job.get(), &LockFileJob::finishedWithoutError, this, [this, serverRelativePath, lockStatus]() { removeLockStatusChangeInprogress(serverRelativePath, lockStatus); Q_EMIT lockFileSuccess(); diff --git a/src/libsync/account.h b/src/libsync/account.h index e118b53fb2f25..d21748f872a1a 100644 --- a/src/libsync/account.h +++ b/src/libsync/account.h @@ -316,7 +316,8 @@ class OWNCLOUDSYNC_EXPORT Account : public QObject const QString &remoteSyncPathWithTrailingSlash, const QString &localSyncPath, SyncJournalDb * const journal, - const SyncFileItem::LockStatus lockStatus); + const SyncFileItem::LockStatus lockStatus, + const SyncFileItem::LockOwnerType lockOwnerType); SyncFileItem::LockStatus fileLockStatus(SyncJournalDb * const journal, const QString &folderRelativePath) const; diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp index 14c51744a228b..0b73b6f7a4652 100644 --- a/src/libsync/capabilities.cpp +++ b/src/libsync/capabilities.cpp @@ -254,6 +254,11 @@ bool Capabilities::filesLockAvailable() const return _capabilities["files"].toMap()["locking"].toByteArray() >= "1.0"; } +bool Capabilities::filesLockTypeAvailable() const +{ + return _capabilities["files"].toMap()["api-feature-lock-type"].toByteArray() >= "1.0"; +} + bool Capabilities::userStatus() const { if (!_capabilities.contains("user_status")) { diff --git a/src/libsync/capabilities.h b/src/libsync/capabilities.h index 9a7f587f00b99..1dd0514a28f69 100644 --- a/src/libsync/capabilities.h +++ b/src/libsync/capabilities.h @@ -66,6 +66,7 @@ class OWNCLOUDSYNC_EXPORT Capabilities [[nodiscard]] bool chunkingNg() const; [[nodiscard]] bool bulkUpload() const; [[nodiscard]] bool filesLockAvailable() const; + [[nodiscard]] bool filesLockTypeAvailable() const; [[nodiscard]] bool userStatus() const; [[nodiscard]] bool userStatusSupportsEmoji() const; [[nodiscard]] QColor serverColor() const; diff --git a/src/libsync/lockfilejobs.cpp b/src/libsync/lockfilejobs.cpp index 47704513938fe..d1d0f98b9b9a4 100644 --- a/src/libsync/lockfilejobs.cpp +++ b/src/libsync/lockfilejobs.cpp @@ -31,10 +31,12 @@ LockFileJob::LockFileJob(const AccountPtr account, const QString &remoteSyncPathWithTrailingSlash, const QString &localSyncPath, const SyncFileItem::LockStatus requestedLockState, + const SyncFileItem::LockOwnerType lockOwnerType, QObject *parent) : AbstractNetworkJob(account, path, parent) , _journal(journal) , _requestedLockState(requestedLockState) + , _requestedLockOwnerType(lockOwnerType) , _remoteSyncPathWithTrailingSlash(remoteSyncPathWithTrailingSlash) , _localSyncPath(localSyncPath) { @@ -48,7 +50,14 @@ void LockFileJob::start() qCInfo(lcLockFileJob()) << "start" << path() << _requestedLockState; QNetworkRequest request; - request.setRawHeader("X-User-Lock", "1"); + request.setRawHeader(QByteArrayLiteral("X-User-Lock"), QByteArrayLiteral("1")); + if (_account->capabilities().filesLockTypeAvailable()) { + if (_requestedLockOwnerType == SyncFileItem::LockOwnerType::UserLock) { + request.setRawHeader(QByteArrayLiteral("X-User-Lock-Type"), ("0")); + } else if (_requestedLockOwnerType == SyncFileItem::LockOwnerType::TokenLock) { + request.setRawHeader(QByteArrayLiteral("X-User-Lock-Type"), ("2")); + } + } QByteArray verb; switch(_requestedLockState) @@ -174,7 +183,7 @@ SyncJournalFileRecord LockFileJob::handleReply() if (_journal->getFileRecord(relativePathInDb, &record) && record.isValid()) { setFileRecordLocked(record); if ((_lockStatus == SyncFileItem::LockStatus::LockedItem) - && (_lockOwnerType != SyncFileItem::LockOwnerType::UserLock || _userId != account()->davUser())) { + && (_lockOwnerType == SyncFileItem::LockOwnerType::AppLock || _userId != account()->davUser())) { FileSystem::setFileReadOnly(_localSyncPath + relativePathInDb, true); } const auto result = _journal->setFileRecord(record); @@ -205,6 +214,8 @@ void LockFileJob::decodeStartElement(const QString &name, const auto convertedValue = valueText.toInt(&isValid); if (isValid) { _lockOwnerType = static_cast(convertedValue); + } else { + _lockOwnerType = SyncFileItem::LockOwnerType::UserLock; } } else if (name == QStringLiteral("lock-owner-displayname")) { _userDisplayName = reader.readElementText(); diff --git a/src/libsync/lockfilejobs.h b/src/libsync/lockfilejobs.h index 50e02016b7d20..8b2e287f6d4c0 100644 --- a/src/libsync/lockfilejobs.h +++ b/src/libsync/lockfilejobs.h @@ -25,6 +25,7 @@ class OWNCLOUDSYNC_EXPORT LockFileJob : public AbstractNetworkJob const QString &remoteSyncPathWithTrailingSlash, const QString &localSyncPath, const SyncFileItem::LockStatus requestedLockState, + const SyncFileItem::LockOwnerType lockOwnerType, QObject *parent = nullptr); void start() override; @@ -48,6 +49,7 @@ class OWNCLOUDSYNC_EXPORT LockFileJob : public AbstractNetworkJob SyncJournalDb* _journal = nullptr; SyncFileItem::LockStatus _requestedLockState = SyncFileItem::LockStatus::LockedItem; + SyncFileItem::LockOwnerType _requestedLockOwnerType = SyncFileItem::LockOwnerType::UserLock; SyncFileItem::LockStatus _lockStatus = SyncFileItem::LockStatus::UnlockedItem; SyncFileItem::LockOwnerType _lockOwnerType = SyncFileItem::LockOwnerType::UserLock; diff --git a/test/testlockfile.cpp b/test/testlockfile.cpp index 7271a56e46abb..174f9c656abea 100644 --- a/test/testlockfile.cpp +++ b/test/testlockfile.cpp @@ -40,7 +40,8 @@ private slots: QStringLiteral("/"), fakeFolder.localPath(), &fakeFolder.syncJournal(), - OCC::SyncFileItem::LockStatus::LockedItem); + OCC::SyncFileItem::LockStatus::LockedItem, + OCC::SyncFileItem::LockOwnerType::UserLock); QVERIFY(lockFileSuccessSpy.wait()); QCOMPARE(lockFileErrorSpy.count(), 0); @@ -85,7 +86,8 @@ private slots: QStringLiteral("/"), fakeFolder.localPath(), &fakeFolder.syncJournal(), - OCC::SyncFileItem::LockStatus::LockedItem); + OCC::SyncFileItem::LockStatus::LockedItem, + OCC::SyncFileItem::LockOwnerType::UserLock); QVERIFY(lockFileErrorSpy.wait()); QCOMPARE(lockFileSuccessSpy.count(), 0); @@ -109,7 +111,8 @@ private slots: QStringLiteral("/"), fakeFolder.localPath(), &fakeFolder.syncJournal(), - OCC::SyncFileItem::LockStatus::LockedItem); + OCC::SyncFileItem::LockStatus::LockedItem, + OCC::SyncFileItem::LockOwnerType::UserLock); QVERIFY(lockFileSuccessSpy.wait()); QCOMPARE(lockFileErrorSpy.count(), 0); @@ -136,7 +139,8 @@ private slots: QStringLiteral("/"), fakeFolder.localPath(), &fakeFolder.syncJournal(), - OCC::SyncFileItem::LockStatus::LockedItem); + OCC::SyncFileItem::LockStatus::LockedItem, + OCC::SyncFileItem::LockOwnerType::UserLock); QVERIFY(lockFileSuccessSpy.wait()); QCOMPARE(lockFileErrorSpy.count(), 0); @@ -160,7 +164,8 @@ private slots: QStringLiteral("/") + testFileName, QStringLiteral("/"), fakeFolder.localPath(), - OCC::SyncFileItem::LockStatus::LockedItem); + OCC::SyncFileItem::LockStatus::LockedItem, + OCC::SyncFileItem::LockOwnerType::UserLock); QSignalSpy jobSuccess(job, &OCC::LockFileJob::finishedWithoutError); QSignalSpy jobFailure(job, &OCC::LockFileJob::finishedWithError); @@ -198,7 +203,8 @@ private slots: QStringLiteral("/") + testFileName, QStringLiteral("/"), fakeFolder.localPath(), - OCC::SyncFileItem::LockStatus::LockedItem); + OCC::SyncFileItem::LockStatus::LockedItem, + OCC::SyncFileItem::LockOwnerType::UserLock); QSignalSpy lockFileJobSuccess(lockFileJob, &OCC::LockFileJob::finishedWithoutError); QSignalSpy lockFileJobFailure(lockFileJob, &OCC::LockFileJob::finishedWithError); @@ -215,7 +221,8 @@ private slots: QStringLiteral("/") + testFileName, QStringLiteral("/"), fakeFolder.localPath(), - OCC::SyncFileItem::LockStatus::UnlockedItem); + OCC::SyncFileItem::LockStatus::UnlockedItem, + OCC::SyncFileItem::LockOwnerType::UserLock); QSignalSpy unlockFileJobSuccess(unlockFileJob, &OCC::LockFileJob::finishedWithoutError); QSignalSpy unlockFileJobFailure(unlockFileJob, &OCC::LockFileJob::finishedWithError); @@ -274,7 +281,8 @@ private slots: QStringLiteral("/") + testFileName, QStringLiteral("/"), fakeFolder.localPath(), - OCC::SyncFileItem::LockStatus::LockedItem); + OCC::SyncFileItem::LockStatus::LockedItem, + OCC::SyncFileItem::LockOwnerType::UserLock); QSignalSpy jobSuccess(job, &OCC::LockFileJob::finishedWithoutError); QSignalSpy jobFailure(job, &OCC::LockFileJob::finishedWithError); @@ -327,7 +335,8 @@ private slots: QStringLiteral("/") + testFileName, QStringLiteral("/"), fakeFolder.localPath(), - OCC::SyncFileItem::LockStatus::LockedItem); + OCC::SyncFileItem::LockStatus::LockedItem, + OCC::SyncFileItem::LockOwnerType::UserLock); QSignalSpy jobSuccess(job, &OCC::LockFileJob::finishedWithoutError); QSignalSpy jobFailure(job, &OCC::LockFileJob::finishedWithError); @@ -380,7 +389,8 @@ private slots: QStringLiteral("/") + testFileName, QStringLiteral("/"), fakeFolder.localPath(), - OCC::SyncFileItem::LockStatus::UnlockedItem); + OCC::SyncFileItem::LockStatus::UnlockedItem, + OCC::SyncFileItem::LockOwnerType::UserLock); QSignalSpy jobSuccess(job, &OCC::LockFileJob::finishedWithoutError); QSignalSpy jobFailure(job, &OCC::LockFileJob::finishedWithError); @@ -431,7 +441,8 @@ private slots: QStringLiteral("/") + testFileName, QStringLiteral("/"), fakeFolder.localPath(), - OCC::SyncFileItem::LockStatus::UnlockedItem); + OCC::SyncFileItem::LockStatus::UnlockedItem, + OCC::SyncFileItem::LockOwnerType::UserLock); QSignalSpy jobSuccess(job, &OCC::LockFileJob::finishedWithoutError); QSignalSpy jobFailure(job, &OCC::LockFileJob::finishedWithError); @@ -469,7 +480,8 @@ private slots: QStringLiteral("/") + testFileName, QStringLiteral("/"), fakeFolder.localPath(), - OCC::SyncFileItem::LockStatus::LockedItem); + OCC::SyncFileItem::LockStatus::LockedItem, + OCC::SyncFileItem::LockOwnerType::UserLock); QSignalSpy lockFileJobSuccess(lockFileJob, &OCC::LockFileJob::finishedWithoutError); QSignalSpy lockFileJobFailure(lockFileJob, &OCC::LockFileJob::finishedWithError); @@ -486,7 +498,8 @@ private slots: QStringLiteral("/") + testFileName, QStringLiteral("/"), fakeFolder.localPath(), - OCC::SyncFileItem::LockStatus::UnlockedItem); + OCC::SyncFileItem::LockStatus::UnlockedItem, + OCC::SyncFileItem::LockOwnerType::UserLock); QSignalSpy unlockFileJobSuccess(unlockFileJob, &OCC::LockFileJob::finishedWithoutError); QSignalSpy unlockFileJobFailure(unlockFileJob, &OCC::LockFileJob::finishedWithError); @@ -539,7 +552,8 @@ private slots: QStringLiteral("/") + testFileName, QStringLiteral("/"), fakeFolder.localPath(), - OCC::SyncFileItem::LockStatus::UnlockedItem); + OCC::SyncFileItem::LockStatus::UnlockedItem, + OCC::SyncFileItem::LockOwnerType::UserLock); QSignalSpy jobSuccess(job, &OCC::LockFileJob::finishedWithoutError); QSignalSpy jobFailure(job, &OCC::LockFileJob::finishedWithError); From 7da66f0aee97aab8e385b9d7bbf77f850fec841d Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Fri, 19 Jan 2024 02:37:02 +0000 Subject: [PATCH 18/22] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- translations/client_ar.ts | 12 ++++++------ translations/client_bg.ts | 12 ++++++------ translations/client_br.ts | 12 ++++++------ translations/client_ca.ts | 12 ++++++------ translations/client_cs.ts | 12 ++++++------ translations/client_da.ts | 12 ++++++------ translations/client_de.ts | 12 ++++++------ translations/client_el.ts | 12 ++++++------ translations/client_en_GB.ts | 12 ++++++------ translations/client_eo.ts | 12 ++++++------ translations/client_es.ts | 12 ++++++------ translations/client_es_CL.ts | 12 ++++++------ translations/client_es_CO.ts | 12 ++++++------ translations/client_es_CR.ts | 12 ++++++------ translations/client_es_DO.ts | 12 ++++++------ translations/client_es_EC.ts | 12 ++++++------ translations/client_es_GT.ts | 12 ++++++------ translations/client_es_HN.ts | 12 ++++++------ translations/client_es_MX.ts | 12 ++++++------ translations/client_es_SV.ts | 12 ++++++------ translations/client_et.ts | 12 ++++++------ translations/client_eu.ts | 12 ++++++------ translations/client_fa.ts | 12 ++++++------ translations/client_fi.ts | 12 ++++++------ translations/client_fr.ts | 12 ++++++------ translations/client_gl.ts | 12 ++++++------ translations/client_he.ts | 12 ++++++------ translations/client_hr.ts | 12 ++++++------ translations/client_hu.ts | 12 ++++++------ translations/client_is.ts | 12 ++++++------ translations/client_it.ts | 12 ++++++------ translations/client_ja.ts | 12 ++++++------ translations/client_ko.ts | 12 ++++++------ translations/client_lt_LT.ts | 12 ++++++------ translations/client_lv.ts | 12 ++++++------ translations/client_mk.ts | 12 ++++++------ translations/client_nb_NO.ts | 12 ++++++------ translations/client_nl.ts | 12 ++++++------ translations/client_oc.ts | 12 ++++++------ translations/client_pl.ts | 12 ++++++------ translations/client_pt.ts | 12 ++++++------ translations/client_pt_BR.ts | 12 ++++++------ translations/client_ro.ts | 12 ++++++------ translations/client_ru.ts | 12 ++++++------ translations/client_sc.ts | 12 ++++++------ translations/client_sk.ts | 12 ++++++------ translations/client_sl.ts | 12 ++++++------ translations/client_sr.ts | 12 ++++++------ translations/client_sv.ts | 12 ++++++------ translations/client_th.ts | 12 ++++++------ translations/client_tr.ts | 12 ++++++------ translations/client_uk.ts | 12 ++++++------ translations/client_zh_CN.ts | 12 ++++++------ translations/client_zh_HK.ts | 12 ++++++------ translations/client_zh_TW.ts | 12 ++++++------ 55 files changed, 330 insertions(+), 330 deletions(-) diff --git a/translations/client_ar.ts b/translations/client_ar.ts index 206e5b8f6329d..5019ae37c7dd1 100644 --- a/translations/client_ar.ts +++ b/translations/client_ar.ts @@ -1881,29 +1881,29 @@ This can be an issue with your OpenSSL libraries. رجاءً، إذهب إلى الإعدادات لاختياره إذا كنت ترغب في تنزيله. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 تجاوز المجلد الحجم الأقصى المحدد و هو %1 ميغا بايت: %2. %3 - + Keep syncing إستمِر في المزامنة - + Stop syncing أوقِف المزامنة - + The folder %1 has surpassed the set folder size limit of %2MB. تجاوز المجلد %1 الحجم الأقصى المحدد و هو %2 ميغا بايت. - + Would you like to stop syncing this folder? هل ترغب في التوقف عن مزامنة هذا المجلد؟ @@ -1929,7 +1929,7 @@ This means that the synchronization client might not upload local changes immedi ٪ 1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" تعذّر تنزيل الملف الظاهري الذي رمزه: "%1", الحالة: "%2" و رسالة الخطأ: "%3" diff --git a/translations/client_bg.ts b/translations/client_bg.ts index 6ee199321ac49..f774e2dafe4bf 100644 --- a/translations/client_bg.ts +++ b/translations/client_bg.ts @@ -1882,28 +1882,28 @@ This can be an issue with your OpenSSL libraries. Моля, отидете в настройки, ако желаете да го свалите. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1931,7 +1931,7 @@ This means that the synchronization client might not upload local changes immedi % 1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_br.ts b/translations/client_br.ts index abb79a26898ef..113d2fa87997c 100644 --- a/translations/client_br.ts +++ b/translations/client_br.ts @@ -1874,28 +1874,28 @@ This can be an issue with your OpenSSL libraries. Ket d'an arventenno evit choaz m'ho peus c'hoant da pellkargañ anezhañ. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1923,7 +1923,7 @@ Talvout a ra ar c'hliant kemprenn a c'hell n'omp pas pellkas ar c %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_ca.ts b/translations/client_ca.ts index 69799eebd5e20..ca953d7d96202 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -1881,28 +1881,28 @@ This can be an issue with your OpenSSL libraries. Aneu als paràmetres per a seleccionar si voleu baixar-la. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1926,7 +1926,7 @@ This means that the synchronization client might not upload local changes immedi No s'ha pogut fer un seguiment fiable dels canvis en les carpetes sincronitzades. Això significa que és possible que el client de sincronització no pugui carregar els canvis locals immediatament i, en canvi, només cercarà els canvis locals i els pujarà ocasionalment (per defecte, cada dues hores). %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 7d557f6a671bb..2929d8ba067cb 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -1885,29 +1885,29 @@ Toto může být způsobeno problémem s OpenSSL knihovnami. Pokud to chcete stáhnout, jděte do nastavení a vyberte to. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 Složka překročila nastavený limit velikosti %1MB: %2. %3 - + Keep syncing Synchronizovat - + Stop syncing Zastavit synchronizaci - + The folder %1 has surpassed the set folder size limit of %2MB. Složka %1 překročila nastavený limit velikosti %2MB. - + Would you like to stop syncing this folder? Chcete ji přestat synchronizovat? @@ -1935,7 +1935,7 @@ To znamená, že se může stávat, že synchronizační klient nebude místní %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" Stažení virtuálního souboru se nezdařilo s kódem „%1“, stav „%2“ a chybové hlášení „%3“ diff --git a/translations/client_da.ts b/translations/client_da.ts index a1b339f42a882..1f23209ae7442 100644 --- a/translations/client_da.ts +++ b/translations/client_da.ts @@ -1879,28 +1879,28 @@ Dette kan være et problem med dine OpenSSL biblioteker. Gå venligst til indstillinger for at vælge om du vil hente den. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1928,7 +1928,7 @@ Dette betyder at synkroniseringsklienten muligvis ikke sender lokale ændringer %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_de.ts b/translations/client_de.ts index 6643f4bac1894..1f75fb5f8ef84 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -1886,29 +1886,29 @@ Dies kann ein Problem mit Ihren OpenSSL-Bibliotheken sein. Bitte wechseln Sie zu den Einstellungen, falls Sie den Ordner herunterladen möchten. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 Ein Ordner hat die festgelegte Ordnergrößenbeschränkung von %1 MB überschritten: %2. %3 - + Keep syncing Weiterhin synchronisieren - + Stop syncing Synchronisation stoppen - + The folder %1 has surpassed the set folder size limit of %2MB. Der Ordner %1 hat die festgelegte Größenbeschränkung von %2 MB überschritten. - + Would you like to stop syncing this folder? Möchten Sie die Synchronisierung dieses Ordners stoppen? @@ -1936,7 +1936,7 @@ Dies bedeutet, dass der Synchronisierungs-Client lokale Änderungen möglicherwe %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" Der Download der virtuellen Datei ist mit dem Code "%1", dem Status "%2" und der Fehlermeldung "%3" fehlgeschlagen. diff --git a/translations/client_el.ts b/translations/client_el.ts index 411115bc40c2e..af854185cc400 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -1877,28 +1877,28 @@ This can be an issue with your OpenSSL libraries. Μεταβείτε στις ρυθμίσεις για να το επιλέξετε εάν επιθυμείτε να το κατεβάσετε. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1924,7 +1924,7 @@ This means that the synchronization client might not upload local changes immedi Αυτό σημαίνει ότι η εφαρμογή δεν θα ανεβάσει τις τοπικές αλλαγές άμεσα, θα ελέγξει μόνο τις τοπικές αλλαγές και θα τις ανεβάσει περιοδικά (κάθε δύο ώρες από προεπιλογή). - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index bf833a776cfa0..0647ba89091b9 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -1887,29 +1887,29 @@ This can be an issue with your OpenSSL libraries. Please go in the settings to select it if you wish to download it. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing Keep syncing - + Stop syncing Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? Would you like to stop syncing this folder? @@ -1937,7 +1937,7 @@ This means that the synchronization client might not upload local changes immedi %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_eo.ts b/translations/client_eo.ts index 09010478da6f3..24a2ecdebe681 100644 --- a/translations/client_eo.ts +++ b/translations/client_eo.ts @@ -1873,28 +1873,28 @@ This can be an issue with your OpenSSL libraries. Bv. iri al la agordoj por elekti, ĉu vi volas elŝuti ĝin. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1922,7 +1922,7 @@ Tio signifas, ke la sinkroniga kliento eble ne alŝutas tuj lokajn ŝanĝojn kaj %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_es.ts b/translations/client_es.ts index 4a08e5a47f377..7f93230527c08 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -1888,29 +1888,29 @@ Esto podría ser un problema con tu librería OpenSSL Por favor vaya a opciones a seleccionarlo si desea descargar esto. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 Una carpeta ha sobrepasado el límite establecido de tamaño de %1MB: %2. %3 - + Keep syncing Continuar sincronización - + Stop syncing Detener sincronización - + The folder %1 has surpassed the set folder size limit of %2MB. La carpeta %1 ha sobrepasado el límite establecido de tamaño de %2MB. - + Would you like to stop syncing this folder? ¿Desea detener la sincronización de esta carpeta? @@ -1938,7 +1938,7 @@ Esto significa que el cliente de sincronización podría no subir inmediatamente %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" La descarga de archivo virtual ha fallado con código "%1" , estado "%2" y mensaje de error "%3" diff --git a/translations/client_es_CL.ts b/translations/client_es_CL.ts index e885c9def59a2..0ba77113220ac 100644 --- a/translations/client_es_CL.ts +++ b/translations/client_es_CL.ts @@ -1873,28 +1873,28 @@ This can be an issue with your OpenSSL libraries. Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1918,7 +1918,7 @@ This means that the synchronization client might not upload local changes immedi - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_es_CO.ts b/translations/client_es_CO.ts index 114bb582f6984..9ddb5217f1f54 100644 --- a/translations/client_es_CO.ts +++ b/translations/client_es_CO.ts @@ -1873,28 +1873,28 @@ This can be an issue with your OpenSSL libraries. Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1918,7 +1918,7 @@ This means that the synchronization client might not upload local changes immedi - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_es_CR.ts b/translations/client_es_CR.ts index a6fe5ad398e80..e3977f35e6aa4 100644 --- a/translations/client_es_CR.ts +++ b/translations/client_es_CR.ts @@ -1873,28 +1873,28 @@ This can be an issue with your OpenSSL libraries. Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1918,7 +1918,7 @@ This means that the synchronization client might not upload local changes immedi - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_es_DO.ts b/translations/client_es_DO.ts index e453511e6865d..19ee275434e8f 100644 --- a/translations/client_es_DO.ts +++ b/translations/client_es_DO.ts @@ -1873,28 +1873,28 @@ This can be an issue with your OpenSSL libraries. Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1918,7 +1918,7 @@ This means that the synchronization client might not upload local changes immedi - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_es_EC.ts b/translations/client_es_EC.ts index 7a5d4adbe8920..b8c99b2534622 100644 --- a/translations/client_es_EC.ts +++ b/translations/client_es_EC.ts @@ -1882,28 +1882,28 @@ This can be an issue with your OpenSSL libraries. Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1931,7 +1931,7 @@ This means that the synchronization client might not upload local changes immedi %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_es_GT.ts b/translations/client_es_GT.ts index 793bc680aae51..5d6d5ceef7e52 100644 --- a/translations/client_es_GT.ts +++ b/translations/client_es_GT.ts @@ -1873,28 +1873,28 @@ This can be an issue with your OpenSSL libraries. Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1918,7 +1918,7 @@ This means that the synchronization client might not upload local changes immedi - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_es_HN.ts b/translations/client_es_HN.ts index cb0a0afa4c3f7..f80a4eb72df34 100644 --- a/translations/client_es_HN.ts +++ b/translations/client_es_HN.ts @@ -1873,28 +1873,28 @@ This can be an issue with your OpenSSL libraries. Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1918,7 +1918,7 @@ This means that the synchronization client might not upload local changes immedi - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_es_MX.ts b/translations/client_es_MX.ts index 817b3cd01baf0..1e2b8fb15cadc 100644 --- a/translations/client_es_MX.ts +++ b/translations/client_es_MX.ts @@ -1873,28 +1873,28 @@ This can be an issue with your OpenSSL libraries. Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1918,7 +1918,7 @@ This means that the synchronization client might not upload local changes immedi - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_es_SV.ts b/translations/client_es_SV.ts index e1e8fd2cc4f63..36546cfc81351 100644 --- a/translations/client_es_SV.ts +++ b/translations/client_es_SV.ts @@ -1873,28 +1873,28 @@ This can be an issue with your OpenSSL libraries. Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1918,7 +1918,7 @@ This means that the synchronization client might not upload local changes immedi - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_et.ts b/translations/client_et.ts index a83d491f394cc..9ed73013d0728 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -1871,28 +1871,28 @@ This can be an issue with your OpenSSL libraries. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1916,7 +1916,7 @@ This means that the synchronization client might not upload local changes immedi - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_eu.ts b/translations/client_eu.ts index 6f85662600451..b9f507dc8edb8 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -1887,29 +1887,29 @@ Baliteke OpenSSL liburutegiekin arazoa egotea. Jo ezarpenetara aukeratzeko deskargatu nahi ote duzun. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 Karpeta batek ezarritako %1MB-ko karpeta-tamainaren muga gainditu du: %2. %3 - + Keep syncing Jarraitu sinkronizatzen - + Stop syncing Utzi sinkronizatzen - + The folder %1 has surpassed the set folder size limit of %2MB. % 1 karpetak ezarritako % 2MB karpeta-tamainaren muga gainditu du. - + Would you like to stop syncing this folder? Karpeta hau sinkronizatzeari utzi nahi al diozu? @@ -1937,7 +1937,7 @@ Honek esan nahi du sinkronizazio bezeroak agian ez duela berehalakoan igoko toki %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" Fitxategi birtuala deskargatzeak huts egin du "%1" kodea, "%2" egoera eta "%3" errore mezuarekin diff --git a/translations/client_fa.ts b/translations/client_fa.ts index b1291dbaeb64f..92825abd985a0 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -1883,29 +1883,29 @@ This can be an issue with your OpenSSL libraries. اگر می خواهید این را دانلود کنید لطفا به تنظیمات بروید تا آن را انتخاب کنید. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing Keep syncing - + Stop syncing Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? Would you like to stop syncing this folder? @@ -1933,7 +1933,7 @@ This means that the synchronization client might not upload local changes immedi %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_fi.ts b/translations/client_fi.ts index 83f65e2e0a55e..49dca29a9f26c 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -1880,28 +1880,28 @@ OpenSSL-kirjastosi kanssa saattaa olla ongelma. Jos haluat ladata sen, valitse kansio asetuksista. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1925,7 +1925,7 @@ This means that the synchronization client might not upload local changes immedi - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 621ea157ced53..a69f674d3ab08 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -1886,29 +1886,29 @@ Cela peut être un problème avec vos bibliothèques OpenSSL. Merci d'aller dans les Paramètres pour indiquer si vous souhaitez le télécharger. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 Un dossier a dépassé la taille limite fixée de %1MB: %2. %3 - + Keep syncing Continuer la synchronisation - + Stop syncing Arrêter la synchronisation - + The folder %1 has surpassed the set folder size limit of %2MB. Le dossier %1 a dépassé la taille limite fixée de %2MB. - + Would you like to stop syncing this folder? Voulez vous arrêter la synchronisation de ce dossier ? @@ -1936,7 +1936,7 @@ Cela signifie que le client de synchronisation ne va pas téléverser immédiate %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" Le téléchargement du fichier virtuel a échoué avec le code « %1 », état « %2 » et le message d'erreur « %3 » diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 19c5a9ff3be31..5ed6c62905a38 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -1887,29 +1887,29 @@ Isto pode ser un problema coas súas bibliotecas OpenSSL. Vaia a axustes para seleccionalo se quere descargar isto. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 Un cartafol superou o límite de tamaño de cartafol establecido de %1MB: %2. %3 - + Keep syncing Manter sincronizado - + Stop syncing Deixar de sincronizar - + The folder %1 has surpassed the set folder size limit of %2MB. O cartafol %1 superou o límite de tamaño de cartafol estabelecido de %2MB. - + Would you like to stop syncing this folder? Quere deixar de sincronizar este cartafol? @@ -1937,7 +1937,7 @@ Isto significa que o cliente de sincronización podería non enviar os cambios i %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" Produciuse un fallo na descarga do ficheiro virtual co código «%1», o estado «%2» e a mensaxe de erro «%3» diff --git a/translations/client_he.ts b/translations/client_he.ts index 389e401423d2c..00ece4ad1c197 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -1876,28 +1876,28 @@ This can be an issue with your OpenSSL libraries. נא לגשת להגדרות כדי לבחור אם ברצונך להוריד אותה. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1921,7 +1921,7 @@ This means that the synchronization client might not upload local changes immedi - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_hr.ts b/translations/client_hr.ts index 7b034b5401618..38d0683cccb92 100644 --- a/translations/client_hr.ts +++ b/translations/client_hr.ts @@ -1881,28 +1881,28 @@ Možda se radi o pogrešci u radu OpenSSL biblioteka. Idite u postavke kako biste je odabrali ako je želite preuzeti. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1930,7 +1930,7 @@ To znači da klijent za sinkronizaciju možda neće odmah otpremiti lokalne prom %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_hu.ts b/translations/client_hu.ts index 597b714454095..4eec6ccc01c3c 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -1883,28 +1883,28 @@ Ezt a problémát valószínűleg az OpenSSL programkönyvtárakban kell keresni A beállításoknál válassza ki, ha le szeretné tölteni. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing Tovább szinkronizálás - + Stop syncing Szinkronizálás megszakítása - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? Meg szeretné szakítani a mappa szinkronizációját? @@ -1932,7 +1932,7 @@ Ez azt jelenti, hogy a szinkronizációs kliens lehet, hogy nem fogja azonnal fe %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_is.ts b/translations/client_is.ts index cfeb6b7e5f3a6..3a9dc408e9556 100644 --- a/translations/client_is.ts +++ b/translations/client_is.ts @@ -1884,28 +1884,28 @@ upp. Skoðaðu atvikaskrána fyrir nánari upplýsingar.Farðu í stillingarnar til að velja hana ef þú vilt sækja hana. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing Halda samstillingu áfram - + Stop syncing Stöðva samstillingu - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1929,7 +1929,7 @@ This means that the synchronization client might not upload local changes immedi - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_it.ts b/translations/client_it.ts index 34edb54c0a152..386de6a057f63 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -1886,28 +1886,28 @@ Questo può essere un problema delle le tue librerie OpenSSL. Vai nelle impostazioni e selezionala se vuoi scaricarla. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1935,7 +1935,7 @@ Questo significa che il client di sincronizzazione potrebbe non caricare le modi %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_ja.ts b/translations/client_ja.ts index 51ffd1f7ae045..e1ab515c90ffa 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -1881,28 +1881,28 @@ This can be an issue with your OpenSSL libraries. このフォルダーをダウンロードするには設定画面で選択してください。 - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1930,7 +1930,7 @@ This means that the synchronization client might not upload local changes immedi %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_ko.ts b/translations/client_ko.ts index ab97e9d595c06..a844bb593877f 100644 --- a/translations/client_ko.ts +++ b/translations/client_ko.ts @@ -1883,29 +1883,29 @@ OpenSSL 라이브러리 이슈일 수 있습니다. 다운로드하려면 설정으로 이동하여 선택하십시오. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 폴더가 설정된 크기 제한인 %1MB를 초과했습니다: %2. %3 - + Keep syncing 계속 동기화 - + Stop syncing 동기화 중지 - + The folder %1 has surpassed the set folder size limit of %2MB. %1 폴더가 설정된 크기 제한인 %2MB를 초과했습니다. - + Would you like to stop syncing this folder? 이 폴더의 동기화를 중단하겠습니까? @@ -1933,7 +1933,7 @@ This means that the synchronization client might not upload local changes immedi %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts index e8aa5ee5d24b0..6db01963171d9 100644 --- a/translations/client_lt_LT.ts +++ b/translations/client_lt_LT.ts @@ -1875,28 +1875,28 @@ This can be an issue with your OpenSSL libraries. Jei norite parsisiųsti, eikite į nustatymus. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1922,7 +1922,7 @@ This means that the synchronization client might not upload local changes immedi Tai reiškia, kad sinchronizacijos klientas gali iš karto neįkelti lokalių pakeitimų, o tik juos nuskaityti. Įkėlimas bus atliekamas tam tikrais laiko tarpais (pagal numatytuosius nustatymus kas dvi valandas). - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_lv.ts b/translations/client_lv.ts index fe27f061a1504..6be223fa438cc 100644 --- a/translations/client_lv.ts +++ b/translations/client_lv.ts @@ -1887,28 +1887,28 @@ Varētu būt problēma ar jūsu OpenSSL bibliotēkām. Lūdzu ieej iestatījumos un izvēlies to, ja tu to gribi lejupielādēt. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing Turpināt sinhronizāciju - + Stop syncing Pārtraukt sinhronizāciju - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1932,7 +1932,7 @@ This means that the synchronization client might not upload local changes immedi - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_mk.ts b/translations/client_mk.ts index 96a3c459db152..91d25692862cf 100644 --- a/translations/client_mk.ts +++ b/translations/client_mk.ts @@ -1875,28 +1875,28 @@ This can be an issue with your OpenSSL libraries. Одете во параметрите и изберете ја ако сакате да ја преземете. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1920,7 +1920,7 @@ This means that the synchronization client might not upload local changes immedi - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index bbf169fd97050..422009ede7305 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -1883,29 +1883,29 @@ Dette kan være et problem med OpenSSL-bibliotekene dine. Gå til Innstillinger og velg den hvis du ønsker å laste den ned. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 En mappe har overskredet den angitte mappestørrelsesgrensen på %1MB: %2. %3 - + Keep syncing Fortsett å synkronisere - + Stop syncing Stopp synkroniseringen - + The folder %1 has surpassed the set folder size limit of %2MB. Mappen %1 har overskredet den angitte mappestørrelsesgrensen på %2MB. - + Would you like to stop syncing this folder? Vil du slutte å synkronisere denne mappen? @@ -1933,7 +1933,7 @@ Dette betyr at synkroniseringsklienten kanskje ikke laster opp lokale endringer %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_nl.ts b/translations/client_nl.ts index 3298d3cd58d77..ba0f693bee213 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -1880,28 +1880,28 @@ Dit kan een probleem zijn met je OpenSSL-bibliotheken. Ga naar de instellingen om het te selecteren als u deze wilt downloaden. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1929,7 +1929,7 @@ Dit betekent dat de synchronisatieclient misschien niet meteen lokale wijziginge %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_oc.ts b/translations/client_oc.ts index f80fcf0909496..6fac6984352b4 100644 --- a/translations/client_oc.ts +++ b/translations/client_oc.ts @@ -1871,28 +1871,28 @@ This can be an issue with your OpenSSL libraries. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1916,7 +1916,7 @@ This means that the synchronization client might not upload local changes immedi - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_pl.ts b/translations/client_pl.ts index fd26263ae1ccc..47aff65c8b13d 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -1887,29 +1887,29 @@ Może to być problem z bibliotekami OpenSSL. Przejdź do ustawień, aby go wybrać do pobrania. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 Katalog przekroczył ustawiony limit rozmiaru katalogu wynoszący %1MB: %2. %3 - + Keep syncing Kontynuuj synchronizację - + Stop syncing Zatrzymaj synchronizację - + The folder %1 has surpassed the set folder size limit of %2MB. Katalog %1 przekroczył ustawiony limit rozmiaru katalogu wynoszący %2MB. - + Would you like to stop syncing this folder? Czy chcesz zatrzymać synchronizację tego katalogu? @@ -1937,7 +1937,7 @@ Oznacza to, że klient synchronizacji może nie przesyłać natychmiast zmian lo %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" Pobieranie pliku wirtualnego nie powiodło się z powodu kodu "%1", status "%2" i komunikatu o błędzie "%3" diff --git a/translations/client_pt.ts b/translations/client_pt.ts index ee689ff5d238f..4c48a2863ed12 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -1874,28 +1874,28 @@ This can be an issue with your OpenSSL libraries. Por favor, vá às definições para a selecionar, se desejar transferi-la. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1919,7 +1919,7 @@ This means that the synchronization client might not upload local changes immedi - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index b3567b1423ef2..0f0f770a19d46 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -1883,29 +1883,29 @@ Isso pode ser um problema com suas bibliotecas OpenSSL. Por favor, vá às configurações para selecioná-la se desejar baixá-la. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 Uma pasta ultrapassou o limite de tamanho de pasta definido de %1 MB: %2. %3 - + Keep syncing Continue sincronizando - + Stop syncing Parar de sincronizar - + The folder %1 has surpassed the set folder size limit of %2MB. A pasta %1 ultrapassou o limite de tamanho de pasta definido de %2MB. - + Would you like to stop syncing this folder? Deseja interromper a sincronização desta pasta? @@ -1933,7 +1933,7 @@ Isso significa que o cliente de sincronização pode não fazer upload de altera %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" Falha no download do arquivo virtual com código "%1", status "%2" e mensagem de erro "%3" diff --git a/translations/client_ro.ts b/translations/client_ro.ts index e89052671173f..6eb1ec61c17fa 100644 --- a/translations/client_ro.ts +++ b/translations/client_ro.ts @@ -1881,28 +1881,28 @@ Aceasta poate fi o problemă cu librariile OpenSSL. Vă rugăm să selectați în setări dacă doriți să descărcați acest fișier. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1930,7 +1930,7 @@ Acest lucru înseamnă că aplicația de sincronizare ar putea să nu încarce %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_ru.ts b/translations/client_ru.ts index 07ef70e2799fe..268e019f774be 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -1885,29 +1885,29 @@ This can be an issue with your OpenSSL libraries. Чтобы скачать новую папку, перейдите в параметры приложения и отметьте её для синхронизации. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 Размер папки превысил заданное ограничение в %1 МБ: %2. %3 - + Keep syncing Продолжить синхронизировать - + Stop syncing Отключить синхронизацию - + The folder %1 has surpassed the set folder size limit of %2MB. Размер папки «%1» превысил заданное ограничение в %2 МБ. - + Would you like to stop syncing this folder? Отключить синхронизацию этой папки? @@ -1934,7 +1934,7 @@ This means that the synchronization client might not upload local changes immedi %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_sc.ts b/translations/client_sc.ts index 70489a8e169c0..ff7c09811a605 100644 --- a/translations/client_sc.ts +++ b/translations/client_sc.ts @@ -1881,28 +1881,28 @@ Custu podet èssere un'errore de is librerias tuas OpenSSL. Pro praghere, bae a is impostatziones pro dda seletzionare si dda boles iscarrigare. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1930,7 +1930,7 @@ Custu bolet nàrrere chi sa sincronizatzione de su cliente diat pòdere non carr %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_sk.ts b/translations/client_sk.ts index 98ee014819a14..b0feaab1127fc 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -1881,29 +1881,29 @@ Môže to byť problém s knižnicami OpenSSL. Ak si to prajete prevziať, tak prejdite do nastavení a vyberte to. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 Priečinok prekročil nastavený limit veľkosti priečinka %1 MB: %2. %3 - + Keep syncing Pokračovať v synchronizácií - + Stop syncing Zastaviť synchronizáciu - + The folder %1 has surpassed the set folder size limit of %2MB. Priečinok %1 prekročil nastavený limit veľkosti priečinka %2 MB. - + Would you like to stop syncing this folder? Chcete vypnúť synchronizáciu tohto priečinka? @@ -1931,7 +1931,7 @@ To znamená, že klient synchronizácie nemusí okamžite odovzdať lokálne zme % 1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_sl.ts b/translations/client_sl.ts index ea18b7f9abbc8..84f97a290ecc7 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -1881,28 +1881,28 @@ Morda je napaka v knjužnicah OpenSSL. Med nastavitvami jo je mogoče izbrati in označiti za prejem. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing Nadaljuj z usklajevanjem - + Stop syncing Zaustavi usklajevanje - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? Ali želite zaustaviti usklajevanje te mape? @@ -1930,7 +1930,7 @@ To pomeni, da odjemalec usklajevanja ne pošilja krajevnih sprememb takoj in mor %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_sr.ts b/translations/client_sr.ts index 2670ff228aad5..2276a0a5b6907 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -1887,29 +1887,29 @@ This can be an issue with your OpenSSL libraries. Идите у поставке и означите ако желите да ја преузмете. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 Фолдер је прешао постављено ограничење величине од %1MB: %2. %3 - + Keep syncing Настави синхронизацију - + Stop syncing Заустави синхронизацију - + The folder %1 has surpassed the set folder size limit of %2MB. Фолдер %1 је прешао постављено ограничење величине од %2MB. - + Would you like to stop syncing this folder? Желите ли да зауставите синхронизацију овог фолдера? @@ -1937,7 +1937,7 @@ This means that the synchronization client might not upload local changes immedi %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" Није успело виртуелно преузимање фајла, кôд „%1”, статус „%2” и порука о грешки „%3~ diff --git a/translations/client_sv.ts b/translations/client_sv.ts index 914df34cba33b..112dfde1c1bc3 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -1887,29 +1887,29 @@ Det kan vara problem med dina OpenSSL-bibliotek. Vänligen gå till inställningar och välj den om du önskar att hämta den. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 En mapp har överskridit den inställda mappstorleksgränsen på %1MB: %2. %3 - + Keep syncing Fortsätt synkronisera - + Stop syncing Sluta synkronisera - + The folder %1 has surpassed the set folder size limit of %2MB. Mappen %1 har överskridit den inställda mappstorleksgränsen på %2MB. - + Would you like to stop syncing this folder? Vill du sluta synkronisera den här mappen? @@ -1937,7 +1937,7 @@ Det betyder att synkroniseringsklienten inte kan ladda upp lokala ändringar ome %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" Virtuell filnedladdning misslyckades med koden "%1", status "%2" och felmeddelandet "%3" diff --git a/translations/client_th.ts b/translations/client_th.ts index fd5227b0f269e..f6a10b93ff269 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -1879,28 +1879,28 @@ This can be an issue with your OpenSSL libraries. กรุณาเข้าไปในการตั้งค่าเพื่อเลือก ถ้าคุณต้องการดาวน์โหลด - + A folder has surpassed the set folder size limit of %1MB: %2. %3 - + Keep syncing - + Stop syncing - + The folder %1 has surpassed the set folder size limit of %2MB. - + Would you like to stop syncing this folder? @@ -1924,7 +1924,7 @@ This means that the synchronization client might not upload local changes immedi - + Virtual file download failed with code "%1", status "%2" and error message "%3" diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 54a81b2c12a5c..9ae4b9c8da430 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -1887,29 +1887,29 @@ Bu durum OpenSLL kitaplıkları ile ilgili bir sorun olabilir. İndirmek istiyorsanız seçmek için lütfen ayarlar bölümüne gidin. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 Bir klasörün boyutu %1MB olan klasör boyutu sınırını aştı : %2. %3 - + Keep syncing Eşitlemeyi sürdür - + Stop syncing Eşitlemeyi durdur - + The folder %1 has surpassed the set folder size limit of %2MB. %1 klasörünün boyutu %2MB olan klasör boyutu sınırını aştı. - + Would you like to stop syncing this folder? Bu klasörün eşitlenmesini durdurmak ister misiniz? @@ -1935,7 +1935,7 @@ This means that the synchronization client might not upload local changes immedi Bunun sonucunda eşitleme istemcisi yerel değişiklikleri anında yükleyemez. Onun yerine yalnızca yerel değişiklikleri tarar ve aralıklarla yükler (varsayılan olarak iki saatte bir). - + Virtual file download failed with code "%1", status "%2" and error message "%3" Sanal dosya indirilemedi. Kod: "%1" Durum: "%2" Hata iletisi: "%3" diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 9d884ebc8c410..876afe758d283 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -1887,29 +1887,29 @@ This can be an issue with your OpenSSL libraries. Будь ласка, перейдіть у налаштуваннях, щоб вибрати її для подальшого звантаження. - + A folder has surpassed the set folder size limit of %1MB: %2. %3 Каталог %2 перевищив встановлене обмеження на розмір %1MB %3 - + Keep syncing Синхронізовувати - + Stop syncing Зупинити синхронізацію - + The folder %1 has surpassed the set folder size limit of %2MB. Каталог %1 перевищив встановлене обмеження на розмір %2MB. - + Would you like to stop syncing this folder? Призупинити синхронізацію цього каталогу? @@ -1937,7 +1937,7 @@ This means that the synchronization client might not upload local changes immedi %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" Помилка звантаженння віртульного файлу: код "%1", статус "%2", повідомлення про помилку "%3" diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index db44a39fab933..f949a0ec97a2c 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -1881,29 +1881,29 @@ This can be an issue with your OpenSSL libraries. 如果您想下载，请到设置页面选择它。 - + A folder has surpassed the set folder size limit of %1MB: %2. %3 文件夹已超过设置的文件夹大小限制 %1MB：%2。 %3 - + Keep syncing 保持同步 - + Stop syncing 停止同步 - + The folder %1 has surpassed the set folder size limit of %2MB. 文件夹 %1 已超过设置的文件夹大小限制 %2MB - + Would you like to stop syncing this folder? 你想要停止同步此文件夹吗？ @@ -1931,7 +1931,7 @@ This means that the synchronization client might not upload local changes immedi %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" 虚拟文件下载失败，错误代码 “%1”，状态 “%2”，错误信息 “%3”。 diff --git a/translations/client_zh_HK.ts b/translations/client_zh_HK.ts index 87366bffa93a1..37f552e505796 100644 --- a/translations/client_zh_HK.ts +++ b/translations/client_zh_HK.ts @@ -1888,29 +1888,29 @@ This can be an issue with your OpenSSL libraries. 若要下載此項目，請前往設定選擇它 - + A folder has surpassed the set folder size limit of %1MB: %2. %3 資料夾已超出設置的資料夾大小限制 %1MB：%2。 %3 - + Keep syncing 保持同步 - + Stop syncing 停止同步 - + The folder %1 has surpassed the set folder size limit of %2MB. 資料夾已超出設置的資料夾大小限制 %2MB。 - + Would you like to stop syncing this folder? 您想停止同步此資料夾嗎？ @@ -1938,7 +1938,7 @@ This means that the synchronization client might not upload local changes immedi %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" 虛擬檔案下載失敗，代碼為“%1”，狀態為“%2”，錯誤訊息為“%3” diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 778082b94ae6b..ecc6faba8aaeb 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -1887,29 +1887,29 @@ This can be an issue with your OpenSSL libraries. 若要下載此項目，請前往設定選擇它。 - + A folder has surpassed the set folder size limit of %1MB: %2. %3 資料夾已超過設定的資料夾大小限制 %1MB：%2。 %3 - + Keep syncing 保持同步 - + Stop syncing 停止同步 - + The folder %1 has surpassed the set folder size limit of %2MB. 資料夾 %1 已超過設定的資料夾大小限制 %2MB - + Would you like to stop syncing this folder? 您想要停止同步此資料夾嗎？ @@ -1937,7 +1937,7 @@ This means that the synchronization client might not upload local changes immedi %1 - + Virtual file download failed with code "%1", status "%2" and error message "%3" 虛擬檔案下載失敗，代碼為「%1」，狀態為「%2」，錯誤訊息「%3」 From 71c5327c9879c39ccac4c920f2acc22d34fdaf6b Mon Sep 17 00:00:00 2001 From: Tobias Kaminsky Date: Thu, 18 Jan 2024 15:40:17 +0100 Subject: [PATCH 19/22] full git path Signed-off-by: Tobias Kaminsky --- .../NextcloudIntegration.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj b/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj index 696f50fdde33d..c592022afe4d6 100644 --- a/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj +++ b/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj @@ -1226,7 +1226,7 @@ /* Begin XCRemoteSwiftPackageReference section */ 5307A6E42965C6FA001E0C6A /* XCRemoteSwiftPackageReference "NextcloudKit" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/nextcloud/NextcloudKit"; + repositoryURL = "https://github.com/nextcloud/NextcloudKit.git"; requirement = { branch = develop; kind = branch; From cdac0cf90f5561d4c5142292c38e70936e192772 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 23:43:48 +0000 Subject: [PATCH 20/22] Build(deps): Bump cpp-linter/cpp-linter-action from 2.7.5 to 2.7.6 Bumps [cpp-linter/cpp-linter-action](https://github.com/cpp-linter/cpp-linter-action) from 2.7.5 to 2.7.6. - [Release notes](https://github.com/cpp-linter/cpp-linter-action/releases) - [Commits](https://github.com/cpp-linter/cpp-linter-action/compare/v2.7.5...v2.7.6) --- updated-dependencies: - dependency-name: cpp-linter/cpp-linter-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/clang-format.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index 66b447b8a8f3c..62cd7ab018d04 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - uses: cpp-linter/cpp-linter-action@v2.7.5 + - uses: cpp-linter/cpp-linter-action@v2.7.6 id: linter env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From a06b88c1b47b0584b1461f198472e6d56c3ccae3 Mon Sep 17 00:00:00 2001 From: Camila Date: Mon, 11 Dec 2023 18:29:33 +0100 Subject: [PATCH 21/22] Utility: Fix the storage string to display terabytes. Signed-off-by: Camila --- src/common/utility.cpp | 10 +++++----- test/testutility.cpp | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/common/utility.cpp b/src/common/utility.cpp index 607bb0414ec7c..bc2681ecd6c58 100644 --- a/src/common/utility.cpp +++ b/src/common/utility.cpp @@ -120,6 +120,7 @@ QString Utility::octetsToString(qint64 octets) static const qint64 kb = THE_FACTOR; static const qint64 mb = THE_FACTOR * kb; static const qint64 gb = THE_FACTOR * mb; + static const qint64 tb = THE_FACTOR * gb; QString s; qreal value = octets; @@ -128,11 +129,10 @@ QString Utility::octetsToString(qint64 octets) // if it's less than 10 units. bool round = true; - // do not display terra byte with the current units, as when - // the MB, GB and KB units were made, there was no TB, - // see the JEDEC standard - // https://en.wikipedia.org/wiki/JEDEC_memory_standards - if (octets >= gb) { + if (octets >= tb) { + s = QCoreApplication::translate("Utility", "%L1 TB"); + value /= tb; + } else if (octets >= gb) { s = QCoreApplication::translate("Utility", "%L1 GB"); value /= gb; round = false; diff --git a/test/testutility.cpp b/test/testutility.cpp index 67030d7384a11..89b54f5d607fe 100644 --- a/test/testutility.cpp +++ b/test/testutility.cpp @@ -37,10 +37,12 @@ private slots: QLocale::setDefault(QLocale("en")); QCOMPARE(octetsToString(999) , QString("999 B")); QCOMPARE(octetsToString(1024) , QString("1 KB")); + QCOMPARE(octetsToString(1110) , QString("1 KB")); QCOMPARE(octetsToString(1364) , QString("1 KB")); QCOMPARE(octetsToString(9110) , QString("9 KB")); QCOMPARE(octetsToString(9910) , QString("10 KB")); + QCOMPARE(octetsToString(9999) , QString("10 KB")); QCOMPARE(octetsToString(10240) , QString("10 KB")); QCOMPARE(octetsToString(123456) , QString("121 KB")); @@ -54,6 +56,8 @@ private slots: QCOMPARE(octetsToString(1024), QString("1 KB")); QCOMPARE(octetsToString(1024*1024), QString("1 MB")); QCOMPARE(octetsToString(1024LL*1024*1024), QString("1 GB")); + QCOMPARE(octetsToString(1024LL*1024*1024*1024), QString("1 TB")); + QCOMPARE(octetsToString(1024LL*1024*1024*1024 * 5), QString("5 TB")); } void testLaunchOnStartup() From 8f628f808c6cc199c2ea83a61c2f7cccc7123eef Mon Sep 17 00:00:00 2001 From: Camila Date: Mon, 11 Dec 2023 18:58:52 +0100 Subject: [PATCH 22/22] Modernize Utility::octetsToString function. - Add {} to single line if. - Use const and auto. - Use constexpr. - Rename variables for readability. Signed-off-by: Camila --- src/common/utility.cpp | 74 ++++++++++++++++++++++-------------------- src/common/utility.h | 2 +- 2 files changed, 39 insertions(+), 37 deletions(-) diff --git a/src/common/utility.cpp b/src/common/utility.cpp index bc2681ecd6c58..ce31bac851a74 100644 --- a/src/common/utility.cpp +++ b/src/common/utility.cpp @@ -58,6 +58,14 @@ #include "utility_unix.cpp" #endif +namespace { +constexpr auto bytes = 1024; +constexpr auto kilobytes = bytes; +constexpr auto megabytes = bytes * kilobytes; +constexpr qint64 gigabytes = bytes * megabytes; +constexpr qint64 terabytes = bytes * gigabytes; +} + namespace OCC { Q_LOGGING_CATEGORY(lcUtility, "nextcloud.sync.utility", QtInfoMsg) @@ -114,46 +122,40 @@ void Utility::removeFavLink(const QString &folder) removeFavLink_private(folder); } -QString Utility::octetsToString(qint64 octets) -{ -#define THE_FACTOR 1024 - static const qint64 kb = THE_FACTOR; - static const qint64 mb = THE_FACTOR * kb; - static const qint64 gb = THE_FACTOR * mb; - static const qint64 tb = THE_FACTOR * gb; - - QString s; - qreal value = octets; - - // Whether we care about decimals: only for GB/MB and only - // if it's less than 10 units. - bool round = true; - - if (octets >= tb) { - s = QCoreApplication::translate("Utility", "%L1 TB"); - value /= tb; - } else if (octets >= gb) { - s = QCoreApplication::translate("Utility", "%L1 GB"); - value /= gb; - round = false; - } else if (octets >= mb) { - s = QCoreApplication::translate("Utility", "%L1 MB"); - value /= mb; - round = false; - } else if (octets >= kb) { - s = QCoreApplication::translate("Utility", "%L1 KB"); - value /= kb; - } else { - s = QCoreApplication::translate("Utility", "%L1 B"); +QString Utility::octetsToString(const qint64 octets) +{ + auto unitName = QCoreApplication::translate("Utility", "%L1 B"); + qreal dataSize = octets; + + // Display decimals when value < TB and unit < 10 + auto showDecimals = true; + + if (octets >= terabytes) { + unitName = QCoreApplication::translate("Utility", "%L1 TB"); + dataSize /= terabytes; + showDecimals = false; + } else if (octets >= gigabytes) { + unitName = QCoreApplication::translate("Utility", "%L1 GB"); + dataSize /= gigabytes; + showDecimals = false; + } else if (octets >= megabytes) { + unitName = QCoreApplication::translate("Utility", "%L1 MB"); + dataSize /= megabytes; + showDecimals = false; + } else if (octets >= kilobytes) { + unitName = QCoreApplication::translate("Utility", "%L1 KB"); + dataSize /= kilobytes; } - if (value > 9.95) - round = true; + if (dataSize > 9.95) { + showDecimals = true; + } - if (round) - return s.arg(qRound(value)); + if (showDecimals) { + return unitName.arg(qRound(dataSize)); + } - return s.arg(value, 0, 'g', 2); + return unitName.arg(dataSize, 0, 'g', 2); } // Qtified version of get_platforms() in csync_owncloud.c diff --git a/src/common/utility.h b/src/common/utility.h index 9f5f71a5b976a..9357b4908d609 100644 --- a/src/common/utility.h +++ b/src/common/utility.h @@ -57,7 +57,7 @@ namespace Utility { OCSYNC_EXPORT void setupFavLink(const QString &folder); OCSYNC_EXPORT void removeFavLink(const QString &folder); OCSYNC_EXPORT bool writeRandomFile(const QString &fname, int size = -1); - OCSYNC_EXPORT QString octetsToString(qint64 octets); + OCSYNC_EXPORT QString octetsToString(const qint64 octets); OCSYNC_EXPORT QByteArray userAgentString(); OCSYNC_EXPORT QByteArray friendlyUserAgentString(); /**