Compare commits

..

2 Commits

Author SHA1 Message Date
Carl Schwan 3caa1467b1 refactor: Improve log message
Co-authored-by: Josh <josh.t.richards@gmail.com>
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
2026-03-02 13:19:08 +01:00
Robin Appelman 2c2335b8b4 fix: improve logging around failed chunked object store uploads
Signed-off-by: Robin Appelman <robin@icewind.nl>
2026-02-27 14:50:49 +01:00
985 changed files with 5919 additions and 5947 deletions
+1 -1
View File
@@ -73,7 +73,7 @@ body:
options:
- "32"
- "33"
- "34 (master)"
- "master"
validations:
required: true
- type: dropdown
-45
View File
@@ -1,45 +0,0 @@
# SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later
name: Auto-label bug reports
on:
issues:
types: [opened]
jobs:
add-version-label:
if: contains(github.event.issue.title, '[Bug]')
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- name: Extract version number and apply label
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
with:
script: |
const body = context.payload.issue.body || '';
const normalizedBody = body.replace(/\r\n?/g, '\n');
let label = '';
// Extract Nextcloud Server version number from a block like:
// ### Nextcloud Server version
// 32
const versionMatch = normalizedBody.match(/### Nextcloud Server version\s*\n+([0-9]{1,3})\b/);
let nextcloudVersion = null;
if (versionMatch) {
nextcloudVersion = parseInt(versionMatch[1], 10);
label = nextcloudVersion + '-feedback';
}
if (label) {
try {
await github.rest.issues.addLabels({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
labels: [label]
});
} catch (error) {
core.setFailed(`Failed to add label "${label}": ${error.message || error}`);
}
}
+2 -2
View File
@@ -37,13 +37,13 @@ jobs:
persist-credentials: false
- name: Initialize CodeQL
uses: github/codeql-action/init@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
uses: github/codeql-action/init@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
with:
languages: ${{ matrix.language }}
build-mode: ${{ matrix.build-mode }}
config-file: ./.github/codeql-config.yml
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
uses: github/codeql-action/analyze@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
with:
category: "/language:${{matrix.language}}"
+3 -3
View File
@@ -171,7 +171,7 @@ jobs:
run: ./node_modules/cypress/bin/cypress install
- name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
uses: cypress-io/github-action@bc22e01685c56e89e7813fd8e26f33dc47f87e15 # v7.1.5
uses: cypress-io/github-action@84d178e4bbce871e23f2ffa3085898cde0e4f0ec # v7.1.2
with:
# We already installed the dependencies in the init job
install: false
@@ -195,7 +195,7 @@ jobs:
SETUP_TESTING: ${{ matrix.containers == 'setup' && 'true' || '' }}
- name: Upload snapshots and videos
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
if: always()
with:
name: snapshots_${{ matrix.containers }}
@@ -218,7 +218,7 @@ jobs:
run: docker exec nextcloud-e2e-test-server_${{ env.APP_NAME }} tar -cvjf - data > data.tar
- name: Upload data archive
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
if: failure() && matrix.containers != 'component'
with:
name: nc_data_${{ matrix.containers }}
+1 -1
View File
@@ -71,7 +71,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Set up Python
uses: LizardByte/actions/actions/setup_python@70bb8d394d1c92f6113aeec6ae9cc959a5763d15 # v2026.227.200013
uses: LizardByte/actions/actions/setup_python@9bf3ef783775e17fe6b8dde3585d94ec570b93c2 # v2026.212.22356
with:
python-version: '2.7'
+3 -3
View File
@@ -63,7 +63,7 @@ jobs:
ref: ${{ github.event.pull_request.head.ref }}
- name: Run before measurements
uses: nextcloud/profiler@6a74c915048285b35b8e1cd96c0835a635945044
uses: nextcloud/profiler@6801ee10fc80f10b444388fb6ca9b36ad8a2ea83
with:
run: |
curl -s -X PROPFIND -u test:test http://localhost:8080/remote.php/dav/files/test
@@ -85,7 +85,7 @@ jobs:
- name: Run after measurements
id: compare
uses: nextcloud/profiler@6a74c915048285b35b8e1cd96c0835a635945044
uses: nextcloud/profiler@6801ee10fc80f10b444388fb6ca9b36ad8a2ea83
with:
run: |
curl -s -X PROPFIND -u test:test http://localhost:8080/remote.php/dav/files/test
@@ -99,7 +99,7 @@ jobs:
- name: Upload profiles
if: always()
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
with:
name: profiles
path: |
-1
View File
@@ -50,7 +50,6 @@ jobs:
run: |
composer remove nextcloud/ocp --dev --no-scripts
composer i
git restore lib/composer/composer
- name: Rector
run: composer run rector
+1 -1
View File
@@ -20,7 +20,7 @@ jobs:
issues: write
steps:
- uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v9
- uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v9
with:
repo-token: ${{ secrets.COMMAND_BOT_PAT }}
stale-issue-message: >
+1 -1
View File
@@ -88,7 +88,7 @@ jobs:
- name: Upload Security Analysis results to GitHub
if: always()
uses: github/codeql-action/upload-sarif@89a39a4e59826350b863aa6b6252a07ad50cf83e # v3
uses: github/codeql-action/upload-sarif@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v3
with:
sarif_file: results.sarif
+1 -1
View File
@@ -23,7 +23,7 @@ OC.L10N.register(
"Could not reload comments" : "Kon reactie niet opnieuw laden",
"Failed to mark comments as read" : "Kon reacties niet als gelezen markeren",
"Unable to load the comments list" : "Kan reactielijst niet laden",
"No comments yet, start the conversation!" : "Nog geen reacties, start het gesprek!",
"No comments yet, start the conversation!" : "Nog geen reacties, start de discussie!",
"No more messages" : "Geen berichten meer",
"Retry" : "Opnieuw proberen",
"_1 new comment_::_{unread} new comments_" : ["1 nieuwe reactie","{unread} nieuwe reacties"],
+1 -1
View File
@@ -21,7 +21,7 @@
"Could not reload comments" : "Kon reactie niet opnieuw laden",
"Failed to mark comments as read" : "Kon reacties niet als gelezen markeren",
"Unable to load the comments list" : "Kan reactielijst niet laden",
"No comments yet, start the conversation!" : "Nog geen reacties, start het gesprek!",
"No comments yet, start the conversation!" : "Nog geen reacties, start de discussie!",
"No more messages" : "Geen berichten meer",
"Retry" : "Opnieuw proberen",
"_1 new comment_::_{unread} new comments_" : ["1 nieuwe reactie","{unread} nieuwe reacties"],
+1 -1
View File
@@ -89,7 +89,7 @@ $server->httpRequest->setUrl(Server::get(IRequest::class)->getRequestUri());
/** @var string $baseuri defined in remote.php */
$server->setBaseUri($baseuri);
// Add plugins
$server->addPlugin(new MaintenancePlugin(Server::get(IConfig::class), Server::get(IL10nFactory::class)->get('dav')));
$server->addPlugin(new MaintenancePlugin(Server::get(IConfig::class), \OCP\Server::get(IL10nFactory::class)->get('dav')));
$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));
$server->addPlugin(new Plugin());
-1
View File
@@ -236,7 +236,6 @@ OC.L10N.register(
"Failed to check file size: %1$s" : "Dateigröße konnte nicht überprüft werden: %1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "Datei konnte nicht geöffnet werden: %1$s (%2$d), Datei scheint aber zu existieren",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Datei konnte nicht geöffnet werden: %1$s (%2$d), Datei scheint nicht zu existieren",
"Failed to get size for : %1$s" : "Größe konnte nicht ermittelt werden für: %1$s",
"Encryption not ready: %1$s" : "Verschlüsselung nicht bereit: %1$s",
"Failed to open file: %1$s" : "Datei konnte nicht geöffnet werden: %1$s",
"Failed to unlink: %1$s" : "Fehler beim Aufheben der Verknüpfung: %1$s",
-1
View File
@@ -234,7 +234,6 @@
"Failed to check file size: %1$s" : "Dateigröße konnte nicht überprüft werden: %1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "Datei konnte nicht geöffnet werden: %1$s (%2$d), Datei scheint aber zu existieren",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Datei konnte nicht geöffnet werden: %1$s (%2$d), Datei scheint nicht zu existieren",
"Failed to get size for : %1$s" : "Größe konnte nicht ermittelt werden für: %1$s",
"Encryption not ready: %1$s" : "Verschlüsselung nicht bereit: %1$s",
"Failed to open file: %1$s" : "Datei konnte nicht geöffnet werden: %1$s",
"Failed to unlink: %1$s" : "Fehler beim Aufheben der Verknüpfung: %1$s",
-1
View File
@@ -236,7 +236,6 @@ OC.L10N.register(
"Failed to check file size: %1$s" : "Dateigröße konnte nicht überprüft werden: %1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "Datei konnte nicht geöffnet werden: %1$s (%2$d), Datei scheint aber zu existieren",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Datei konnte nicht geöffnet werden: %1$s (%2$d), Datei scheint nicht zu existieren",
"Failed to get size for : %1$s" : "Größe konnte nicht ermittelt werden für: %1$s",
"Encryption not ready: %1$s" : "Verschlüsselung nicht bereit: %1$s",
"Failed to open file: %1$s" : "Datei konnte nicht geöffnet werden: %1$s",
"Failed to unlink: %1$s" : "Fehler beim Aufheben der Verknüpfung: %1$s",
-1
View File
@@ -234,7 +234,6 @@
"Failed to check file size: %1$s" : "Dateigröße konnte nicht überprüft werden: %1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "Datei konnte nicht geöffnet werden: %1$s (%2$d), Datei scheint aber zu existieren",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Datei konnte nicht geöffnet werden: %1$s (%2$d), Datei scheint nicht zu existieren",
"Failed to get size for : %1$s" : "Größe konnte nicht ermittelt werden für: %1$s",
"Encryption not ready: %1$s" : "Verschlüsselung nicht bereit: %1$s",
"Failed to open file: %1$s" : "Datei konnte nicht geöffnet werden: %1$s",
"Failed to unlink: %1$s" : "Fehler beim Aufheben der Verknüpfung: %1$s",
-1
View File
@@ -236,7 +236,6 @@ OC.L10N.register(
"Failed to check file size: %1$s" : "Failed to check file size: %1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "Could not open file: %1$s (%2$d), file does seem to exist",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Could not open file: %1$s (%2$d), file doesn't seem to exist",
"Failed to get size for : %1$s" : "Failed to get size for : %1$s",
"Encryption not ready: %1$s" : "Encryption not ready: %1$s",
"Failed to open file: %1$s" : "Failed to open file: %1$s",
"Failed to unlink: %1$s" : "Failed to unlink: %1$s",
-1
View File
@@ -234,7 +234,6 @@
"Failed to check file size: %1$s" : "Failed to check file size: %1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "Could not open file: %1$s (%2$d), file does seem to exist",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Could not open file: %1$s (%2$d), file doesn't seem to exist",
"Failed to get size for : %1$s" : "Failed to get size for : %1$s",
"Encryption not ready: %1$s" : "Encryption not ready: %1$s",
"Failed to open file: %1$s" : "Failed to open file: %1$s",
"Failed to unlink: %1$s" : "Failed to unlink: %1$s",
+10 -10
View File
@@ -254,16 +254,16 @@ OC.L10N.register(
"Due on %s" : "Tähtaeg: %s",
"Welcome to Nextcloud Calendar!\n\nThis is a sample event - explore the flexibility of planning with Nextcloud Calendar by making any edits you want!\n\nWith Nextcloud Calendar, you can:\n- Create, edit, and manage events effortlessly.\n- Create multiple calendars and share them with teammates, friends, or family.\n- Check availability and display your busy times to others.\n- Seamlessly integrate with apps and devices via CalDAV.\n- Customize your experience: schedule recurring events, adjust notifications and other settings." : "Tere tulemast Nextcloudi Kalendrisse!\n\nSee näidissündmus võimaldab sul tutvuda Nextcloudi Kalendri paindlikkusega oma aja plaanimisel - proovi teha igasuguseid muudatusi!\n\nNextcloudi Kalendriga saad sa:\n- vaevata luua, muuta ja hallata sündmusi,\n- koostada mitmeid kalendreid ning neid jagada tiimikaaslaste, sõprade ja perega,\n- kontrollida teiste vabu aega ja enda omi näidata teistele,\n- kasutada sujuvat CalDAV-i põhist lõimingut teiste rakenduste ja seadmetega,\n- kohendada kõike oma vajadustele: ajastades korduvaid sündmusi ning sättida teavitusi ja muid seadistusi.",
"Example event - open me!" : "Näidissündmus - klõpsi mind!",
"System Address Book" : "Süsteemiülene aadressiraamat",
"The system address book contains contact information for all users in your instance." : "Süsteemiüleses aadressiraamatus leiduvad kõikide selle serveri kasutajate kontaktandmed.",
"Enable System Address Book" : "Kasuta süsteemiülest aadressiraamatut",
"DAV system address book" : "DAV-i süsteemiülene aadressiraamat",
"No outstanding DAV system address book sync." : "DAV-i süsteemiülese aadressiraamatu sünkroonimist pole ootel või toimunud.",
"The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "Kuna selles serveris on üle 1000 kasutaja, siis DAV-i süsteemiülese aadressiraamatu sünkroonimist pole veel toimunud. Aga võis ka juhtuda viga. Palun käivita ta käsurealt ise käsuga „occ dav:sync-system-addressbook“.",
"DAV system address book size" : "DAV-i süsteemiülese aadressiraamatu suurus",
"The system address book is disabled" : "Süsteemiülene aadressiraamat pole kasutusel",
"The system address book is enabled, but contains more than the configured limit of %d contacts" : "Süsteemiülene aadressiraamat on kasutusel, kuid seal on andmeid rohkem, kui seadistatud %d kontakti ülempiir lubab",
"The system address book is enabled and contains less than the configured limit of %d contacts" : "Süsteemiülene aadressiraamat on kasutusel ning seal on andmeid vähem, kui seadistatud %d kontakti ülempiir lubab",
"System Address Book" : "Süsteemne aadressiraamat",
"The system address book contains contact information for all users in your instance." : "Süsteemses aadressiraamatus leiduvad kõikde selle serveri kasutajate kontaktteave.",
"Enable System Address Book" : "Kasuta süsteemset aadressiraamatut",
"DAV system address book" : "DAV-i süsteemne aadressiraamat",
"No outstanding DAV system address book sync." : "Pole DAV-i süsteemse aadressiraamatu sünkroniseerimist.",
"The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "Kuna selles serveris on üle 1000 kasutaja, siis DAV-i süsteemse aadressiraamatu sünkroonomist poel veel toimunud. Aga võis ka juhtuda viga. Palun käivita ta käsurealt ise käsuga „occ dav:sync-system-addressbook“.",
"DAV system address book size" : "DAV-i süsteemse aadressiraamatu suurus",
"The system address book is disabled" : "Süsteemne aadressiraamat pole kasutusel",
"The system address book is enabled, but contains more than the configured limit of %d contacts" : "Süsteemne aadressiraamat on kasutusel, kuid seal on andmeid rohkem, kui seadistatud %d kontakti ülempiir lubab",
"The system address book is enabled and contains less than the configured limit of %d contacts" : "Süsteemne aadressiraamat on kasutusel ning seal on andmeid vähem, kui seadistatud %d kontakti ülempiir lubab",
"WebDAV endpoint" : "WebDAV-i teenuse otspunkt",
"Could not check that your web server is properly set up to allow file synchronization over WebDAV. Please check manually." : "Ei õnnestunud kontrollida, kas sinu veebiserver on korrektselt seadistatud ja võimaldab kasutada failide sünkroniseerimist WebDAV-i vahendusel. Palun kontrolli seda käsitsi.",
"Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Sinu veebiserver pole veel failide sünkroniseerimiseks vajalikult seadistatud, kuna WebDAV liides paistab olevat katki.",
+10 -10
View File
@@ -252,16 +252,16 @@
"Due on %s" : "Tähtaeg: %s",
"Welcome to Nextcloud Calendar!\n\nThis is a sample event - explore the flexibility of planning with Nextcloud Calendar by making any edits you want!\n\nWith Nextcloud Calendar, you can:\n- Create, edit, and manage events effortlessly.\n- Create multiple calendars and share them with teammates, friends, or family.\n- Check availability and display your busy times to others.\n- Seamlessly integrate with apps and devices via CalDAV.\n- Customize your experience: schedule recurring events, adjust notifications and other settings." : "Tere tulemast Nextcloudi Kalendrisse!\n\nSee näidissündmus võimaldab sul tutvuda Nextcloudi Kalendri paindlikkusega oma aja plaanimisel - proovi teha igasuguseid muudatusi!\n\nNextcloudi Kalendriga saad sa:\n- vaevata luua, muuta ja hallata sündmusi,\n- koostada mitmeid kalendreid ning neid jagada tiimikaaslaste, sõprade ja perega,\n- kontrollida teiste vabu aega ja enda omi näidata teistele,\n- kasutada sujuvat CalDAV-i põhist lõimingut teiste rakenduste ja seadmetega,\n- kohendada kõike oma vajadustele: ajastades korduvaid sündmusi ning sättida teavitusi ja muid seadistusi.",
"Example event - open me!" : "Näidissündmus - klõpsi mind!",
"System Address Book" : "Süsteemiülene aadressiraamat",
"The system address book contains contact information for all users in your instance." : "Süsteemiüleses aadressiraamatus leiduvad kõikide selle serveri kasutajate kontaktandmed.",
"Enable System Address Book" : "Kasuta süsteemiülest aadressiraamatut",
"DAV system address book" : "DAV-i süsteemiülene aadressiraamat",
"No outstanding DAV system address book sync." : "DAV-i süsteemiülese aadressiraamatu sünkroonimist pole ootel või toimunud.",
"The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "Kuna selles serveris on üle 1000 kasutaja, siis DAV-i süsteemiülese aadressiraamatu sünkroonimist pole veel toimunud. Aga võis ka juhtuda viga. Palun käivita ta käsurealt ise käsuga „occ dav:sync-system-addressbook“.",
"DAV system address book size" : "DAV-i süsteemiülese aadressiraamatu suurus",
"The system address book is disabled" : "Süsteemiülene aadressiraamat pole kasutusel",
"The system address book is enabled, but contains more than the configured limit of %d contacts" : "Süsteemiülene aadressiraamat on kasutusel, kuid seal on andmeid rohkem, kui seadistatud %d kontakti ülempiir lubab",
"The system address book is enabled and contains less than the configured limit of %d contacts" : "Süsteemiülene aadressiraamat on kasutusel ning seal on andmeid vähem, kui seadistatud %d kontakti ülempiir lubab",
"System Address Book" : "Süsteemne aadressiraamat",
"The system address book contains contact information for all users in your instance." : "Süsteemses aadressiraamatus leiduvad kõikde selle serveri kasutajate kontaktteave.",
"Enable System Address Book" : "Kasuta süsteemset aadressiraamatut",
"DAV system address book" : "DAV-i süsteemne aadressiraamat",
"No outstanding DAV system address book sync." : "Pole DAV-i süsteemse aadressiraamatu sünkroniseerimist.",
"The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "Kuna selles serveris on üle 1000 kasutaja, siis DAV-i süsteemse aadressiraamatu sünkroonomist poel veel toimunud. Aga võis ka juhtuda viga. Palun käivita ta käsurealt ise käsuga „occ dav:sync-system-addressbook“.",
"DAV system address book size" : "DAV-i süsteemse aadressiraamatu suurus",
"The system address book is disabled" : "Süsteemne aadressiraamat pole kasutusel",
"The system address book is enabled, but contains more than the configured limit of %d contacts" : "Süsteemne aadressiraamat on kasutusel, kuid seal on andmeid rohkem, kui seadistatud %d kontakti ülempiir lubab",
"The system address book is enabled and contains less than the configured limit of %d contacts" : "Süsteemne aadressiraamat on kasutusel ning seal on andmeid vähem, kui seadistatud %d kontakti ülempiir lubab",
"WebDAV endpoint" : "WebDAV-i teenuse otspunkt",
"Could not check that your web server is properly set up to allow file synchronization over WebDAV. Please check manually." : "Ei õnnestunud kontrollida, kas sinu veebiserver on korrektselt seadistatud ja võimaldab kasutada failide sünkroniseerimist WebDAV-i vahendusel. Palun kontrolli seda käsitsi.",
"Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Sinu veebiserver pole veel failide sünkroniseerimiseks vajalikult seadistatud, kuna WebDAV liides paistab olevat katki.",
-1
View File
@@ -236,7 +236,6 @@ OC.L10N.register(
"Failed to check file size: %1$s" : "Níorbh fhéidir méid an chomhaid a sheiceáil: %1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "Níorbh fhéidir an comhad a oscailt: %1$s (%2$d), is cosúil go bhfuil an comhad ann",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Níorbh fhéidir an comhad a oscailt: %1$s (%2$d), is cosúil nach bhfuil an comhad ann.",
"Failed to get size for : %1$s" : "Theip ar mhéid a fháil le haghaidh: %1$s",
"Encryption not ready: %1$s" : "Níl an criptiúchán réidh: %1$s",
"Failed to open file: %1$s" : "Níorbh fhéidir an comhad a oscailt: %1$s",
"Failed to unlink: %1$s" : "Theip ar dhínascadh: %1$s",
-1
View File
@@ -234,7 +234,6 @@
"Failed to check file size: %1$s" : "Níorbh fhéidir méid an chomhaid a sheiceáil: %1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "Níorbh fhéidir an comhad a oscailt: %1$s (%2$d), is cosúil go bhfuil an comhad ann",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Níorbh fhéidir an comhad a oscailt: %1$s (%2$d), is cosúil nach bhfuil an comhad ann.",
"Failed to get size for : %1$s" : "Theip ar mhéid a fháil le haghaidh: %1$s",
"Encryption not ready: %1$s" : "Níl an criptiúchán réidh: %1$s",
"Failed to open file: %1$s" : "Níorbh fhéidir an comhad a oscailt: %1$s",
"Failed to unlink: %1$s" : "Theip ar dhínascadh: %1$s",
-1
View File
@@ -236,7 +236,6 @@ OC.L10N.register(
"Failed to check file size: %1$s" : "Produciuse un erro ao comprobar o tamaño do ficheiro: %1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "Non foi posíbel abrir o ficheiro: %1$s (%2$d), semella o ficheiro existe",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Non foi posíbel abrir o ficheiro: %1$s (%2$d), semella o ficheiro non existe",
"Failed to get size for : %1$s" : "Produciuse un fallo ao obter o tamaño de: %1$s",
"Encryption not ready: %1$s" : "A cifraxe non está preparada: %1$s",
"Failed to open file: %1$s" : "Produciuse un erro ao abrir o ficheiro: %1$s",
"Failed to unlink: %1$s" : "Produciuse un erro ao desligar: %1$s",
-1
View File
@@ -234,7 +234,6 @@
"Failed to check file size: %1$s" : "Produciuse un erro ao comprobar o tamaño do ficheiro: %1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "Non foi posíbel abrir o ficheiro: %1$s (%2$d), semella o ficheiro existe",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Non foi posíbel abrir o ficheiro: %1$s (%2$d), semella o ficheiro non existe",
"Failed to get size for : %1$s" : "Produciuse un fallo ao obter o tamaño de: %1$s",
"Encryption not ready: %1$s" : "A cifraxe non está preparada: %1$s",
"Failed to open file: %1$s" : "Produciuse un erro ao abrir o ficheiro: %1$s",
"Failed to unlink: %1$s" : "Produciuse un erro ao desligar: %1$s",
-1
View File
@@ -236,7 +236,6 @@ OC.L10N.register(
"Failed to check file size: %1$s" : "Kon bestandsomvang niet controleren: %1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "Kon bestand niet openen: %1$s (%2$d), bestand lijkt wel te bestaan",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Kon bestand niet openen: %1$s (%2$d), bestand lijkt niet te bestaan",
"Failed to get size for : %1$s" : "Niet gelukt om grootte te krijgen voor : %1$s",
"Encryption not ready: %1$s" : "Versleuteling niet gereed: %1$s",
"Failed to open file: %1$s" : "Kon het bestand %1$s niet openen",
"Failed to unlink: %1$s" : "Kon link niet verwijderen: %1$s",
-1
View File
@@ -234,7 +234,6 @@
"Failed to check file size: %1$s" : "Kon bestandsomvang niet controleren: %1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "Kon bestand niet openen: %1$s (%2$d), bestand lijkt wel te bestaan",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Kon bestand niet openen: %1$s (%2$d), bestand lijkt niet te bestaan",
"Failed to get size for : %1$s" : "Niet gelukt om grootte te krijgen voor : %1$s",
"Encryption not ready: %1$s" : "Versleuteling niet gereed: %1$s",
"Failed to open file: %1$s" : "Kon het bestand %1$s niet openen",
"Failed to unlink: %1$s" : "Kon link niet verwijderen: %1$s",
-1
View File
@@ -236,7 +236,6 @@ OC.L10N.register(
"Failed to check file size: %1$s" : "Falha ao verificar o tamanho do arquivo: %1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "Não foi possível abrir o arquivo: %1$s (%2$d), o arquivo parece existir",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Não foi possível abrir o arquivo: %1$s (%2$d), o arquivo parece não existir",
"Failed to get size for : %1$s" : "Falha ao obter o tamanho para: %1$s",
"Encryption not ready: %1$s" : "A criptografia não está pronta: %1$s",
"Failed to open file: %1$s" : "Falha ao abrir arquivo: %1$s",
"Failed to unlink: %1$s" : "Falha ao desvincular: %1$s",
-1
View File
@@ -234,7 +234,6 @@
"Failed to check file size: %1$s" : "Falha ao verificar o tamanho do arquivo: %1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "Não foi possível abrir o arquivo: %1$s (%2$d), o arquivo parece existir",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Não foi possível abrir o arquivo: %1$s (%2$d), o arquivo parece não existir",
"Failed to get size for : %1$s" : "Falha ao obter o tamanho para: %1$s",
"Encryption not ready: %1$s" : "A criptografia não está pronta: %1$s",
"Failed to open file: %1$s" : "Falha ao abrir arquivo: %1$s",
"Failed to unlink: %1$s" : "Falha ao desvincular: %1$s",
-1
View File
@@ -236,7 +236,6 @@ OC.L10N.register(
"Failed to check file size: %1$s" : "Dosya boyutu denetlenemedi: %1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "Dosya açılamadı: %1$s (%2$d), dosya var gibi görünüyor",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Dosya açılamadı: %1$s (%2$d), dosya var gibi görünmüyor",
"Failed to get size for : %1$s" : "Dosya boyutu alınamadı: %1$s",
"Encryption not ready: %1$s" : "Şifreleme hazır değil: %1$s",
"Failed to open file: %1$s" : "Dosya açılamadı: %1$s",
"Failed to unlink: %1$s" : "Bağlantı kaldırılamadı: %1$s",
-1
View File
@@ -234,7 +234,6 @@
"Failed to check file size: %1$s" : "Dosya boyutu denetlenemedi: %1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "Dosya açılamadı: %1$s (%2$d), dosya var gibi görünüyor",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Dosya açılamadı: %1$s (%2$d), dosya var gibi görünmüyor",
"Failed to get size for : %1$s" : "Dosya boyutu alınamadı: %1$s",
"Encryption not ready: %1$s" : "Şifreleme hazır değil: %1$s",
"Failed to open file: %1$s" : "Dosya açılamadı: %1$s",
"Failed to unlink: %1$s" : "Bağlantı kaldırılamadı: %1$s",
-1
View File
@@ -236,7 +236,6 @@ OC.L10N.register(
"Failed to check file size: %1$s" : "檢查檔案大小失敗:%1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "無法開啟檔案:%1$s%2$d),檔案似乎存在",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "無法開啟檔案:%1$s%2$d),檔案似乎不存在",
"Failed to get size for : %1$s" : "無法取得以下項目的大小:%1$s",
"Encryption not ready: %1$s" : "尚未準備好加密:%1$s",
"Failed to open file: %1$s" : "開啟檔案失敗:%1$s",
"Failed to unlink: %1$s" : "解除連結失敗:%1$s",
-1
View File
@@ -234,7 +234,6 @@
"Failed to check file size: %1$s" : "檢查檔案大小失敗:%1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "無法開啟檔案:%1$s%2$d),檔案似乎存在",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "無法開啟檔案:%1$s%2$d),檔案似乎不存在",
"Failed to get size for : %1$s" : "無法取得以下項目的大小:%1$s",
"Encryption not ready: %1$s" : "尚未準備好加密:%1$s",
"Failed to open file: %1$s" : "開啟檔案失敗:%1$s",
"Failed to unlink: %1$s" : "解除連結失敗:%1$s",
-1
View File
@@ -236,7 +236,6 @@ OC.L10N.register(
"Failed to check file size: %1$s" : "檢查檔案大小失敗:%1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "無法開啟檔案:%1$s (%2$d),檔案似乎存在",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "無法開啟檔案:%1$s%2$d),檔案似乎不存在",
"Failed to get size for : %1$s" : "無法取得以下項目的大小:%1$s",
"Encryption not ready: %1$s" : "尚未準備好加密:%1$s",
"Failed to open file: %1$s" : "開啟檔案失敗:%1$s",
"Failed to unlink: %1$s" : "解除連結失敗:%1$s",
-1
View File
@@ -234,7 +234,6 @@
"Failed to check file size: %1$s" : "檢查檔案大小失敗:%1$s",
"Could not open file: %1$s (%2$d), file does seem to exist" : "無法開啟檔案:%1$s (%2$d),檔案似乎存在",
"Could not open file: %1$s (%2$d), file doesn't seem to exist" : "無法開啟檔案:%1$s%2$d),檔案似乎不存在",
"Failed to get size for : %1$s" : "無法取得以下項目的大小:%1$s",
"Encryption not ready: %1$s" : "尚未準備好加密:%1$s",
"Failed to open file: %1$s" : "開啟檔案失敗:%1$s",
"Failed to unlink: %1$s" : "解除連結失敗:%1$s",
@@ -11,7 +11,6 @@ namespace OCA\DAV\CalDAV\Federation;
use OCA\DAV\DAV\RemoteUserPrincipalBackend;
use OCP\AppFramework\Db\Entity;
use OCP\Constants;
use OCP\DB\Types;
use Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet;
@@ -95,7 +94,7 @@ class FederatedCalendarEntity extends Entity {
'{' . \Sabre\CalDAV\Plugin::NS_CALENDARSERVER . '}getctag' => $this->getSyncTokenForSabre(),
'{' . \Sabre\CalDAV\Plugin::NS_CALDAV . '}supported-calendar-component-set' => $this->getSupportedCalendarComponentSet(),
'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->getSharedByPrincipal(),
'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => ($this->getPermissions() & Constants::PERMISSION_UPDATE) === 0 ? 1 : 0,
'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => ($this->getPermissions() & \OCP\Constants::PERMISSION_UPDATE) === 0 ? 1 : 0,
'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}permissions' => $this->getPermissions(),
];
}
+1 -3
View File
@@ -20,15 +20,13 @@ class Capabilities implements ICapability {
}
/**
* @return array{dav: array{chunking: string, public_shares_chunking: bool, search_supports_creation_time: bool, search_supports_upload_time: bool, bulkupload?: string, absence-supported?: bool, absence-replacement?: bool}}
* @return array{dav: array{chunking: string, public_shares_chunking: bool, bulkupload?: string, absence-supported?: bool, absence-replacement?: bool}}
*/
public function getCapabilities() {
$capabilities = [
'dav' => [
'chunking' => '1.0',
'public_shares_chunking' => true,
'search_supports_creation_time' => true,
'search_supports_upload_time' => true,
]
];
if ($this->config->getSystemValueBool('bulkupload.enabled', true)) {
+1 -2
View File
@@ -22,7 +22,6 @@ use OCP\IDBConnection;
use OCP\IGroupManager;
use OCP\IUserManager;
use OCP\IUserSession;
use OCP\L10N\IFactory;
use OCP\Security\ISecureRandom;
use OCP\Server;
use Psr\Log\LoggerInterface;
@@ -67,7 +66,7 @@ class CreateCalendar extends Command {
Server::get(ProxyMapper::class),
Server::get(KnownUserService::class),
Server::get(IConfig::class),
Server::get(IFactory::class),
\OC::$server->getL10NFactory(),
);
$random = Server::get(ISecureRandom::class);
$logger = Server::get(LoggerInterface::class);
+1 -1
View File
@@ -532,7 +532,7 @@ class Directory extends Node implements
}
if ($info->getMimeType() === FileInfo::MIMETYPE_FOLDER) {
$node = new Directory($this->fileView, $info, $this->tree, $this->shareManager);
$node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this->tree, $this->shareManager);
} else {
// In case reading a directory was allowed but it turns out the node was a not a directory, reject it now.
if (!$this->info->isReadable()) {
+2 -6
View File
@@ -480,15 +480,11 @@ class File extends Node implements IFile {
}
}
$logger = Server::get(LoggerInterface::class);
// comparing current file size with the one in DB
// if different, fix DB and refresh cache.
//
$fsSize = $this->fileView->filesize($this->getPath());
if ($fsSize === false) {
$logger->warning('file not found on storage after successfully opening it');
throw new ServiceUnavailable($this->l10n->t('Failed to get size for : %1$s', [$this->getPath()]));
} elseif ($this->getSize() !== $fsSize) {
if ($this->getSize() !== $fsSize) {
$logger = Server::get(LoggerInterface::class);
$logger->warning('fixing cached size of file id=' . $this->getId() . ', cached size was ' . $this->getSize() . ', but the filesystem reported a size of ' . $fsSize);
$this->getFileInfo()->getStorage()->getUpdater()->update($this->getFileInfo()->getInternalPath());
-5
View File
@@ -86,7 +86,6 @@ class FileSearchBackend implements ISearchBackend {
new SearchPropertyDefinition('{DAV:}displayname', true, true, true),
new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true),
new SearchPropertyDefinition('{DAV:}getlastmodified', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME),
new SearchPropertyDefinition('{DAV:}creationdate', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME),
new SearchPropertyDefinition('{http://nextcloud.org/ns}upload_time', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME),
new SearchPropertyDefinition(FilesPlugin::SIZE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
new SearchPropertyDefinition(TagsPlugin::FAVORITE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_BOOLEAN),
@@ -300,8 +299,6 @@ class FileSearchBackend implements ISearchBackend {
return $node->getName();
case '{DAV:}getlastmodified':
return $node->getLastModified();
case '{DAV:}creationdate':
return $node->getNode()->getCreationTime();
case '{http://nextcloud.org/ns}upload_time':
return $node->getNode()->getUploadTime();
case FilesPlugin::SIZE_PROPERTYNAME:
@@ -464,8 +461,6 @@ class FileSearchBackend implements ISearchBackend {
return 'mimetype';
case '{DAV:}getlastmodified':
return 'mtime';
case '{DAV:}creationdate':
return 'creation_time';
case '{http://nextcloud.org/ns}upload_time':
return 'upload_time';
case FilesPlugin::SIZE_PROPERTYNAME:
+1 -2
View File
@@ -8,7 +8,6 @@
namespace OCA\DAV\Files;
use OCP\Files\FileInfo;
use OCP\Files\IRootFolder;
use OCP\IUserSession;
use OCP\Server;
use Sabre\DAV\INode;
@@ -36,7 +35,7 @@ class RootCollection extends AbstractPrincipalCollection {
// in the future this could be considered to be used for accessing shared files
return new SimpleCollection($name);
}
$userFolder = Server::get(IRootFolder::class)->getUserFolder($user->getUID());
$userFolder = \OC::$server->getUserFolder();
if (!($userFolder instanceof FileInfo)) {
throw new \Exception('Home does not exist');
}
+1 -2
View File
@@ -42,7 +42,6 @@ use OCP\IDBConnection;
use OCP\IGroupManager;
use OCP\IUserManager;
use OCP\IUserSession;
use OCP\L10N\IFactory;
use OCP\Security\ISecureRandom;
use OCP\Server;
use OCP\SystemTag\ISystemTagManager;
@@ -76,7 +75,7 @@ class RootCollection extends SimpleCollection {
$proxyMapper,
Server::get(KnownUserService::class),
Server::get(IConfig::class),
Server::get(IFactory::class)
\OC::$server->getL10NFactory()
);
$groupPrincipalBackend = new GroupPrincipalBackend($groupManager, $userSession, $shareManager, $config);
+14 -21
View File
@@ -150,13 +150,13 @@ class EventsSearchProvider extends ACalendarSearchProvider implements IFiltering
$formattedResults = \array_map(function (array $eventRow) use ($calendarsById, $subscriptionsById): SearchResultEntry {
$component = $this->getPrimaryComponent($eventRow['calendardata'], self::$componentType);
$title = (string)($component->SUMMARY ?? $this->l10n->t('Untitled event'));
$subline = $this->generateSubline($component);
if ($eventRow['calendartype'] === CalDavBackend::CALENDAR_TYPE_CALENDAR) {
$calendar = $calendarsById[$eventRow['calendarid']];
} else {
$calendar = $subscriptionsById[$eventRow['calendarid']];
}
$subline = $this->generateSubline($component, $calendar);
$resourceUrl = $this->getDeepLinkToCalendarApp($calendar['principaluri'], $calendar['uri'], $eventRow['uri']);
$result = new SearchResultEntry('', $title, $subline, $resourceUrl, 'icon-calendar-dark', false);
@@ -204,7 +204,7 @@ class EventsSearchProvider extends ACalendarSearchProvider implements IFiltering
. $calendarObjectUri;
}
protected function generateSubline(Component $eventComponent, array $calendarInfo): string {
protected function generateSubline(Component $eventComponent): string {
$dtStart = $eventComponent->DTSTART;
$dtEnd = $this->getDTEndForEvent($eventComponent);
$isAllDayEvent = $dtStart instanceof Property\ICalendar\Date;
@@ -214,31 +214,24 @@ class EventsSearchProvider extends ACalendarSearchProvider implements IFiltering
if ($isAllDayEvent) {
$endDateTime->modify('-1 day');
if ($this->isDayEqual($startDateTime, $endDateTime)) {
$formattedSubline = $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
} else {
$formattedStart = $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
$formattedEnd = $this->l10n->l('date', $endDateTime, ['width' => 'medium']);
$formattedSubline = "$formattedStart - $formattedEnd";
return $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
}
} else {
$formattedStartDate = $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
$formattedEndDate = $this->l10n->l('date', $endDateTime, ['width' => 'medium']);
$formattedStartTime = $this->l10n->l('time', $startDateTime, ['width' => 'short']);
$formattedEndTime = $this->l10n->l('time', $endDateTime, ['width' => 'short']);
if ($this->isDayEqual($startDateTime, $endDateTime)) {
$formattedSubline = "$formattedStartDate $formattedStartTime - $formattedEndTime";
} else {
$formattedSubline = "$formattedStartDate $formattedStartTime - $formattedEndDate $formattedEndTime";
}
$formattedStart = $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
$formattedEnd = $this->l10n->l('date', $endDateTime, ['width' => 'medium']);
return "$formattedStart - $formattedEnd";
}
if (isset($calendarInfo['{DAV:}displayname']) && !empty($calendarInfo['{DAV:}displayname'])) {
$formattedSubline = $formattedSubline . " ({$calendarInfo['{DAV:}displayname']})";
$formattedStartDate = $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
$formattedEndDate = $this->l10n->l('date', $endDateTime, ['width' => 'medium']);
$formattedStartTime = $this->l10n->l('time', $startDateTime, ['width' => 'short']);
$formattedEndTime = $this->l10n->l('time', $endDateTime, ['width' => 'short']);
if ($this->isDayEqual($startDateTime, $endDateTime)) {
return "$formattedStartDate $formattedStartTime - $formattedEndTime";
}
// string cast is just to make psalm happy
return (string)$formattedSubline;
return "$formattedStartDate $formattedStartTime - $formattedEndDate $formattedEndTime";
}
protected function getDTEndForEvent(Component $eventComponent):Property {
+10 -14
View File
@@ -96,13 +96,13 @@ class TasksSearchProvider extends ACalendarSearchProvider {
$formattedResults = \array_map(function (array $taskRow) use ($calendarsById, $subscriptionsById):SearchResultEntry {
$component = $this->getPrimaryComponent($taskRow['calendardata'], self::$componentType);
$title = (string)($component->SUMMARY ?? $this->l10n->t('Untitled task'));
$subline = $this->generateSubline($component);
if ($taskRow['calendartype'] === CalDavBackend::CALENDAR_TYPE_CALENDAR) {
$calendar = $calendarsById[$taskRow['calendarid']];
} else {
$calendar = $subscriptionsById[$taskRow['calendarid']];
}
$subline = $this->generateSubline($component, $calendar);
$resourceUrl = $this->getDeepLinkToTasksApp($calendar['uri'], $taskRow['uri']);
return new SearchResultEntry('', $title, $subline, $resourceUrl, 'icon-checkmark', false);
@@ -128,29 +128,25 @@ class TasksSearchProvider extends ACalendarSearchProvider {
);
}
protected function generateSubline(Component $taskComponent, array $calendarInfo): string {
protected function generateSubline(Component $taskComponent): string {
if ($taskComponent->COMPLETED) {
$completedDateTime = new \DateTime($taskComponent->COMPLETED->getDateTime()->format(\DateTimeInterface::ATOM));
$formattedDate = $this->l10n->l('date', $completedDateTime, ['width' => 'medium']);
$formattedSubline = $this->l10n->t('Completed on %s', [$formattedDate]);
} elseif ($taskComponent->DUE) {
return $this->l10n->t('Completed on %s', [$formattedDate]);
}
if ($taskComponent->DUE) {
$dueDateTime = new \DateTime($taskComponent->DUE->getDateTime()->format(\DateTimeInterface::ATOM));
$formattedDate = $this->l10n->l('date', $dueDateTime, ['width' => 'medium']);
if ($taskComponent->DUE->hasTime()) {
$formattedTime = $this->l10n->l('time', $dueDateTime, ['width' => 'short']);
$formattedSubline = $this->l10n->t('Due on %s by %s', [$formattedDate, $formattedTime]);
} else {
$formattedSubline = $this->l10n->t('Due on %s', [$formattedDate]);
return $this->l10n->t('Due on %s by %s', [$formattedDate, $formattedTime]);
}
} else {
$formattedSubline = '';
return $this->l10n->t('Due on %s', [$formattedDate]);
}
if (isset($calendarInfo['{DAV:}displayname']) && !empty($calendarInfo['{DAV:}displayname'])) {
$formattedSubline = $formattedSubline . (!empty($formattedSubline) ? ' ' : '') . "({$calendarInfo['{DAV:}displayname']})";
}
return $formattedSubline;
return '';
}
}
@@ -15,7 +15,6 @@ use OCP\AppFramework\Services\IAppConfig;
use OCP\Files\AppData\IAppDataFactory;
use OCP\Files\IAppData;
use OCP\Files\NotFoundException;
use OCP\IL10N;
use Psr\Log\LoggerInterface;
use Symfony\Component\Uid\Uuid;
@@ -27,7 +26,6 @@ class ExampleContactService {
private readonly IAppConfig $appConfig,
private readonly LoggerInterface $logger,
private readonly CardDavBackend $cardDav,
private readonly IL10N $l,
) {
$this->appData = $appDataFactory->get(Application::APP_ID);
}
@@ -133,9 +131,6 @@ class ExampleContactService {
} else {
$vcard->add('REV', $newRev);
}
if (!$vcard->Note) {
$vcard->add('note', $this->l->t('This is an example contact'));
}
// Level 3 means that the document is invalid
// https://sabre.io/vobject/vcard/#validating-vcard
+1 -9
View File
@@ -30,9 +30,7 @@
"type": "object",
"required": [
"chunking",
"public_shares_chunking",
"search_supports_creation_time",
"search_supports_upload_time"
"public_shares_chunking"
],
"properties": {
"chunking": {
@@ -41,12 +39,6 @@
"public_shares_chunking": {
"type": "boolean"
},
"search_supports_creation_time": {
"type": "boolean"
},
"search_supports_upload_time": {
"type": "boolean"
},
"bulkupload": {
"type": "string"
},
@@ -17,7 +17,6 @@ use OCP\Config\IUserConfig;
use OCP\IAppConfig;
use OCP\IDBConnection;
use OCP\IL10N;
use OCP\IUser;
use OCP\IUserManager;
use OCP\L10N\IFactory;
use OCP\Security\ISecureRandom;
@@ -164,7 +163,7 @@ class IMipServiceTest extends TestCase {
public function testIsSystemUserWhenUserExists(): void {
$email = 'user@example.com';
$user = $this->createMock(IUser::class);
$user = $this->createMock(\OCP\IUser::class);
$this->userManager->expects(self::once())
->method('getByEmail')
-6
View File
@@ -31,8 +31,6 @@ class CapabilitiesTest extends TestCase {
'dav' => [
'chunking' => '1.0',
'public_shares_chunking' => true,
'search_supports_creation_time' => true,
'search_supports_upload_time' => true,
],
];
$this->assertSame($expected, $capabilities->getCapabilities());
@@ -53,8 +51,6 @@ class CapabilitiesTest extends TestCase {
'dav' => [
'chunking' => '1.0',
'public_shares_chunking' => true,
'search_supports_creation_time' => true,
'search_supports_upload_time' => true,
'bulkupload' => '1.0',
],
];
@@ -76,8 +72,6 @@ class CapabilitiesTest extends TestCase {
'dav' => [
'chunking' => '1.0',
'public_shares_chunking' => true,
'search_supports_creation_time' => true,
'search_supports_upload_time' => true,
'absence-supported' => true,
'absence-replacement' => true,
],
@@ -436,7 +436,7 @@ class EventsSearchProviderTest extends TestCase {
}
#[\PHPUnit\Framework\Attributes\DataProvider(methodName: 'generateSublineDataProvider')]
public function testGenerateSubline(string $ics, string $expectedSubline, array $calendarInfo = []): void {
public function testGenerateSubline(string $ics, string $expectedSubline): void {
$vCalendar = Reader::read($ics, Reader::OPTION_FORGIVING);
$eventComponent = $vCalendar->VEVENT;
@@ -449,23 +449,19 @@ class EventsSearchProviderTest extends TestCase {
return $date->format('m-d');
});
$actual = self::invokePrivate($this->provider, 'generateSubline', [$eventComponent, $calendarInfo]);
$actual = self::invokePrivate($this->provider, 'generateSubline', [$eventComponent]);
$this->assertEquals($expectedSubline, $actual);
}
public static function generateSublineDataProvider(): array {
return [
[self::$vEvent1, '08-16 09:00 - 10:00', []],
[self::$vEvent2, '08-16 09:00 - 08-17 10:00', []],
[self::$vEvent3, '10-05', []],
[self::$vEvent4, '10-05 - 10-07', []],
[self::$vEvent5, '10-05 - 10-09', []],
[self::$vEvent6, '10-05', []],
[self::$vEvent7, '08-16 09:00 - 09:00', []],
[self::$vEvent1, '08-16 09:00 - 10:00 (My Calendar)', ['{DAV:}displayname' => 'My Calendar']],
[self::$vEvent3, '10-05 (My Calendar)', ['{DAV:}displayname' => 'My Calendar']],
[self::$vEvent2, '08-16 09:00 - 08-17 10:00 (My Calendar)', ['{DAV:}displayname' => 'My Calendar']],
[self::$vEvent1, '08-16 09:00 - 10:00', ['{DAV:}displayname' => '']],
[self::$vEvent1, '08-16 09:00 - 10:00'],
[self::$vEvent2, '08-16 09:00 - 08-17 10:00'],
[self::$vEvent3, '10-05'],
[self::$vEvent4, '10-05 - 10-07'],
[self::$vEvent5, '10-05 - 10-09'],
[self::$vEvent6, '10-05'],
[self::$vEvent7, '08-16 09:00 - 09:00'],
];
}
}
@@ -290,29 +290,24 @@ class TasksSearchProviderTest extends TestCase {
}
#[\PHPUnit\Framework\Attributes\DataProvider(methodName: 'generateSublineDataProvider')]
public function testGenerateSubline(string $ics, string $expectedSubline, array $calendarInfo = []): void {
public function testGenerateSubline(string $ics, string $expectedSubline): void {
$vCalendar = Reader::read($ics, Reader::OPTION_FORGIVING);
$taskComponent = $vCalendar->VTODO;
$this->l10n->method('t')->willReturnArgument(0);
$this->l10n->method('l')->willReturnArgument(0);
$actual = self::invokePrivate($this->provider, 'generateSubline', [$taskComponent, $calendarInfo]);
$actual = self::invokePrivate($this->provider, 'generateSubline', [$taskComponent]);
$this->assertEquals($expectedSubline, $actual);
}
public static function generateSublineDataProvider(): array {
return [
[self::$vTodo0, '', []],
[self::$vTodo1, 'Completed on %s', []],
[self::$vTodo2, 'Completed on %s', []],
[self::$vTodo3, 'Due on %s', []],
[self::$vTodo4, 'Due on %s by %s', []],
[self::$vTodo0, '(My Tasks)', ['{DAV:}displayname' => 'My Tasks']],
[self::$vTodo1, 'Completed on %s (My Tasks)', ['{DAV:}displayname' => 'My Tasks']],
[self::$vTodo3, 'Due on %s (My Tasks)', ['{DAV:}displayname' => 'My Tasks']],
[self::$vTodo4, 'Due on %s by %s (My Tasks)', ['{DAV:}displayname' => 'My Tasks']],
[self::$vTodo1, 'Completed on %s', ['{DAV:}displayname' => '']],
[self::$vTodo0, ''],
[self::$vTodo1, 'Completed on %s'],
[self::$vTodo2, 'Completed on %s'],
[self::$vTodo3, 'Due on %s'],
[self::$vTodo4, 'Due on %s by %s'],
];
}
}
@@ -18,7 +18,6 @@ use OCP\Files\IAppData;
use OCP\Files\NotFoundException;
use OCP\Files\SimpleFS\ISimpleFile;
use OCP\Files\SimpleFS\ISimpleFolder;
use OCP\IL10N;
use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\LoggerInterface;
use Symfony\Component\Uid\Uuid;
@@ -32,7 +31,6 @@ class ExampleContactServiceTest extends TestCase {
protected LoggerInterface&MockObject $logger;
protected IAppConfig&MockObject $appConfig;
protected IAppData&MockObject $appData;
protected IL10N&MockObject $l;
protected function setUp(): void {
parent::setUp();
@@ -41,7 +39,6 @@ class ExampleContactServiceTest extends TestCase {
$this->appDataFactory = $this->createMock(IAppDataFactory::class);
$this->logger = $this->createMock(LoggerInterface::class);
$this->appConfig = $this->createMock(IAppConfig::class);
$this->l = $this->createMock((IL10N::class));
$this->appData = $this->createMock(IAppData::class);
$this->appDataFactory->method('get')
@@ -53,7 +50,6 @@ class ExampleContactServiceTest extends TestCase {
$this->appConfig,
$this->logger,
$this->cardDav,
$this->l,
);
}
-10
View File
@@ -33,31 +33,21 @@ OC.L10N.register(
"Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Por favor ingrese en la interfaz web, vaya a la sección \"Seguridad\" de sus ajustes personales y actualice su contraseña de cifrado ingresando esta contraseña en el campo \"Contraseña de inicio de sesión antigua\" y su contraseña actual.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede descifrar este archivo, probablemente se trate de un archivo compartido. Por favor, pida al propietario del archivo que vuelva a compartirlo con usted.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente se trate de un archivo compartido. Por favor, pida al propietario del archivo que vuelva a compartirlo con usted.",
"Default Encryption Module" : "Módulo de cifrado predeterminado",
"Default encryption module for Nextcloud Server-side Encryption (SSE)" : "Módulo de cifrado predeterminado para el cifrado del lado del servidor (SSE) de Nextcloud",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Al activar esta opción se encriptarán todos los archivos almacenados en la memoria principal, de lo contrario, serán cifrados sólo los archivos de almacenamiento externo",
"Encrypt the home storage" : "Encriptar el almacenamiento personal",
"Disable recovery key" : "Desactiva la clave de recuperación",
"Enable recovery key" : "Activa la clave de recuperación",
"The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "La llave de recuperación es una llave de cifrado adicional utilizada para cifrar archivos. Es utilizada para recuperar los archivos de una cuenta si la contraseña fuese olvidada.",
"Recovery key password" : "Contraseña de clave de recuperación",
"Passwords fields do not match" : "Las contraseñas no coinciden",
"Repeat recovery key password" : "Repita la contraseña de recuperación",
"An error occurred while updating the recovery key settings. Please try again." : "Se produjo un error al actualizar la configuración de la clave de recuperación. Por favor, inténtelo de nuevo.",
"Change recovery key password" : "Cambiar la contraseña de la clave de recuperación",
"Old recovery key password" : "Antigua contraseña de recuperación",
"New recovery key password" : "Nueva contraseña de recuperación",
"Repeat new recovery key password" : "Repita la nueva contraseña de recuperación",
"An error occurred while changing the recovery key password. Please try again." : "Se produjo un error al cambiar la contraseña de la clave de recuperación. Por favor, inténtelo de nuevo.",
"Update private key password" : "Actualizar la contraseña de la clave privada",
"Your private key password no longer matches your log-in password. Set your old private key password to your current log-in password." : "Tu contraseña de clave privada ya no coincide con tu contraseña de inicio de sesión. Cambia tu contraseña de clave privada anterior a tu contraseña de inicio de sesión actual.",
"If you do not remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña, puede pedir a su administrador que recupere sus archivos.",
"Old log-in password" : "Contraseña de acceso antigua",
"Current log-in password" : "Contraseña de acceso actual",
"Update" : "Actualizar",
"Updating recovery keys. This can take some time…" : "Actualizando las claves de recuperación. Esto puede tardar algún tiempo …",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus archivos cifrados en caso de pérdida de contraseña",
"Enable password recovery" : "Habilitar la contraseña de recuperación",
"Default encryption module" : "Módulo de cifrado por defecto",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
"Basic encryption module" : "Módulo de cifrado básico",
-10
View File
@@ -31,31 +31,21 @@
"Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Por favor ingrese en la interfaz web, vaya a la sección \"Seguridad\" de sus ajustes personales y actualice su contraseña de cifrado ingresando esta contraseña en el campo \"Contraseña de inicio de sesión antigua\" y su contraseña actual.",
"Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede descifrar este archivo, probablemente se trate de un archivo compartido. Por favor, pida al propietario del archivo que vuelva a compartirlo con usted.",
"Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente se trate de un archivo compartido. Por favor, pida al propietario del archivo que vuelva a compartirlo con usted.",
"Default Encryption Module" : "Módulo de cifrado predeterminado",
"Default encryption module for Nextcloud Server-side Encryption (SSE)" : "Módulo de cifrado predeterminado para el cifrado del lado del servidor (SSE) de Nextcloud",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Al activar esta opción se encriptarán todos los archivos almacenados en la memoria principal, de lo contrario, serán cifrados sólo los archivos de almacenamiento externo",
"Encrypt the home storage" : "Encriptar el almacenamiento personal",
"Disable recovery key" : "Desactiva la clave de recuperación",
"Enable recovery key" : "Activa la clave de recuperación",
"The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "La llave de recuperación es una llave de cifrado adicional utilizada para cifrar archivos. Es utilizada para recuperar los archivos de una cuenta si la contraseña fuese olvidada.",
"Recovery key password" : "Contraseña de clave de recuperación",
"Passwords fields do not match" : "Las contraseñas no coinciden",
"Repeat recovery key password" : "Repita la contraseña de recuperación",
"An error occurred while updating the recovery key settings. Please try again." : "Se produjo un error al actualizar la configuración de la clave de recuperación. Por favor, inténtelo de nuevo.",
"Change recovery key password" : "Cambiar la contraseña de la clave de recuperación",
"Old recovery key password" : "Antigua contraseña de recuperación",
"New recovery key password" : "Nueva contraseña de recuperación",
"Repeat new recovery key password" : "Repita la nueva contraseña de recuperación",
"An error occurred while changing the recovery key password. Please try again." : "Se produjo un error al cambiar la contraseña de la clave de recuperación. Por favor, inténtelo de nuevo.",
"Update private key password" : "Actualizar la contraseña de la clave privada",
"Your private key password no longer matches your log-in password. Set your old private key password to your current log-in password." : "Tu contraseña de clave privada ya no coincide con tu contraseña de inicio de sesión. Cambia tu contraseña de clave privada anterior a tu contraseña de inicio de sesión actual.",
"If you do not remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña, puede pedir a su administrador que recupere sus archivos.",
"Old log-in password" : "Contraseña de acceso antigua",
"Current log-in password" : "Contraseña de acceso actual",
"Update" : "Actualizar",
"Updating recovery keys. This can take some time…" : "Actualizando las claves de recuperación. Esto puede tardar algún tiempo …",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus archivos cifrados en caso de pérdida de contraseña",
"Enable password recovery" : "Habilitar la contraseña de recuperación",
"Default encryption module" : "Módulo de cifrado por defecto",
"Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
"Basic encryption module" : "Módulo de cifrado básico",
-4
View File
@@ -22,20 +22,16 @@ OC.L10N.register(
"Sharing" : "Delen",
"Federated file sharing" : "Gefedereerd delen",
"Provide federated file sharing across servers" : "Voorzien in gefedereerd delen van bestanden over verschillende servers",
"Enable data upload" : "Schakel data upload in",
"Disable upload" : "Schakel upload uit",
"This is used to retrieve the federated cloud ID to make federated sharing easier." : "Dit wordt gebruikt om de federatieve cloud-ID op te halen om federatief delen gemakkelijker te maken.",
"Share with me through my #Nextcloud Federated Cloud ID, see {url}" : "Deel met mij via mijn #Nextcloud Federated Cloud-ID, zie {url}",
"Share with me through my #Nextcloud Federated Cloud ID" : "Deel met mij via mijn #Nextcloud gefedereerde Cloud-ID",
"Share with me via Nextcloud" : "Deel met mij via Nextcloud",
"Cloud ID copied" : "Cloud ID gekopieerd",
"Copy" : "Kopiëren",
"Clipboard not available. Please copy the cloud ID manually." : "Klembord niet beschikbaar. Kopieer de cloud-ID handmatig.",
"Copied!" : "Gekopieerd!",
"Federated Cloud" : "Gefedereerde Cloud",
"Your Federated Cloud ID" : "Jouw Federated Cloud-ID",
"Share it so your friends can share files with you:" : "Deel het, zodat anderen bestanden met jou kunnen delen:",
"Bluesky" : "Bluesky",
"Facebook" : "Facebook",
"Mastodon" : "Mastodon",
"Add to your website" : "Toevoegen aan je website",
-4
View File
@@ -20,20 +20,16 @@
"Sharing" : "Delen",
"Federated file sharing" : "Gefedereerd delen",
"Provide federated file sharing across servers" : "Voorzien in gefedereerd delen van bestanden over verschillende servers",
"Enable data upload" : "Schakel data upload in",
"Disable upload" : "Schakel upload uit",
"This is used to retrieve the federated cloud ID to make federated sharing easier." : "Dit wordt gebruikt om de federatieve cloud-ID op te halen om federatief delen gemakkelijker te maken.",
"Share with me through my #Nextcloud Federated Cloud ID, see {url}" : "Deel met mij via mijn #Nextcloud Federated Cloud-ID, zie {url}",
"Share with me through my #Nextcloud Federated Cloud ID" : "Deel met mij via mijn #Nextcloud gefedereerde Cloud-ID",
"Share with me via Nextcloud" : "Deel met mij via Nextcloud",
"Cloud ID copied" : "Cloud ID gekopieerd",
"Copy" : "Kopiëren",
"Clipboard not available. Please copy the cloud ID manually." : "Klembord niet beschikbaar. Kopieer de cloud-ID handmatig.",
"Copied!" : "Gekopieerd!",
"Federated Cloud" : "Gefedereerde Cloud",
"Your Federated Cloud ID" : "Jouw Federated Cloud-ID",
"Share it so your friends can share files with you:" : "Deel het, zodat anderen bestanden met jou kunnen delen:",
"Bluesky" : "Bluesky",
"Facebook" : "Facebook",
"Mastodon" : "Mastodon",
"Add to your website" : "Toevoegen aan je website",
@@ -17,7 +17,6 @@ use OCP\AppFramework\Bootstrap\IBootContext;
use OCP\AppFramework\Bootstrap\IBootstrap;
use OCP\AppFramework\Bootstrap\IRegistrationContext;
use OCP\Federation\ICloudFederationProviderManager;
use OCP\Server;
class Application extends App implements IBootstrap {
@@ -42,7 +41,7 @@ class Application extends App implements IBootstrap {
$manager->addCloudFederationProvider($type,
'Federated Files Sharing',
function (): CloudFederationProviderFiles {
return Server::get(CloudFederationProviderFiles::class);
return \OCP\Server::get(CloudFederationProviderFiles::class);
});
}
}
@@ -329,29 +329,14 @@ class FederatedShareProvider implements IShareProvider, IShareProviderSupportsAl
->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATETIME_MUTABLE))
->executeStatement();
/*
* If the share owner and share initiator are on the same instance,
* then we're done here as the share was just updated above.
*
* However, if the share owner/sharee is on a remote instance (and thus we're dealing with a federated share),
* then we are supposed to let the share owner/ sharee on the remote instance know.
*/
if ($this->shouldNotifyRemote($share)) {
// send the updated permission to the owner/initiator, if they are not the same
if ($share->getShareOwner() !== $share->getSharedBy()) {
$this->sendPermissionUpdate($share);
}
return $share;
}
/**
* Notify owner/sharee if they are not the same and ANY of them is a remote user.
*/
protected function shouldNotifyRemote(IShare $share): bool {
$ownerOrSharerIsRemoteUser = !$this->userManager->userExists($share->getShareOwner())
|| !$this->userManager->userExists($share->getSharedBy());
return $ownerOrSharerIsRemoteUser && $share->getShareOwner() !== $share->getSharedBy();
}
/**
* Send the updated permission to the owner/initiator, if they are not the same.
*
@@ -481,8 +466,13 @@ class FederatedShareProvider implements IShareProvider, IShareProviderSupportsAl
* @throws HintException
*/
protected function revokeShare($share, $isOwner) {
if ($this->userManager->userExists($share->getShareOwner()) && $this->userManager->userExists($share->getSharedBy())) {
// If both the owner and the initiator of the share are local users we don't have to notify anybody else
return;
}
// also send a unShare request to the initiator, if this is a different user than the owner
if ($this->shouldNotifyRemote($share)) {
if ($share->getShareOwner() !== $share->getSharedBy()) {
if ($isOwner) {
[, $remote] = $this->addressHandler->splitUserRemote($share->getSharedBy());
} else {
@@ -14,7 +14,6 @@ use OCP\GlobalScale\IConfig;
use OCP\IL10N;
use OCP\IURLGenerator;
use OCP\Settings\IDelegatedSettings;
use OCP\Util;
class Admin implements IDelegatedSettings {
/**
@@ -45,8 +44,8 @@ class Admin implements IDelegatedSettings {
$this->initialState->provideInitialState('lookupServerUploadEnabled', $this->fedShareProvider->isLookupServerUploadEnabled());
$this->initialState->provideInitialState('federatedTrustedShareAutoAccept', $this->fedShareProvider->isFederatedTrustedShareAutoAccept());
Util::addStyle(Application::APP_ID, 'settings-admin');
Util::addScript(Application::APP_ID, 'settings-admin');
\OCP\Util::addStyle(Application::APP_ID, 'settings-admin');
\OCP\Util::addScript(Application::APP_ID, 'settings-admin');
return new TemplateResponse(Application::APP_ID, 'settings-admin', renderAs: '');
}
@@ -16,7 +16,6 @@ use OCP\Defaults;
use OCP\IURLGenerator;
use OCP\IUserSession;
use OCP\Settings\ISettings;
use OCP\Util;
class Personal implements ISettings {
public function __construct(
@@ -43,8 +42,8 @@ class Personal implements ISettings {
$this->initialState->provideInitialState('cloudId', $cloudID);
$this->initialState->provideInitialState('docUrlFederated', $this->urlGenerator->linkToDocs('user-sharing-federated'));
Util::addStyle(Application::APP_ID, 'settings-personal');
Util::addScript(Application::APP_ID, 'settings-personal');
\OCP\Util::addStyle(Application::APP_ID, 'settings-personal');
\OCP\Util::addScript(Application::APP_ID, 'settings-personal');
return new TemplateResponse(Application::APP_ID, 'settings-personal', renderAs: TemplateResponse::RENDER_AS_BLANK);
}
@@ -1,417 +0,0 @@
<?php
declare(strict_types=1);
/**
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OCA\FederatedFileSharing\Tests;
use LogicException;
use OC\Federation\CloudId;
use OC\Share20\Share;
use OCA\FederatedFileSharing\AddressHandler;
use OCA\FederatedFileSharing\FederatedShareProvider;
use OCA\FederatedFileSharing\Notifications;
use OCA\FederatedFileSharing\TokenHandler;
use OCP\Constants;
use OCP\DB\IResult;
use OCP\DB\QueryBuilder\IExpressionBuilder;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\Federation\ICloudFederationProviderManager;
use OCP\Federation\ICloudIdManager;
use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\GlobalScale\IConfig as GlobalScaleConfig;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\IL10N;
use OCP\IUserManager;
use OCP\Share\IShare;
use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\LoggerInterface;
use Psr\Log\NullLogger;
class FederatedShareProviderReshareRemoteTest extends \Test\TestCase {
private IDBConnection&MockObject $connection;
private AddressHandler&MockObject $addressHandler;
private Notifications&MockObject $notifications;
private TokenHandler&MockObject $tokenHandler;
private IL10N&MockObject $l10n;
private IRootFolder&MockObject $rootFolder;
private IConfig&MockObject $config;
private IUserManager&MockObject $userManager;
private ICloudIdManager&MockObject $cloudIdManager;
private GlobalScaleConfig&MockObject $gsConfig;
private ICloudFederationProviderManager&MockObject $cloudFederationProviderManager;
private LoggerInterface $logger;
private FederatedShareProvider $shareProvider;
protected function setUp(): void {
$this->connection = $this->createMock(IDBConnection::class);
$this->addressHandler = $this->createMock(AddressHandler::class);
$this->notifications = $this->createMock(Notifications::class);
$this->tokenHandler = $this->createMock(TokenHandler::class);
$this->l10n = $this->createMock(IL10N::class);
$this->rootFolder = $this->createMock(IRootFolder::class);
$this->config = $this->createMock(IConfig::class);
$this->userManager = $this->createMock(IUserManager::class);
$this->cloudIdManager = $this->createMock(ICloudIdManager::class);
$this->gsConfig = $this->createMock(GlobalScaleConfig::class);
$this->cloudFederationProviderManager = $this->createMock(ICloudFederationProviderManager::class);
$this->logger = new NullLogger();
$this->shareProvider = new FederatedShareProvider(
$this->connection,
$this->addressHandler,
$this->notifications,
$this->tokenHandler,
$this->l10n,
$this->rootFolder,
$this->config,
$this->userManager,
$this->cloudIdManager,
$this->gsConfig,
$this->cloudFederationProviderManager,
$this->logger,
);
}
/**
* This test case validates that requestReShare is called when creating a federated share.
*
* We have three actors:
*
* jane@https://origin.test
* alice@https://local.test
* bob@https://destination.test
*
* Jane shared the folder with Alice which re-shares the folder with Bob.
*
* The expected outcome is, that Alice sends a request to Jane to share the folder with Bob.
*/
public function testCreateRemoteOwner(): void {
$permissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
$node = $this->createMock(Folder::class);
$node->method('getId')->willReturn(1000);
$node->method('getName')->willReturn('Share 1');
/*
* Mocks getSharedWith ($alreadyShared and $alreadySharedGroup).
* The share we are going to create does not already exist.
*/
$expr1 = $this->createMock(IExpressionBuilder::class);
$expr1->method('in')->willReturn('');
$expr1->method('eq')->willReturn('');
$result1 = $this->createMock(IResult::class);
$result1->method('fetchAssociative')->willReturn(false);
$qb1 = $this->createMock(IQueryBuilder::class);
$qb1->method('select')->willReturnSelf();
$qb1->method('from')->willReturnSelf();
$qb1->method('where')->willReturnSelf();
$qb1->method('expr')->willReturn($expr1);
$qb1->method('createNamedParameter')->willReturn('');
$qb1->method('executeQuery')->willReturn($result1);
/*
* Mocks for getShareFromExternalShareTable.
* The share we are going to create is an external share.
*/
$expr2 = $this->createMock(IExpressionBuilder::class);
$expr2->method('eq')->willReturn('');
$result2 = $this->createMock(IResult::class);
$result2->method('fetchAllAssociative')->willReturn([
[
'id' => 100000,
'parent' => -1,
'share_type' => 0,
'remote' => 'https://origin.test/',
'remote_id' => '10',
'share_token' => 'share_token1',
'password' => '',
'name' => '/Share1',
'owner' => 'jane', // owner in share_external is the user on the remote instance
'user' => 'alice', // user in share_external is the receiver on the current instance
'mountpoint' => '/Share1',
'mountpoint_hash' => '94ee935396a30e27953838d0f65d1e17', // md5(mountpoint)
'accepted' => 1,
],
]);
$qb2 = $this->createMock(IQueryBuilder::class);
$qb2->method('select')->willReturnSelf();
$qb2->method('from')->willReturnSelf();
$qb2->method('where')->willReturnSelf();
$qb2->method('expr')->willReturn($expr2);
$qb2->method('createNamedParameter')->willReturn('');
$qb2->method('executeQuery')->willReturn($result2);
/*
* Mocks for addShareToDB.
* The record on the local instance for the outgoing share.
*/
$expr3 = $this->createMock(IExpressionBuilder::class);
$expr3->method('eq')->willReturn('');
$result3 = $this->createMock(IResult::class);
$result3->method('fetchAllAssociative')->willReturn([
[
'id' => 100000,
'parent' => -1,
'share_type' => 0,
'remote' => 'https://origin.test/',
'remote_id' => '10',
'share_token' => 'share_token2',
'password' => '',
'name' => '/Share1',
'owner' => 'jane', // owner in share_external is the user on the remote instance
'user' => 'alice', // user in share_external is the receiver on the current instance
'mountpoint' => '/Share1',
'mountpoint_hash' => '94ee935396a30e27953838d0f65d1e17', // md5(mountpoint)
'accepted' => 1,
],
]);
$qb3 = $this->createMock(IQueryBuilder::class);
$qb3->method('insert')->willReturnSelf();
$qb3->method('setValue')->willReturnSelf();
$qb3->method('getLastInsertId')->willReturn(2000);
/*
* Mocks for updateSuccessfulReShare
*/
$expr4 = $this->createMock(IExpressionBuilder::class);
$expr4->method('eq')->willReturn('');
$qb4 = $this->createMock(IQueryBuilder::class);
$qb4->method('update')->willReturnSelf();
$qb4->method('where')->willReturnSelf();
$qb4->method('expr')->willReturn($expr4);
$qb4->method('set')->willReturnSelf();
$qb4->method('createNamedParameter')->willReturn('');
/*
* Mocks for storeRemoteId.
*/
$qb5 = $this->createMock(IQueryBuilder::class);
$qb5->method('insert')->willReturnSelf();
$qb5->method('values')->willReturnSelf();
/*
* Mocks for getRawShare.
*/
$expr6 = $this->createMock(IExpressionBuilder::class);
$expr6->method('eq')->willReturn('');
$result6 = $this->createMock(IResult::class);
$result6->method('fetchAssociative')->willReturn([
'id' => 20000,
'share_type' => IShare::TYPE_REMOTE,
'share_with' => 'bob@https://destination.test',
'password' => null,
'uid_owner' => 'jane@origin.test',
'uid_initiator' => 'alice',
'parent' => null,
'item_type' => 'folder',
'item_source' => (string)$node->getId(),
'item_target' => null,
'file_source' => $node->getId(),
'file_target' => '',
'permissions' => $permissions,
'stime' => 0,
'accepted' => 0,
'expiration' => null,
'token' => 'share_token3',
'mail_send' => 0,
'share_name' => null,
'password_by_talk' => 0,
'note' => null,
'hide_download' => 0,
'label' => null,
'attributes' => null,
'password_expiration_time' => null,
'reminder_sent' => 0,
]);
$qb6 = $this->createMock(IQueryBuilder::class);
$qb6->method('select')->willReturnSelf();
$qb6->method('from')->willReturnSelf();
$qb6->method('where')->willReturnSelf();
$qb6->method('expr')->willReturn($expr6);
$qb6->method('createNamedParameter')->willReturn('');
$qb6->method('executeQuery')->willReturn($result6);
$queryBuilderMatcher = $this->exactly(8);
$this->connection
->expects($queryBuilderMatcher)
->method('getQueryBuilder')
->willReturnCallback(function () use ($queryBuilderMatcher, $qb1, $qb2, $qb3, $qb4, $qb5, $qb6) {
return match ($queryBuilderMatcher->numberOfInvocations()) {
1, 2 => $qb1,
3, 5 => $qb2,
4 => $qb3,
6 => $qb4,
7 => $qb5,
8 => $qb6,
default => throw new LogicException('Unexpected number of invocations for getQueryBuilder')
};
});
// the cloud id for the recipient
$this->cloudIdManager->method('resolveCloudId')
->with('bob@https://destination.test')
->willReturn(new CloudId(
'bob@https://destination.test',
'bob',
'https://destination.test',
'Bob', // is usually null in prod, setting it here to avoid additional mocking
));
$this->addressHandler->method('generateRemoteURL')
->willReturn('https://local.test');
$this->addressHandler->method('compareAddresses')
->willReturn(false);
// the cloud id of the actual owner
$this->cloudIdManager->method('getCloudId')
->willReturn(new CloudId(
'jane@https://origin.test',
'jane',
'https://origin.test',
'Jane', // is usually null in prod, setting it here to avoid additional mocking
));
$this->notifications->expects($this->once())
->method('requestReShare')
->with(
$this->equalTo('share_token1'),
$this->equalTo('10'),
$this->equalTo('2000'),
$this->equalTo('https://origin.test/'),
$this->equalTo('bob@https://destination.test'),
$this->equalTo($permissions),
$this->equalTo('Share 1'),
$this->equalTo(IShare::TYPE_REMOTE),
)
->willReturn(['share_token2', '20']);
$share = new Share($this->rootFolder, $this->userManager);
$share
->setSharedWith('bob@https://destination.test')
->setShareOwner('alice')
->setSharedBy('alice')
->setPermissions($permissions)
->setShareType(IShare::TYPE_REMOTE)
->setNode($node)
->setTarget('/Share1');
$this->shareProvider->create($share);
}
/**
* This test case validates that sendPermission is called when updating a federated share.
*
* We have three actors:
*
* jane@https://origin.test
* alice@https://local.test
* bob@https://destination.test
*
* Jane shared the folder with Alice which re-shared the folder with Bob.
* Alice is now changing the permissions for the share.
*
* The expected outcome is, that Alice sends a request to Jane to change the share.
*/
public function testUpdateRemoteOwner(): void {
$permissions = Constants::PERMISSION_READ;
$node = $this->createMock(Folder::class);
$node->method('getId')->willReturn(1000);
$node->method('getName')->willReturn('Share 1');
/*
* Mocks update share.
*/
$expr1 = $this->createMock(IExpressionBuilder::class);
$expr1->method('eq')->willReturn('');
$qb1 = $this->createMock(IQueryBuilder::class);
$qb1->method('update')->willReturnSelf();
$qb1->method('where')->willReturnSelf();
$qb1->method('expr')->willReturn($expr1);
$qb1->method('createNamedParameter')->willReturn('');
$qb1->method('set')->willReturnSelf();
/*
* Mocks getRemoteId.
*/
$expr2 = $this->createMock(IExpressionBuilder::class);
$expr2->method('eq')->willReturn('');
$result2 = $this->createMock(IResult::class);
$result2->method('fetchAssociative')->willReturn([
'share_id' => 3000,
'remote_id' => '10',
]);
$qb2 = $this->createMock(IQueryBuilder::class);
$qb2->method('select')->willReturnSelf();
$qb2->method('from')->willReturnSelf();
$qb2->method('where')->willReturnSelf();
$qb2->method('expr')->willReturn($expr2);
$qb2->method('createNamedParameter')->willReturn('');
$qb2->method('executeQuery')->willReturn($result2);
$queryBuilderMatcher = $this->exactly(2);
$this->connection
->expects($queryBuilderMatcher)
->method('getQueryBuilder')
->willReturnCallback(function () use ($queryBuilderMatcher, $qb1, $qb2) {
return match ($queryBuilderMatcher->numberOfInvocations()) {
1 => $qb1,
2 => $qb2,
default => throw new LogicException('Unexpected number of invocations for getQueryBuilder')
};
});
$this->userManager->method('userExists')
->willReturnMap([
['jane@https://origin.test', false],
['alice', true],
]);
$this->addressHandler->method('splitUserRemote')
->willReturn(['jane', 'https://origin.test']);
$this->notifications->expects($this->once())
->method('sendPermissionChange')
->with(
$this->equalTo('https://origin.test'),
$this->equalTo('10'),
$this->equalTo('share_token3'),
$this->equalTo($permissions),
);
$share = new Share($this->rootFolder, $this->userManager);
$share
->setId('3000')
->setToken('share_token3')
->setSharedWith('bob@https://destination.test')
->setShareOwner('jane@https://origin.test')
->setSharedBy('alice')
->setPermissions($permissions)
->setShareType(IShare::TYPE_REMOTE)
->setNode($node)
->setTarget('/Share1');
$this->shareProvider->update($share);
}
}
@@ -450,7 +450,11 @@ class FederatedShareProviderTest extends \Test\TestCase {
$sharedBy . '@http://localhost'
)->willReturn(true);
$this->provider->expects($this->never())->method('sendPermissionUpdate');
if ($owner === $sharedBy) {
$this->provider->expects($this->never())->method('sendPermissionUpdate');
} else {
$this->provider->expects($this->once())->method('sendPermissionUpdate');
}
$this->rootFolder->expects($this->never())->method($this->anything());
+5 -1
View File
@@ -328,6 +328,10 @@ OC.L10N.register(
"Tags" : "الوسوم",
"Save as …" : "حفظ باسم ...",
"Converting files …" : "تحويل الملفات ...",
"Converting file …" : "تحويل الملف ..."
"Converting file …" : "تحويل الملف ...",
"Moving \"{source}\" to \"{destination}\" …" : "نقل \"{source}\" إلى \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "نسخ \"{source}\" إلى \"{destination}\" …",
"(copy)" : "(نسخ)",
"(copy %n)" : "(نسخ %n)"
},
"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
+5 -1
View File
@@ -326,6 +326,10 @@
"Tags" : "الوسوم",
"Save as …" : "حفظ باسم ...",
"Converting files …" : "تحويل الملفات ...",
"Converting file …" : "تحويل الملف ..."
"Converting file …" : "تحويل الملف ...",
"Moving \"{source}\" to \"{destination}\" …" : "نقل \"{source}\" إلى \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "نسخ \"{source}\" إلى \"{destination}\" …",
"(copy)" : "(نسخ)",
"(copy %n)" : "(نسخ %n)"
},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
}
+3 -1
View File
@@ -245,6 +245,8 @@ OC.L10N.register(
"You" : "Tu",
"Shared multiple times with different people" : "Compartióse múltiples vegaes con otres persones",
"Error while loading the file data" : "Hebo un error mentanto de cargaben los datos de los ficheros",
"Tags" : "Etiquetes"
"Tags" : "Etiquetes",
"(copy)" : "(copia)",
"(copy %n)" : "(copia %n)"
},
"nplurals=2; plural=(n != 1);");
+3 -1
View File
@@ -243,6 +243,8 @@
"You" : "Tu",
"Shared multiple times with different people" : "Compartióse múltiples vegaes con otres persones",
"Error while loading the file data" : "Hebo un error mentanto de cargaben los datos de los ficheros",
"Tags" : "Etiquetes"
"Tags" : "Etiquetes",
"(copy)" : "(copia)",
"(copy %n)" : "(copia %n)"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+5 -1
View File
@@ -390,6 +390,10 @@ OC.L10N.register(
"Tags" : "Тэгі",
"Save as …" : "Захаваць як …",
"Converting files …" : "Канвертацыя файлаў …",
"Converting file …" : "Канвертацыя файла …"
"Converting file …" : "Канвертацыя файла …",
"Moving \"{source}\" to \"{destination}\" …" : "Перамяшчэнне \"{source}\" у \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Капіяванне \"{source}\" у \"{destination}\" …",
"(copy)" : "(копія)",
"(copy %n)" : "(копія %n)"
},
"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
+5 -1
View File
@@ -388,6 +388,10 @@
"Tags" : "Тэгі",
"Save as …" : "Захаваць як …",
"Converting files …" : "Канвертацыя файлаў …",
"Converting file …" : "Канвертацыя файла …"
"Converting file …" : "Канвертацыя файла …",
"Moving \"{source}\" to \"{destination}\" …" : "Перамяшчэнне \"{source}\" у \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Капіяванне \"{source}\" у \"{destination}\" …",
"(copy)" : "(копія)",
"(copy %n)" : "(копія %n)"
},"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
}
+5 -1
View File
@@ -397,6 +397,10 @@ OC.L10N.register(
"Tags" : "Етикети",
"Save as …" : "Запази като...",
"Converting files …" : "Конвертиране на файлове...",
"Converting file …" : "Файлът се преобразува..."
"Converting file …" : "Файлът се преобразува...",
"Moving \"{source}\" to \"{destination}\" …" : "Преместване на \"{source}\" към \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Копиране на \"{source}\" в \"{destination}\" …",
"(copy)" : "(копие)",
"(copy %n)" : "(копирай %n)"
},
"nplurals=2; plural=(n != 1);");
+5 -1
View File
@@ -395,6 +395,10 @@
"Tags" : "Етикети",
"Save as …" : "Запази като...",
"Converting files …" : "Конвертиране на файлове...",
"Converting file …" : "Файлът се преобразува..."
"Converting file …" : "Файлът се преобразува...",
"Moving \"{source}\" to \"{destination}\" …" : "Преместване на \"{source}\" към \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Копиране на \"{source}\" в \"{destination}\" …",
"(copy)" : "(копие)",
"(copy %n)" : "(копирай %n)"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+5 -1
View File
@@ -326,6 +326,10 @@ OC.L10N.register(
"Tags" : "Etiquetes",
"Save as …" : "Anomena i desa …",
"Converting files …" : "Convertint fitxers …",
"Converting file …" : "S'està convertint el fitxer …"
"Converting file …" : "S'està convertint el fitxer …",
"Moving \"{source}\" to \"{destination}\" …" : "S'està movent \"{source}\" a \"{destination}”…",
"Copying \"{source}\" to \"{destination}\" …" : "S'està copiant \"{source}\" a \"{destination}” …",
"(copy)" : "(còpia)",
"(copy %n)" : "(còpia %n)"
},
"nplurals=2; plural=(n != 1);");
+5 -1
View File
@@ -324,6 +324,10 @@
"Tags" : "Etiquetes",
"Save as …" : "Anomena i desa …",
"Converting files …" : "Convertint fitxers …",
"Converting file …" : "S'està convertint el fitxer …"
"Converting file …" : "S'està convertint el fitxer …",
"Moving \"{source}\" to \"{destination}\" …" : "S'està movent \"{source}\" a \"{destination}”…",
"Copying \"{source}\" to \"{destination}\" …" : "S'està copiant \"{source}\" a \"{destination}” …",
"(copy)" : "(còpia)",
"(copy %n)" : "(còpia %n)"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+5 -1
View File
@@ -411,6 +411,10 @@ OC.L10N.register(
"Tags" : "Štítky",
"Save as …" : "Uložit jako …",
"Converting files …" : "Převádění souborů …",
"Converting file …" : "Převádění souboru …"
"Converting file …" : "Převádění souboru …",
"Moving \"{source}\" to \"{destination}\" …" : "Přesouvání „{source}“ do „{destination}“ …",
"Copying \"{source}\" to \"{destination}\" …" : "Kopírování „{source}“ do „{destination}“ …",
"(copy)" : "(zkopírovat)",
"(copy %n)" : "(zkopírovat %n)"
},
"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");
+5 -1
View File
@@ -409,6 +409,10 @@
"Tags" : "Štítky",
"Save as …" : "Uložit jako …",
"Converting files …" : "Převádění souborů …",
"Converting file …" : "Převádění souboru …"
"Converting file …" : "Převádění souboru …",
"Moving \"{source}\" to \"{destination}\" …" : "Přesouvání „{source}“ do „{destination}“ …",
"Copying \"{source}\" to \"{destination}\" …" : "Kopírování „{source}“ do „{destination}“ …",
"(copy)" : "(zkopírovat)",
"(copy %n)" : "(zkopírovat %n)"
},"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
}
+5 -1
View File
@@ -395,6 +395,10 @@ OC.L10N.register(
"Tags" : "Tags",
"Save as …" : "Gem som ...",
"Converting files …" : "Konverterer filer ...",
"Converting file …" : "Konverterer fil ..."
"Converting file …" : "Konverterer fil ...",
"Moving \"{source}\" to \"{destination}\" …" : "Flytter \"{source}\" til \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Kopierer \"{source}\" til \"{destination}\" …",
"(copy)" : "(kopier)",
"(copy %n)" : "(kopier %n)"
},
"nplurals=2; plural=(n != 1);");
+5 -1
View File
@@ -393,6 +393,10 @@
"Tags" : "Tags",
"Save as …" : "Gem som ...",
"Converting files …" : "Konverterer filer ...",
"Converting file …" : "Konverterer fil ..."
"Converting file …" : "Konverterer fil ...",
"Moving \"{source}\" to \"{destination}\" …" : "Flytter \"{source}\" til \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Kopierer \"{source}\" til \"{destination}\" …",
"(copy)" : "(kopier)",
"(copy %n)" : "(kopier %n)"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+5 -2
View File
@@ -95,7 +95,6 @@ OC.L10N.register(
"Another entry with the same name already exists." : "Ein anderer Eintrag mit diesem Namen existiert bereits.",
"Invalid filename." : "Ungültiger Dateiname.",
"Rename file" : "Datei umbenennen",
"Recently created" : "Zuletzt erstellt",
"Folder" : "Ordner",
"Unknown file type" : "Unbekannter Dateityp",
"{ext} image" : "{ext}-Bild",
@@ -412,6 +411,10 @@ OC.L10N.register(
"Tags" : "Schlagworte",
"Save as …" : "Speichern als …",
"Converting files …" : "Dateien werden konvertiert …",
"Converting file …" : "Datei wird konvertiert …"
"Converting file …" : "Datei wird konvertiert …",
"Moving \"{source}\" to \"{destination}\" …" : "Verschiebe \"{source}\" nach \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Kopiere \"{source}\" nach \"{destination}\" …",
"(copy)" : "(Kopie)",
"(copy %n)" : "(Kopie %n)"
},
"nplurals=2; plural=(n != 1);");
+5 -2
View File
@@ -93,7 +93,6 @@
"Another entry with the same name already exists." : "Ein anderer Eintrag mit diesem Namen existiert bereits.",
"Invalid filename." : "Ungültiger Dateiname.",
"Rename file" : "Datei umbenennen",
"Recently created" : "Zuletzt erstellt",
"Folder" : "Ordner",
"Unknown file type" : "Unbekannter Dateityp",
"{ext} image" : "{ext}-Bild",
@@ -410,6 +409,10 @@
"Tags" : "Schlagworte",
"Save as …" : "Speichern als …",
"Converting files …" : "Dateien werden konvertiert …",
"Converting file …" : "Datei wird konvertiert …"
"Converting file …" : "Datei wird konvertiert …",
"Moving \"{source}\" to \"{destination}\" …" : "Verschiebe \"{source}\" nach \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Kopiere \"{source}\" nach \"{destination}\" …",
"(copy)" : "(Kopie)",
"(copy %n)" : "(Kopie %n)"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+5 -2
View File
@@ -95,7 +95,6 @@ OC.L10N.register(
"Another entry with the same name already exists." : "Ein anderer Eintrag mit diesem Namen existiert bereits.",
"Invalid filename." : "Ungültiger Dateiname.",
"Rename file" : "Datei umbenennen",
"Recently created" : "Zuletzt erstellt",
"Folder" : "Ordner",
"Unknown file type" : "Unbekannter Dateityp",
"{ext} image" : "{ext}-Bild",
@@ -412,6 +411,10 @@ OC.L10N.register(
"Tags" : "Schlagworte",
"Save as …" : "Speichern als …",
"Converting files …" : "Dateien werden konvertiert …",
"Converting file …" : "Datei wird konvertiert …"
"Converting file …" : "Datei wird konvertiert …",
"Moving \"{source}\" to \"{destination}\" …" : "Verschiebe \"{source}\" nach \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Kopiere \"{source}\" nach \"{destination}\" …",
"(copy)" : "(Kopie)",
"(copy %n)" : "(Kopie %n)"
},
"nplurals=2; plural=(n != 1);");
+5 -2
View File
@@ -93,7 +93,6 @@
"Another entry with the same name already exists." : "Ein anderer Eintrag mit diesem Namen existiert bereits.",
"Invalid filename." : "Ungültiger Dateiname.",
"Rename file" : "Datei umbenennen",
"Recently created" : "Zuletzt erstellt",
"Folder" : "Ordner",
"Unknown file type" : "Unbekannter Dateityp",
"{ext} image" : "{ext}-Bild",
@@ -410,6 +409,10 @@
"Tags" : "Schlagworte",
"Save as …" : "Speichern als …",
"Converting files …" : "Dateien werden konvertiert …",
"Converting file …" : "Datei wird konvertiert …"
"Converting file …" : "Datei wird konvertiert …",
"Moving \"{source}\" to \"{destination}\" …" : "Verschiebe \"{source}\" nach \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Kopiere \"{source}\" nach \"{destination}\" …",
"(copy)" : "(Kopie)",
"(copy %n)" : "(Kopie %n)"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+5 -1
View File
@@ -409,6 +409,10 @@ OC.L10N.register(
"Tags" : "Ετικέτες",
"Save as …" : "Αποθήκευση ως …",
"Converting files …" : "Μετατροπή αρχείων …",
"Converting file …" : "Μετατροπή αρχείου …"
"Converting file …" : "Μετατροπή αρχείου …",
"Moving \"{source}\" to \"{destination}\" …" : "Μετακίνηση του \"{source}\" στο \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Αντιγραφή του \"{source}\" στο \"{destination}\" …",
"(copy)" : "(αντιγραφή)",
"(copy %n)" : "(αντιγραφή %n)"
},
"nplurals=2; plural=(n != 1);");
+5 -1
View File
@@ -407,6 +407,10 @@
"Tags" : "Ετικέτες",
"Save as …" : "Αποθήκευση ως …",
"Converting files …" : "Μετατροπή αρχείων …",
"Converting file …" : "Μετατροπή αρχείου …"
"Converting file …" : "Μετατροπή αρχείου …",
"Moving \"{source}\" to \"{destination}\" …" : "Μετακίνηση του \"{source}\" στο \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Αντιγραφή του \"{source}\" στο \"{destination}\" …",
"(copy)" : "(αντιγραφή)",
"(copy %n)" : "(αντιγραφή %n)"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+5 -2
View File
@@ -95,7 +95,6 @@ OC.L10N.register(
"Another entry with the same name already exists." : "Another entry with the same name already exists.",
"Invalid filename." : "Invalid filename.",
"Rename file" : "Rename file",
"Recently created" : "Recently created",
"Folder" : "Folder",
"Unknown file type" : "Unknown file type",
"{ext} image" : "{ext} image",
@@ -412,6 +411,10 @@ OC.L10N.register(
"Tags" : "Tags",
"Save as …" : "Save as …",
"Converting files …" : "Converting files …",
"Converting file …" : "Converting file …"
"Converting file …" : "Converting file …",
"Moving \"{source}\" to \"{destination}\" …" : "Moving \"{source}\" to \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Copying \"{source}\" to \"{destination}\" …",
"(copy)" : "(copy)",
"(copy %n)" : "(copy %n)"
},
"nplurals=2; plural=(n != 1);");
+5 -2
View File
@@ -93,7 +93,6 @@
"Another entry with the same name already exists." : "Another entry with the same name already exists.",
"Invalid filename." : "Invalid filename.",
"Rename file" : "Rename file",
"Recently created" : "Recently created",
"Folder" : "Folder",
"Unknown file type" : "Unknown file type",
"{ext} image" : "{ext} image",
@@ -410,6 +409,10 @@
"Tags" : "Tags",
"Save as …" : "Save as …",
"Converting files …" : "Converting files …",
"Converting file …" : "Converting file …"
"Converting file …" : "Converting file …",
"Moving \"{source}\" to \"{destination}\" …" : "Moving \"{source}\" to \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Copying \"{source}\" to \"{destination}\" …",
"(copy)" : "(copy)",
"(copy %n)" : "(copy %n)"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+5 -1
View File
@@ -411,6 +411,10 @@ OC.L10N.register(
"Tags" : "Etiquetas",
"Save as …" : "Guardar como …",
"Converting files …" : "Convirtiendo archivos …",
"Converting file …" : "Convirtiendo archivo …"
"Converting file …" : "Convirtiendo archivo …",
"Moving \"{source}\" to \"{destination}\" …" : "Moviendo \"{source}\" a \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Copiando \"{source}\" a \"{destination}\" …",
"(copy)" : "(copiar)",
"(copy %n)" : "(copiar %n)"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
+5 -1
View File
@@ -409,6 +409,10 @@
"Tags" : "Etiquetas",
"Save as …" : "Guardar como …",
"Converting files …" : "Convirtiendo archivos …",
"Converting file …" : "Convirtiendo archivo …"
"Converting file …" : "Convirtiendo archivo …",
"Moving \"{source}\" to \"{destination}\" …" : "Moviendo \"{source}\" a \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Copiando \"{source}\" a \"{destination}\" …",
"(copy)" : "(copiar)",
"(copy %n)" : "(copiar %n)"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
}
+5 -1
View File
@@ -287,6 +287,10 @@ OC.L10N.register(
"You" : "Usted",
"Shared multiple times with different people" : "Compartido múltiples veces con diferentes personas",
"Error while loading the file data" : "Error al cargar los datos del archivo",
"Tags" : "Etiquetas"
"Tags" : "Etiquetas",
"Moving \"{source}\" to \"{destination}\" …" : "Moviendo \"{source}\" a \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Copiando \"{source}\" a \"{destination}\" …",
"(copy)" : "(copiar)",
"(copy %n)" : "(copiar %n)"
},
"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
+5 -1
View File
@@ -285,6 +285,10 @@
"You" : "Usted",
"Shared multiple times with different people" : "Compartido múltiples veces con diferentes personas",
"Error while loading the file data" : "Error al cargar los datos del archivo",
"Tags" : "Etiquetas"
"Tags" : "Etiquetas",
"Moving \"{source}\" to \"{destination}\" …" : "Moviendo \"{source}\" a \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Copiando \"{source}\" a \"{destination}\" …",
"(copy)" : "(copiar)",
"(copy %n)" : "(copiar %n)"
},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
}
+7 -4
View File
@@ -95,7 +95,6 @@ OC.L10N.register(
"Another entry with the same name already exists." : "Selle nimega kirje on juba olemas.",
"Invalid filename." : "Vigane failinimi.",
"Rename file" : "Muuda failinime",
"Recently created" : "Loodud hiljuti",
"Folder" : "Kaust",
"Unknown file type" : "Tundmatu failitüüp",
"{ext} image" : "{ext} pilt",
@@ -367,7 +366,7 @@ OC.L10N.register(
"The name \"{newName}\" is already used in the folder \"{dir}\". Please choose a different name." : "„{newName}“ nimi on juba „{dir}“ kaustas kasutusel. Palun vali teine nimi.",
"Could not rename \"{oldName}\"" : "„{oldName}“ faili nime muutmine ei õnnestunud",
"This operation is forbidden" : "See toiming on keelatud",
"This folder is unavailable, please try again later or contact the administration" : "See kaust pole saadaval, palun proovi hiljem uuesti või võta ühendust haldajaga",
"This folder is unavailable, please try again later or contact the administration" : "See kaust pole saadaval, palun proovi hiljem uuesti või võta ühendust haldajaaga",
"Storage is temporarily not available" : "Salvestusruum pole ajutiselt kättesaadav",
"Unexpected error: {error}" : "Tundmatu viga: {error}",
"_%n file_::_%n files_" : ["%n fail","%n faili"],
@@ -391,7 +390,7 @@ OC.L10N.register(
"No recently modified files" : "Hiljuti muudetud faile pole.",
"Files and folders you recently modified will show up here." : "Failid ja kaustad, mida oled hiljuti muutnud, ilmuvad siia.",
"Search" : "Otsi",
"Search results within your files." : "Otsingutulemused sinu failide seast.",
"Search results within your files." : "Otsingutulemusd sinu failide seast.",
"No entries found in this folder" : "Selles kaustast ei leitud kirjeid",
"Select all" : "Vali kõik",
"Upload too large" : "Üleslaadimine on liiga suur",
@@ -412,6 +411,10 @@ OC.L10N.register(
"Tags" : "Sildid",
"Save as …" : "Salvesta kui…",
"Converting files …" : "Teisendan faile…",
"Converting file …" : "Teisendan faili…"
"Converting file …" : "Teisendan faili…",
"Moving \"{source}\" to \"{destination}\" …" : "Teisaldan „{source}“ → „{destination}“…",
"Copying \"{source}\" to \"{destination}\" …" : "Kopeerin „{source}“ → „{destination}“…",
"(copy)" : "(koopia)",
"(copy %n)" : "(%n koopia)"
},
"nplurals=2; plural=(n != 1);");
+7 -4
View File
@@ -93,7 +93,6 @@
"Another entry with the same name already exists." : "Selle nimega kirje on juba olemas.",
"Invalid filename." : "Vigane failinimi.",
"Rename file" : "Muuda failinime",
"Recently created" : "Loodud hiljuti",
"Folder" : "Kaust",
"Unknown file type" : "Tundmatu failitüüp",
"{ext} image" : "{ext} pilt",
@@ -365,7 +364,7 @@
"The name \"{newName}\" is already used in the folder \"{dir}\". Please choose a different name." : "„{newName}“ nimi on juba „{dir}“ kaustas kasutusel. Palun vali teine nimi.",
"Could not rename \"{oldName}\"" : "„{oldName}“ faili nime muutmine ei õnnestunud",
"This operation is forbidden" : "See toiming on keelatud",
"This folder is unavailable, please try again later or contact the administration" : "See kaust pole saadaval, palun proovi hiljem uuesti või võta ühendust haldajaga",
"This folder is unavailable, please try again later or contact the administration" : "See kaust pole saadaval, palun proovi hiljem uuesti või võta ühendust haldajaaga",
"Storage is temporarily not available" : "Salvestusruum pole ajutiselt kättesaadav",
"Unexpected error: {error}" : "Tundmatu viga: {error}",
"_%n file_::_%n files_" : ["%n fail","%n faili"],
@@ -389,7 +388,7 @@
"No recently modified files" : "Hiljuti muudetud faile pole.",
"Files and folders you recently modified will show up here." : "Failid ja kaustad, mida oled hiljuti muutnud, ilmuvad siia.",
"Search" : "Otsi",
"Search results within your files." : "Otsingutulemused sinu failide seast.",
"Search results within your files." : "Otsingutulemusd sinu failide seast.",
"No entries found in this folder" : "Selles kaustast ei leitud kirjeid",
"Select all" : "Vali kõik",
"Upload too large" : "Üleslaadimine on liiga suur",
@@ -410,6 +409,10 @@
"Tags" : "Sildid",
"Save as …" : "Salvesta kui…",
"Converting files …" : "Teisendan faile…",
"Converting file …" : "Teisendan faili…"
"Converting file …" : "Teisendan faili…",
"Moving \"{source}\" to \"{destination}\" …" : "Teisaldan „{source}“ → „{destination}“…",
"Copying \"{source}\" to \"{destination}\" …" : "Kopeerin „{source}“ → „{destination}“…",
"(copy)" : "(koopia)",
"(copy %n)" : "(%n koopia)"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+5 -1
View File
@@ -405,6 +405,10 @@ OC.L10N.register(
"Tags" : "Etiketak",
"Save as …" : "Gorde honela...",
"Converting files …" : "Fitxategiak bihurtzen...",
"Converting file …" : "Fitxategia bihurtzen..."
"Converting file …" : "Fitxategia bihurtzen...",
"Moving \"{source}\" to \"{destination}\" …" : "«{source}» «{destination}»(e)ra mugitzen",
"Copying \"{source}\" to \"{destination}\" …" : "«{source}» «{destination}»(e)ra mugitzen",
"(copy)" : "(kopiatu)",
"(copy %n)" : "(kopiatu %n)"
},
"nplurals=2; plural=(n != 1);");
+5 -1
View File
@@ -403,6 +403,10 @@
"Tags" : "Etiketak",
"Save as …" : "Gorde honela...",
"Converting files …" : "Fitxategiak bihurtzen...",
"Converting file …" : "Fitxategia bihurtzen..."
"Converting file …" : "Fitxategia bihurtzen...",
"Moving \"{source}\" to \"{destination}\" …" : "«{source}» «{destination}»(e)ra mugitzen",
"Copying \"{source}\" to \"{destination}\" …" : "«{source}» «{destination}»(e)ra mugitzen",
"(copy)" : "(kopiatu)",
"(copy %n)" : "(kopiatu %n)"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+5 -1
View File
@@ -397,6 +397,10 @@ OC.L10N.register(
"Tags" : "برچسب‌ها",
"Save as …" : "ذخیره به عنوان …",
"Converting files …" : "تبدیل فایل‌ها…",
"Converting file …" : "تبدیل فایل …"
"Converting file …" : "تبدیل فایل …",
"Moving \"{source}\" to \"{destination}\" …" : "انتقال «{source}» به «{destination}» ...",
"Copying \"{source}\" to \"{destination}\" …" : "کپی کردن \"{source}\" به \"{destination}\" ...",
"(copy)" : "(کپی)",
"(copy %n)" : "(کپی %n)"
},
"nplurals=2; plural=(n > 1);");
+5 -1
View File
@@ -395,6 +395,10 @@
"Tags" : "برچسب‌ها",
"Save as …" : "ذخیره به عنوان …",
"Converting files …" : "تبدیل فایل‌ها…",
"Converting file …" : "تبدیل فایل …"
"Converting file …" : "تبدیل فایل …",
"Moving \"{source}\" to \"{destination}\" …" : "انتقال «{source}» به «{destination}» ...",
"Copying \"{source}\" to \"{destination}\" …" : "کپی کردن \"{source}\" به \"{destination}\" ...",
"(copy)" : "(کپی)",
"(copy %n)" : "(کپی %n)"
},"pluralForm" :"nplurals=2; plural=(n > 1);"
}
+4 -6
View File
@@ -122,7 +122,6 @@ OC.L10N.register(
"General" : "Yleiset",
"Sort favorites first" : "Järjestä suosikit ensiksi",
"Sort folders before files" : "Järjestä kansiot ennen tiedostoja",
"Enable folder tree view" : "Käytä kansiopuunäkymää",
"Default view" : "Oletusnäkymä",
"All files" : "Kaikki tiedostot",
"Personal files" : "Henkilökohtaiset tiedostot",
@@ -132,8 +131,6 @@ OC.L10N.register(
"Selection" : "Valinta",
"Select all files" : "Valitse kaikki tiedostot",
"Deselect all" : "Poista valinnat",
"Select or deselect" : "Valitse tai poista valinta",
"Select a range" : "Valitse väliltä",
"Navigation" : "Navigointi",
"Go to parent folder" : "Siirry ylätason kansioon",
"Go to file above" : "Siirry yllä olevaan tiedostoon",
@@ -142,13 +139,11 @@ OC.L10N.register(
"Go right in grid" : "Siirry oikealle ruudukossa",
"View" : "Näytä",
"Toggle grid view" : "Ruudukkonäkymä päälle/pois",
"Show those shortcuts" : "Näytä pikanäppäimet",
"Warnings" : "Varoitukset",
"Warn before changing a file extension" : "Varoita ennen tiedostopäätteen muuttamista",
"Warn before deleting a file" : "Varoita ennen tiedoston poistamista",
"WebDAV URL" : "WebDAV:in URL-osoite",
"Create an app password" : "Luo sovellussalasana",
"How to access files using WebDAV" : "Tiedostojen käyttö WebDAVin avulla",
"Name" : "Nimi",
"File type" : "Tiedoston tyyppi",
"Size" : "Koko",
@@ -366,6 +361,9 @@ OC.L10N.register(
"Tags" : "Tunnisteet",
"Save as …" : "Tallenna nimellä",
"Converting files …" : "Muunnetaan tiedostoja…",
"Converting file …" : "Muunnetaan tiedostoa…"
"Converting file …" : "Muunnetaan tiedostoa…",
"Moving \"{source}\" to \"{destination}\" …" : "Siirretään \"{source}\" kohteeseen \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Kopioidaan \"{source}\" kohteeseen \"{destination}\" …",
"(copy)" : "(kopioi)"
},
"nplurals=2; plural=(n != 1);");
+4 -6
View File
@@ -120,7 +120,6 @@
"General" : "Yleiset",
"Sort favorites first" : "Järjestä suosikit ensiksi",
"Sort folders before files" : "Järjestä kansiot ennen tiedostoja",
"Enable folder tree view" : "Käytä kansiopuunäkymää",
"Default view" : "Oletusnäkymä",
"All files" : "Kaikki tiedostot",
"Personal files" : "Henkilökohtaiset tiedostot",
@@ -130,8 +129,6 @@
"Selection" : "Valinta",
"Select all files" : "Valitse kaikki tiedostot",
"Deselect all" : "Poista valinnat",
"Select or deselect" : "Valitse tai poista valinta",
"Select a range" : "Valitse väliltä",
"Navigation" : "Navigointi",
"Go to parent folder" : "Siirry ylätason kansioon",
"Go to file above" : "Siirry yllä olevaan tiedostoon",
@@ -140,13 +137,11 @@
"Go right in grid" : "Siirry oikealle ruudukossa",
"View" : "Näytä",
"Toggle grid view" : "Ruudukkonäkymä päälle/pois",
"Show those shortcuts" : "Näytä pikanäppäimet",
"Warnings" : "Varoitukset",
"Warn before changing a file extension" : "Varoita ennen tiedostopäätteen muuttamista",
"Warn before deleting a file" : "Varoita ennen tiedoston poistamista",
"WebDAV URL" : "WebDAV:in URL-osoite",
"Create an app password" : "Luo sovellussalasana",
"How to access files using WebDAV" : "Tiedostojen käyttö WebDAVin avulla",
"Name" : "Nimi",
"File type" : "Tiedoston tyyppi",
"Size" : "Koko",
@@ -364,6 +359,9 @@
"Tags" : "Tunnisteet",
"Save as …" : "Tallenna nimellä",
"Converting files …" : "Muunnetaan tiedostoja…",
"Converting file …" : "Muunnetaan tiedostoa…"
"Converting file …" : "Muunnetaan tiedostoa…",
"Moving \"{source}\" to \"{destination}\" …" : "Siirretään \"{source}\" kohteeseen \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Kopioidaan \"{source}\" kohteeseen \"{destination}\" …",
"(copy)" : "(kopioi)"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+5 -1
View File
@@ -411,6 +411,10 @@ OC.L10N.register(
"Tags" : "Étiquettes",
"Save as …" : "Enregistrer sous...",
"Converting files …" : "Conversion des fichiers...",
"Converting file …" : "Conversion du fichier..."
"Converting file …" : "Conversion du fichier...",
"Moving \"{source}\" to \"{destination}\" …" : "Déplacement de \"{source}\" vers \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Copie de \"{source}\" vers \"{destination}\" …",
"(copy)" : "(copie)",
"(copy %n)" : "(copier %n)"
},
"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
+5 -1
View File
@@ -409,6 +409,10 @@
"Tags" : "Étiquettes",
"Save as …" : "Enregistrer sous...",
"Converting files …" : "Conversion des fichiers...",
"Converting file …" : "Conversion du fichier..."
"Converting file …" : "Conversion du fichier...",
"Moving \"{source}\" to \"{destination}\" …" : "Déplacement de \"{source}\" vers \"{destination}\" …",
"Copying \"{source}\" to \"{destination}\" …" : "Copie de \"{source}\" vers \"{destination}\" …",
"(copy)" : "(copie)",
"(copy %n)" : "(copier %n)"
},"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
}
+5 -2
View File
@@ -95,7 +95,6 @@ OC.L10N.register(
"Another entry with the same name already exists." : "Tá iontráil eile leis an ainm céanna ann cheana féin.",
"Invalid filename." : "Ainm comhaid neamhbhailí.",
"Rename file" : "Athainmnigh an comhad",
"Recently created" : "Cruthaithe le déanaí",
"Folder" : "Fillteán",
"Unknown file type" : "Cineál comhaid anaithnid",
"{ext} image" : "íomhá {ext}",
@@ -412,6 +411,10 @@ OC.L10N.register(
"Tags" : "Clibeanna",
"Save as …" : "Sábháil mar…",
"Converting files …" : "Comhaid á thiontú…",
"Converting file …" : "Comhad á thiontú…"
"Converting file …" : "Comhad á thiontú…",
"Moving \"{source}\" to \"{destination}\" …" : "Ag bogadh \"{source}\" go \"{destination}\" ...",
"Copying \"{source}\" to \"{destination}\" …" : "“{source}” á chóipeáil go “{destination}”…",
"(copy)" : "(cóip)",
"(copy %n)" : "(cóip %n)"
},
"nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);");
+5 -2
View File
@@ -93,7 +93,6 @@
"Another entry with the same name already exists." : "Tá iontráil eile leis an ainm céanna ann cheana féin.",
"Invalid filename." : "Ainm comhaid neamhbhailí.",
"Rename file" : "Athainmnigh an comhad",
"Recently created" : "Cruthaithe le déanaí",
"Folder" : "Fillteán",
"Unknown file type" : "Cineál comhaid anaithnid",
"{ext} image" : "íomhá {ext}",
@@ -410,6 +409,10 @@
"Tags" : "Clibeanna",
"Save as …" : "Sábháil mar…",
"Converting files …" : "Comhaid á thiontú…",
"Converting file …" : "Comhad á thiontú…"
"Converting file …" : "Comhad á thiontú…",
"Moving \"{source}\" to \"{destination}\" …" : "Ag bogadh \"{source}\" go \"{destination}\" ...",
"Copying \"{source}\" to \"{destination}\" …" : "“{source}” á chóipeáil go “{destination}”…",
"(copy)" : "(cóip)",
"(copy %n)" : "(cóip %n)"
},"pluralForm" :"nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);"
}
+6 -3
View File
@@ -79,7 +79,7 @@ OC.L10N.register(
"Go to the \"{dir}\" directory" : "Vaia ao directorio «{dir}».",
"Current directory path" : "Ruta do directorio actual",
"Share" : "Compartir",
"Reload content" : "Volver cargar o contido",
"Reload content" : "Recargar o contido",
"Your have used your space quota and cannot upload files anymore" : "Vde. usou a súa cota de espazo e xa non pode enviar ningún ficheiro más",
"You do not have permission to upload or create files here." : "Non ten permiso para enviar ou crear ficheiros aquí.",
"Drag and drop files here to upload" : "Arrastre e solte os ficheiros aquí para envialos",
@@ -95,7 +95,6 @@ OC.L10N.register(
"Another entry with the same name already exists." : "Xa existe outra entrada co mesmo nome.",
"Invalid filename." : "Nome de ficheiro incorrecto.",
"Rename file" : "Cambiar o nome do ficheiro",
"Recently created" : "Creado recentemente",
"Folder" : "Cartafol",
"Unknown file type" : "Tipo de ficheiro descoñecido",
"{ext} image" : "Imaxe {ext}",
@@ -412,6 +411,10 @@ OC.L10N.register(
"Tags" : "Etiquetas",
"Save as …" : "Gardar como…",
"Converting files …" : "Convertendo ficheiros…",
"Converting file …" : "Convertendo o ficheiro…"
"Converting file …" : "Convertendo o ficheiro…",
"Moving \"{source}\" to \"{destination}\" …" : "Movendo «{source}» a «{destination}»…",
"Copying \"{source}\" to \"{destination}\" …" : "Copiando «{source}» en «{destination}»…",
"(copy)" : "(copiar)",
"(copy %n)" : "(copiar %n)"
},
"nplurals=2; plural=(n != 1);");

Some files were not shown because too many files have changed in this diff Show More