Skip to content

Commit a21c834

Browse files
GretaDGretaD
committed
Merge branch 'master' of github.com:nextcloud/server into fix/user_menu_not_focused
2 parents b093694 + 4e8bbc4 commit a21c834

File tree

549 files changed

+2437
-1069
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

549 files changed

+2437
-1069
lines changed

‎apps/dav/appinfo/v1/publicwebdav.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565

6666
$server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
6767
$isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest');
68-
$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
68+
$federatedSharingApp = \OC::$server->query(\OCA\FederatedFileSharing\AppInfo\Application::class);
6969
$federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
7070
if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
7171
// this is what is thrown when trying to access a non-existing share

‎apps/dav/l10n/eu.js‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ OC.L10N.register(
1010
"You deleted calendar {calendar}" : "{calendar} egutegia borratu duzu",
1111
"{actor} updated calendar {calendar}" : "{actor} -k {calendar} egutegia eguneratu du",
1212
"You updated calendar {calendar}" : "{calendar} egutegia eguneratu duzu ",
13+
"You removed public link for calendar {calendar}" : "{calendar} egutegiaren esteka publikoa kendu duzu",
1314
"{actor} shared calendar {calendar} with you" : "{actor} -k zurekin {calendar} egutegia partekatu du",
1415
"You shared calendar {calendar} with {user}" : "{calendar} egutegia {user} erabiltzailearekin partekatu duzu",
1516
"{actor} shared calendar {calendar} with {user}" : "{actor} -k {calendar} egutegia {user}-rekin partekatu du",
1617
"{actor} unshared calendar {calendar} from you" : "{actor} zurekin partekatzen zuen {calendar} egutegia partekatzeari utzi dio",
1718
"You unshared calendar {calendar} from {user}" : "Partekatzen zenuen {calendar} egutegia {user} -rekin partekatzeari utzi diozu ",
18-
"{actor} unshared calendar {calendar} from {user}" : "{actor} {user} erabiltzailearekin partekatzen zuen {calendar} egutegia partekatzeari utzi dio",
19+
"{actor} unshared calendar {calendar} from {user}" : "{actor}-ek {user} erabiltzailearekin partekatzen zuen {calendar} egutegia partekatzeari utzi dio",
1920
"{actor} unshared calendar {calendar} from themselves" : "{actor} {calendar} egutegia partekatzeari utzi dio bere buruarekin",
20-
"You shared calendar {calendar} with group {group}" : "{calendar} egutegia {group} taldearekin partekatu duz",
21+
"You shared calendar {calendar} with group {group}" : "{calendar} egutegia {group} taldearekin partekatu duzu",
2122
"{actor} shared calendar {calendar} with group {group}" : "{actor} {group} taldearekin {calendar} egutegia partekatu du",
2223
"You unshared calendar {calendar} from group {group}" : "{group} taldearekin {calendar} egutegia partekatzeari utzi dio.",
2324
"{actor} unshared calendar {calendar} from group {group}" : "{actor}-rk {group} taldearekin {calendar} egutegia partekatzeari utzi dio.",
@@ -28,16 +29,16 @@ OC.L10N.register(
2829
"{actor} updated event {event} in calendar {calendar}" : "{actor}-rek {event} gertaera {calendar} eguneratu du egutegian",
2930
"You updated event {event} in calendar {calendar}" : "{event} gertaera {calendar} egutegian eguneratu duzu ",
3031
"Busy" : "Lanpetua",
31-
"{actor} created todo {todo} in list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} ekintza sortu du.",
32+
"{actor} created todo {todo} in list {calendar}" : "{actor}-ek {calendar} zerrendan {todo} zeregina sortu du.",
3233
"You created todo {todo} in list {calendar}" : "{calendar} zerrendan {todo} ekintza sortu duzu.",
3334
"{actor} deleted todo {todo} from list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina borratu du.",
3435
"You deleted todo {todo} from list {calendar}" : " {calendar} zerrendan {todo} zeregina borratu duzu.",
3536
"{actor} updated todo {todo} in list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina eguneratu du.",
3637
"You updated todo {todo} in list {calendar}" : "{calendar} zerrendan {todo} zeregina eguneratu duzu.",
3738
"{actor} solved todo {todo} in list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina bukatu du.",
3839
"You solved todo {todo} in list {calendar}" : " {calendar} zerrendan {todo} zeregina bukatu duzu.",
39-
"{actor} reopened todo {todo} in list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina birreki du.",
40-
"You reopened todo {todo} in list {calendar}" : "{calendar} zerrendan {todo} zeregina birreki duzu. ",
40+
"{actor} reopened todo {todo} in list {calendar}" : "{actor} erabiltzaileak {calendar} zerrendan {todo} zeregina berrireki du.",
41+
"You reopened todo {todo} in list {calendar}" : "{calendar} egutegian {todo} zeregina berrireki duzu. ",
4142
"A <strong>calendar</strong> was modified" : "Egutegia aldatu da",
4243
"A calendar <strong>event</strong> was modified" : "Egutegiaren <strong>gertaera</strong> bat aldatu da",
4344
"A calendar <strong>todo</strong> was modified" : "Egutegiaren zeregin bat aldatu da",
@@ -51,6 +52,7 @@ OC.L10N.register(
5152
"Date: %s" : "Data: %s",
5253
"Description: %s" : "Deskripzioa: %s",
5354
"Where: %s" : "Non: %s",
55+
"%1$s via %2$s" : "%2$s bidez, %1$s",
5456
"Invitation canceled" : "Gonbidapena ezeztatua",
5557
"Hello %s," : "Kaixo 1%s,",
5658
"Invitation updated" : "Gonbidapena eguneratu da",
@@ -65,6 +67,7 @@ OC.L10N.register(
6567
"Save" : "Gorde",
6668
"Calendar server" : "Egutegi-zerbitzaria",
6769
"Send invitations to attendees" : "Gonbidatutakoei gonbidapenak bidali",
70+
"Automatically generate a birthday calendar" : "Automatikoki sortu urtebetetzeen egutegia",
6871
"Technical details" : "Xehetasun teknikoak",
6972
"Remote Address: %s" : "Urruneko helbidea: 1%s",
7073
"Request ID: %s" : "Eskatutako ID: 1%s"

‎apps/dav/l10n/eu.json‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
"You deleted calendar {calendar}" : "{calendar} egutegia borratu duzu",
99
"{actor} updated calendar {calendar}" : "{actor} -k {calendar} egutegia eguneratu du",
1010
"You updated calendar {calendar}" : "{calendar} egutegia eguneratu duzu ",
11+
"You removed public link for calendar {calendar}" : "{calendar} egutegiaren esteka publikoa kendu duzu",
1112
"{actor} shared calendar {calendar} with you" : "{actor} -k zurekin {calendar} egutegia partekatu du",
1213
"You shared calendar {calendar} with {user}" : "{calendar} egutegia {user} erabiltzailearekin partekatu duzu",
1314
"{actor} shared calendar {calendar} with {user}" : "{actor} -k {calendar} egutegia {user}-rekin partekatu du",
1415
"{actor} unshared calendar {calendar} from you" : "{actor} zurekin partekatzen zuen {calendar} egutegia partekatzeari utzi dio",
1516
"You unshared calendar {calendar} from {user}" : "Partekatzen zenuen {calendar} egutegia {user} -rekin partekatzeari utzi diozu ",
16-
"{actor} unshared calendar {calendar} from {user}" : "{actor} {user} erabiltzailearekin partekatzen zuen {calendar} egutegia partekatzeari utzi dio",
17+
"{actor} unshared calendar {calendar} from {user}" : "{actor}-ek {user} erabiltzailearekin partekatzen zuen {calendar} egutegia partekatzeari utzi dio",
1718
"{actor} unshared calendar {calendar} from themselves" : "{actor} {calendar} egutegia partekatzeari utzi dio bere buruarekin",
18-
"You shared calendar {calendar} with group {group}" : "{calendar} egutegia {group} taldearekin partekatu duz",
19+
"You shared calendar {calendar} with group {group}" : "{calendar} egutegia {group} taldearekin partekatu duzu",
1920
"{actor} shared calendar {calendar} with group {group}" : "{actor} {group} taldearekin {calendar} egutegia partekatu du",
2021
"You unshared calendar {calendar} from group {group}" : "{group} taldearekin {calendar} egutegia partekatzeari utzi dio.",
2122
"{actor} unshared calendar {calendar} from group {group}" : "{actor}-rk {group} taldearekin {calendar} egutegia partekatzeari utzi dio.",
@@ -26,16 +27,16 @@
2627
"{actor} updated event {event} in calendar {calendar}" : "{actor}-rek {event} gertaera {calendar} eguneratu du egutegian",
2728
"You updated event {event} in calendar {calendar}" : "{event} gertaera {calendar} egutegian eguneratu duzu ",
2829
"Busy" : "Lanpetua",
29-
"{actor} created todo {todo} in list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} ekintza sortu du.",
30+
"{actor} created todo {todo} in list {calendar}" : "{actor}-ek {calendar} zerrendan {todo} zeregina sortu du.",
3031
"You created todo {todo} in list {calendar}" : "{calendar} zerrendan {todo} ekintza sortu duzu.",
3132
"{actor} deleted todo {todo} from list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina borratu du.",
3233
"You deleted todo {todo} from list {calendar}" : " {calendar} zerrendan {todo} zeregina borratu duzu.",
3334
"{actor} updated todo {todo} in list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina eguneratu du.",
3435
"You updated todo {todo} in list {calendar}" : "{calendar} zerrendan {todo} zeregina eguneratu duzu.",
3536
"{actor} solved todo {todo} in list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina bukatu du.",
3637
"You solved todo {todo} in list {calendar}" : " {calendar} zerrendan {todo} zeregina bukatu duzu.",
37-
"{actor} reopened todo {todo} in list {calendar}" : "{actor}-rek {calendar} zerrendan {todo} zeregina birreki du.",
38-
"You reopened todo {todo} in list {calendar}" : "{calendar} zerrendan {todo} zeregina birreki duzu. ",
38+
"{actor} reopened todo {todo} in list {calendar}" : "{actor} erabiltzaileak {calendar} zerrendan {todo} zeregina berrireki du.",
39+
"You reopened todo {todo} in list {calendar}" : "{calendar} egutegian {todo} zeregina berrireki duzu. ",
3940
"A <strong>calendar</strong> was modified" : "Egutegia aldatu da",
4041
"A calendar <strong>event</strong> was modified" : "Egutegiaren <strong>gertaera</strong> bat aldatu da",
4142
"A calendar <strong>todo</strong> was modified" : "Egutegiaren zeregin bat aldatu da",
@@ -49,6 +50,7 @@
4950
"Date: %s" : "Data: %s",
5051
"Description: %s" : "Deskripzioa: %s",
5152
"Where: %s" : "Non: %s",
53+
"%1$s via %2$s" : "%2$s bidez, %1$s",
5254
"Invitation canceled" : "Gonbidapena ezeztatua",
5355
"Hello %s," : "Kaixo 1%s,",
5456
"Invitation updated" : "Gonbidapena eguneratu da",
@@ -63,6 +65,7 @@
6365
"Save" : "Gorde",
6466
"Calendar server" : "Egutegi-zerbitzaria",
6567
"Send invitations to attendees" : "Gonbidatutakoei gonbidapenak bidali",
68+
"Automatically generate a birthday calendar" : "Automatikoki sortu urtebetetzeen egutegia",
6669
"Technical details" : "Xehetasun teknikoak",
6770
"Remote Address: %s" : "Urruneko helbidea: 1%s",
6871
"Request ID: %s" : "Eskatutako ID: 1%s"

‎apps/dav/l10n/ru.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ OC.L10N.register(
4040
"You solved todo {todo} in list {calendar}" : "Вы завершили задачу «{todo}» из списка «{calendar}»",
4141
"{actor} reopened todo {todo} in list {calendar}" : "{actor} повторно(а) открыл задачу «{todo}» из списка «{calendar}»",
4242
"You reopened todo {todo} in list {calendar}" : "Вы повторно открыли задачу «{todo}» из списка «{calendar}»",
43-
"A <strong>calendar</strong> was modified" : "<strong>Календарь</strong> был изменен",
44-
"A calendar <strong>event</strong> was modified" : "<strong>Событие</strong> календаря была изменено",
45-
"A calendar <strong>todo</strong> was modified" : "<strong>Задача</strong> календаря была изменена",
43+
"A <strong>calendar</strong> was modified" : "Изменения <strong>календаря</strong> ",
44+
"A calendar <strong>event</strong> was modified" : "В календаре изменено <strong>событие</strong>",
45+
"A calendar <strong>todo</strong> was modified" : "В календаре изменена <strong>задача</strong>",
4646
"Death of %s" : "Смерть %s",
4747
"Contact birthdays" : "Дни рождения контакта",
4848
"Calendar:" : "Календарь:",

‎apps/dav/l10n/ru.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
"You solved todo {todo} in list {calendar}" : "Вы завершили задачу «{todo}» из списка «{calendar}»",
3939
"{actor} reopened todo {todo} in list {calendar}" : "{actor} повторно(а) открыл задачу «{todo}» из списка «{calendar}»",
4040
"You reopened todo {todo} in list {calendar}" : "Вы повторно открыли задачу «{todo}» из списка «{calendar}»",
41-
"A <strong>calendar</strong> was modified" : "<strong>Календарь</strong> был изменен",
42-
"A calendar <strong>event</strong> was modified" : "<strong>Событие</strong> календаря была изменено",
43-
"A calendar <strong>todo</strong> was modified" : "<strong>Задача</strong> календаря была изменена",
41+
"A <strong>calendar</strong> was modified" : "Изменения <strong>календаря</strong> ",
42+
"A calendar <strong>event</strong> was modified" : "В календаре изменено <strong>событие</strong>",
43+
"A calendar <strong>todo</strong> was modified" : "В календаре изменена <strong>задача</strong>",
4444
"Death of %s" : "Смерть %s",
4545
"Contact birthdays" : "Дни рождения контакта",
4646
"Calendar:" : "Календарь:",

‎apps/files/js/dist/personal-settings.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/files/js/dist/personal-settings.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/files/l10n/da.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@ OC.L10N.register(
164164
"Shared with others" : "Delt med andre",
165165
"Shared with you" : "Delt med dig",
166166
"Shared by link" : "Delt via link",
167+
"Deleted shares" : "Slettede delinger",
168+
"Pending shares" : "Afventende delinger",
167169
"Text file" : "Tekstfil",
168170
"New text file.txt" : "Ny tekst file.txt",
169171
"%s of %s used" : "%s af %s brugt",

‎apps/files/l10n/da.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@
162162
"Shared with others" : "Delt med andre",
163163
"Shared with you" : "Delt med dig",
164164
"Shared by link" : "Delt via link",
165+
"Deleted shares" : "Slettede delinger",
166+
"Pending shares" : "Afventende delinger",
165167
"Text file" : "Tekstfil",
166168
"New text file.txt" : "Ny tekst file.txt",
167169
"%s of %s used" : "%s af %s brugt",

‎apps/files/l10n/hr.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ OC.L10N.register(
158158
"Transfer {path} to {userid}" : "Prijenos {path} na {userid}",
159159
"Invalid path selected" : "Odabran nevažeći put",
160160
"Ownership transfer request sent" : "Zahtjev za prijenos vlasništva je poslan",
161+
"Cannot transfer ownership of a file or folder you don't own" : "Ne možete prenijeti vlasništvo nad datotekom ili mapom koja nije u vašem vlasništvu",
161162
"Tags" : "Oznake",
162163
"Error while loading the file data" : "Pogreška pri učitavanju podataka iz datoteke",
163164
"Unable to change the favourite state of the file" : "Nije moguće promijeniti status favorita datoteke",
@@ -187,6 +188,7 @@ OC.L10N.register(
187188
"New text file.txt" : "Nova tekstna datoteka.txt",
188189
"%s of %s used" : "Iskorišteno %s od %s",
189190
"%1$s%% of %2$s used" : "Iskorišteno %1$s%% od %2$s",
190-
"Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer noopener\">access your Files via WebDAV</a>" : "Upotrijebite ovu adresu za <a href=\"%s\" target=\"_blank\" rel=\"noreferrer noopener\"> pristupanje svojim datotekama putem WebDAVa</a>"
191+
"Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer noopener\">access your Files via WebDAV</a>" : "Upotrijebite ovu adresu za <a href=\"%s\" target=\"_blank\" rel=\"noreferrer noopener\"> pristupanje svojim datotekama putem WebDAVa</a>",
192+
"Cannot transfter ownership of a file or folder you don't own" : "Ne možete prenijeti vlasništvo nad datotekom ili mapom koja nije u vašem vlasništvu"
191193
},
192194
"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");

0 commit comments

Comments
 (0)