From d12b51c116ba8f0b2b3f291cfac71d3f842c7efa Mon Sep 17 00:00:00 2001 From: Jyrki Gadinger Date: Fri, 10 Jan 2025 10:57:12 +0100 Subject: [PATCH 01/17] improve feedback from documentation generation workflow see also: https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/workflow-commands-for-github-actions#setting-a-warning-message Signed-off-by: Jyrki Gadinger --- .github/workflows/documentation.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 95b71918d8ad7..6ffae4d68a159 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -16,6 +16,12 @@ jobs: cd doc make html > build.log 2>&1 if grep WARNING build.log; then + grep WARNING build.log | awk '{ + split($0, fields, ":"); + sub("/__w/desktop/desktop/", "", fields[1]); + print "::warning file=" fields[1] ( length(fields[2]) ? ",line=" fields[2] : "" ) ",title=Documentation generation::" substr($0, index($0, fields[4]) + 1) + }' + exit 1 else exit 0 From 60daba9147c447ba1812dd4c649cbe4676c75032 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Fri, 29 Nov 2024 00:56:14 +0800 Subject: [PATCH 02/17] Use standard ComboBox for user status selector Signed-off-by: Claudio Cambra --- src/gui/UserStatusSelector.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/UserStatusSelector.qml b/src/gui/UserStatusSelector.qml index 3e303b469bee6..9ce7043d0cea6 100644 --- a/src/gui/UserStatusSelector.qml +++ b/src/gui/UserStatusSelector.qml @@ -293,7 +293,7 @@ ColumnLayout { wrapMode: Text.Wrap } - BasicComboBox { + ComboBox { id: clearComboBox Layout.fillWidth: true From 1c68012ac3f3e147c3452472f0e38360e7b9dec6 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Fri, 29 Nov 2024 00:57:19 +0800 Subject: [PATCH 03/17] Delete unused BasicComboBox component Signed-off-by: Claudio Cambra --- resources.qrc | 1 - src/gui/BasicComboBox.qml | 99 --------------------------------------- 2 files changed, 100 deletions(-) delete mode 100644 src/gui/BasicComboBox.qml diff --git a/resources.qrc b/resources.qrc index 9d1da12609314..19994e2962f1f 100644 --- a/resources.qrc +++ b/resources.qrc @@ -5,7 +5,6 @@ src/gui/EmojiPicker.qml src/gui/UserStatusSelectorButton.qml src/gui/PredefinedStatusButton.qml - src/gui/BasicComboBox.qml src/gui/ErrorBox.qml src/gui/filedetails/FileActivityView.qml src/gui/filedetails/FileDetailsPage.qml diff --git a/src/gui/BasicComboBox.qml b/src/gui/BasicComboBox.qml deleted file mode 100644 index a890adeaf665e..0000000000000 --- a/src/gui/BasicComboBox.qml +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (C) 2022 by Claudio Cambra - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - */ - -import QtQuick -import QtQuick.Layouts -import QtQuick.Controls -import Qt5Compat.GraphicalEffects - -import Style -import "./tray" - -ComboBox { - id: clearComboBox - - topPadding: Style.smallSpacing + topInset - leftPadding: Style.smallSpacing + leftInset - rightPadding: Style.smallSpacing + rightInset - bottomPadding: Style.smallSpacing + bottomInset - - background: Rectangle { - radius: Style.slightlyRoundedButtonRadius - color: palette.button - opacity: clearComboBox.hovered ? Style.hoverOpacity : 1.0 - } - - contentItem: EnforcedPlainTextLabel { - leftPadding: clearComboBox.leftPadding - rightPadding: clearComboBox.indicator.width + clearComboBox.spacing - - text: clearComboBox.displayText - verticalAlignment: Text.AlignVCenter - elide: Text.ElideRight - } - - indicator: ColorOverlay { - anchors.right: clearComboBox.right - anchors.rightMargin: clearComboBox.rightPadding - anchors.verticalCenter: clearComboBox.verticalCenter - - cached: true - width: source.width - height: source.height - - source: Image { - horizontalAlignment: Qt.AlignRight - verticalAlignment: Qt.AlignVCenter - source: "image://svgimage-custom-color/caret-down.svg/" + palette.windowText - sourceSize.width: Style.accountDropDownCaretSize - sourceSize.height: Style.accountDropDownCaretSize - Accessible.role: Accessible.PopupMenu - Accessible.name: qsTr("Clear status message menu") - } - } - - popup: Popup { - y: clearComboBox.height - Style.normalBorderWidth - width: clearComboBox.width - implicitHeight: contentItem.implicitHeight - padding: Style.normalBorderWidth - - contentItem: ListView { - clip: true - implicitHeight: contentHeight - model: clearComboBox.popup.visible ? clearComboBox.delegateModel : null - currentIndex: clearComboBox.highlightedIndex - - ScrollIndicator.vertical: ScrollIndicator { } - } - - background: Rectangle { - color: palette.toolTipBase - border.color: palette.dark - radius: Style.slightlyRoundedButtonRadius - } - } - - - delegate: ItemDelegate { - id: clearStatusDelegate - width: clearComboBox.width - contentItem: EnforcedPlainTextLabel { - text: modelData.display - elide: Text.ElideRight - verticalAlignment: Text.AlignVCenter - } - highlighted: clearComboBox.highlightedIndex === index - } -} From 1ffc210ac432c1b18f1591c8b49671cb91073259 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sat, 11 Jan 2025 02:56:02 +0000 Subject: [PATCH 04/17] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- translations/client_ar.ts | 16 +++--- translations/client_bg.ts | 16 +++--- translations/client_br.ts | 16 +++--- translations/client_ca.ts | 16 +++--- translations/client_cs.ts | 16 +++--- translations/client_da.ts | 16 +++--- translations/client_de.ts | 16 +++--- translations/client_el.ts | 16 +++--- translations/client_en_GB.ts | 16 +++--- translations/client_eo.ts | 16 +++--- translations/client_es.ts | 16 +++--- translations/client_es_CL.ts | 16 +++--- translations/client_es_CO.ts | 16 +++--- translations/client_es_CR.ts | 16 +++--- translations/client_es_DO.ts | 16 +++--- translations/client_es_EC.ts | 16 +++--- translations/client_es_GT.ts | 16 +++--- translations/client_es_HN.ts | 16 +++--- translations/client_es_MX.ts | 16 +++--- translations/client_es_SV.ts | 16 +++--- translations/client_eu.ts | 16 +++--- translations/client_fa.ts | 16 +++--- translations/client_fi.ts | 16 +++--- translations/client_fr.ts | 16 +++--- translations/client_ga.ts | 16 +++--- translations/client_gl.ts | 16 +++--- translations/client_he.ts | 16 +++--- translations/client_hr.ts | 16 +++--- translations/client_hu.ts | 16 +++--- translations/client_is.ts | 16 +++--- translations/client_it.ts | 16 +++--- translations/client_ja.ts | 25 +++++---- translations/client_ko.ts | 16 +++--- translations/client_lt_LT.ts | 16 +++--- translations/client_lv.ts | 16 +++--- translations/client_mk.ts | 16 +++--- translations/client_nb_NO.ts | 16 +++--- translations/client_nl.ts | 16 +++--- translations/client_oc.ts | 16 +++--- translations/client_pl.ts | 16 +++--- translations/client_pt.ts | 16 +++--- translations/client_pt_BR.ts | 16 +++--- translations/client_ro.ts | 16 +++--- translations/client_ru.ts | 16 +++--- translations/client_sc.ts | 16 +++--- translations/client_sk.ts | 98 ++++++++++++++++++++---------------- translations/client_sl.ts | 16 +++--- translations/client_sr.ts | 16 +++--- translations/client_sv.ts | 16 +++--- translations/client_th.ts | 16 +++--- translations/client_tr.ts | 16 +++--- translations/client_ug.ts | 16 +++--- translations/client_uk.ts | 16 +++--- translations/client_zh_CN.ts | 16 +++--- translations/client_zh_HK.ts | 16 +++--- translations/client_zh_TW.ts | 16 +++--- 56 files changed, 501 insertions(+), 486 deletions(-) diff --git a/translations/client_ar.ts b/translations/client_ar.ts index 23506333425a8..c615f8dd31347 100644 --- a/translations/client_ar.ts +++ b/translations/client_ar.ts @@ -38,14 +38,6 @@ لا توجد أي أنشطة حتى الآن - - BasicComboBox - - - Clear status message menu - إمسح قائمة رسالة الحالة - - CallNotificationDialog @@ -7163,6 +7155,14 @@ Server replied with error: %2 قم بتحرير المساحة المحلية + + BasicComboBox + + + Clear status message menu + إمسح قائمة رسالة الحالة + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_bg.ts b/translations/client_bg.ts index b1ae9fa1ab01d..2de70e47f471a 100644 --- a/translations/client_bg.ts +++ b/translations/client_bg.ts @@ -38,14 +38,6 @@ Все още няма активности - - BasicComboBox - - - Clear status message menu - Изчистване на менюто за съобщения на състояние - - CallNotificationDialog @@ -7169,6 +7161,14 @@ Server replied with error: %2 Освобождаване на локално място + + BasicComboBox + + + Clear status message menu + Изчистване на менюто за съобщения на състояние + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_br.ts b/translations/client_br.ts index 7f97742fbd6c3..a141d369ba5f8 100644 --- a/translations/client_br.ts +++ b/translations/client_br.ts @@ -38,14 +38,6 @@ - - BasicComboBox - - - Clear status message menu - - - CallNotificationDialog @@ -7143,6 +7135,14 @@ Server replied with error: %2 + + BasicComboBox + + + Clear status message menu + + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_ca.ts b/translations/client_ca.ts index 230f37075e477..4a52eb194319a 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -38,14 +38,6 @@ Encara no hi ha activitats - - BasicComboBox - - - Clear status message menu - Esborra el menú del missatge d'estat - - CallNotificationDialog @@ -7144,6 +7136,14 @@ Server replied with error: %2 Allibera espai local + + BasicComboBox + + + Clear status message menu + Esborra el menú del missatge d'estat + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 1e757b3dc0861..104fb4f6cf5ef 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -38,14 +38,6 @@ Zatím žádné aktivity - - BasicComboBox - - - Clear status message menu - Vyčistit nabídku se stavovými zprávami - - CallNotificationDialog @@ -7187,6 +7179,14 @@ Server odpověděl chybou: %2 Uvolnit lokální prostor + + BasicComboBox + + + Clear status message menu + Vyčistit nabídku se stavovými zprávami + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_da.ts b/translations/client_da.ts index 1a3ac1a3e9cf7..4f32a4875d890 100644 --- a/translations/client_da.ts +++ b/translations/client_da.ts @@ -38,14 +38,6 @@ Ingen aktiviteter endnu - - BasicComboBox - - - Clear status message menu - Ryd statusbesked menu - - CallNotificationDialog @@ -7153,6 +7145,14 @@ Server replied with error: %2 Frigør lokal lagerplads + + BasicComboBox + + + Clear status message menu + Ryd statusbesked menu + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_de.ts b/translations/client_de.ts index 9c498c417a703..0d80b729367dc 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -38,14 +38,6 @@ Noch keine Aktivitäten vorhanden - - BasicComboBox - - - Clear status message menu - Statusmeldungs-Menü löschen - - CallNotificationDialog @@ -7187,6 +7179,14 @@ Server antwortete mit Fehler: %2 Lokalen Speicherplatz freigeben + + BasicComboBox + + + Clear status message menu + Statusmeldungs-Menü löschen + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_el.ts b/translations/client_el.ts index aed1948bea066..0baba15f0db28 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -38,14 +38,6 @@ - - BasicComboBox - - - Clear status message menu - - - CallNotificationDialog @@ -7151,6 +7143,14 @@ Server replied with error: %2 Απελευθερώστε τοπικό χώρο + + BasicComboBox + + + Clear status message menu + + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index bdda639fc39cc..9aee26f776826 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -38,14 +38,6 @@ No activities yet - - BasicComboBox - - - Clear status message menu - Clear status message menu - - CallNotificationDialog @@ -7189,6 +7181,14 @@ Server replied with error: %2 Free up local space + + BasicComboBox + + + Clear status message menu + Clear status message menu + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_eo.ts b/translations/client_eo.ts index d7ecab3aecf12..fbc791a866c84 100644 --- a/translations/client_eo.ts +++ b/translations/client_eo.ts @@ -38,14 +38,6 @@ - - BasicComboBox - - - Clear status message menu - - - CallNotificationDialog @@ -7141,6 +7133,14 @@ Server replied with error: %2 + + BasicComboBox + + + Clear status message menu + + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_es.ts b/translations/client_es.ts index 3ef92655b17bc..b5b14369a9fb2 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -38,14 +38,6 @@ Aún no hay actividades - - BasicComboBox - - - Clear status message menu - Borrar el menú de mensajes de estado - - CallNotificationDialog @@ -7188,6 +7180,14 @@ El servidor respondió con el error: %2 Liberar espacio local + + BasicComboBox + + + Clear status message menu + Borrar el menú de mensajes de estado + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_es_CL.ts b/translations/client_es_CL.ts index 5620793f364c4..a668e966e4fa4 100644 --- a/translations/client_es_CL.ts +++ b/translations/client_es_CL.ts @@ -38,14 +38,6 @@ - - BasicComboBox - - - Clear status message menu - - - CallNotificationDialog @@ -7134,6 +7126,14 @@ Server replied with error: %2 + + BasicComboBox + + + Clear status message menu + + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_es_CO.ts b/translations/client_es_CO.ts index 294c1c2438ccc..46630aaeb481c 100644 --- a/translations/client_es_CO.ts +++ b/translations/client_es_CO.ts @@ -38,14 +38,6 @@ - - BasicComboBox - - - Clear status message menu - - - CallNotificationDialog @@ -7134,6 +7126,14 @@ Server replied with error: %2 + + BasicComboBox + + + Clear status message menu + + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_es_CR.ts b/translations/client_es_CR.ts index 4ba1e140e495f..8f85de6f1fb20 100644 --- a/translations/client_es_CR.ts +++ b/translations/client_es_CR.ts @@ -38,14 +38,6 @@ - - BasicComboBox - - - Clear status message menu - - - CallNotificationDialog @@ -7134,6 +7126,14 @@ Server replied with error: %2 + + BasicComboBox + + + Clear status message menu + + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_es_DO.ts b/translations/client_es_DO.ts index 7e45702b614c8..2a2ab9f21b6a8 100644 --- a/translations/client_es_DO.ts +++ b/translations/client_es_DO.ts @@ -38,14 +38,6 @@ - - BasicComboBox - - - Clear status message menu - - - CallNotificationDialog @@ -7134,6 +7126,14 @@ Server replied with error: %2 + + BasicComboBox + + + Clear status message menu + + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_es_EC.ts b/translations/client_es_EC.ts index 430b137009908..d95d8d8be242e 100644 --- a/translations/client_es_EC.ts +++ b/translations/client_es_EC.ts @@ -38,14 +38,6 @@ Aún no hay actividades - - BasicComboBox - - - Clear status message menu - Limpiar menú de mensajes de estado - - CallNotificationDialog @@ -7169,6 +7161,14 @@ Server replied with error: %2 Liberar espacio local + + BasicComboBox + + + Clear status message menu + Limpiar menú de mensajes de estado + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_es_GT.ts b/translations/client_es_GT.ts index 64687a2d60f65..52dda6f9413d1 100644 --- a/translations/client_es_GT.ts +++ b/translations/client_es_GT.ts @@ -38,14 +38,6 @@ Aún no hay actividades - - BasicComboBox - - - Clear status message menu - Borrar menú de mensaje de estado - - CallNotificationDialog @@ -7134,6 +7126,14 @@ Server replied with error: %2 + + BasicComboBox + + + Clear status message menu + Borrar menú de mensaje de estado + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_es_HN.ts b/translations/client_es_HN.ts index f0975ac69fbc6..e95dd4c580950 100644 --- a/translations/client_es_HN.ts +++ b/translations/client_es_HN.ts @@ -38,14 +38,6 @@ - - BasicComboBox - - - Clear status message menu - - - CallNotificationDialog @@ -7134,6 +7126,14 @@ Server replied with error: %2 + + BasicComboBox + + + Clear status message menu + + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_es_MX.ts b/translations/client_es_MX.ts index 6a2dbb8e37222..59c90121e9752 100644 --- a/translations/client_es_MX.ts +++ b/translations/client_es_MX.ts @@ -38,14 +38,6 @@ Sin actividades todavía - - BasicComboBox - - - Clear status message menu - Limpiar menú de mensajes de estado - - CallNotificationDialog @@ -7175,6 +7167,14 @@ El servidor respondió con el error: %2 Liberar espacio local + + BasicComboBox + + + Clear status message menu + Limpiar menú de mensajes de estado + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_es_SV.ts b/translations/client_es_SV.ts index 2c6ad4a3a699b..2402390db95f1 100644 --- a/translations/client_es_SV.ts +++ b/translations/client_es_SV.ts @@ -38,14 +38,6 @@ - - BasicComboBox - - - Clear status message menu - - - CallNotificationDialog @@ -7134,6 +7126,14 @@ Server replied with error: %2 + + BasicComboBox + + + Clear status message menu + + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_eu.ts b/translations/client_eu.ts index 663346cb2906f..a4db717d1296b 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -38,14 +38,6 @@ Ez dago jarduerarik oraindik - - BasicComboBox - - - Clear status message menu - Garbitu egoera mezuaren menua - - CallNotificationDialog @@ -7185,6 +7177,14 @@ Zerbitzariak errorearekin erantzun du: %2 Egin leku librea lokalean + + BasicComboBox + + + Clear status message menu + Garbitu egoera mezuaren menua + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_fa.ts b/translations/client_fa.ts index 77df9e0d3db9b..f5f73fbca0339 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -38,14 +38,6 @@ No activities yet - - BasicComboBox - - - Clear status message menu - Clear status message menu - - CallNotificationDialog @@ -7168,6 +7160,14 @@ Server replied with error: %2 Free up local space + + BasicComboBox + + + Clear status message menu + Clear status message menu + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_fi.ts b/translations/client_fi.ts index e69589d909cb9..50d79c5bf4bed 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -38,14 +38,6 @@ - - BasicComboBox - - - Clear status message menu - Tyhjennä tilaviestien valikko - - CallNotificationDialog @@ -7145,6 +7137,14 @@ Server replied with error: %2 Vapauta paikallista tilaa + + BasicComboBox + + + Clear status message menu + Tyhjennä tilaviestien valikko + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 2ed4044769a9e..6131726863080 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -38,14 +38,6 @@ Pas encore d'activité - - BasicComboBox - - - Clear status message menu - Menu d'effacement du message de statut - - CallNotificationDialog @@ -7184,6 +7176,14 @@ Le serveur a répondu avec l'erreur : %2 Libérer de l'espace local + + BasicComboBox + + + Clear status message menu + Menu d'effacement du message de statut + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_ga.ts b/translations/client_ga.ts index 38e972ad46018..2f8d35a109a7f 100644 --- a/translations/client_ga.ts +++ b/translations/client_ga.ts @@ -38,14 +38,6 @@ Níl aon ghníomhaíochtaí fós - - BasicComboBox - - - Clear status message menu - Glan an roghchlár teachtaireacht stádais - - CallNotificationDialog @@ -7189,6 +7181,14 @@ D'fhreagair an freastalaí le hearráid: % 2 Saor suas spás áitiúil + + BasicComboBox + + + Clear status message menu + Glan an roghchlár teachtaireacht stádais + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 94bc670b4d4c7..85b0b5dcd4969 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -38,14 +38,6 @@ Aínda non hai actividades - - BasicComboBox - - - Clear status message menu - Limpar o menú de mensaxes de estado - - CallNotificationDialog @@ -7185,6 +7177,14 @@ O servidor respondeu co erro: %2 Liberar espazo local + + BasicComboBox + + + Clear status message menu + Limpar o menú de mensaxes de estado + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_he.ts b/translations/client_he.ts index 6428524306877..f4efa6e53726b 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -38,14 +38,6 @@ - - BasicComboBox - - - Clear status message menu - - - CallNotificationDialog @@ -7139,6 +7131,14 @@ Server replied with error: %2 + + BasicComboBox + + + Clear status message menu + + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_hr.ts b/translations/client_hr.ts index d76601b7b4626..47a0b8da028e1 100644 --- a/translations/client_hr.ts +++ b/translations/client_hr.ts @@ -38,14 +38,6 @@ - - BasicComboBox - - - Clear status message menu - - - CallNotificationDialog @@ -7166,6 +7158,14 @@ Server replied with error: %2 Oslobodi lokalni prostor za pohranu + + BasicComboBox + + + Clear status message menu + + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_hu.ts b/translations/client_hu.ts index 033d65b55e8f3..ee0b37ecb001d 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -38,14 +38,6 @@ Még nincsenek tevékenységek - - BasicComboBox - - - Clear status message menu - Állapotüzenet-menü ürítése - - CallNotificationDialog @@ -7187,6 +7179,14 @@ A kiszolgáló hibával válaszolt: %2 Hely felszabadítása ezen az eszközön + + BasicComboBox + + + Clear status message menu + Állapotüzenet-menü ürítése + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_is.ts b/translations/client_is.ts index 3d6cbc86debdd..f02471dc0bae3 100644 --- a/translations/client_is.ts +++ b/translations/client_is.ts @@ -38,14 +38,6 @@ Engar athafnir ennþá - - BasicComboBox - - - Clear status message menu - Hreinsa valmynd stöðuskilaboða - - CallNotificationDialog @@ -7151,6 +7143,14 @@ sjálfgefið? + + BasicComboBox + + + Clear status message menu + Hreinsa valmynd stöðuskilaboða + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_it.ts b/translations/client_it.ts index 6bd1de47a981e..21b216d33d72b 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -38,14 +38,6 @@ Ancora nessuna attività - - BasicComboBox - - - Clear status message menu - Cancella il messaggio di stato - - CallNotificationDialog @@ -7181,6 +7173,14 @@ Il server ha risposto con errore: %2 Libera spazio locale + + BasicComboBox + + + Clear status message menu + Cancella il messaggio di stato + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_ja.ts b/translations/client_ja.ts index 0435297bda27a..03296f2aa5472 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -38,14 +38,6 @@ まだアクティビティはありません - - BasicComboBox - - - Clear status message menu - メニューのステータスメッセージの削除 - - CallNotificationDialog @@ -2491,7 +2483,10 @@ Alternatively, you can restore all deleted files by downloading them from the se This setup can cause data loss and it is no longer supported. To resolve this issue: please remove %1 from one of the accounts and create a new sync folder. For advanced users: this issue might be related to multiple sync database files found in one folder. Please check %1 for outdated and unused .sync_*.db files and remove them. - + %1フォルダは複数のアカウントにリンクされています。 +この設定はデータ損失の原因となる可能性があり、現在はサポートされていません。 +この問題を解決するには：%1をいずれかのアカウントから削除し、新しい同期フォルダを作成してください。 +上級者向け：この問題は、1つのフォルダに複数の同期データベースファイルがあることが原因である可能性があります。%1に古くて使用されていない.sync_*.dbファイルがないか確認し、削除してください。 @@ -4393,7 +4388,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss unknown exception - + 不明な例外 @@ -4527,7 +4522,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss unknown exception - + 不明な例外 @@ -7185,6 +7180,14 @@ Server replied with error: %2 ローカル領域の確保 + + BasicComboBox + + + Clear status message menu + メニューのステータスメッセージの削除 + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_ko.ts b/translations/client_ko.ts index b8284e988d4f4..ee09db18bc18b 100644 --- a/translations/client_ko.ts +++ b/translations/client_ko.ts @@ -38,14 +38,6 @@ 활동 없음 - - BasicComboBox - - - Clear status message menu - 상태 메시지 메뉴 지우기 - - CallNotificationDialog @@ -7187,6 +7179,14 @@ Server replied with error: %2 로컬 저장공간 확보 + + BasicComboBox + + + Clear status message menu + 상태 메시지 메뉴 지우기 + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts index 70b558892523e..a7462028cd4f5 100644 --- a/translations/client_lt_LT.ts +++ b/translations/client_lt_LT.ts @@ -38,14 +38,6 @@ Kol kas nėra veiklų - - BasicComboBox - - - Clear status message menu - - - CallNotificationDialog @@ -7143,6 +7135,14 @@ Server replied with error: %2 + + BasicComboBox + + + Clear status message menu + + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_lv.ts b/translations/client_lv.ts index e736c5954b245..62958f77a6db9 100644 --- a/translations/client_lv.ts +++ b/translations/client_lv.ts @@ -38,14 +38,6 @@ Vēl nav darbību - - BasicComboBox - - - Clear status message menu - Notīrīt statusa ziņojumu izvēlni - - CallNotificationDialog @@ -7152,6 +7144,14 @@ Server replied with error: %2 Atbrīvojiet lokālo vietu + + BasicComboBox + + + Clear status message menu + Notīrīt statusa ziņojumu izvēlni + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_mk.ts b/translations/client_mk.ts index f39b9a0eecc4b..3a2a179db3b70 100644 --- a/translations/client_mk.ts +++ b/translations/client_mk.ts @@ -38,14 +38,6 @@ Сеуште нема активности - - BasicComboBox - - - Clear status message menu - - - CallNotificationDialog @@ -7141,6 +7133,14 @@ Server replied with error: %2 Ослободете простор од локалниот диск + + BasicComboBox + + + Clear status message menu + + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index 5ea39726d747f..8bc5069c2672c 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -38,14 +38,6 @@ Ingen aktiviteter ennå - - BasicComboBox - - - Clear status message menu - Slett statusmeldingsmeny - - CallNotificationDialog @@ -7174,6 +7166,14 @@ Server svarte med feil: %2 Frigjør lokal plass + + BasicComboBox + + + Clear status message menu + Slett statusmeldingsmeny + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_nl.ts b/translations/client_nl.ts index f8f4fa7483791..0032675665f25 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -38,14 +38,6 @@ Nog geen activiteiten - - BasicComboBox - - - Clear status message menu - Menu Statusbericht wissen - - CallNotificationDialog @@ -7171,6 +7163,14 @@ Server antwoordde met fout: %2 Lokale ruimte vrijmaken + + BasicComboBox + + + Clear status message menu + Menu Statusbericht wissen + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_oc.ts b/translations/client_oc.ts index 2ed738b08a56c..bdaf42999870c 100644 --- a/translations/client_oc.ts +++ b/translations/client_oc.ts @@ -38,14 +38,6 @@ Cap d’activitat pel moment - - BasicComboBox - - - Clear status message menu - Escafar lo menú de messatge d’estatut - - CallNotificationDialog @@ -7132,6 +7124,14 @@ Server replied with error: %2 + + BasicComboBox + + + Clear status message menu + Escafar lo menú de messatge d’estatut + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 742d4c333fead..5114395860d1a 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -38,14 +38,6 @@ Brak aktywności - - BasicComboBox - - - Clear status message menu - Wyczyść menu komunikatu statusu - - CallNotificationDialog @@ -7175,6 +7167,14 @@ Serwer odpowiedział błędem: %2 Zwolnij miejsce lokalne + + BasicComboBox + + + Clear status message menu + Wyczyść menu komunikatu statusu + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_pt.ts b/translations/client_pt.ts index 51c7d7ab7fb48..32867449c6393 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -38,14 +38,6 @@ Ainda sem atividade - - BasicComboBox - - - Clear status message menu - Limpar menu de mensagem de estado - - CallNotificationDialog @@ -7137,6 +7129,14 @@ Server replied with error: %2 + + BasicComboBox + + + Clear status message menu + Limpar menu de mensagem de estado + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index 40777499bbf38..0515ea2edf2a8 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -38,14 +38,6 @@ Nenhuma atividade ainda - - BasicComboBox - - - Clear status message menu - Limpar menu de mensagem de status - - CallNotificationDialog @@ -7180,6 +7172,14 @@ Servidor respondeu com erro: %2 Libere espaço local + + BasicComboBox + + + Clear status message menu + Limpar menu de mensagem de status + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_ro.ts b/translations/client_ro.ts index bf9c137f63fcc..e162e4e60db60 100644 --- a/translations/client_ro.ts +++ b/translations/client_ro.ts @@ -38,14 +38,6 @@ - - BasicComboBox - - - Clear status message menu - - - CallNotificationDialog @@ -7147,6 +7139,14 @@ Server replied with error: %2 Eliberați spațiu local + + BasicComboBox + + + Clear status message menu + + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_ru.ts b/translations/client_ru.ts index df205a15089db..f446ee193db27 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -38,14 +38,6 @@ Пока ничего не делалось - - BasicComboBox - - - Clear status message menu - Меню отчистки статуса сообщения - - CallNotificationDialog @@ -7180,6 +7172,14 @@ Server replied with error: %2 Освободить место на локальном диске + + BasicComboBox + + + Clear status message menu + Меню отчистки статуса сообщения + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_sc.ts b/translations/client_sc.ts index 1480ae6e7165c..8dc362c92c1e1 100644 --- a/translations/client_sc.ts +++ b/translations/client_sc.ts @@ -38,14 +38,6 @@ - - BasicComboBox - - - Clear status message menu - - - CallNotificationDialog @@ -7166,6 +7158,14 @@ Server replied with error: %2 Faghe logu + + BasicComboBox + + + Clear status message menu + + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_sk.ts b/translations/client_sk.ts index a169383e1e5cf..c1eeb09c8959a 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -38,14 +38,6 @@ Zatiaľ žiadna aktivita - - BasicComboBox - - - Clear status message menu - Vymazať menu správ o stave - - CallNotificationDialog @@ -223,7 +215,7 @@ Account switcher and settings menu - + Prepínač účtov a menu nastavení @@ -467,12 +459,12 @@ Nextcloud desktop main dialog - + Hlavné dialógové okno pracovnej plochy Nextcloud Unified search results list - + Jednotný zoznam výsledkov vyhľadávania @@ -2281,14 +2273,18 @@ To znamená, že klient synchronizácie nemusí okamžite odovzdať lokálne zme A large number of files in the server have been deleted. Please confirm if you'd like to proceed with these deletions. Alternatively, you can restore all deleted files by uploading from '%1' folder to the server. - + Veľký počet súborov na serveri bol odstránený. +Potvrďte, či chcete pokračovať v tomto odstraňovaní. +Prípadne môžete obnoviť všetky vymazané súbory ich nahraním z adresára '%1' na server. A large number of files in your local '%1' folder have been deleted. Please confirm if you'd like to proceed with these deletions. Alternatively, you can restore all deleted files by downloading them from the server. - + Veľký počet súborov vo vašom miestnom adresáre '%1' bolo odstránených. +Potvrďte, či chcete pokračovať v tomto odstraňovaní. +Prípadne môžete obnoviť všetky odstránené súbory ich stiahnutím zo servera. @@ -2449,7 +2445,7 @@ Alternatively, you can restore all deleted files by downloading them from the se The folder %1 is used in a folder sync connection! - + Adresár %1 sa používa v pripojení na synchronizáciu adresára! @@ -2487,7 +2483,10 @@ Alternatively, you can restore all deleted files by downloading them from the se This setup can cause data loss and it is no longer supported. To resolve this issue: please remove %1 from one of the accounts and create a new sync folder. For advanced users: this issue might be related to multiple sync database files found in one folder. Please check %1 for outdated and unused .sync_*.db files and remove them. - + Adresár %1 je prepojený s viacerými účtami. +Toto nastavenie môže spôsobiť stratu údajov a už nie je podporované. +Ak chcete vyriešiť tento problém, odstráňte %1 z jedného z účtov a vytvorte nový synchronizačný adresár. +Pre pokročilých užívateľov: tento problém môže súvisieť s viacerými synchronizačnými databázovými súbormi nachádzajúcimi sa v jednom adresáre. Skontrolujte %1 na zastarané a nepoužívané súbory .sync_*.db a odstráňte ich. @@ -2910,7 +2909,7 @@ For advanced users: this issue might be related to multiple sync database files Show Chat Notifications - + Zobraziť upozornenia na Chat @@ -3052,7 +3051,7 @@ For advanced users: this issue might be related to multiple sync database files Show chat notification dialogs. - + Zobraziť dialógy upozornenia na Chat. @@ -3107,7 +3106,10 @@ Upozorňujeme, že sa tým vyberie iba to, odkiaľ sa aktualizácie budú sťaho Downgrading versions is not possible immediately: changing from beta to stable means waiting for the new stable version. list of available update channels to non enterprise users and downgrading warning - + - beta: obsahuje verzie s novými funkciami, ktoré nemusia byť dôkladne testované +- denne: obsahuje verzie vytvorené denne, len pre testovanie a vývoj + +Prechod na nižšiu verziu nie je možný okamžite: zmena z beta na stabilnú znamená čakanie na novú stabilnú verziu. @@ -3115,7 +3117,9 @@ Downgrading versions is not possible immediately: changing from beta to stable m Downgrading versions is not possible immediately: changing from stable to enterprise means waiting for the new enterprise version. list of available update channels to enterprise users and downgrading warning - + - Enterprise: obsahuje stabilné verzie pre zákazníkov. + +Prechod na nižšiu verziu nie je možný okamžite: zmena zo stabilnej na podnikovú znamená čakanie na novú podnikovú verziu. @@ -3338,27 +3342,27 @@ Položky, pri ktorých je povolené odstraňovanie budú vymazané, ak bránia o The file "%1" could not be synced because the name contains characters which are not allowed on the server. - + Súbor "%1" nebolo možné synchronizovať, pretože názov obsahuje znaky, ktoré nie sú povolené serverom. The following characters are not allowed: %1 - + Nasledujúce znaky nie sú povolené: %1 The following basenames are not allowed: %1 - + Nasledujúce názvy nie su povolené: %1 The following filenames are not allowed: %1 - + Nasledujúce názvy súborov nie su povolené: %1 The following file extensions are not allowed: %1 - + Nasledujúce prípony súborov nie su povolené: %1 @@ -3492,32 +3496,32 @@ Upozorňujeme, že použitie akýchkoľvek príkazov pre logovanie z príkazové Could not start editing locally. - + Nepodarilo sa spustiť lokálnu úpravu. An error occurred during setup. - + Počas nastavovania sa vyskytla chyba. Could not find a file for local editing.Make sure its path is valid and it is synced locally. - + Nepodarilo sa nájsť súbor pre lokálne úpravy. Uistite sa, že jeho cesta je platná a je synchronizovaná lokálne. Could not get file ID. - + Nepodarilo sa získať ID súboru. Could not get file identifier. - + Nepodarilo sa získať identifikátor súboru. The file identifier is empty. - + Identifikátor súboru je prázdny. @@ -4181,7 +4185,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v %1 name containing the character "%2" is not supported on this file system. folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character - + Názov %1 obsahuje znak "%2" ktorý nie je podporovaný na tomto súborovom systéme. @@ -4251,12 +4255,12 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v Reason: the filename has a forbidden base name (filename start). - + Dôvod: meno súboru obsahuje zakázaný názov (začiatok názvu súboru). Reason: the file has a forbidden extension (.%1). - + Dôvod: súbor obsahuje zakázanú príponu (.%1). @@ -4385,7 +4389,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v unknown exception - + neznáma chyba @@ -4519,7 +4523,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v unknown exception - + neznáma chyba @@ -4550,7 +4554,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v Folder %1 cannot be renamed because of a local file or folder name clash! - + Adresár %1 nemôže byť premenovaný z dôvodu kolízie s menom lokálneho súboru alebo adresára. @@ -5708,7 +5712,7 @@ Server odpovedal chybou: %2 Could not add or remove user %1 to access folder %2 - + Nepodarilo sa pridať alebo odstrániť užívateľa %1 pre prístup k adresáru %2 @@ -5875,7 +5879,7 @@ Server odpovedal chybou: %2 The Virtual filesystem feature does not support a drive as sync root - + Funkcia virtuálneho systému súborov nepodporuje jednotku ako koreňový adresár pre synchronizáciu @@ -5885,7 +5889,7 @@ Server odpovedal chybou: %2 The Virtual filesystem feature is not supported on network drives - + Funkcia virtuálneho systému súborov nie je podporovaná na sieťových jednodkách @@ -6033,7 +6037,7 @@ Server odpovedal chybou: %2 Your account %1 requires you to accept the terms of service of your server. You will be redirected to %2 to acknowledge that you have read it and agrees with it. - + Váš účet %1 vyžaduje, aby ste prijali zmluvné podmienky vášho servera. Budete presmerovaní na %2, aby ste potvrdili, že ste si ho prečítali a súhlasíte s ním. @@ -6289,12 +6293,12 @@ Server odpovedal chybou: %2 Failed to create debug archive - + Archív informácií pre ladenie sa nepodarilo vytvoriť Could not create debug archive in selected location! - + Archív informácií pre ladenie sa nepodarilo vytvoriť vo vybranej lokácii! @@ -6957,7 +6961,7 @@ Server odpovedal chybou: %2 Updated local virtual files metadata - + Lokálne metadáta virtuálných súborov boli aktualizované @@ -7177,6 +7181,14 @@ Server odpovedal chybou: %2 Uvoľniť lokálny priestor + + BasicComboBox + + + Clear status message menu + Vymazať menu správ o stave + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_sl.ts b/translations/client_sl.ts index 7a216d3b5aaec..7d74e2c79b4a3 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -38,14 +38,6 @@ Ni še zabeležene dejavnosti - - BasicComboBox - - - Clear status message menu - Počisti meni sporočil stanja - - CallNotificationDialog @@ -7166,6 +7158,14 @@ Server replied with error: %2 Sprostite krajevno shrambo + + BasicComboBox + + + Clear status message menu + Počisti meni sporočil stanja + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_sr.ts b/translations/client_sr.ts index 55f79b73a6f10..67815cab7429d 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -38,14 +38,6 @@ Још увек нема активности - - BasicComboBox - - - Clear status message menu - Обриши мени статусне поруке - - CallNotificationDialog @@ -7186,6 +7178,14 @@ Server replied with error: %2 Ослободи локални простор + + BasicComboBox + + + Clear status message menu + Обриши мени статусне поруке + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_sv.ts b/translations/client_sv.ts index 7ec6bba84a55c..cb996f3c78716 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -38,14 +38,6 @@ Inga aktiviteter än - - BasicComboBox - - - Clear status message menu - Rensa statusmeddelandemenyn - - CallNotificationDialog @@ -7189,6 +7181,14 @@ Servern svarade med fel: %2 Frigör lokalt utrymme + + BasicComboBox + + + Clear status message menu + Rensa statusmeddelandemenyn + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_th.ts b/translations/client_th.ts index 045ac3b49828d..66bc0860c2d83 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -38,14 +38,6 @@ ยังไม่มีกิจกรรม - - BasicComboBox - - - Clear status message menu - ล้างเมนูข้อความสถานะ - - CallNotificationDialog @@ -7141,6 +7133,14 @@ Server replied with error: %2 + + BasicComboBox + + + Clear status message menu + ล้างเมนูข้อความสถานะ + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_tr.ts b/translations/client_tr.ts index b3bacd72693ac..cb09cc98e57b0 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -38,14 +38,6 @@ Henüz bir işlem yok - - BasicComboBox - - - Clear status message menu - Durum iletisini kaldırma menüsü - - CallNotificationDialog @@ -7188,6 +7180,14 @@ Sunucunun verdiği hata yanıtı: %2 Yerelden kaldırıp yer aç + + BasicComboBox + + + Clear status message menu + Durum iletisini kaldırma menüsü + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_ug.ts b/translations/client_ug.ts index 2e07d098f00d6..b89f29eef9c1f 100644 --- a/translations/client_ug.ts +++ b/translations/client_ug.ts @@ -38,14 +38,6 @@ تېخى پائالىيەت يوق - - BasicComboBox - - - Clear status message menu - ھالەت ئۇچۇر تىزىملىكىنى تازىلاش - - CallNotificationDialog @@ -7186,6 +7178,14 @@ Server replied with error: %2 يەرلىك بوشلۇقنى ھەقسىز قىلىڭ + + BasicComboBox + + + Clear status message menu + ھالەت ئۇچۇر تىزىملىكىنى تازىلاش + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 378e2edf06961..c29b39b39d220 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -38,14 +38,6 @@ Поки не було дій - - BasicComboBox - - - Clear status message menu - Очистити меню статусних повідомлень - - CallNotificationDialog @@ -7184,6 +7176,14 @@ Server replied with error: %2 Звільнити місце на пристрої + + BasicComboBox + + + Clear status message menu + Очистити меню статусних повідомлень + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index 110f31e2da138..67d2231c7a0ad 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -38,14 +38,6 @@ 暂无动态 - - BasicComboBox - - - Clear status message menu - 清除状态信息菜单 - - CallNotificationDialog @@ -7174,6 +7166,14 @@ Server replied with error: %2 释放本地空间 + + BasicComboBox + + + Clear status message menu + 清除状态信息菜单 + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_zh_HK.ts b/translations/client_zh_HK.ts index 384e55ea2baa9..172c95b86ba11 100644 --- a/translations/client_zh_HK.ts +++ b/translations/client_zh_HK.ts @@ -38,14 +38,6 @@ 尚無系統事件 - - BasicComboBox - - - Clear status message menu - 清除狀態訊息選項單 - - CallNotificationDialog @@ -7190,6 +7182,14 @@ Server replied with error: %2 釋放近端存儲空間 + + BasicComboBox + + + Clear status message menu + 清除狀態訊息選項單 + + OCC::AbstractPropagateRemoteDeleteEncrypted diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index fb27872eb972a..cde2e34b1d1cc 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -38,14 +38,6 @@ 尚無活動狀態 - - BasicComboBox - - - Clear status message menu - 清除狀態訊息選單 - - CallNotificationDialog @@ -7189,6 +7181,14 @@ Server replied with error: %2 釋放本機空間 + + BasicComboBox + + + Clear status message menu + 清除狀態訊息選單 + + OCC::AbstractPropagateRemoteDeleteEncrypted From 800690a14c3cd727aa434696238041d8dae05bb4 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Mon, 13 Jan 2025 02:56:11 +0000 Subject: [PATCH 05/17] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- translations/client_lt_LT.ts | 8 ++++---- translations/client_uk.ts | 9 ++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts index a7462028cd4f5..a87482ff3dc45 100644 --- a/translations/client_lt_LT.ts +++ b/translations/client_lt_LT.ts @@ -1377,13 +1377,13 @@ This action will abort any currently running synchronization. file A - + failas A today - + šiandiena @@ -1395,7 +1395,7 @@ This action will abort any currently running synchronization. Open existing file - + Atverti esamą failą @@ -1421,7 +1421,7 @@ This action will abort any currently running synchronization. New filename - + Naujas failo pavadinimas diff --git a/translations/client_uk.ts b/translations/client_uk.ts index c29b39b39d220..1cf4a262bd475 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -2483,7 +2483,10 @@ Alternatively, you can restore all deleted files by downloading them from the se This setup can cause data loss and it is no longer supported. To resolve this issue: please remove %1 from one of the accounts and create a new sync folder. For advanced users: this issue might be related to multiple sync database files found in one folder. Please check %1 for outdated and unused .sync_*.db files and remove them. - + Каталог %1 використовується кількома користувачами. +Така конфігурація може призвети до втрати даних, відтак більше не підтримується. +Для вирішення проблеми потрібно вилучити каталог %1 з одного з облікових записів та створити новий каталог для синхронізації. +Для експертів: проблема може полягати в тому, що кілька файлів синхронізації баз даних розташовано в одному каталозі. Перевірте, каталог %1 містить застарілі та невикористовувані файли .sync_*.db, вилучіть їх. @@ -4384,7 +4387,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss unknown exception - + невідомий виняток @@ -4518,7 +4521,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss unknown exception - + невідомий виняток From 937d99bf1826c3b868d6eccb9ecc106701f7d0b2 Mon Sep 17 00:00:00 2001 From: tflidd Date: Fri, 10 Jan 2025 10:11:47 +0100 Subject: [PATCH 06/17] Update macosvfs.rst Typo in the header Signed-off-by: tflidd --- doc/macosvfs.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/macosvfs.rst b/doc/macosvfs.rst index 70495fa45e4fb..32da58c9a1106 100644 --- a/doc/macosvfs.rst +++ b/doc/macosvfs.rst @@ -6,7 +6,7 @@ macOS Virtual Files .. index:: macosvfs -macOS Vitual Files client +macOS Virtual Files client ============ Virtual file-based synchronisation for Nextcloud desktop users is now From 92488042eee6bacabffb680abf0ec5f0dd3501d5 Mon Sep 17 00:00:00 2001 From: rakekniven <2069590+rakekniven@users.noreply.github.com> Date: Sun, 12 Jan 2025 18:34:47 +0100 Subject: [PATCH 07/17] chore(i18n): Improved grammar Reported on the forums Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com> --- src/gui/filedetails/ShareDetailsPage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/filedetails/ShareDetailsPage.qml b/src/gui/filedetails/ShareDetailsPage.qml index 1ac69e1b38cbe..2b2eb0b45ef15 100644 --- a/src/gui/filedetails/ShareDetailsPage.qml +++ b/src/gui/filedetails/ShareDetailsPage.qml @@ -466,7 +466,7 @@ Page { checkable: true checked: root.passwordProtectEnabled - text: qsTr("Password protect") + text: qsTr("Password protection") visible: root.shareSupportsPassword enabled: visible && !root.waitingForPasswordProtectEnabledChange && From ddc4d4fe62495c4d5ea1f7e28148d2ff140104ca Mon Sep 17 00:00:00 2001 From: Ankur Bavisa Date: Thu, 6 Jul 2023 18:35:14 +0530 Subject: [PATCH 08/17] update runwizard introduction screen Signed-off-by: Ankur Bavisa --- src/gui/wizard/flow2authwidget.cpp | 18 ++-- src/gui/wizard/flow2authwidget.ui | 164 ++++++++++++++++++++--------- 2 files changed, 120 insertions(+), 62 deletions(-) diff --git a/src/gui/wizard/flow2authwidget.cpp b/src/gui/wizard/flow2authwidget.cpp index cb9262846d971..e191648e32ad1 100644 --- a/src/gui/wizard/flow2authwidget.cpp +++ b/src/gui/wizard/flow2authwidget.cpp @@ -42,8 +42,8 @@ Flow2AuthWidget::Flow2AuthWidget(QWidget *parent) WizardCommon::initErrorLabel(_ui.errorLabel); _ui.errorLabel->setTextFormat(Qt::RichText); - connect(_ui.openLinkLabel, &LinkLabel::clicked, this, &Flow2AuthWidget::slotOpenBrowser); - connect(_ui.copyLinkLabel, &LinkLabel::clicked, this, &Flow2AuthWidget::slotCopyLinkToClipboard); + connect(_ui.openLinkButton, &QPushButton::clicked, this, &Flow2AuthWidget::slotOpenBrowser); + connect(_ui.copyLinkButton, &QPushButton::clicked, this, &Flow2AuthWidget::slotCopyLinkToClipboard); auto sizePolicy = _progressIndi->sizePolicy(); sizePolicy.setRetainSizeWhenHidden(true); @@ -186,8 +186,8 @@ void Flow2AuthWidget::startSpinner() _progressIndi->setVisible(true); _progressIndi->startAnimation(); - _ui.openLinkLabel->setEnabled(false); - _ui.copyLinkLabel->setEnabled(false); + _ui.openLinkButton->setEnabled(false); + _ui.copyLinkButton->setEnabled(false); } void Flow2AuthWidget::stopSpinner(bool showStatusLabel) @@ -197,8 +197,8 @@ void Flow2AuthWidget::stopSpinner(bool showStatusLabel) _progressIndi->setVisible(false); _progressIndi->stopAnimation(); - _ui.openLinkLabel->setEnabled(_statusUpdateSkipCount == 0); - _ui.copyLinkLabel->setEnabled(_statusUpdateSkipCount == 0); + _ui.openLinkButton->setEnabled(_statusUpdateSkipCount == 0); + _ui.copyLinkButton->setEnabled(_statusUpdateSkipCount == 0); } void Flow2AuthWidget::slotStyleChanged() @@ -219,11 +219,9 @@ void Flow2AuthWidget::customizeStyle() } } - _ui.openLinkLabel->setText(tr("Reopen Browser")); - _ui.openLinkLabel->setAlignment(Qt::AlignCenter); + _ui.openLinkButton->setText(tr("Open Browser")); - _ui.copyLinkLabel->setText(tr("Copy Link")); - _ui.copyLinkLabel->setAlignment(Qt::AlignCenter); + _ui.copyLinkButton->setText(tr("Copy Link")); WizardCommon::customizeHintLabel(_ui.statusLabel); } diff --git a/src/gui/wizard/flow2authwidget.ui b/src/gui/wizard/flow2authwidget.ui index 44961ddae1a2a..e98f3c6d5e515 100644 --- a/src/gui/wizard/flow2authwidget.ui +++ b/src/gui/wizard/flow2authwidget.ui @@ -6,8 +6,8 @@ 0 0 - 580 - 330 + 597 + 387 @@ -25,31 +25,22 @@ Browser Authentication - + - + Qt::Vertical - - QSizePolicy::Expanding - 20 - 80 + 40 - - - 0 - - - 0 - + @@ -60,12 +51,24 @@ + + + + Qt::Vertical + + + + 20 + 32 + + + + 12 - 75 true @@ -80,6 +83,22 @@ + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 8 + + + + @@ -94,13 +113,36 @@ - - - 0 + + + Qt::Vertical - - 0 + + + 20 + 32 + + + + + + + + + + Qt::Vertical + + + + 20 + 64 + + + + + + @@ -115,15 +157,54 @@ - - - 0 - + - + + + + 0 + 0 + + + + + 9 + + + + pbSelectLocalFolder + + + true + + + false + + - + + + + 0 + 0 + + + + + 9 + + + + pbSelectLocalFolder + + + true + + + false + + @@ -155,47 +236,26 @@ - - - - + Qt::Vertical - - - 20 - 20 - - - - - - - - Qt::Vertical + + QSizePolicy::Expanding 20 - 80 + 60 - - - OCC::LinkLabel - QWidget -
wizard/linklabel.h
- 1 - - From 5081024cfff0607e6aecc8598c03bb099014c0e5 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Tue, 14 Jan 2025 01:38:12 +0000 Subject: [PATCH 09/17] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- translations/client_ar.ts | 10 ++++++++++ translations/client_bg.ts | 10 ++++++++++ translations/client_br.ts | 10 ++++++++++ translations/client_ca.ts | 10 ++++++++++ translations/client_cs.ts | 10 ++++++++++ translations/client_da.ts | 10 ++++++++++ translations/client_de.ts | 10 ++++++++++ translations/client_el.ts | 10 ++++++++++ translations/client_en_GB.ts | 10 ++++++++++ translations/client_eo.ts | 10 ++++++++++ translations/client_es.ts | 10 ++++++++++ translations/client_es_CL.ts | 10 ++++++++++ translations/client_es_CO.ts | 10 ++++++++++ translations/client_es_CR.ts | 10 ++++++++++ translations/client_es_DO.ts | 10 ++++++++++ translations/client_es_EC.ts | 10 ++++++++++ translations/client_es_GT.ts | 10 ++++++++++ translations/client_es_HN.ts | 10 ++++++++++ translations/client_es_MX.ts | 10 ++++++++++ translations/client_es_SV.ts | 10 ++++++++++ translations/client_eu.ts | 10 ++++++++++ translations/client_fa.ts | 10 ++++++++++ translations/client_fi.ts | 10 ++++++++++ translations/client_fr.ts | 10 ++++++++++ translations/client_ga.ts | 10 ++++++++++ translations/client_gl.ts | 10 ++++++++++ translations/client_he.ts | 10 ++++++++++ translations/client_hr.ts | 10 ++++++++++ translations/client_hu.ts | 10 ++++++++++ translations/client_is.ts | 10 ++++++++++ translations/client_it.ts | 10 ++++++++++ translations/client_ja.ts | 10 ++++++++++ translations/client_ko.ts | 10 ++++++++++ translations/client_lt_LT.ts | 10 ++++++++++ translations/client_lv.ts | 10 ++++++++++ translations/client_mk.ts | 10 ++++++++++ translations/client_nb_NO.ts | 10 ++++++++++ translations/client_nl.ts | 10 ++++++++++ translations/client_oc.ts | 10 ++++++++++ translations/client_pl.ts | 10 ++++++++++ translations/client_pt.ts | 10 ++++++++++ translations/client_pt_BR.ts | 10 ++++++++++ translations/client_ro.ts | 10 ++++++++++ translations/client_ru.ts | 10 ++++++++++ translations/client_sc.ts | 10 ++++++++++ translations/client_sk.ts | 10 ++++++++++ translations/client_sl.ts | 10 ++++++++++ translations/client_sr.ts | 10 ++++++++++ translations/client_sv.ts | 10 ++++++++++ translations/client_th.ts | 10 ++++++++++ translations/client_tr.ts | 10 ++++++++++ translations/client_ug.ts | 10 ++++++++++ translations/client_uk.ts | 10 ++++++++++ translations/client_zh_CN.ts | 10 ++++++++++ translations/client_zh_HK.ts | 10 ++++++++++ translations/client_zh_TW.ts | 10 ++++++++++ 56 files changed, 560 insertions(+) diff --git a/translations/client_ar.ts b/translations/client_ar.ts index c615f8dd31347..66c45b51f9759 100644 --- a/translations/client_ar.ts +++ b/translations/client_ar.ts @@ -2036,6 +2036,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser أَعِد فتح المُتصفّح + + + Open Browser + + Copy Link @@ -6460,6 +6465,11 @@ Server replied with error: %2 Hide download إخفاء التنزيل + + + Password protection + + Password protect diff --git a/translations/client_bg.ts b/translations/client_bg.ts index 2de70e47f471a..2e6e91c94943e 100644 --- a/translations/client_bg.ts +++ b/translations/client_bg.ts @@ -2037,6 +2037,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser Отворете Браузъра отново + + + Open Browser + + Copy Link @@ -6466,6 +6471,11 @@ Server replied with error: %2 Hide download Скриване на изтеглянето + + + Password protection + + Password protect diff --git a/translations/client_br.ts b/translations/client_br.ts index a141d369ba5f8..e898d35f81d2b 100644 --- a/translations/client_br.ts +++ b/translations/client_br.ts @@ -2029,6 +2029,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser + + + Open Browser + + Copy Link @@ -6440,6 +6445,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_ca.ts b/translations/client_ca.ts index 4a52eb194319a..d4cd4131124de 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -2036,6 +2036,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser + + + Open Browser + + Copy Link @@ -6441,6 +6446,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 104fb4f6cf5ef..d5396d52aac46 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -2041,6 +2041,11 @@ Toto může být způsobeno problémem s OpenSSL knihovnami. Reopen Browser Znovu otevřít webový prohlížeč + + + Open Browser + + Copy Link @@ -6484,6 +6489,11 @@ Server odpověděl chybou: %2 Hide download Skrýt stažení + + + Password protection + + Password protect diff --git a/translations/client_da.ts b/translations/client_da.ts index 4f32a4875d890..d58589781681c 100644 --- a/translations/client_da.ts +++ b/translations/client_da.ts @@ -2039,6 +2039,11 @@ Dette kan være et problem med dine OpenSSL biblioteker. Reopen Browser + + + Open Browser + + Copy Link @@ -6450,6 +6455,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_de.ts b/translations/client_de.ts index 0d80b729367dc..62fde7bbac629 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -2041,6 +2041,11 @@ Dies kann ein Problem mit Ihren OpenSSL-Bibliotheken sein. Reopen Browser Browser erneut öffnen + + + Open Browser + + Copy Link @@ -6484,6 +6489,11 @@ Server antwortete mit Fehler: %2 Hide download Download verbergen + + + Password protection + + Password protect diff --git a/translations/client_el.ts b/translations/client_el.ts index 0baba15f0db28..55443608ce384 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -2032,6 +2032,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser Επανεκκίνηση περιηγητή + + + Open Browser + + Copy Link @@ -6448,6 +6453,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index 9aee26f776826..30d0747ce6183 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -2042,6 +2042,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser Reopen Browser + + + Open Browser + + Copy Link @@ -6486,6 +6491,11 @@ Server replied with error: %2 Hide download Hide download + + + Password protection + + Password protect diff --git a/translations/client_eo.ts b/translations/client_eo.ts index fbc791a866c84..f8a5c9e3568d1 100644 --- a/translations/client_eo.ts +++ b/translations/client_eo.ts @@ -2028,6 +2028,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser Remalfermi TTT-legilon + + + Open Browser + + Copy Link @@ -6438,6 +6443,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_es.ts b/translations/client_es.ts index b5b14369a9fb2..d7c8334996eb7 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -2043,6 +2043,11 @@ Esto podría ser un problema con tu librería OpenSSL Reopen Browser Reabrir el navegador + + + Open Browser + + Copy Link @@ -6485,6 +6490,11 @@ El servidor respondió con el error: %2 Hide download Ocultar descarga + + + Password protection + + Password protect diff --git a/translations/client_es_CL.ts b/translations/client_es_CL.ts index a668e966e4fa4..e7d1526e73191 100644 --- a/translations/client_es_CL.ts +++ b/translations/client_es_CL.ts @@ -2028,6 +2028,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser + + + Open Browser + + Copy Link @@ -6431,6 +6436,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_es_CO.ts b/translations/client_es_CO.ts index 46630aaeb481c..ec81560931fd8 100644 --- a/translations/client_es_CO.ts +++ b/translations/client_es_CO.ts @@ -2028,6 +2028,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser + + + Open Browser + + Copy Link @@ -6431,6 +6436,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_es_CR.ts b/translations/client_es_CR.ts index 8f85de6f1fb20..b074d71e71e26 100644 --- a/translations/client_es_CR.ts +++ b/translations/client_es_CR.ts @@ -2028,6 +2028,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser + + + Open Browser + + Copy Link @@ -6431,6 +6436,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_es_DO.ts b/translations/client_es_DO.ts index 2a2ab9f21b6a8..1d22a9a973556 100644 --- a/translations/client_es_DO.ts +++ b/translations/client_es_DO.ts @@ -2028,6 +2028,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser + + + Open Browser + + Copy Link @@ -6431,6 +6436,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_es_EC.ts b/translations/client_es_EC.ts index d95d8d8be242e..011a795508fe9 100644 --- a/translations/client_es_EC.ts +++ b/translations/client_es_EC.ts @@ -2037,6 +2037,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser Volver a abrir el navegador + + + Open Browser + + Copy Link @@ -6466,6 +6471,11 @@ Server replied with error: %2 Hide download Ocultar descarga + + + Password protection + + Password protect diff --git a/translations/client_es_GT.ts b/translations/client_es_GT.ts index 52dda6f9413d1..c6898589484cf 100644 --- a/translations/client_es_GT.ts +++ b/translations/client_es_GT.ts @@ -2028,6 +2028,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser + + + Open Browser + + Copy Link @@ -6431,6 +6436,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_es_HN.ts b/translations/client_es_HN.ts index e95dd4c580950..5fc3e2bf49876 100644 --- a/translations/client_es_HN.ts +++ b/translations/client_es_HN.ts @@ -2028,6 +2028,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser + + + Open Browser + + Copy Link @@ -6431,6 +6436,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_es_MX.ts b/translations/client_es_MX.ts index 59c90121e9752..798ad6dfe75ad 100644 --- a/translations/client_es_MX.ts +++ b/translations/client_es_MX.ts @@ -2042,6 +2042,11 @@ Esto podría ser un problema con su librería OpenSSL. Reopen Browser Reabrir el navegador + + + Open Browser + + Copy Link @@ -6472,6 +6477,11 @@ El servidor respondió con el error: %2 Hide download Ocultar descarga + + + Password protection + + Password protect diff --git a/translations/client_es_SV.ts b/translations/client_es_SV.ts index 2402390db95f1..4c5a698423ef9 100644 --- a/translations/client_es_SV.ts +++ b/translations/client_es_SV.ts @@ -2028,6 +2028,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser + + + Open Browser + + Copy Link @@ -6431,6 +6436,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_eu.ts b/translations/client_eu.ts index a4db717d1296b..2eb6e41995b1e 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -2042,6 +2042,11 @@ Baliteke OpenSSL liburutegiekin arazoa egotea. Reopen Browser Berrireki nabigatzailea + + + Open Browser + + Copy Link @@ -6482,6 +6487,11 @@ Zerbitzariak errorearekin erantzun du: %2 Hide download Ezkutuko deskarga + + + Password protection + + Password protect diff --git a/translations/client_fa.ts b/translations/client_fa.ts index f5f73fbca0339..c4ceea3222993 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -2038,6 +2038,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser Reopen Browser + + + Open Browser + + Copy Link @@ -6465,6 +6470,11 @@ Server replied with error: %2 Hide download Hide download + + + Password protection + + Password protect diff --git a/translations/client_fi.ts b/translations/client_fi.ts index 50d79c5bf4bed..970efbd36d174 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -2035,6 +2035,11 @@ OpenSSL-kirjastosi kanssa saattaa olla ongelma. Reopen Browser Avaa selain uudelleen + + + Open Browser + + Copy Link @@ -6442,6 +6447,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 6131726863080..6673b79a7aa51 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -2040,6 +2040,11 @@ Cela peut être un problème avec vos bibliothèques OpenSSL. Reopen Browser Rouvrir le navigateur + + + Open Browser + + Copy Link @@ -6481,6 +6486,11 @@ Le serveur a répondu avec l'erreur : %2 Hide download Masquer le téléchargement + + + Password protection + + Password protect diff --git a/translations/client_ga.ts b/translations/client_ga.ts index 2f8d35a109a7f..fb5d69ea63401 100644 --- a/translations/client_ga.ts +++ b/translations/client_ga.ts @@ -2042,6 +2042,11 @@ Féadfaidh sé seo a bheith ina fhadhb le do leabharlanna OpenSSL. Reopen Browser Athoscail Brabhsálaí + + + Open Browser + + Copy Link @@ -6486,6 +6491,11 @@ D'fhreagair an freastalaí le hearráid: % 2 Hide download Folaigh íoslódáil + + + Password protection + + Password protect diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 85b0b5dcd4969..9e6a59819ae12 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -2042,6 +2042,11 @@ Isto pode ser un problema coas súas bibliotecas OpenSSL. Reopen Browser Volver abrir o navegador + + + Open Browser + + Copy Link @@ -6482,6 +6487,11 @@ O servidor respondeu co erro: %2 Hide download Agochar a descarga + + + Password protection + + Password protect diff --git a/translations/client_he.ts b/translations/client_he.ts index f4efa6e53726b..e5596abc94660 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -2031,6 +2031,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser פתיחת דפדפן מחדש + + + Open Browser + + Copy Link @@ -6436,6 +6441,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_hr.ts b/translations/client_hr.ts index 47a0b8da028e1..32c8d5ff81183 100644 --- a/translations/client_hr.ts +++ b/translations/client_hr.ts @@ -2036,6 +2036,11 @@ Možda se radi o pogrešci u radu OpenSSL biblioteka. Reopen Browser Ponovno otvori preglednik + + + Open Browser + + Copy Link @@ -6463,6 +6468,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_hu.ts b/translations/client_hu.ts index ee0b37ecb001d..b143263d21dd8 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -2042,6 +2042,11 @@ Ezt a problémát valószínűleg az OpenSSL programkönyvtárakban kell keresni Reopen Browser Böngésző újranyitása + + + Open Browser + + Copy Link @@ -6484,6 +6489,11 @@ A kiszolgáló hibával válaszolt: %2 Hide download Letöltés elrejtése + + + Password protection + + Password protect diff --git a/translations/client_is.ts b/translations/client_is.ts index f02471dc0bae3..54db42df485e9 100644 --- a/translations/client_is.ts +++ b/translations/client_is.ts @@ -2038,6 +2038,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser Enduropna vafra + + + Open Browser + + Copy Link @@ -6445,6 +6450,11 @@ Server replied with error: %2 Hide download Fela niðurhal + + + Password protection + + Password protect diff --git a/translations/client_it.ts b/translations/client_it.ts index 21b216d33d72b..c93c94f6ebd1f 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -2042,6 +2042,11 @@ Questo può essere un problema delle le tue librerie OpenSSL. Reopen Browser Riapri browser + + + Open Browser + + Copy Link @@ -6478,6 +6483,11 @@ Il server ha risposto con errore: %2 Hide download Nascondi scaricamento + + + Password protection + + Password protect diff --git a/translations/client_ja.ts b/translations/client_ja.ts index 03296f2aa5472..ba69b3bad8bc8 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -2042,6 +2042,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser ブラウザーを再度開く + + + Open Browser + + Copy Link @@ -6485,6 +6490,11 @@ Server replied with error: %2 Hide download ダウンロードを隠す + + + Password protection + + Password protect diff --git a/translations/client_ko.ts b/translations/client_ko.ts index ee09db18bc18b..0bff58220547d 100644 --- a/translations/client_ko.ts +++ b/translations/client_ko.ts @@ -2041,6 +2041,11 @@ OpenSSL 라이브러리 이슈일 수 있습니다. Reopen Browser 브라우저를 다시 열기 + + + Open Browser + + Copy Link @@ -6484,6 +6489,11 @@ Server replied with error: %2 Hide download 다운로드 숨기기 + + + Password protection + + Password protect diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts index a87482ff3dc45..a7060db3b7c3e 100644 --- a/translations/client_lt_LT.ts +++ b/translations/client_lt_LT.ts @@ -2031,6 +2031,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser Atverti naršyklę iš naujo + + + Open Browser + + Copy Link @@ -6440,6 +6445,11 @@ Server replied with error: %2 Hide download Slėpti atsiuntimą + + + Password protection + + Password protect diff --git a/translations/client_lv.ts b/translations/client_lv.ts index 62958f77a6db9..77f3b36a0cd6f 100644 --- a/translations/client_lv.ts +++ b/translations/client_lv.ts @@ -2042,6 +2042,11 @@ Varētu būt problēma ar jūsu OpenSSL bibliotēkām. Reopen Browser Atkārtoti atvērt pārlūku + + + Open Browser + + Copy Link @@ -6449,6 +6454,11 @@ Server replied with error: %2 Hide download Paslēpt lejupielādi + + + Password protection + + Password protect diff --git a/translations/client_mk.ts b/translations/client_mk.ts index 3a2a179db3b70..783f706a1e2e4 100644 --- a/translations/client_mk.ts +++ b/translations/client_mk.ts @@ -2030,6 +2030,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser Повторно отвори го прелистувачот + + + Open Browser + + Copy Link @@ -6438,6 +6443,11 @@ Server replied with error: %2 Hide download Сокриј преземање + + + Password protection + + Password protect diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index 8bc5069c2672c..9d566ba3ee7d3 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -2042,6 +2042,11 @@ Dette kan være et problem med OpenSSL-bibliotekene dine. Reopen Browser Gjenåpne nettleser + + + Open Browser + + Copy Link @@ -6471,6 +6476,11 @@ Server svarte med feil: %2 Hide download Skjul nedlasting + + + Password protection + + Password protect diff --git a/translations/client_nl.ts b/translations/client_nl.ts index 0032675665f25..b0a9a07526872 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -2038,6 +2038,11 @@ Dit kan een probleem zijn met je OpenSSL-bibliotheken. Reopen Browser Heropen browser + + + Open Browser + + Copy Link @@ -6468,6 +6473,11 @@ Server antwoordde met fout: %2 Hide download Verberg download + + + Password protection + + Password protect diff --git a/translations/client_oc.ts b/translations/client_oc.ts index bdaf42999870c..9740fddf7cc37 100644 --- a/translations/client_oc.ts +++ b/translations/client_oc.ts @@ -2028,6 +2028,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser Tornar dobrir lo navegador + + + Open Browser + + Copy Link @@ -6429,6 +6434,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 5114395860d1a..da41709f3ad83 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -2042,6 +2042,11 @@ Może to być problem z bibliotekami OpenSSL. Reopen Browser Otwórz ponownie przeglądarkę + + + Open Browser + + Copy Link @@ -6472,6 +6477,11 @@ Serwer odpowiedział błędem: %2 Hide download Ukryj pobieranie + + + Password protection + + Password protect diff --git a/translations/client_pt.ts b/translations/client_pt.ts index 32867449c6393..187e77ac007be 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -2029,6 +2029,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser + + + Open Browser + + Copy Link @@ -6434,6 +6439,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index 0515ea2edf2a8..34c835b5a0552 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -2038,6 +2038,11 @@ Isso pode ser um problema com suas bibliotecas OpenSSL. Reopen Browser Reabrir Navegador + + + Open Browser + + Copy Link @@ -6477,6 +6482,11 @@ Servidor respondeu com erro: %2 Hide download Ocultar enviar + + + Password protection + + Password protect diff --git a/translations/client_ro.ts b/translations/client_ro.ts index e162e4e60db60..4efbcc354e116 100644 --- a/translations/client_ro.ts +++ b/translations/client_ro.ts @@ -2036,6 +2036,11 @@ Aceasta poate fi o problemă cu librariile OpenSSL. Reopen Browser Re-deschide Browser-ul + + + Open Browser + + Copy Link @@ -6444,6 +6449,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_ru.ts b/translations/client_ru.ts index f446ee193db27..1559d1f5ed6ff 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -2040,6 +2040,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser Повторно открыть браузер + + + Open Browser + + Copy Link @@ -6477,6 +6482,11 @@ Server replied with error: %2 Hide download Скрыть закачку + + + Password protection + + Password protect diff --git a/translations/client_sc.ts b/translations/client_sc.ts index 8dc362c92c1e1..ca5290609c975 100644 --- a/translations/client_sc.ts +++ b/translations/client_sc.ts @@ -2036,6 +2036,11 @@ Custu podet èssere un'errore de is librerias tuas OpenSSL. Reopen Browser Torra a abèrrere su navigadore + + + Open Browser + + Copy Link @@ -6463,6 +6468,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_sk.ts b/translations/client_sk.ts index c1eeb09c8959a..f7a7317f57917 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -2042,6 +2042,11 @@ Môže to byť problém s knižnicami OpenSSL. Reopen Browser Znovu otvoriť prehliadač + + + Open Browser + + Copy Link @@ -6486,6 +6491,11 @@ Server odpovedal chybou: %2 Hide download Skryť sťahovanie + + + Password protection + + Password protect diff --git a/translations/client_sl.ts b/translations/client_sl.ts index 7d74e2c79b4a3..5e06b0838a4cd 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -2036,6 +2036,11 @@ Morda je napaka v knjužnicah OpenSSL. Reopen Browser Ponovno odpri brskalnik + + + Open Browser + + Copy Link @@ -6463,6 +6468,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_sr.ts b/translations/client_sr.ts index 67815cab7429d..41366c2af8187 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -2042,6 +2042,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser Поново отвори прегледач + + + Open Browser + + Copy Link @@ -6483,6 +6488,11 @@ Server replied with error: %2 Hide download Сакриј преузимање + + + Password protection + + Password protect diff --git a/translations/client_sv.ts b/translations/client_sv.ts index cb996f3c78716..32019dd98385b 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -2042,6 +2042,11 @@ Det kan vara problem med dina OpenSSL-bibliotek. Reopen Browser Öppna webbläsaren igen + + + Open Browser + + Copy Link @@ -6486,6 +6491,11 @@ Servern svarade med fel: %2 Hide download Dölj nedladdning + + + Password protection + + Password protect diff --git a/translations/client_th.ts b/translations/client_th.ts index 66bc0860c2d83..a69e3e83dd113 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -2034,6 +2034,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser เปิดเบราว์เซอร์อีกครั้ง + + + Open Browser + + Copy Link @@ -6438,6 +6443,11 @@ Server replied with error: %2 Hide download + + + Password protection + + Password protect diff --git a/translations/client_tr.ts b/translations/client_tr.ts index cb09cc98e57b0..bd71de9ad15f7 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -2042,6 +2042,11 @@ Bu durum OpenSLL kitaplıkları ile ilgili bir sorun olabilir. Reopen Browser Tarayıcıyı yeniden aç + + + Open Browser + + Copy Link @@ -6485,6 +6490,11 @@ Sunucunun verdiği hata yanıtı: %2 Hide download İndirme gizlensin + + + Password protection + + Password protect diff --git a/translations/client_ug.ts b/translations/client_ug.ts index b89f29eef9c1f..2e2f2417fc641 100644 --- a/translations/client_ug.ts +++ b/translations/client_ug.ts @@ -2042,6 +2042,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser توركۆرگۈنى قايتا ئېچىڭ + + + Open Browser + + Copy Link @@ -6483,6 +6488,11 @@ Server replied with error: %2 Hide download چۈشۈرۈشنى يوشۇرۇش + + + Password protection + + Password protect diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 1cf4a262bd475..ca5fafabf4518 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -2042,6 +2042,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser Відкрити бравзер наново + + + Open Browser + + Copy Link @@ -6484,6 +6489,11 @@ Server replied with error: %2 Hide download Приховати звантаження + + + Password protection + + Password protect diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index 67d2231c7a0ad..e1d01d5c3407b 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -2038,6 +2038,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser 重新打开浏览器 + + + Open Browser + + Copy Link @@ -6471,6 +6476,11 @@ Server replied with error: %2 Hide download 隐藏下载 + + + Password protection + + Password protect diff --git a/translations/client_zh_HK.ts b/translations/client_zh_HK.ts index 172c95b86ba11..90fc39939bc21 100644 --- a/translations/client_zh_HK.ts +++ b/translations/client_zh_HK.ts @@ -2044,6 +2044,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser 重新開啟瀏覽器 + + + Open Browser + + Copy Link @@ -6487,6 +6492,11 @@ Server replied with error: %2 Hide download 隱藏下載 + + + Password protection + + Password protect diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index cde2e34b1d1cc..562e7e97dadd6 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -2042,6 +2042,11 @@ This can be an issue with your OpenSSL libraries. Reopen Browser 重新開啟瀏覽器 + + + Open Browser + + Copy Link @@ -6486,6 +6491,11 @@ Server replied with error: %2 Hide download 隱藏下載 + + + Password protection + + Password protect From 14d6930d16794ff494edaef784c1e74165edf8f5 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Wed, 15 Jan 2025 02:57:53 +0000 Subject: [PATCH 10/17] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- translations/client_ar.ts | 4 ++-- translations/client_en_GB.ts | 4 ++-- translations/client_ga.ts | 4 ++-- translations/client_it.ts | 4 ++-- translations/client_sv.ts | 4 ++-- translations/client_zh_HK.ts | 4 ++-- translations/client_zh_TW.ts | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/translations/client_ar.ts b/translations/client_ar.ts index 66c45b51f9759..e890e6f89b0cf 100644 --- a/translations/client_ar.ts +++ b/translations/client_ar.ts @@ -2039,7 +2039,7 @@ This can be an issue with your OpenSSL libraries. Open Browser - + إفتَح المُستعرِض @@ -6468,7 +6468,7 @@ Server replied with error: %2 Password protection - + حماية بكلمة مرور diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index 30d0747ce6183..158174873b6a9 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -2045,7 +2045,7 @@ This can be an issue with your OpenSSL libraries. Open Browser - + Open Browser @@ -6494,7 +6494,7 @@ Server replied with error: %2 Password protection - + Password protection diff --git a/translations/client_ga.ts b/translations/client_ga.ts index fb5d69ea63401..2f1c63195afbb 100644 --- a/translations/client_ga.ts +++ b/translations/client_ga.ts @@ -2045,7 +2045,7 @@ Féadfaidh sé seo a bheith ina fhadhb le do leabharlanna OpenSSL. Open Browser - + Oscail Brabhsálaí @@ -6494,7 +6494,7 @@ D'fhreagair an freastalaí le hearráid: % 2 Password protection - + Cosaint pasfhocal diff --git a/translations/client_it.ts b/translations/client_it.ts index c93c94f6ebd1f..3da1bb1ba3194 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -2045,7 +2045,7 @@ Questo può essere un problema delle le tue librerie OpenSSL. Open Browser - + Apri il browser @@ -6486,7 +6486,7 @@ Il server ha risposto con errore: %2 Password protection - + Protezione con password diff --git a/translations/client_sv.ts b/translations/client_sv.ts index 32019dd98385b..511e2a2b129af 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -2045,7 +2045,7 @@ Det kan vara problem med dina OpenSSL-bibliotek. Open Browser - + Öppna webbläsare @@ -6494,7 +6494,7 @@ Servern svarade med fel: %2 Password protection - + Lösenordsskydd diff --git a/translations/client_zh_HK.ts b/translations/client_zh_HK.ts index 90fc39939bc21..b1a14434542dd 100644 --- a/translations/client_zh_HK.ts +++ b/translations/client_zh_HK.ts @@ -2047,7 +2047,7 @@ This can be an issue with your OpenSSL libraries. Open Browser - + 開啟瀏覽器 @@ -6495,7 +6495,7 @@ Server replied with error: %2 Password protection - + 密碼保護 diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 562e7e97dadd6..9d94adc46e4f4 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -2045,7 +2045,7 @@ This can be an issue with your OpenSSL libraries. Open Browser - + 開啟瀏覽器 @@ -6494,7 +6494,7 @@ Server replied with error: %2 Password protection - + 密碼保護 From 51ffdb2a531e6b017e1f9d094d7c594a0fe985ad Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Tue, 14 Jan 2025 12:58:38 +0800 Subject: [PATCH 11/17] mac-crafter: Update Sparkle version to 2.6.4 Signed-off-by: Claudio Cambra --- admin/osx/mac-crafter/Sources/main.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/osx/mac-crafter/Sources/main.swift b/admin/osx/mac-crafter/Sources/main.swift index 654954ec965c0..f7d723b80e3ad 100644 --- a/admin/osx/mac-crafter/Sources/main.swift +++ b/admin/osx/mac-crafter/Sources/main.swift @@ -60,7 +60,7 @@ struct Build: ParsableCommand { @Option(name: [.long], help: "Sparkle download URL.") var sparkleDownloadUrl = - "https://github.com/sparkle-project/Sparkle/releases/download/1.27.3/Sparkle-1.27.3.tar.xz" + "https://github.com/sparkle-project/Sparkle/releases/download/2.6.4/Sparkle-2.6.4.tar.xz" @Option(name: [.long], help: "Git clone command; include options such as depth.") var gitCloneCommand = "git clone --depth=1" From 2cce2636efca77ec36a3577ba493a92ee1a4edd3 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Tue, 14 Jan 2025 13:02:00 +0800 Subject: [PATCH 12/17] updater: Replace SUUpdater with SPUStandardUpdaterController Signed-off-by: Claudio Cambra --- src/gui/updater/sparkleupdater_mac.mm | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/gui/updater/sparkleupdater_mac.mm b/src/gui/updater/sparkleupdater_mac.mm index 062ca31a3db33..49285c317550f 100644 --- a/src/gui/updater/sparkleupdater_mac.mm +++ b/src/gui/updater/sparkleupdater_mac.mm @@ -15,7 +15,6 @@ #include #include -#include #include #include "common/utility.h" @@ -34,7 +33,7 @@ explicit SparkleInterface(SparkleUpdater *parent) ~SparkleInterface() { - [updater release]; + [updaterController release]; [delegate release]; } @@ -45,7 +44,7 @@ void statusChanged(const OCC::SparkleUpdater::State state, const QString &status emit q->statusChanged(); } - SUUpdater* updater; + SPUStandardUpdaterController *updaterController; NCSparkleUpdaterDelegate *delegate; private: @@ -250,27 +249,25 @@ - (void)userDidCancelDownload:(SUUpdater *)updater _interface->delegate = [[NCSparkleUpdaterDelegate alloc] initWithOwner:_interface.get()]; [_interface->delegate retain]; - _interface->updater = [SUUpdater sharedUpdater]; - [_interface->updater setDelegate:_interface->delegate]; - [_interface->updater setAutomaticallyChecksForUpdates:YES]; - [_interface->updater setAutomaticallyDownloadsUpdates:NO]; - [_interface->updater setSendsSystemProfile:NO]; - [_interface->updater resetUpdateCycle]; - [_interface->updater retain]; + _interface->updaterController = + [[SPUStandardUpdaterController alloc] initWithStartingUpdater:YES + updaterDelegate:_interface->delegate + userDriverDelegate:nil]; + [_interface->updaterController retain]; setUpdateUrl(appCastUrl); // Sparkle 1.8 required const auto userAgentString = QString::fromUtf8(Utility::userAgentString()); - NSString *userAgent = userAgentString.toNSString(); - [_interface->updater setUserAgentString: userAgent]; + NSString *const userAgent = userAgentString.toNSString(); + _interface->updaterController.updater.userAgentString = userAgent; } SparkleUpdater::~SparkleUpdater() = default; void SparkleUpdater::setUpdateUrl(const QUrl &url) { - [_interface->updater setFeedURL:url.toNSURL()]; + _interface->updaterController.updater.feedURL = url.toNSURL(); } bool SparkleUpdater::autoUpdaterAllowed() @@ -295,7 +292,7 @@ - (void)userDidCancelDownload:(SUUpdater *)updater { qCInfo(OCC::lcUpdater) << "Checking for updates."; if (autoUpdaterAllowed()) { - [_interface->updater checkForUpdates: NSApp]; + [_interface->updaterController.updater checkForUpdates]; } } @@ -303,7 +300,7 @@ - (void)userDidCancelDownload:(SUUpdater *)updater { if (autoUpdaterAllowed() && !ConfigFile().skipUpdateCheck()) { qCInfo(OCC::lcUpdater) << "launching background check"; - [_interface->updater checkForUpdatesInBackground]; + [_interface->updaterController.updater checkForUpdatesInBackground]; } else { qCInfo(OCC::lcUpdater) << "not launching background check, auto updater not allowed or update check skipped in config"; } From bbde9bb2377d52c2540b2b70b74d12109a1df68a Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Tue, 14 Jan 2025 13:03:57 +0800 Subject: [PATCH 13/17] updater: Refactor NCSparkleUpdaterDelegate to conform to SPUUpdaterDelegate Signed-off-by: Claudio Cambra --- src/gui/updater/sparkleupdater_mac.mm | 75 +++++++++++++-------------- 1 file changed, 35 insertions(+), 40 deletions(-) diff --git a/src/gui/updater/sparkleupdater_mac.mm b/src/gui/updater/sparkleupdater_mac.mm index 49285c317550f..55925c1973650 100644 --- a/src/gui/updater/sparkleupdater_mac.mm +++ b/src/gui/updater/sparkleupdater_mac.mm @@ -52,12 +52,11 @@ void statusChanged(const OCC::SparkleUpdater::State state, const QString &status }; -@interface NCSparkleUpdaterDelegate : NSObject +@interface NCSparkleUpdaterDelegate : NSObject @property (readwrite, assign) OCC::SparkleUpdater::SparkleInterface *owner; - (instancetype)initWithOwner:(OCC::SparkleUpdater::SparkleInterface *)owner; -- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)bundle; @end @@ -74,21 +73,15 @@ - (instancetype)initWithOwner:(OCC::SparkleUpdater::SparkleInterface *)owner - (BOOL)backgroundUpdateChecksAllowed { - BOOL allowUpdateCheck = OCC::ConfigFile().skipUpdateCheck() ? NO : YES; + const BOOL allowUpdateCheck = OCC::ConfigFile().skipUpdateCheck() ? NO : YES; qCInfo(OCC::lcUpdater) << "Updater may check for updates:" << (allowUpdateCheck ? "YES" : "NO"); return allowUpdateCheck; } -- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)bundle -{ - Q_UNUSED(bundle) - return [self backgroundUpdateChecksAllowed]; -} - -- (BOOL)updaterShouldShowUpdateAlertForScheduledUpdate:(SUUpdater *)updater forItem:(SUAppcastItem *)item +- (BOOL)updater:(nonnull SPUUpdater *)updater mayPerformUpdateCheck:(SPUUpdateCheck)updateCheck error:(NSError **)error { Q_UNUSED(updater) - Q_UNUSED(item) + Q_UNUSED(updateCheck) return [self backgroundUpdateChecksAllowed]; } @@ -99,12 +92,12 @@ - (void)notifyStateChange:(const OCC::SparkleUpdater::State)state displayStatus: } // Sent when a valid update is found by the update driver. -- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)update +- (void)updater:(nonnull SPUUpdater *)updater didFindValidUpdate:(nonnull SUAppcastItem *)item { Q_UNUSED(updater) - Q_UNUSED(update) + Q_UNUSED(item) - const auto versionQstring = QString::fromNSString(update.displayVersionString); + const auto versionQstring = QString::fromNSString(item.displayVersionString); const auto message = QObject::tr("Found a valid update: version %1", "%1 is version number").arg(versionQstring); [self notifyStateChange:OCC::SparkleUpdater::State::AwaitingUserInput @@ -112,7 +105,7 @@ - (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)update } // Sent when a valid update is not found. -- (void)updaterDidNotFindUpdate:(SUUpdater *)updater +- (void)updaterDidNotFindUpdate:(nonnull SPUUpdater *)updater { Q_UNUSED(updater) [self notifyStateChange:OCC::SparkleUpdater::State::Idle @@ -120,7 +113,7 @@ - (void)updaterDidNotFindUpdate:(SUUpdater *)updater } // Sent immediately before installing the specified update. -- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update +- (void)updater:(nonnull SPUUpdater *)updater willInstallUpdate:(nonnull SUAppcastItem *)update { Q_UNUSED(updater) @@ -131,7 +124,7 @@ - (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update displayStatus:message]; } -- (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error +- (void)updater:(nonnull SPUUpdater *)updater didAbortWithError:(nonnull NSError *)error { Q_UNUSED(updater) @@ -141,7 +134,7 @@ - (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error displayStatus:message]; } -- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast +- (void)updater:(nonnull SPUUpdater *)updater didFinishLoadingAppcast:(nonnull SUAppcast *)appcast { Q_UNUSED(updater) Q_UNUSED(appcast) @@ -149,30 +142,32 @@ - (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcas displayStatus:QObject::tr("Finished loading appcast.")]; } -- (void)updater:(SUUpdater *)updater didDismissUpdateAlertPermanently:(BOOL)permanently forItem:(nonnull SUAppcastItem *)item -{ - Q_UNUSED(updater) - - const auto permanencyString = permanently ? QObject::tr("Permanently") : QObject::tr("Temporarily"); - const auto versionQstring = QString::fromNSString(item.displayVersionString); - const auto message = QObject::tr("%1 dismissed %2 update", "%1 is permanently or temporarily, %2 is version number").arg(permanencyString, versionQstring); - - [self notifyStateChange:OCC::SparkleUpdater::State::Idle - displayStatus:message]; -} - -- (void)updater:(nonnull SUUpdater *)updater userDidSkipThisVersion:(nonnull SUAppcastItem *)item +- (void)updater:(nonnull SPUUpdater *)updater +userDidMakeChoice:(SPUUserUpdateChoice)choice + forUpdate:(nonnull SUAppcastItem *)item + state:(nonnull SPUUserUpdateState *)state { Q_UNUSED(updater) const auto versionQstring = QString::fromNSString(item.displayVersionString); - const auto message = QObject::tr("Update version %1 will not be applied as it was chosen to be skipped.", "%1 is version number").arg(versionQstring); + QString message; + + switch(choice) { + case SPUUserUpdateChoiceSkip: + message = QObject::tr("Update version %1 will not be applied as it was chosen to be skipped.", "%1 is version number").arg(versionQstring); + break; + case SPUUserUpdateChoiceInstall: + message = QObject::tr("Update version %1 will be installed.", "%1 is version number").arg(versionQstring); + break; + case SPUUserUpdateChoiceDismiss: + message = QObject::tr("Update version %1 will not be applied as it was dismissed.", "%1 is version number").arg(versionQstring); + break; + } - [self notifyStateChange:OCC::SparkleUpdater::State::Idle - displayStatus:message]; + [self notifyStateChange:OCC::SparkleUpdater::State::Idle displayStatus:message]; } -- (void)updater:(nonnull SUUpdater *)updater willDownloadUpdate:(nonnull SUAppcastItem *)item withRequest:(nonnull NSMutableURLRequest *)request +- (void)updater:(nonnull SPUUpdater *)updater willDownloadUpdate:(nonnull SUAppcastItem *)item withRequest:(nonnull NSMutableURLRequest *)request { Q_UNUSED(updater) Q_UNUSED(request) @@ -184,7 +179,7 @@ - (void)updater:(nonnull SUUpdater *)updater willDownloadUpdate:(nonnull SUAppca displayStatus:message]; } -- (void)updater:(nonnull SUUpdater *)updater didDownloadUpdate:(nonnull SUAppcastItem *)item +- (void)updater:(nonnull SPUUpdater *)updater didDownloadUpdate:(nonnull SUAppcastItem *)item { Q_UNUSED(updater) @@ -195,7 +190,7 @@ - (void)updater:(nonnull SUUpdater *)updater didDownloadUpdate:(nonnull SUAppcas displayStatus:message]; } -- (void)updater:(nonnull SUUpdater *)updater failedToDownloadUpdate:(nonnull SUAppcastItem *)item error:(nonnull NSError *)error +- (void)updater:(nonnull SPUUpdater *)updater failedToDownloadUpdate:(nonnull SUAppcastItem *)item error:(nonnull NSError *)error { Q_UNUSED(updater) @@ -207,7 +202,7 @@ - (void)updater:(nonnull SUUpdater *)updater failedToDownloadUpdate:(nonnull SUA displayStatus:message]; } -- (void)updater:(nonnull SUUpdater *)updater willExtractUpdate:(nonnull SUAppcastItem *)item +- (void)updater:(nonnull SPUUpdater *)updater willExtractUpdate:(nonnull SUAppcastItem *)item { Q_UNUSED(updater) @@ -218,7 +213,7 @@ - (void)updater:(nonnull SUUpdater *)updater willExtractUpdate:(nonnull SUAppcas displayStatus:message]; } -- (void)updater:(nonnull SUUpdater *)updater didExtractUpdate:(nonnull SUAppcastItem *)item +- (void)updater:(nonnull SPUUpdater *)updater didExtractUpdate:(nonnull SUAppcastItem *)item { Q_UNUSED(updater) @@ -229,7 +224,7 @@ - (void)updater:(nonnull SUUpdater *)updater didExtractUpdate:(nonnull SUAppcast displayStatus:message]; } -- (void)userDidCancelDownload:(SUUpdater *)updater +- (void)userDidCancelDownload:(SPUUpdater *)updater { Q_UNUSED(updater); [self notifyStateChange:OCC::SparkleUpdater::State::Idle From d16efb07279452cce5957850f9dadbb58033e77e Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Tue, 14 Jan 2025 13:43:58 +0800 Subject: [PATCH 14/17] mac-crafter: Apply code-signing procedure on Sparkle as recommended by Sparkle docs Signed-off-by: Claudio Cambra --- .../mac-crafter/Sources/Utils/Codesign.swift | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/admin/osx/mac-crafter/Sources/Utils/Codesign.swift b/admin/osx/mac-crafter/Sources/Utils/Codesign.swift index f262ff39d7bac..1f43d3e49aed7 100644 --- a/admin/osx/mac-crafter/Sources/Utils/Codesign.swift +++ b/admin/osx/mac-crafter/Sources/Utils/Codesign.swift @@ -126,17 +126,31 @@ func codesignClientAppBundle( // We need to strip these out manually. let sparkleFrameworkPath = "\(frameworksPath)/Sparkle.framework" - if FileManager.default.fileExists(atPath: "\(sparkleFrameworkPath)/Resources/Autoupdate.app") { - print("Code-signing Sparkle autoupdater app (without entitlements)...") - - try recursivelyCodesign( - path: "\(sparkleFrameworkPath)/Resources/Autoupdate.app", + if FileManager.default.fileExists(atPath: sparkleFrameworkPath) { + print("Code-signing Sparkle...") + try codesign( identity: codeSignIdentity, - options: "--timestamp --force --verbose=4 --options runtime --deep" + path: "\(sparkleFrameworkPath)/Versions/B/XPCServices/Installer.xpc", + options: "-f -o runtime" + ) + try codesign( + identity: codeSignIdentity, + path: "\(sparkleFrameworkPath)/Versions/B/XPCServices/Downloader.xpc", + options: "-f -o runtime --preserve-metadata=entitlements" + ) + try codesign( + identity: codeSignIdentity, + path: "\(sparkleFrameworkPath)/Versions/B/Autoupdate", + options: "-f -o runtime" + ) + try codesign( + identity: codeSignIdentity, + path: "\(sparkleFrameworkPath)/Versions/B/Updater.app", + options: "-f -o runtime" + ) + try codesign( + identity: codeSignIdentity, path: sparkleFrameworkPath, options: "-f -o runtime" ) - - print("Re-codesigning Sparkle library...") - try codesign(identity: codeSignIdentity, path: "\(sparkleFrameworkPath)/Sparkle") } else { print("Build does not have Sparkle, skipping.") } From 12dee2fb16c6a11b79d9721172da287674cd0589 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Tue, 14 Jan 2025 13:44:38 +0800 Subject: [PATCH 15/17] updater: Provide feedURL via non-deprecated delegate method Signed-off-by: Claudio Cambra --- src/gui/updater/sparkleupdater_mac.mm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/gui/updater/sparkleupdater_mac.mm b/src/gui/updater/sparkleupdater_mac.mm index 55925c1973650..ef167d95551e8 100644 --- a/src/gui/updater/sparkleupdater_mac.mm +++ b/src/gui/updater/sparkleupdater_mac.mm @@ -55,6 +55,7 @@ void statusChanged(const OCC::SparkleUpdater::State state, const QString &status @interface NCSparkleUpdaterDelegate : NSObject @property (readwrite, assign) OCC::SparkleUpdater::SparkleInterface *owner; +@property (readwrite, retain) NSString *feedURLString; - (instancetype)initWithOwner:(OCC::SparkleUpdater::SparkleInterface *)owner; @@ -231,6 +232,12 @@ - (void)userDidCancelDownload:(SPUUpdater *)updater displayStatus:QObject::tr("Update download cancelled.")]; } +- (NSString *)feedURLStringForUpdater:(SPUUpdater *)updater +{ + Q_UNUSED(updater) + return self.feedURLString; +} + @end @@ -262,7 +269,7 @@ - (void)userDidCancelDownload:(SPUUpdater *)updater void SparkleUpdater::setUpdateUrl(const QUrl &url) { - _interface->updaterController.updater.feedURL = url.toNSURL(); + _interface->delegate.feedURLString = url.toNSURL().absoluteString; } bool SparkleUpdater::autoUpdaterAllowed() From 952e2d9fdc009ba27a0dfd1af7c7df7cf41785af Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Fri, 10 Jan 2025 14:18:14 +0800 Subject: [PATCH 16/17] Set allPaused as false if we have available FileProvider domains with macOS VFS Signed-off-by: Claudio Cambra --- src/gui/owncloudgui.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp index 7323a8d5b4a8a..53b97c11331d8 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -319,6 +319,7 @@ void ownCloudGui::slotComputeOverallSyncStatus() if (!Mac::FileProviderSettingsController::instance()->vfsEnabledForAccount(accountFpId)) { continue; } + allPaused = false; const auto fileProvider = Mac::FileProvider::instance(); if (!fileProvider->xpc()->fileProviderExtReachable(accountFpId)) { From f352e8e2155a1b6dc74077b1a6f1abc037f88f23 Mon Sep 17 00:00:00 2001 From: Jyrki Gadinger Date: Thu, 9 Jan 2025 11:44:56 +0100 Subject: [PATCH 17/17] fix window resize on DPI changes This commit fixes #7678 and likely fixes #7447 too. On Windows, when the screen is changed to one with a different scaling setting the window is being incorrectly resized. This can be worked around by storing the window's size before moving it to a different screen, and then resizing the window again. Signed-off-by: Jyrki Gadinger --- src/gui/systray.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp index 8074a4b7977b7..3c28aca043d09 100644 --- a/src/gui/systray.cpp +++ b/src/gui/systray.cpp @@ -588,11 +588,18 @@ void Systray::setSyncIsPaused(const bool syncIsPaused) void Systray::positionWindowAtTray(QQuickWindow *window) const { - if (!useNormalWindow()) { - window->setScreen(currentScreen()); - const auto position = computeWindowPosition(window->width(), window->height()); - window->setPosition(position); + if (useNormalWindow()) { + return; } + + // need to store the current window size before moving the window to another screen, + // otherwise it is being incorrectly resized by the OS or Qt when switching to a screen + // with a different DPI setting + const auto initialSize = window->size(); + const auto position = computeWindowPosition(initialSize.width(), initialSize.height()); + window->setPosition(position); + window->setScreen(currentScreen()); + window->resize(initialSize); } void Systray::positionWindowAtScreenCenter(QQuickWindow *window) const