Skip to content

Commit 1ba32ab

Browse files
hopleushopleus
authored
Merge branch 'nextcloud:master' into bugfix/incorrect-filename-when-sync-s3
2 parents f286eca + c423973 commit 1ba32ab

File tree

1,082 files changed

+17596
-9024
lines changed

Some content is hidden

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

1,082 files changed

+17596
-9024
lines changed

‎.github/CODEOWNERS‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
/apps/workflowengine/appinfo/info.xml @blizzz @juliushaertl
3030

3131
# Frontend expertise
32-
/apps/files/src @skjnldsv
33-
/apps/files_external/src @skjnldsv
34-
/apps/files_reminders/src @skjnldsv
35-
/apps/files_sharing/src/actions @skjnldsv
36-
/apps/files_trashbin/src @skjnldsv
32+
/apps/files/src* @skjnldsv
33+
/apps/files_external/src* @skjnldsv
34+
/apps/files_reminders/src* @skjnldsv
35+
/apps/files_sharing/src/actions* @skjnldsv
36+
/apps/files_trashbin/src* @skjnldsv
3737

3838
# Security team
3939
/resources/codesigning @mgallien @miaulalala @nickvergessen

‎apps/comments/l10n/he.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ OC.L10N.register(
1919
"No more messages" : "אין יותר הודעות",
2020
"Retry" : "ניסיון חוזר",
2121
"Unable to load the comments list" : "לא ניתן לטעון את רשימת התגובות",
22-
"_1 new comment_::_{unread} new comments_" : ["הערה חדשה אחת","{unread} הערות חדשות","{unread} הערות חדשות","{unread} הערות חדשות"],
22+
"_1 new comment_::_{unread} new comments_" : ["הערה חדשה אחת","{unread} הערות חדשות","{unread} הערות חדשות"],
2323
"Comment" : "תגובה",
2424
"An error occurred while trying to edit the comment" : "אירעה שגיאה בניסיון לערוך את התגובה",
2525
"Comment deleted" : "נמחקה הערה",
@@ -28,4 +28,4 @@ OC.L10N.register(
2828
"You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "אוזכרת בקובץ „{file}”, בהערה על ידי משתמש שנמחק מאז",
2929
"_%n unread comment_::_%n unread comments_" : ["תגובה אחת שלא נקראה","%n תגובות שלא נקראו","%n תגובות שלא נקראו","%n תגובות שלא נקראו"]
3030
},
31-
"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;");
31+
"nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;");

‎apps/comments/l10n/he.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
"No more messages" : "אין יותר הודעות",
1818
"Retry" : "ניסיון חוזר",
1919
"Unable to load the comments list" : "לא ניתן לטעון את רשימת התגובות",
20-
"_1 new comment_::_{unread} new comments_" : ["הערה חדשה אחת","{unread} הערות חדשות","{unread} הערות חדשות","{unread} הערות חדשות"],
20+
"_1 new comment_::_{unread} new comments_" : ["הערה חדשה אחת","{unread} הערות חדשות","{unread} הערות חדשות"],
2121
"Comment" : "תגובה",
2222
"An error occurred while trying to edit the comment" : "אירעה שגיאה בניסיון לערוך את התגובה",
2323
"Comment deleted" : "נמחקה הערה",
2424
"An error occurred while trying to delete the comment" : "אירעה שגיאה בניסיון למחוק את התגובה",
2525
"An error occurred while trying to create the comment" : "אירעה שגיאה בניסיון ליצור את התגובה",
2626
"You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "אוזכרת בקובץ „{file}”, בהערה על ידי משתמש שנמחק מאז",
2727
"_%n unread comment_::_%n unread comments_" : ["תגובה אחת שלא נקראה","%n תגובות שלא נקראו","%n תגובות שלא נקראו","%n תגובות שלא נקראו"]
28-
},"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;"
28+
},"pluralForm" :"nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;"
2929
}

‎apps/comments/l10n/pt_BR.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ OC.L10N.register(
99
"%1$s commented on %2$s" : "%1$s comentaram em %2$s",
1010
"{author} commented on {file}" : "{author} comentou em {file}",
1111
"<strong>Comments</strong> for files" : "<strong>Comentários</strong> para arquivos",
12+
"You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Você foi mencionado em \"{file}\", em um comentário de uma conta que já foi excluída",
1213
"{user} mentioned you in a comment on \"{file}\"" : "{user} mencionou você em um comentário em \"{file}\"",
1314
"Files app plugin to add comments to files" : "Complemento do aplicativo Files para adicionar comentários",
1415
"Edit comment" : "Editar comentário",
1516
"Delete comment" : "Excluir comentário",
1617
"Cancel edit" : "Cancelar edição",
1718
"New comment" : "Novo comentário",
19+
"Write a comment …" : "Escreva um comentário …",
1820
"Post comment" : "Postar comentário",
1921
"@ for mentions, : for emoji, / for smart picker" : "@ para menções, : para emoji, / para seletor inteligente",
2022
"Could not reload comments" : "Não foi possível recarregar comentários",

‎apps/comments/l10n/pt_BR.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
"%1$s commented on %2$s" : "%1$s comentaram em %2$s",
88
"{author} commented on {file}" : "{author} comentou em {file}",
99
"<strong>Comments</strong> for files" : "<strong>Comentários</strong> para arquivos",
10+
"You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Você foi mencionado em \"{file}\", em um comentário de uma conta que já foi excluída",
1011
"{user} mentioned you in a comment on \"{file}\"" : "{user} mencionou você em um comentário em \"{file}\"",
1112
"Files app plugin to add comments to files" : "Complemento do aplicativo Files para adicionar comentários",
1213
"Edit comment" : "Editar comentário",
1314
"Delete comment" : "Excluir comentário",
1415
"Cancel edit" : "Cancelar edição",
1516
"New comment" : "Novo comentário",
17+
"Write a comment …" : "Escreva um comentário …",
1618
"Post comment" : "Postar comentário",
1719
"@ for mentions, : for emoji, / for smart picker" : "@ para menções, : para emoji, / para seletor inteligente",
1820
"Could not reload comments" : "Não foi possível recarregar comentários",

‎apps/comments/l10n/sk.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,21 @@ OC.L10N.register(
99
"%1$s commented on %2$s" : "%1$s komentoval %2$s",
1010
"{author} commented on {file}" : "{author} komentoval {file}",
1111
"<strong>Comments</strong> for files" : "<strong>Komentáre</strong> pre súbory",
12+
"You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Boli ste spomenutý v \"{file}\", v komentári užívateľom ktorý bol už vymazaný",
1213
"{user} mentioned you in a comment on \"{file}\"" : "{user} vás spomenul v komentári k “{file}”",
1314
"Files app plugin to add comments to files" : "Zásuvný modul aplikácie súborov, ktorý umožňuje súborom pridávať komentáre",
1415
"Edit comment" : "Upraviť komentár",
1516
"Delete comment" : "Zmazať komentár",
1617
"Cancel edit" : "Zrušiť upravovanie",
18+
"New comment" : "Nový komentár",
19+
"Write a comment …" : "Napísať komentár ...",
1720
"Post comment" : "Odoslať komentár",
21+
"@ for mentions, : for emoji, / for smart picker" : "@ pre spomienky, : pre emotikony, / pre inteligentný výber",
22+
"Could not reload comments" : "Nepodarilo sa obnoviť komentáre",
1823
"No comments yet, start the conversation!" : "Žiadne komentáre, začnite konverzáciu!",
1924
"No more messages" : "Žiadne ďaĺšie správy",
2025
"Retry" : "Skúsiť znova",
26+
"Failed to mark comments as read" : "Nepodarilo sa označiť komentáre ako prečítané.",
2127
"Unable to load the comments list" : "Nie je možné načítať zoznam komentárov",
2228
"_1 new comment_::_{unread} new comments_" : ["1 nový komentár","{unread} nové komentáre","{unread} nových komentárov","{unread} nových komentárov"],
2329
"Comment" : "Komentár",

‎apps/comments/l10n/sk.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,21 @@
77
"%1$s commented on %2$s" : "%1$s komentoval %2$s",
88
"{author} commented on {file}" : "{author} komentoval {file}",
99
"<strong>Comments</strong> for files" : "<strong>Komentáre</strong> pre súbory",
10+
"You were mentioned on \"{file}\", in a comment by an account that has since been deleted" : "Boli ste spomenutý v \"{file}\", v komentári užívateľom ktorý bol už vymazaný",
1011
"{user} mentioned you in a comment on \"{file}\"" : "{user} vás spomenul v komentári k “{file}”",
1112
"Files app plugin to add comments to files" : "Zásuvný modul aplikácie súborov, ktorý umožňuje súborom pridávať komentáre",
1213
"Edit comment" : "Upraviť komentár",
1314
"Delete comment" : "Zmazať komentár",
1415
"Cancel edit" : "Zrušiť upravovanie",
16+
"New comment" : "Nový komentár",
17+
"Write a comment …" : "Napísať komentár ...",
1518
"Post comment" : "Odoslať komentár",
19+
"@ for mentions, : for emoji, / for smart picker" : "@ pre spomienky, : pre emotikony, / pre inteligentný výber",
20+
"Could not reload comments" : "Nepodarilo sa obnoviť komentáre",
1621
"No comments yet, start the conversation!" : "Žiadne komentáre, začnite konverzáciu!",
1722
"No more messages" : "Žiadne ďaĺšie správy",
1823
"Retry" : "Skúsiť znova",
24+
"Failed to mark comments as read" : "Nepodarilo sa označiť komentáre ako prečítané.",
1925
"Unable to load the comments list" : "Nie je možné načítať zoznam komentárov",
2026
"_1 new comment_::_{unread} new comments_" : ["1 nový komentár","{unread} nové komentáre","{unread} nových komentárov","{unread} nových komentárov"],
2127
"Comment" : "Komentár",

‎apps/contactsinteraction/l10n/he.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ OC.L10N.register(
66
"Manages interaction between users and contacts" : "מנהל אינטראקציה בין משתמשים ואנשי קשר",
77
"Collect data about user and contacts interactions and provide an address book for the data" : "אוסף נתונים על אינטראקציות של משתמשים ואנשי קשר, ומספק פנקס כתובות לנתונים"
88
},
9-
"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;");
9+
"nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;");

‎apps/contactsinteraction/l10n/he.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"Contacts Interaction" : "אינטראקציה בין אנשי קשר",
44
"Manages interaction between users and contacts" : "מנהל אינטראקציה בין משתמשים ואנשי קשר",
55
"Collect data about user and contacts interactions and provide an address book for the data" : "אוסף נתונים על אינטראקציות של משתמשים ואנשי קשר, ומספק פנקס כתובות לנתונים"
6-
},"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;"
6+
},"pluralForm" :"nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;"
77
}

‎apps/dav/l10n/ast.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ OC.L10N.register(
8484
"_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
8585
"Could not open file" : "Nun se pudo abrir el ficheru",
8686
"Encryption not ready: %1$s" : "El cifráu nun ta preparáu: %1$s",
87+
"Failed to open file: %1$s" : "Nun se pue abrir el ficheru: %1$s",
88+
"Failed to unlink: %1$s" : "Nun se pue desenllaciar: %1$s",
89+
"Failed to write file contents: %1$s" : "Nun se pue escribir el conteníu nel ficheru: %1$s",
8790
"File not found: %1$s" : "Nun s'atopó'l ficheru: %1$s",
8891
"Configures a CalDAV account" : "Configura una cuenta CalDAV",
8992
"Configures a CardDAV account" : "Configura una cuenta CardDAV",
@@ -101,6 +104,8 @@ OC.L10N.register(
101104
"Friday" : "Vienres",
102105
"Saturday" : "Sábadu",
103106
"Sunday" : "Domingu",
107+
"Failed to load availability" : "Nun se pue cargar la disponibilidá",
108+
"Failed to save availability" : "Nun se pue guardar la disponibilidá",
104109
"Availability" : "Disponibilidá",
105110
"Calendar server" : "Sirvidor de calendarios",
106111
"Are you accepting the invitation?" : "¿Aceptes la invitación?",

0 commit comments

Comments
 (0)