Dont always use the current users quota when calculating storage info

instead pass the quota as parameter.

Without this fix, when 'quota_include_external_storage' is enabled, the
webui will show the quota configured for the admin for every user
instead of the users quota

Signed-off-by: Robin Appelman <robin@icewind.nl>

3rdparty

@@ -1 +1 @@
-Subproject commit 97fb70b955d004d781142ee409210fcb9b6eb853
+Subproject commit 0ad03d165a6b4734c0167bf60a3a0cbffba80e35

apps/accessibility/l10n/es_AR.js

@@ -2,25 +2,20 @@ OC.L10N.register(
     "accessibility",
     {
     "Dark theme" : "Tema oscuro",
-    "Enable dark theme" : "Habilitar tema nocturno",
     "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Un tema oscuro para facilitar la vista al reducir la luminosidad y el brillo general. Todavía está en desarrollo, por lo tanto, informe cualquier problema que pueda encontrar.",
     "High contrast mode" : "Modo alto contraste",
-    "Enable high contrast mode" : "Habilitar modo de Contraste Alto",
     "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un modo de alto contraste para facilitar su navegación. Se reducirá la calidad visual pero se aumentará la claridad.",
     "Dyslexia font" : "Dislexia fuente",
-    "Enable dyslexia font" : "Habilitar la fuente para personas con dislexia",
     "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic es un tipo de letra/fuente gratuita diseñada para mitigar algunos de los errores comunes de lectura causados ​​por la dislexia.",
     "Accessibility" : "Accesibilidad",
     "Accessibility options for nextcloud" : "Opciones de accesibilidad para nextcloud",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "Proporciona múltiples opciones de accesibilidad para facilitar el uso de Nextcloud",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Si encuentra algún problema, no dude en informarlo en {issuetracker}nuestro rastreador de problemas {linkend}. Y si desea participar, ¡únase a {designteam}a nuestro equipo de diseño {linkend}!",
     "High contrast theme" : "Tema de alto contraste",
     "A high contrast theme to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un tema de alto contraste para facilitar su navegación. Se reducirá la calidad visual pero se aumentará la claridad.",
     "Dark theme (beta)" : "Tema oscuro (beta)",
     "Web Content Accessibility Guidelines" : "Pautas de accesibilidad de contenido web",
     "our issue tracker" : "nuestro rastreador de problemas",
     "our design team" : "nuestro equipo de diseño",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}. And if you want to get involved, come join {designteam}!" : "Si encuentras algún problema, no dudes en informarlo en {issuetracker}. Y si deseas involucrarte, ¡unite a {designteam}!",
     "Enable" : "Habilitar"
 },
 "nplurals=2; plural=(n != 1);");

apps/accessibility/l10n/es_AR.json

@@ -1,24 +1,19 @@
 { "translations": {
     "Dark theme" : "Tema oscuro",
-    "Enable dark theme" : "Habilitar tema nocturno",
     "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Un tema oscuro para facilitar la vista al reducir la luminosidad y el brillo general. Todavía está en desarrollo, por lo tanto, informe cualquier problema que pueda encontrar.",
     "High contrast mode" : "Modo alto contraste",
-    "Enable high contrast mode" : "Habilitar modo de Contraste Alto",
     "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un modo de alto contraste para facilitar su navegación. Se reducirá la calidad visual pero se aumentará la claridad.",
     "Dyslexia font" : "Dislexia fuente",
-    "Enable dyslexia font" : "Habilitar la fuente para personas con dislexia",
     "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic es un tipo de letra/fuente gratuita diseñada para mitigar algunos de los errores comunes de lectura causados ​​por la dislexia.",
     "Accessibility" : "Accesibilidad",
     "Accessibility options for nextcloud" : "Opciones de accesibilidad para nextcloud",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "Proporciona múltiples opciones de accesibilidad para facilitar el uso de Nextcloud",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Si encuentra algún problema, no dude en informarlo en {issuetracker}nuestro rastreador de problemas {linkend}. Y si desea participar, ¡únase a {designteam}a nuestro equipo de diseño {linkend}!",
     "High contrast theme" : "Tema de alto contraste",
     "A high contrast theme to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un tema de alto contraste para facilitar su navegación. Se reducirá la calidad visual pero se aumentará la claridad.",
     "Dark theme (beta)" : "Tema oscuro (beta)",
     "Web Content Accessibility Guidelines" : "Pautas de accesibilidad de contenido web",
     "our issue tracker" : "nuestro rastreador de problemas",
     "our design team" : "nuestro equipo de diseño",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}. And if you want to get involved, come join {designteam}!" : "Si encuentras algún problema, no dudes en informarlo en {issuetracker}. Y si deseas involucrarte, ¡unite a {designteam}!",
     "Enable" : "Habilitar"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/accessibility/l10n/fr.js

@@ -13,7 +13,7 @@ OC.L10N.register(
     "Accessibility" : "Accessibilité",
     "Accessibility options for nextcloud" : "Options d'accessibilité pour Nextcloud",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "Fournit de nombreuses options d'accessibilité pour faciliter votre utilisation de Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "L'accès universel est très important pour nous. Nous suivons les standards du web et vérifions que tout soit utilisable également sans souris et avec des logiciels d'assistance technique tels que les lecteurs d'écran. Nous visons à respecter les {guidelines}Règles pour l'accessibilité des contenus Web{linkend} 2.1 de niveau AA et même de niveau AAA avec le thème à fort contraste.",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "L'accès universel est très important pour nous. Nous suivons les standards du web et vérifions de tout rendre utilisable également sans souris, et avec des logiciels d'assistance technique tels que les lecteurs d'écran. Nous visons à respecter les {guidelines}Règles pour l'accessibilité des contenus Web{linkend} 2.1 de niveau AA, et même de niveau AAA avec le thème à fort contraste.",
     "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Si vous rencontrez un problème, n'hésitez pas à nous le signaler sur {issuetracker}notre traqueur de problème{linkend}. Et si vous souhaitez vous impliquer, rejoignez {designteam}notre équipe de conception{linkend} !",
     "High contrast theme" : "Thème à contraste élevé",
     "A high contrast theme to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un thème au contraste élevé pour faciliter votre navigation. La qualité visuelle sera réduite, mais la clarté sera améliorée.",

apps/accessibility/l10n/fr.json

@@ -11,7 +11,7 @@
     "Accessibility" : "Accessibilité",
     "Accessibility options for nextcloud" : "Options d'accessibilité pour Nextcloud",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "Fournit de nombreuses options d'accessibilité pour faciliter votre utilisation de Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "L'accès universel est très important pour nous. Nous suivons les standards du web et vérifions que tout soit utilisable également sans souris et avec des logiciels d'assistance technique tels que les lecteurs d'écran. Nous visons à respecter les {guidelines}Règles pour l'accessibilité des contenus Web{linkend} 2.1 de niveau AA et même de niveau AAA avec le thème à fort contraste.",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "L'accès universel est très important pour nous. Nous suivons les standards du web et vérifions de tout rendre utilisable également sans souris, et avec des logiciels d'assistance technique tels que les lecteurs d'écran. Nous visons à respecter les {guidelines}Règles pour l'accessibilité des contenus Web{linkend} 2.1 de niveau AA, et même de niveau AAA avec le thème à fort contraste.",
     "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Si vous rencontrez un problème, n'hésitez pas à nous le signaler sur {issuetracker}notre traqueur de problème{linkend}. Et si vous souhaitez vous impliquer, rejoignez {designteam}notre équipe de conception{linkend} !",
     "High contrast theme" : "Thème à contraste élevé",
     "A high contrast theme to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un thème au contraste élevé pour faciliter votre navigation. La qualité visuelle sera réduite, mais la clarté sera améliorée.",

apps/accessibility/l10n/vi.js

@@ -1,14 +1,11 @@
 OC.L10N.register(
     "accessibility",
     {
-    "Dark theme" : "Chế độ ban đêm",
-    "Enable dark theme" : "Bật chế độ ban đêm",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Chế độ ban đêm giúp giảm mỏi mắt bằng cách giảm tương phản ở các màu chói và giảm độ sáng. Chế độ này đang được phát triển, vì vậy, xin hãy báo cáo nếu bạn gặp bất kỳ vấn đề nào trong lúc sử dụng.",
+    "Dark theme" : "Chế độ tối",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Một chủ đề tối để làm dịu đôi mắt của bạn bằng cách giảm độ sáng và độ sáng tổng thể. Nó vẫn đang được phát triển, vì vậy vui lòng báo cáo bất kỳ vấn đề bạn có thể tìm thấy.",
     "High contrast mode" : "Chế độ tương phản cao",
-    "Enable high contrast mode" : "Bật chế độ tương phản cao",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Chế độ tương phản cao giúp bạn dễ dàng điều hướng và phân biệt vị trí các mục chính xác hơn. Chất lượng hình ảnh sẽ giảm nhưng độ rõ sẽ được tăng lên.",
+    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Một chế độ tương phản cao để dễ dàng điều hướng của bạn. Chất lượng hình ảnh sẽ giảm nhưng độ rõ sẽ được tăng lên.",
     "Dyslexia font" : "Chứng khó đọc",
-    "Enable dyslexia font" : "Bật chế độ dành cho người gặp chứng khó đọc",
     "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic là một kiểu chữ / phông chữ miễn phí được thiết kế để giảm thiểu một số lỗi đọc phổ biến do chứng khó đọc gây ra.",
     "Accessibility" : "Khả năng tiếp cận",
     "Accessibility options for nextcloud" : "Tùy chọn truy cập cho nextcloud",

apps/accessibility/l10n/vi.json

@@ -1,12 +1,9 @@
 { "translations": {
-    "Dark theme" : "Chế độ ban đêm",
-    "Enable dark theme" : "Bật chế độ ban đêm",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Chế độ ban đêm giúp giảm mỏi mắt bằng cách giảm tương phản ở các màu chói và giảm độ sáng. Chế độ này đang được phát triển, vì vậy, xin hãy báo cáo nếu bạn gặp bất kỳ vấn đề nào trong lúc sử dụng.",
+    "Dark theme" : "Chế độ tối",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Một chủ đề tối để làm dịu đôi mắt của bạn bằng cách giảm độ sáng và độ sáng tổng thể. Nó vẫn đang được phát triển, vì vậy vui lòng báo cáo bất kỳ vấn đề bạn có thể tìm thấy.",
     "High contrast mode" : "Chế độ tương phản cao",
-    "Enable high contrast mode" : "Bật chế độ tương phản cao",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Chế độ tương phản cao giúp bạn dễ dàng điều hướng và phân biệt vị trí các mục chính xác hơn. Chất lượng hình ảnh sẽ giảm nhưng độ rõ sẽ được tăng lên.",
+    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Một chế độ tương phản cao để dễ dàng điều hướng của bạn. Chất lượng hình ảnh sẽ giảm nhưng độ rõ sẽ được tăng lên.",
     "Dyslexia font" : "Chứng khó đọc",
-    "Enable dyslexia font" : "Bật chế độ dành cho người gặp chứng khó đọc",
     "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic là một kiểu chữ / phông chữ miễn phí được thiết kế để giảm thiểu một số lỗi đọc phổ biến do chứng khó đọc gây ra.",
     "Accessibility" : "Khả năng tiếp cận",
     "Accessibility options for nextcloud" : "Tùy chọn truy cập cho nextcloud",

apps/accessibility/src/Accessibility.vue

@@ -82,7 +82,7 @@ export default {
 			)
 				.replace('{issuetracker}', this.issuetrackerLink)
 				.replace('{designteam}', this.designteamLink)
-				.replace(/\{linkend\}/g, '</a>')
+				.replace('/{linkend}/g', '</a>')
 		},
 		issuetrackerLink() {
 			return `<a target="_blank" href="https://github.com/nextcloud/server/issues/" rel="noreferrer nofollow">`

apps/dav/l10n/ca.js

@@ -63,7 +63,7 @@ OC.L10N.register(
     "Where: %s" : "On: %s",
     "%1$s via %2$s" : "%1$s mitjançant %2$s",
     "Invitation canceled" : "Invitació cancel·lada",
-    "Hello %s," : "Hola, %s,",
+    "Hello %s," : "Hola %s,",
     "The meeting »%1$s« with %2$s was canceled." : "La reunió »%1$s« amb %2$s ha estat cancel·lada.",
     "Invitation updated" : "Invitació actualitzada",
     "The meeting »%1$s« with %2$s was updated." : "La reunió »%1$s« amb %2$s ha estat actualitzada.",

apps/dav/l10n/ca.json

@@ -61,7 +61,7 @@
     "Where: %s" : "On: %s",
     "%1$s via %2$s" : "%1$s mitjançant %2$s",
     "Invitation canceled" : "Invitació cancel·lada",
-    "Hello %s," : "Hola, %s,",
+    "Hello %s," : "Hola %s,",
     "The meeting »%1$s« with %2$s was canceled." : "La reunió »%1$s« amb %2$s ha estat cancel·lada.",
     "Invitation updated" : "Invitació actualitzada",
     "The meeting »%1$s« with %2$s was updated." : "La reunió »%1$s« amb %2$s ha estat actualitzada.",

apps/dav/l10n/es.js

@@ -50,7 +50,7 @@ OC.L10N.register(
     "Where:" : "Dónde:",
     "Description:" : "Descripción:",
     "Untitled event" : "Evento sin título",
-    "_%n year_::_%n years_" : ["%n año","%n años"],
+    "_%n year_::_%n years_" : ["%n año","%naños"],
     "_%n month_::_%n months_" : ["%n mes","%n meses"],
     "_%n day_::_%n days_" : ["%n día","%n días"],
     "_%n hour_::_%n hours_" : ["%n hora","%n horas"],

apps/dav/l10n/es.json

@@ -48,7 +48,7 @@
     "Where:" : "Dónde:",
     "Description:" : "Descripción:",
     "Untitled event" : "Evento sin título",
-    "_%n year_::_%n years_" : ["%n año","%n años"],
+    "_%n year_::_%n years_" : ["%n año","%naños"],
     "_%n month_::_%n months_" : ["%n mes","%n meses"],
     "_%n day_::_%n days_" : ["%n día","%n días"],
     "_%n hour_::_%n hours_" : ["%n hora","%n horas"],

apps/federatedfilesharing/l10n/es.js

@@ -24,7 +24,7 @@ OC.L10N.register(
     "Sharing %1$s failed, could not find %2$s, maybe the server is currently unreachable or uses a self-signed certificate." : "Compartir %1$s ha fallado, no se ha podido encontrar %2$s, quizás el servidor no se puede alcanzar ahora mismo o usa un certificado autofirmado.",
     "Could not find share" : "No se ha podido encontrar el compartido",
     "Federated sharing" : "Compartido federado",
-    "You received \"%3$s\" as a remote share from %4$s (%1$s) (on behalf of %5$s (%2$s))" : "Has recibido \"%3$s\" como recurso remoto compartido de %4$s (%1$s) (en nombre de %5$s (%2$s))",
+    "You received \"%3$s\" as a remote share from %4$s (%1$s) (on behalf of %5$s (%2$s))" : "Has recibido \"%3$s\" como recurso remoto comparitdo de %4$s (%1$s) (en nombre de %5$s (%2$s))",
     "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Has recibido {share} como un recurso compartido remoto de {user} (en nombre de {behalf})",
     "You received \"%3$s\" as a remote share from %4$s (%1$s)" : "Has recibido \"%3$s\" como un recurso compartido remoto de %4$s (%1$s)",
     "You received {share} as a remote share from {user}" : "Has recibido {share} como un compartido remoto de {user}",
@@ -51,7 +51,7 @@ OC.L10N.register(
     "Add to your website" : "Añadir a su sitio web",
     "Share with me via Nextcloud" : "Compartirlo conmigo vía Nextcloud",
     "HTML Code:" : "Código HTML:",
-    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Has recibido \"%3$s\" como un recurso compartido remoto desde %1$s (en nombre de %2$s)",
+    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Has recibido \"/%3$s\" como un recurso compartido remoto de %1$s (en nombre de %2$s)",
     "You received \"%3$s\" as a remote share from %1$s" : "Has recibido \"%3$s\" como un compartido remoto de %1$s"
 },
 "nplurals=2; plural=(n != 1);");

apps/federatedfilesharing/l10n/es.json

@@ -22,7 +22,7 @@
     "Sharing %1$s failed, could not find %2$s, maybe the server is currently unreachable or uses a self-signed certificate." : "Compartir %1$s ha fallado, no se ha podido encontrar %2$s, quizás el servidor no se puede alcanzar ahora mismo o usa un certificado autofirmado.",
     "Could not find share" : "No se ha podido encontrar el compartido",
     "Federated sharing" : "Compartido federado",
-    "You received \"%3$s\" as a remote share from %4$s (%1$s) (on behalf of %5$s (%2$s))" : "Has recibido \"%3$s\" como recurso remoto compartido de %4$s (%1$s) (en nombre de %5$s (%2$s))",
+    "You received \"%3$s\" as a remote share from %4$s (%1$s) (on behalf of %5$s (%2$s))" : "Has recibido \"%3$s\" como recurso remoto comparitdo de %4$s (%1$s) (en nombre de %5$s (%2$s))",
     "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Has recibido {share} como un recurso compartido remoto de {user} (en nombre de {behalf})",
     "You received \"%3$s\" as a remote share from %4$s (%1$s)" : "Has recibido \"%3$s\" como un recurso compartido remoto de %4$s (%1$s)",
     "You received {share} as a remote share from {user}" : "Has recibido {share} como un compartido remoto de {user}",
@@ -49,7 +49,7 @@
     "Add to your website" : "Añadir a su sitio web",
     "Share with me via Nextcloud" : "Compartirlo conmigo vía Nextcloud",
     "HTML Code:" : "Código HTML:",
-    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Has recibido \"%3$s\" como un recurso compartido remoto desde %1$s (en nombre de %2$s)",
+    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Has recibido \"/%3$s\" como un recurso compartido remoto de %1$s (en nombre de %2$s)",
     "You received \"%3$s\" as a remote share from %1$s" : "Has recibido \"%3$s\" como un compartido remoto de %1$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/federatedfilesharing/l10n/pl.js

@@ -1,11 +1,11 @@
 OC.L10N.register(
     "federatedfilesharing",
     {
-    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Czy chcesz dodać zdalne udostępnienie {name} od {owner}@{remote}?",
-    "Remote share" : "Zdalne udostępnienie",
-    "Remote share password" : "Hasło zdalnego udostępnienia",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Chcesz się dzielić zdalnie {name} z {owner}@{remote}?",
+    "Remote share" : "Zdalny zasób",
+    "Remote share password" : "Hasło do zdalnego zasobu",
     "Cancel" : "Anuluj",
-    "Add remote share" : "Dodaj zdalne udostępnienie",
+    "Add remote share" : "Dodaj zdalny zasób",
     "Copy" : "Kopiuj",
     "Copied!" : "Skopiowano!",
     "Not supported!" : "Brak wsparcia!",
@@ -30,8 +30,8 @@ OC.L10N.register(
     "You received {share} as a remote share from {user}" : "Otrzymałeś {share} zdalne udostępnienie od {user}",
     "Accept" : "Akceptuj",
     "Decline" : "Odrzuć",
-    "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Udostępnij mi poprzez mój ID #Nextcloud Chmury Federacyjnej, zobacz %s",
-    "Share with me through my #Nextcloud Federated Cloud ID" : "Udostępnij mi poprzez mój ID #Nextcloud Chmury Federacyjnej",
+    "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Podziel się ze mną przez mój ID #Nextcloud Chmury Federacyjnej, zobacz %s",
+    "Share with me through my #Nextcloud Federated Cloud ID" : "Podziel się ze mną za pomocą mojego ID #Nextcloud Chmury Federacyjnej",
     "Sharing" : "Udostępnianie",
     "Federated file sharing" : "Federacyjne udostępnianie plików",
     "Provide federated file sharing across servers" : "Zezwól na federacyjne udostępnianie plików na serwerach",

apps/federatedfilesharing/l10n/pl.json

@@ -1,9 +1,9 @@
 { "translations": {
-    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Czy chcesz dodać zdalne udostępnienie {name} od {owner}@{remote}?",
-    "Remote share" : "Zdalne udostępnienie",
-    "Remote share password" : "Hasło zdalnego udostępnienia",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Chcesz się dzielić zdalnie {name} z {owner}@{remote}?",
+    "Remote share" : "Zdalny zasób",
+    "Remote share password" : "Hasło do zdalnego zasobu",
     "Cancel" : "Anuluj",
-    "Add remote share" : "Dodaj zdalne udostępnienie",
+    "Add remote share" : "Dodaj zdalny zasób",
     "Copy" : "Kopiuj",
     "Copied!" : "Skopiowano!",
     "Not supported!" : "Brak wsparcia!",
@@ -28,8 +28,8 @@
     "You received {share} as a remote share from {user}" : "Otrzymałeś {share} zdalne udostępnienie od {user}",
     "Accept" : "Akceptuj",
     "Decline" : "Odrzuć",
-    "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Udostępnij mi poprzez mój ID #Nextcloud Chmury Federacyjnej, zobacz %s",
-    "Share with me through my #Nextcloud Federated Cloud ID" : "Udostępnij mi poprzez mój ID #Nextcloud Chmury Federacyjnej",
+    "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Podziel się ze mną przez mój ID #Nextcloud Chmury Federacyjnej, zobacz %s",
+    "Share with me through my #Nextcloud Federated Cloud ID" : "Podziel się ze mną za pomocą mojego ID #Nextcloud Chmury Federacyjnej",
     "Sharing" : "Udostępnianie",
     "Federated file sharing" : "Federacyjne udostępnianie plików",
     "Provide federated file sharing across servers" : "Zezwól na federacyjne udostępnianie plików na serwerach",

apps/files/l10n/cs.js

@@ -158,7 +158,6 @@ OC.L10N.register(
     "Transfer {path} to {userid}" : "Převést {path} na {userid}",
     "Invalid path selected" : "Vybrán neplatný popis umístění",
     "Ownership transfer request sent" : "Žádost o převedení vlastnictví zaslána",
-    "Cannot transfter ownership of a file or folder you don't own" : "Není možné převést vlastnictví souboru nebo složky, která vám nenáleží",
     "Tags" : "Značky",
     "Error while loading the file data" : "Chyba při načítání dat souboru",
     "Unable to change the favourite state of the file" : "Nedaří se změnit stav „oblíbené“ souboru",

apps/files/l10n/cs.json

@@ -156,7 +156,6 @@
     "Transfer {path} to {userid}" : "Převést {path} na {userid}",
     "Invalid path selected" : "Vybrán neplatný popis umístění",
     "Ownership transfer request sent" : "Žádost o převedení vlastnictví zaslána",
-    "Cannot transfter ownership of a file or folder you don't own" : "Není možné převést vlastnictví souboru nebo složky, která vám nenáleží",
     "Tags" : "Značky",
     "Error while loading the file data" : "Chyba při načítání dat souboru",
     "Unable to change the favourite state of the file" : "Nedaří se změnit stav „oblíbené“ souboru",

apps/files/l10n/es.js

@@ -158,7 +158,6 @@ OC.L10N.register(
     "Transfer {path} to {userid}" : "Transferir {path} a {userid}",
     "Invalid path selected" : "Ruta de archivo seleccionada no válida.",
     "Ownership transfer request sent" : "Enviada la solicitud de transferencia de propiedad",
-    "Cannot transfter ownership of a file or folder you don't own" : "No se puede transferir la propiedad de un archivo o carpeta que no te pertenece",
     "Tags" : "Etiquetas",
     "Error while loading the file data" : "Error al cargar los datos del archivo",
     "Unable to change the favourite state of the file" : "No se ha podido cambiar el estado de favorito del fichero",

apps/files/l10n/es.json

@@ -156,7 +156,6 @@
     "Transfer {path} to {userid}" : "Transferir {path} a {userid}",
     "Invalid path selected" : "Ruta de archivo seleccionada no válida.",
     "Ownership transfer request sent" : "Enviada la solicitud de transferencia de propiedad",
-    "Cannot transfter ownership of a file or folder you don't own" : "No se puede transferir la propiedad de un archivo o carpeta que no te pertenece",
     "Tags" : "Etiquetas",
     "Error while loading the file data" : "Error al cargar los datos del archivo",
     "Unable to change the favourite state of the file" : "No se ha podido cambiar el estado de favorito del fichero",

apps/files/l10n/gl.js

@@ -86,7 +86,7 @@ OC.L10N.register(
     "_matches '{filter}'_::_match '{filter}'_" : ["coincidente con «{filter}»","coincidentes con «{filter}»"],
     "View in folder" : "Ver no cartafol",
     "Copied!" : "Copiado!",
-    "Copy direct link (only works for users who have access to this file/folder)" : "Copiar a ligazón directa (só funciona para usuarios con acceso a este ficheiro/cartafol)",
+    "Copy direct link (only works for users who have access to this file/folder)" : "Copiar a ligazón directa (só funciona para usuarios que teñen acceso a este ficheiro/cartafol)",
     "Path" : "Ruta",
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Marcado como favorito",
@@ -158,7 +158,6 @@ OC.L10N.register(
     "Transfer {path} to {userid}" : "Transferir {path} cara a {userid}",
     "Invalid path selected" : "Seleccionou unha ruta incorrecta.",
     "Ownership transfer request sent" : "Enviouse solicitude de transferencia da propiedade",
-    "Cannot transfter ownership of a file or folder you don't own" : "Non é posíbel transferir a propiedade dun ficheiro ou cartafol que non é de seu",
     "Tags" : "Etiquetas",
     "Error while loading the file data" : "Produciuse un erro ao cargar os datos do ficheiro",
     "Unable to change the favourite state of the file" : "Non é posíbel cambiar o estado favorito do ficheiro",

apps/files/l10n/gl.json

@@ -84,7 +84,7 @@
     "_matches '{filter}'_::_match '{filter}'_" : ["coincidente con «{filter}»","coincidentes con «{filter}»"],
     "View in folder" : "Ver no cartafol",
     "Copied!" : "Copiado!",
-    "Copy direct link (only works for users who have access to this file/folder)" : "Copiar a ligazón directa (só funciona para usuarios con acceso a este ficheiro/cartafol)",
+    "Copy direct link (only works for users who have access to this file/folder)" : "Copiar a ligazón directa (só funciona para usuarios que teñen acceso a este ficheiro/cartafol)",
     "Path" : "Ruta",
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Marcado como favorito",
@@ -156,7 +156,6 @@
     "Transfer {path} to {userid}" : "Transferir {path} cara a {userid}",
     "Invalid path selected" : "Seleccionou unha ruta incorrecta.",
     "Ownership transfer request sent" : "Enviouse solicitude de transferencia da propiedade",
-    "Cannot transfter ownership of a file or folder you don't own" : "Non é posíbel transferir a propiedade dun ficheiro ou cartafol que non é de seu",
     "Tags" : "Etiquetas",
     "Error while loading the file data" : "Produciuse un erro ao cargar os datos do ficheiro",
     "Unable to change the favourite state of the file" : "Non é posíbel cambiar o estado favorito do ficheiro",

apps/files/l10n/it.js

@@ -158,7 +158,6 @@ OC.L10N.register(
     "Transfer {path} to {userid}" : "Trasferisci {path} a {userid}",
     "Invalid path selected" : "Percorso selezionato non valido",
     "Ownership transfer request sent" : "Richiesta di trasferimento della proprietà inviata",
-    "Cannot transfter ownership of a file or folder you don't own" : " Impossibile trasferire la proprietà di un file o di una cartella di altri",
     "Tags" : "Etichette",
     "Error while loading the file data" : "Errore durante il caricamento del file di dati",
     "Unable to change the favourite state of the file" : "Impossibile cambiare lo stato di preferito del file",

apps/files/l10n/it.json

@@ -156,7 +156,6 @@
     "Transfer {path} to {userid}" : "Trasferisci {path} a {userid}",
     "Invalid path selected" : "Percorso selezionato non valido",
     "Ownership transfer request sent" : "Richiesta di trasferimento della proprietà inviata",
-    "Cannot transfter ownership of a file or folder you don't own" : " Impossibile trasferire la proprietà di un file o di una cartella di altri",
     "Tags" : "Etichette",
     "Error while loading the file data" : "Errore durante il caricamento del file di dati",
     "Unable to change the favourite state of the file" : "Impossibile cambiare lo stato di preferito del file",

apps/files/l10n/lt_LT.js

@@ -59,7 +59,6 @@ OC.L10N.register(
     "Could not create file \"{file}\"" : "Nepavyko sukurti failo \"{file}\"",
     "Could not create file \"{file}\" because it already exists" : "Nepavyko sukurti failo \"{file}\", nes jis jau yra",
     "Could not create folder \"{dir}\" because it already exists" : "Nepavyko sukurti aplanko \"{dir}\", nes jis jau yra",
-    "Could not fetch file details \"{file}\"" : "Nepavyko gauti išsamesnės failo \"{file}\" informacijos",
     "Error deleting file \"{fileName}\"." : "Klaida trinant failą \"{fileName}\".",
     "No search results in other folders for {tag}{filter}{endtag}" : "Kituose aplankuose nėra paieškos rezultatų, skirtų {tag}{filter}{endtag}",
     "Name" : "Pavadinimas",
@@ -142,11 +141,7 @@ OC.L10N.register(
     "Incoming ownership transfer from {user}" : "Gaunamasis nuosavybės perdavimas nuo {user}",
     "Do you want to accept {path}?\n\nNote: The transfer process after accepting may take up to 1 hour." : "Ar norite priimti {path}?\n\nPastaba: Priėmus, perdavimo procesas gali užtrukti iki 1 valandos.",
     "Ownership transfer failed" : "Nuosavybės perdavimas nepavyko",
-    "Your ownership transfer of {path} to {user} failed." : "Nepavyko perduoti jūsų {path} nuosavybės naudotojui {user}.",
-    "The ownership transfer of {path} from {user} failed." : "{path} nuosavybės perdavimas iš naudotojo {user} nepavyko.",
     "Ownership transfer done" : "Nuosavybės perdavimas atliktas",
-    "Your ownership transfer of {path} to {user} has completed." : "Jūsų {path} nuosavybės perdavimas naudotojui {user} užbaigtas.",
-    "The ownership transfer of {path} from {user} has completed." : "{path} nuosavybės perdavimas iš naudotojo {user} užbaigtas.",
     "File Management" : "Failų tvarkymas",
     "Transfer ownership of a file or folder" : "Perduoti failo ar aplanko nuosavybę",
     "Choose file or folder to transfer" : "Pasirinkti norimą perduoti failą ar aplanką",

apps/files/l10n/lt_LT.json

@@ -57,7 +57,6 @@
     "Could not create file \"{file}\"" : "Nepavyko sukurti failo \"{file}\"",
     "Could not create file \"{file}\" because it already exists" : "Nepavyko sukurti failo \"{file}\", nes jis jau yra",
     "Could not create folder \"{dir}\" because it already exists" : "Nepavyko sukurti aplanko \"{dir}\", nes jis jau yra",
-    "Could not fetch file details \"{file}\"" : "Nepavyko gauti išsamesnės failo \"{file}\" informacijos",
     "Error deleting file \"{fileName}\"." : "Klaida trinant failą \"{fileName}\".",
     "No search results in other folders for {tag}{filter}{endtag}" : "Kituose aplankuose nėra paieškos rezultatų, skirtų {tag}{filter}{endtag}",
     "Name" : "Pavadinimas",
@@ -140,11 +139,7 @@
     "Incoming ownership transfer from {user}" : "Gaunamasis nuosavybės perdavimas nuo {user}",
     "Do you want to accept {path}?\n\nNote: The transfer process after accepting may take up to 1 hour." : "Ar norite priimti {path}?\n\nPastaba: Priėmus, perdavimo procesas gali užtrukti iki 1 valandos.",
     "Ownership transfer failed" : "Nuosavybės perdavimas nepavyko",
-    "Your ownership transfer of {path} to {user} failed." : "Nepavyko perduoti jūsų {path} nuosavybės naudotojui {user}.",
-    "The ownership transfer of {path} from {user} failed." : "{path} nuosavybės perdavimas iš naudotojo {user} nepavyko.",
     "Ownership transfer done" : "Nuosavybės perdavimas atliktas",
-    "Your ownership transfer of {path} to {user} has completed." : "Jūsų {path} nuosavybės perdavimas naudotojui {user} užbaigtas.",
-    "The ownership transfer of {path} from {user} has completed." : "{path} nuosavybės perdavimas iš naudotojo {user} užbaigtas.",
     "File Management" : "Failų tvarkymas",
     "Transfer ownership of a file or folder" : "Perduoti failo ar aplanko nuosavybę",
     "Choose file or folder to transfer" : "Pasirinkti norimą perduoti failą ar aplanką",

apps/files/l10n/pl.js

@@ -158,7 +158,6 @@ OC.L10N.register(
     "Transfer {path} to {userid}" : "Przenieś {path} do {userid}",
     "Invalid path selected" : "Wybrano nieprawidłową ścieżkę",
     "Ownership transfer request sent" : "Wysłano żądanie przeniesienia własności",
-    "Cannot transfter ownership of a file or folder you don't own" : "Nie można przenieść prawa własności z pliku lub katalogu, którego nie jesteś właścicielem",
     "Tags" : "Etykiety",
     "Error while loading the file data" : "Błąd podczas ładowania danych pliku",
     "Unable to change the favourite state of the file" : "Nie można zmienić ulubionego stanu pliku",

apps/files/l10n/pl.json

@@ -156,7 +156,6 @@
     "Transfer {path} to {userid}" : "Przenieś {path} do {userid}",
     "Invalid path selected" : "Wybrano nieprawidłową ścieżkę",
     "Ownership transfer request sent" : "Wysłano żądanie przeniesienia własności",
-    "Cannot transfter ownership of a file or folder you don't own" : "Nie można przenieść prawa własności z pliku lub katalogu, którego nie jesteś właścicielem",
     "Tags" : "Etykiety",
     "Error while loading the file data" : "Błąd podczas ładowania danych pliku",
     "Unable to change the favourite state of the file" : "Nie można zmienić ulubionego stanu pliku",

apps/files/l10n/pt_BR.js

@@ -158,7 +158,6 @@ OC.L10N.register(
     "Transfer {path} to {userid}" : "Transferir {path} para {userid}",
     "Invalid path selected" : "Caminho inválido selecionado",
     "Ownership transfer request sent" : "Solicitação de transferência de propriedade enviada",
-    "Cannot transfter ownership of a file or folder you don't own" : "Não é possível transferir a propriedade de um arquivo ou pasta que você não é o dono",
     "Tags" : "Etiquetas",
     "Error while loading the file data" : "Erro ao carregar os dados do arquivo",
     "Unable to change the favourite state of the file" : "Não foi possível alterar o estado favorito do arquivo",

apps/files/l10n/pt_BR.json

@@ -156,7 +156,6 @@
     "Transfer {path} to {userid}" : "Transferir {path} para {userid}",
     "Invalid path selected" : "Caminho inválido selecionado",
     "Ownership transfer request sent" : "Solicitação de transferência de propriedade enviada",
-    "Cannot transfter ownership of a file or folder you don't own" : "Não é possível transferir a propriedade de um arquivo ou pasta que você não é o dono",
     "Tags" : "Etiquetas",
     "Error while loading the file data" : "Erro ao carregar os dados do arquivo",
     "Unable to change the favourite state of the file" : "Não foi possível alterar o estado favorito do arquivo",

apps/files/lib/Controller/TransferOwnershipController.php

@@ -96,10 +96,6 @@ class TransferOwnershipController extends OCSController {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
 
-		if ($node->getOwner()->getUID() !== $this->userId) {
-			return new DataResponse([], Http::STATUS_FORBIDDEN);
-		}
-
 		$transferOwnership = new TransferOwnershipEntity();
 		$transferOwnership->setSourceUser($this->userId);
 		$transferOwnership->setTargetUser($recipient);

apps/files/src/components/TransferOwnershipDialogue.vue

@@ -215,11 +215,7 @@ export default {
 				.catch(error => {
 					logger.error('Could not send ownership transfer request', { error })
 
-					if (error?.response?.status === 403) {
-						this.submitError = t('files', 'Cannot transfter ownership of a file or folder you don\'t own')
-					} else {
-						this.submitError = error.message || t('files', 'Unknown error')
-					}
+					this.submitError = error.message || t('files', 'Unknown error')
 				})
 		},
 	},

apps/files/src/views/Sidebar.vue

@@ -47,7 +47,7 @@
 				:close-after-click="true"
 				icon="icon-tag"
 				@click="toggleTags">
-				{{ t('files', 'Tags') }}
+				{{ t('files_sharing', 'Tags') }}
 			</ActionButton>
 		</template>
 

apps/files_external/l10n/es.js

@@ -18,24 +18,24 @@ OC.L10N.register(
     "Enable sharing" : "Habilitar el uso compartido",
     "Check for changes" : "Comprobar si hay cambios",
     "Never" : "Nunca",
-    "Once every direct access" : "Una vez en cada acceso",
+    "Once every direct access" : "Una vez cada acceso directo",
     "Read only" : "Solo lectura",
     "Delete" : "Eliminar",
     "Admin defined" : "Admin definido",
     "Are you sure you want to delete this external storage?" : "¿Estás seguro de querer eliminar el almacenamiento externo?",
     "Delete storage?" : "¿Borrar almacenamiento?",
     "Saved" : "Guardado",
-    "Saving …" : "Guardando…",
+    "Saving …" : "Guardando...",
     "Save" : "Guardar",
     "Empty response from the server" : "Respuesta vacía desde el servidor",
-    "Couldn't access. Please log out and in again to activate this mount point" : "No se ha podido acceder. Por favor, cierra sesión y vuelve a entrar para activar este punto de montaje",
+    "Couldn't access. Please log out and in again to activate this mount point" : "No se ha podido acceder. Por favor, sal de la cuenta y vuelve a entrar para activar este punto de montaje",
     "Couldn't get the information from the remote server: {code} {type}" : "No se pudo obtener la información del servidor remoto: {code} {type}",
     "Couldn't get the list of external mount points: {type}" : "No se puede obtener la lista de los puntos de montaje externos: {type}",
     "There was an error with message: " : "Ha habido un error con el mensaje:",
     "External mount error" : "Error de montaje externo",
     "external-storage" : "almacenamiento-externo",
     "Couldn't fetch list of Windows network drive mount points: Empty response from server" : "No se ha podido recuperar la lista de puntos de montaje de las unidades de red de Windows: respuesta vacía del servidor",
-    "Please enter the credentials for the {mount} mount" : "Por favor introduzca las credenciales para el punto de montaje {mount}",
+    "Please enter the credentials for the {mount} mount" : "Por favor introduzca los credenciales para el punto de montaje {mount}",
     "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
     "Credentials saved" : "Credenciales guardados",

apps/files_external/l10n/es.json

@@ -16,24 +16,24 @@
     "Enable sharing" : "Habilitar el uso compartido",
     "Check for changes" : "Comprobar si hay cambios",
     "Never" : "Nunca",
-    "Once every direct access" : "Una vez en cada acceso",
+    "Once every direct access" : "Una vez cada acceso directo",
     "Read only" : "Solo lectura",
     "Delete" : "Eliminar",
     "Admin defined" : "Admin definido",
     "Are you sure you want to delete this external storage?" : "¿Estás seguro de querer eliminar el almacenamiento externo?",
     "Delete storage?" : "¿Borrar almacenamiento?",
     "Saved" : "Guardado",
-    "Saving …" : "Guardando…",
+    "Saving …" : "Guardando...",
     "Save" : "Guardar",
     "Empty response from the server" : "Respuesta vacía desde el servidor",
-    "Couldn't access. Please log out and in again to activate this mount point" : "No se ha podido acceder. Por favor, cierra sesión y vuelve a entrar para activar este punto de montaje",
+    "Couldn't access. Please log out and in again to activate this mount point" : "No se ha podido acceder. Por favor, sal de la cuenta y vuelve a entrar para activar este punto de montaje",
     "Couldn't get the information from the remote server: {code} {type}" : "No se pudo obtener la información del servidor remoto: {code} {type}",
     "Couldn't get the list of external mount points: {type}" : "No se puede obtener la lista de los puntos de montaje externos: {type}",
     "There was an error with message: " : "Ha habido un error con el mensaje:",
     "External mount error" : "Error de montaje externo",
     "external-storage" : "almacenamiento-externo",
     "Couldn't fetch list of Windows network drive mount points: Empty response from server" : "No se ha podido recuperar la lista de puntos de montaje de las unidades de red de Windows: respuesta vacía del servidor",
-    "Please enter the credentials for the {mount} mount" : "Por favor introduzca las credenciales para el punto de montaje {mount}",
+    "Please enter the credentials for the {mount} mount" : "Por favor introduzca los credenciales para el punto de montaje {mount}",
     "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
     "Credentials saved" : "Credenciales guardados",

apps/files_sharing/l10n/eu.js

@@ -16,7 +16,6 @@ OC.L10N.register(
     "Shares" : "Partekatzeak",
     "No shares" : "Partekatzerik ez",
     "Shares will show up here" : "Partekatzeak hemen agertuko dira",
-    "Restore" : "Berrezarri",
     "Restore share" : "Berrezarri partekatzea",
     "Something happened. Unable to restore the share." : "Zer edo zer gertatu da. Ezin izan da partekatzea berrezarri.",
     "This will stop your current uploads." : "Honek zure uneko igoerak geldituko ditu.",
@@ -44,7 +43,6 @@ OC.L10N.register(
     "{actor} shared {file} with group {group}" : "{actor}-k partekatu du {file} fitxategia {group} taldearekin",
     "{actor} removed group {group} from {file}" : "{actor}-k kendu du {group} taldea {file} fitxategitik",
     "Removed public link" : "Esteke publikoa kenduta",
-    "Shared by {actor}" : "{actor}(e)k partekatua",
     "A file or folder was shared from <strong>another server</strong>" : "Fitxategia edo karpeta konpartitu da <strong>beste zerbitzari batetatik</strong>",
     "A file or folder has been <strong>shared</strong>" : "Fitxategia edo karpeta <strong>konpartitu</strong> da",
     "Could not delete share" : "Ezin izan da partekatzea ezabatu",
@@ -87,7 +85,6 @@ OC.L10N.register(
     "Add another link" : "Gehitu beste esteka bat",
     "Share link" : "Partekatu esteka",
     "Resharing is not allowed" : "Birpartekatzea ez da onartzen",
-    "Searching …" : "Bilatzen …",
     "Search globally" : "Bilatu globalki",
     "Shared" : "Partekatuta",
     "Share" : "Partekatu",

apps/files_sharing/l10n/eu.json

@@ -14,7 +14,6 @@
     "Shares" : "Partekatzeak",
     "No shares" : "Partekatzerik ez",
     "Shares will show up here" : "Partekatzeak hemen agertuko dira",
-    "Restore" : "Berrezarri",
     "Restore share" : "Berrezarri partekatzea",
     "Something happened. Unable to restore the share." : "Zer edo zer gertatu da. Ezin izan da partekatzea berrezarri.",
     "This will stop your current uploads." : "Honek zure uneko igoerak geldituko ditu.",
@@ -42,7 +41,6 @@
     "{actor} shared {file} with group {group}" : "{actor}-k partekatu du {file} fitxategia {group} taldearekin",
     "{actor} removed group {group} from {file}" : "{actor}-k kendu du {group} taldea {file} fitxategitik",
     "Removed public link" : "Esteke publikoa kenduta",
-    "Shared by {actor}" : "{actor}(e)k partekatua",
     "A file or folder was shared from <strong>another server</strong>" : "Fitxategia edo karpeta konpartitu da <strong>beste zerbitzari batetatik</strong>",
     "A file or folder has been <strong>shared</strong>" : "Fitxategia edo karpeta <strong>konpartitu</strong> da",
     "Could not delete share" : "Ezin izan da partekatzea ezabatu",
@@ -85,7 +83,6 @@
     "Add another link" : "Gehitu beste esteka bat",
     "Share link" : "Partekatu esteka",
     "Resharing is not allowed" : "Birpartekatzea ez da onartzen",
-    "Searching …" : "Bilatzen …",
     "Search globally" : "Bilatu globalki",
     "Shared" : "Partekatuta",
     "Share" : "Partekatu",

apps/files_sharing/l10n/gl.js

@@ -158,8 +158,8 @@ OC.L10N.register(
     "Link copied" : "Ligazón copiada",
     "Cannot copy, please copy the link manually" : "Non foi posíbel copiala. Copie a ligazón manualmente",
     "Copy to clipboard" : "Copiar no portapapeis.",
-    "Only works for users with access to this folder" : "Só funciona para usuarios con acceso a este cartafol",
-    "Only works for users with access to this file" : "Só funciona para usuarios con acceso a este ficheiro",
+    "Only works for users with access to this folder" : "Só funciona para usuarios que teñen acceso a este cartafol",
+    "Only works for users with access to this file" : "Só funciona para usuarios que teñen acceso a este ficheiro",
     "Please enter the following required information before creating the share" : "Introduza a seguinte información necesaria antes de crear a compartición",
     "Password protection (enforced)" : "Protección con contrasinal (obrigado)",
     "Password protection" : "Protección por contrasinal",

apps/files_sharing/l10n/gl.json

@@ -156,8 +156,8 @@
     "Link copied" : "Ligazón copiada",
     "Cannot copy, please copy the link manually" : "Non foi posíbel copiala. Copie a ligazón manualmente",
     "Copy to clipboard" : "Copiar no portapapeis.",
-    "Only works for users with access to this folder" : "Só funciona para usuarios con acceso a este cartafol",
-    "Only works for users with access to this file" : "Só funciona para usuarios con acceso a este ficheiro",
+    "Only works for users with access to this folder" : "Só funciona para usuarios que teñen acceso a este cartafol",
+    "Only works for users with access to this file" : "Só funciona para usuarios que teñen acceso a este ficheiro",
     "Please enter the following required information before creating the share" : "Introduza a seguinte información necesaria antes de crear a compartición",
     "Password protection (enforced)" : "Protección con contrasinal (obrigado)",
     "Password protection" : "Protección por contrasinal",

apps/files_versions/l10n/sr.js

@@ -2,7 +2,7 @@ OC.L10N.register(
     "files_versions",
     {
     "Versions" : "Верзије",
-    "This application automatically maintains older versions of files that are changed." : "Ова апликација аутоматски одржава старије верзије измењених фајлова.",
+    "This application automatically maintains older versions of files that are changed." : "Ова апликација аутоматски одржава старије верзије фајлова који су се изменили.",
     "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Ова апликација аутоматски чува старије верзије фајлова који су се изменили. Када се укључи, у свакој корисничкој фасцикли се додаје још једна скривена фасцикла у коју се смештају старије верзије фајлова. Корисник се у сваком тренутку може вратити на старију верзију фајлова кроз веб интерфејс, с тим да замењени фајл постаје исто једна верзија. Апликација аутоматски управља фасциклама са верзијама да би се осигурала да корисник не дође до квоте због чувања верзија.\n\t\tУз истицање верзија, апликација верзионисања се стара да се никад не користи више од 50% корисничког слободног простора. Уколико ускладиштена верзија прелази ову вредност, апликација ће кренути да брише верзије почевши од најстарије све док се не падне испод границе од 50%. Још информација је доступно у документацији апликације за Верзионисање.",
     "Failed to revert {file} to revision {timestamp}." : "Не могу да вратим {file} на ревизију {timestamp}.",
     "_%n byte_::_%n bytes_" : ["%n бајт","%n бајта","%n бајтова"],

apps/files_versions/l10n/sr.json

@@ -1,6 +1,6 @@
 { "translations": {
     "Versions" : "Верзије",
-    "This application automatically maintains older versions of files that are changed." : "Ова апликација аутоматски одржава старије верзије измењених фајлова.",
+    "This application automatically maintains older versions of files that are changed." : "Ова апликација аутоматски одржава старије верзије фајлова који су се изменили.",
     "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Ова апликација аутоматски чува старије верзије фајлова који су се изменили. Када се укључи, у свакој корисничкој фасцикли се додаје још једна скривена фасцикла у коју се смештају старије верзије фајлова. Корисник се у сваком тренутку може вратити на старију верзију фајлова кроз веб интерфејс, с тим да замењени фајл постаје исто једна верзија. Апликација аутоматски управља фасциклама са верзијама да би се осигурала да корисник не дође до квоте због чувања верзија.\n\t\tУз истицање верзија, апликација верзионисања се стара да се никад не користи више од 50% корисничког слободног простора. Уколико ускладиштена верзија прелази ову вредност, апликација ће кренути да брише верзије почевши од најстарије све док се не падне испод границе од 50%. Још информација је доступно у документацији апликације за Верзионисање.",
     "Failed to revert {file} to revision {timestamp}." : "Не могу да вратим {file} на ревизију {timestamp}.",
     "_%n byte_::_%n bytes_" : ["%n бајт","%n бајта","%n бајтова"],

apps/settings/l10n/ja.js

@@ -316,8 +316,6 @@ OC.L10N.register(
     "For optimal performance it's important to configure background jobs correctly. For bigger instances 'Cron' is the recommended setting. Please see the documentation for more information." : "最適なパフォーマンスにするには、バックグラウンドジョブを正確に設定することが重要です。大規模なインスタンスでは、'Cron'がお薦めの設定です。詳細な情報は、ドキュメントを参照してください。",
     "Pick background job setting" : "バックグラウンドジョブ設定を選択",
     "Execute one task with each page loaded" : "各ページの読み込み時にタスクを実行します。",
-    "cron.php is registered at a webcron service to call cron.php every 5 minutes over HTTP." : "cron.phpは、HTTP経由で5分ごとにcron.phpを実行するようwebcronサービスに登録されます。",
-    "Use system cron service to call the cron.php file every 5 minutes." : "システムのcronサービスを利用して、5分fごとにcron.phpファイルを実行します。",
     "The cron.php needs to be executed by the system user \"%s\"." : "cron.php はシステムユーザー \"%s\" で実行する必要があります。",
     "To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details." : "これを実行するにはPHPのposix拡張が必要です。詳細については、{linkstart} PHPドキュメント{linkend}を参照してください。",
     "As admin you can fine-tune the sharing behavior. Please see the documentation for more information." : "管理者であれば共有時の挙動を微調整できます。詳細な情報はドキュメントを参照してください。",

apps/settings/l10n/ja.json

@@ -314,8 +314,6 @@
     "For optimal performance it's important to configure background jobs correctly. For bigger instances 'Cron' is the recommended setting. Please see the documentation for more information." : "最適なパフォーマンスにするには、バックグラウンドジョブを正確に設定することが重要です。大規模なインスタンスでは、'Cron'がお薦めの設定です。詳細な情報は、ドキュメントを参照してください。",
     "Pick background job setting" : "バックグラウンドジョブ設定を選択",
     "Execute one task with each page loaded" : "各ページの読み込み時にタスクを実行します。",
-    "cron.php is registered at a webcron service to call cron.php every 5 minutes over HTTP." : "cron.phpは、HTTP経由で5分ごとにcron.phpを実行するようwebcronサービスに登録されます。",
-    "Use system cron service to call the cron.php file every 5 minutes." : "システムのcronサービスを利用して、5分fごとにcron.phpファイルを実行します。",
     "The cron.php needs to be executed by the system user \"%s\"." : "cron.php はシステムユーザー \"%s\" で実行する必要があります。",
     "To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details." : "これを実行するにはPHPのposix拡張が必要です。詳細については、{linkstart} PHPドキュメント{linkend}を参照してください。",
     "As admin you can fine-tune the sharing behavior. Please see the documentation for more information." : "管理者であれば共有時の挙動を微調整できます。詳細な情報はドキュメントを参照してください。",

apps/settings/l10n/sr.js

@@ -32,7 +32,7 @@ OC.L10N.register(
     "Week starts on {fdow}" : "Недеља почиње у {fdow}",
     "Groups" : "Групе",
     "Group list is empty" : "Списак група је празан",
-    "Unable to retrieve the group list" : "Не могу да добавим списак група",
+    "Unable to retrieve the group list" : "Није могуће дохватити списак група",
     "{actor} added you to group {group}" : "{actor} Вас је додао у групу {group}",
     "You added {user} to group {group}" : "Додали сте корисника {user} у групу {group}",
     "{actor} added {user} to group {group}" : "{actor} је додао корисника {user} у групу {group}",

apps/settings/l10n/sr.json

@@ -30,7 +30,7 @@
     "Week starts on {fdow}" : "Недеља почиње у {fdow}",
     "Groups" : "Групе",
     "Group list is empty" : "Списак група је празан",
-    "Unable to retrieve the group list" : "Не могу да добавим списак група",
+    "Unable to retrieve the group list" : "Није могуће дохватити списак група",
     "{actor} added you to group {group}" : "{actor} Вас је додао у групу {group}",
     "You added {user} to group {group}" : "Додали сте корисника {user} у групу {group}",
     "{actor} added {user} to group {group}" : "{actor} је додао корисника {user} у групу {group}",

apps/settings/src/views/Users.vue

@@ -75,6 +75,7 @@
 				<AppNavigationCaption v-if="groupList.length > 0" :title="t('settings', 'Groups')" />
 				<AppNavigationItem
 					v-for="group in groupList"
+					:id="group.id"
 					:key="group.id"
 					:exact="true"
 					:title="group.title"
@@ -489,7 +490,7 @@ export default {
 		 */
 		formatGroupMenu(group) {
 			const item = {}
-			item.id = group.id
+			item.id = group.id.replace(' ', '_')
 			item.title = group.name
 			item.usercount = group.usercount
 

apps/workflowengine/l10n/sr.js

@@ -43,7 +43,7 @@ OC.L10N.register(
     "Check #%s does not exist" : "Проверите да ли #%s постоји",
     "Check %s is invalid or does not exist" : "Проверите да ли је %s неисправно или не постоји",
     "Flow" : "Ток",
-    "Nextcloud workflow engine" : "Некстклаудов мотор радног тока",
+    "Nextcloud workflow engine" : "Некстклауд мотор тока рада",
     "Select a filter" : "Одаберите филтер",
     "Select a comparator" : "Одаберите компаратор",
     "Select a file type" : "Одаберите тип фајла",
@@ -79,7 +79,7 @@ OC.L10N.register(
     "Active" : "Активан",
     "Save" : "Сачувај",
     "Available flows" : "Доступни токови",
-    "For details on how to write your own flow, check out the development documentation." : "За детаље како написати сопствени ток, погледајте програмерску документацију.",
+    "For details on how to write your own flow, check out the development documentation." : "За детаље како писати Ваш ток, погледај програмерску документацију.",
     "More flows" : "Још токова",
     "Browse the app store" : "Прегледајте продавницу апликација",
     "Show less" : "Прикажи мање",
@@ -118,7 +118,7 @@ OC.L10N.register(
     "Reset" : "Ресетуј",
     "Saving…" : "Чувам…",
     "Group list is empty" : "Списак група је празан",
-    "Unable to retrieve the group list" : "Не могу да добавим списак група",
+    "Unable to retrieve the group list" : "Није могуће дохватити списак група",
     "Saved" : "Снимљено",
     "Saving failed:" : "Снимање није успело:",
     "Add rule group" : "Додај групу правила",
@@ -129,7 +129,7 @@ OC.L10N.register(
     "Select timezone…" : "Одаберите временску зону…",
     "Sync clients" : "Синхронизовани клијенти",
     "Tag management" : "Управљање ознакама",
-    "Files workflow engine" : "Мотор за радни ток фајлова",
+    "Files workflow engine" : "Датотеке за мотор процеса рада",
     "Open documentation" : "Отвори документацију",
     "Loading…" : "Учитавање…"
 },

apps/workflowengine/l10n/sr.json

@@ -41,7 +41,7 @@
     "Check #%s does not exist" : "Проверите да ли #%s постоји",
     "Check %s is invalid or does not exist" : "Проверите да ли је %s неисправно или не постоји",
     "Flow" : "Ток",
-    "Nextcloud workflow engine" : "Некстклаудов мотор радног тока",
+    "Nextcloud workflow engine" : "Некстклауд мотор тока рада",
     "Select a filter" : "Одаберите филтер",
     "Select a comparator" : "Одаберите компаратор",
     "Select a file type" : "Одаберите тип фајла",
@@ -77,7 +77,7 @@
     "Active" : "Активан",
     "Save" : "Сачувај",
     "Available flows" : "Доступни токови",
-    "For details on how to write your own flow, check out the development documentation." : "За детаље како написати сопствени ток, погледајте програмерску документацију.",
+    "For details on how to write your own flow, check out the development documentation." : "За детаље како писати Ваш ток, погледај програмерску документацију.",
     "More flows" : "Још токова",
     "Browse the app store" : "Прегледајте продавницу апликација",
     "Show less" : "Прикажи мање",
@@ -116,7 +116,7 @@
     "Reset" : "Ресетуј",
     "Saving…" : "Чувам…",
     "Group list is empty" : "Списак група је празан",
-    "Unable to retrieve the group list" : "Не могу да добавим списак група",
+    "Unable to retrieve the group list" : "Није могуће дохватити списак група",
     "Saved" : "Снимљено",
     "Saving failed:" : "Снимање није успело:",
     "Add rule group" : "Додај групу правила",
@@ -127,7 +127,7 @@
     "Select timezone…" : "Одаберите временску зону…",
     "Sync clients" : "Синхронизовани клијенти",
     "Tag management" : "Управљање ознакама",
-    "Files workflow engine" : "Мотор за радни ток фајлова",
+    "Files workflow engine" : "Датотеке за мотор процеса рада",
     "Open documentation" : "Отвори документацију",
     "Loading…" : "Учитавање…"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"

core/Controller/AvatarController.php

@@ -144,8 +144,8 @@ class AvatarController extends Controller {
 			$avatarFile = $avatar->getFile($size);
 			$response = new FileDisplayResponse(
 				$avatarFile,
-				Http::STATUS_OK,
-				['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int)$avatar->isCustomAvatar()]
+				$avatar->isCustomAvatar() ? Http::STATUS_OK : Http::STATUS_CREATED,
+				['Content-Type' => $avatarFile->getMimeType()]
 			);
 		} catch (\Exception $e) {
 			return new JSONResponse([], Http::STATUS_NOT_FOUND);

core/l10n/ca.js

@@ -119,8 +119,8 @@ OC.L10N.register(
     "unknown text" : "text desconegut",
     "Hello world!" : "Hola a tothom!",
     "sunny" : "assolellat",
-    "Hello {name}, the weather is {weather}" : "Hola, {name}, el temps és {weather}",
-    "Hello {name}" : "Hola, {name}",
+    "Hello {name}, the weather is {weather}" : "Hola {name}, el temps és {weather}",
+    "Hello {name}" : "Hola {name}",
     "<strong>These are your search results<script>alert(1)</script></strong>" : "<strong>Aquests són els resultats de la cerca<script>alert(1)</script></strong>",
     "new" : "nou",
     "_download %n file_::_download %n files_" : ["descarregar l'arxiu %n","descarrega %n fitxers"],

core/l10n/ca.json

@@ -117,8 +117,8 @@
     "unknown text" : "text desconegut",
     "Hello world!" : "Hola a tothom!",
     "sunny" : "assolellat",
-    "Hello {name}, the weather is {weather}" : "Hola, {name}, el temps és {weather}",
-    "Hello {name}" : "Hola, {name}",
+    "Hello {name}, the weather is {weather}" : "Hola {name}, el temps és {weather}",
+    "Hello {name}" : "Hola {name}",
     "<strong>These are your search results<script>alert(1)</script></strong>" : "<strong>Aquests són els resultats de la cerca<script>alert(1)</script></strong>",
     "new" : "nou",
     "_download %n file_::_download %n files_" : ["descarregar l'arxiu %n","descarrega %n fitxers"],

core/l10n/pt_BR.js

@@ -246,7 +246,7 @@ OC.L10N.register(
     "Error" : "Erro",
     "Internal Server Error" : "Erro Interno do Servidor",
     "The server was unable to complete your request." : "O servidor não conseguiu completar sua solicitação.",
-    "If this happens again, please send the technical details below to the server administrator." : "Se isso acontecer novamente, envie os detalhes técnicos abaixo para o administrador do servidor.",
+    "If this happens again, please send the technical details below to the server administrator." : "Se isso acontecer novamente, envie os detalhes técnicos abaixo para o administrador de servidor.",
     "More details can be found in the server log." : "Mais detalhes podem ser encontrados no log do servidor.",
     "Technical details" : "Detalhes técnicos",
     "Remote Address: %s" : "Endereço remoto: %s",

core/l10n/pt_BR.json

@@ -244,7 +244,7 @@
     "Error" : "Erro",
     "Internal Server Error" : "Erro Interno do Servidor",
     "The server was unable to complete your request." : "O servidor não conseguiu completar sua solicitação.",
-    "If this happens again, please send the technical details below to the server administrator." : "Se isso acontecer novamente, envie os detalhes técnicos abaixo para o administrador do servidor.",
+    "If this happens again, please send the technical details below to the server administrator." : "Se isso acontecer novamente, envie os detalhes técnicos abaixo para o administrador de servidor.",
     "More details can be found in the server log." : "Mais detalhes podem ser encontrados no log do servidor.",
     "Technical details" : "Detalhes técnicos",
     "Remote Address: %s" : "Endereço remoto: %s",

lib/l10n/es.js

@@ -15,8 +15,8 @@ OC.L10N.register(
     "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s, y %4$s",
     "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s",
     "Education Edition" : "Edición Educación",
-    "Enterprise bundle" : "Pack para empresas",
-    "Groupware bundle" : "Pack groupware",
+    "Enterprise bundle" : "Conjunto para empresas",
+    "Groupware bundle" : "Conjunto de groupware",
     "Hub bundle" : "Conjunto de Hub",
     "Social sharing bundle" : "Conjunto para compartir en redes",
     "PHP %s or higher is required." : "Se requiere PHP %s o superior.",

lib/l10n/es.json

@@ -13,8 +13,8 @@
     "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s, y %4$s",
     "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s",
     "Education Edition" : "Edición Educación",
-    "Enterprise bundle" : "Pack para empresas",
-    "Groupware bundle" : "Pack groupware",
+    "Enterprise bundle" : "Conjunto para empresas",
+    "Groupware bundle" : "Conjunto de groupware",
     "Hub bundle" : "Conjunto de Hub",
     "Social sharing bundle" : "Conjunto para compartir en redes",
     "PHP %s or higher is required." : "Se requiere PHP %s o superior.",

lib/l10n/eu.js

@@ -170,7 +170,6 @@ OC.L10N.register(
     "Verify" : "Egiaztatu",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "%s partekatzeak huts egin du, motorrak %i motako partekatzeak baimentzen ez dituelako",
     "Sharing %s failed, because the file does not exist" : "%s elkarbanatzeak huts egin du, fitxategia ez delako existitzen",
-    "Sharing %s failed, because you can not share with yourself" : "Ezin izan da %s partekatu, zure buruarekin ezin baituzu partekatu.",
     "You need to provide a password to create a public link, only protected links are allowed" : "Lotura publiko bat sortzeko pasahitza idatzi behar duzu, bakarrik babestutako loturak baimenduta daude",
     "Sharing %s failed, because sharing with links is not allowed" : "%s elkarbanatzeak huts egin du, lotura bidezko elkarbanatzea baimendua ez dagoelako",
     "Not allowed to create a federated share with the same user" : "Ezin da erabiltzaile berdinarekin federatutako partekatzea sortu.",

lib/l10n/eu.json

@@ -168,7 +168,6 @@
     "Verify" : "Egiaztatu",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "%s partekatzeak huts egin du, motorrak %i motako partekatzeak baimentzen ez dituelako",
     "Sharing %s failed, because the file does not exist" : "%s elkarbanatzeak huts egin du, fitxategia ez delako existitzen",
-    "Sharing %s failed, because you can not share with yourself" : "Ezin izan da %s partekatu, zure buruarekin ezin baituzu partekatu.",
     "You need to provide a password to create a public link, only protected links are allowed" : "Lotura publiko bat sortzeko pasahitza idatzi behar duzu, bakarrik babestutako loturak baimenduta daude",
     "Sharing %s failed, because sharing with links is not allowed" : "%s elkarbanatzeak huts egin du, lotura bidezko elkarbanatzea baimendua ez dagoelako",
     "Not allowed to create a federated share with the same user" : "Ezin da erabiltzaile berdinarekin federatutako partekatzea sortu.",

lib/l10n/mk.js

@@ -1,7 +1,7 @@
 OC.L10N.register(
     "lib",
     {
-    "Cannot write into \"config\" directory!" : "Не може да зе запишува во \"config\" директориумот!",
+    "Cannot write into \"config\" directory!" : "Не можам да впишувам во \"config\" директориумот!",
     "See %s" : "Види %s",
     "Sample configuration detected" : "Детектирана е едноставна конфигурација",
     "%1$s and %2$s" : "%1$s и %2$s",
@@ -48,7 +48,6 @@ OC.L10N.register(
     "Empty file" : "Празна датотека",
     "File name is too long" : "Името на датотеката е премногу долго",
     "Empty filename is not allowed" : "Датотеки без име не се дозболени",
-    "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Апликацијата \"%s\" неможе да се инсталира бидејќи не е компатибилна со верзијата на серверот.",
     "__language_name__" : "Македонски",
     "This is an automatically sent email, please do not reply." : "Ова е автоматски испратена порака, не одговарајте на истата.",
     "Help" : "Помош",
@@ -74,7 +73,6 @@ OC.L10N.register(
     "Open »%s«" : "Отвори »%s«",
     "%1$s via %2$s" : "%1$s преку %2$s",
     "You are not allowed to share %s" : "Не сте овластени да ја споделите %s",
-    "Expiration date is in the past" : "Рокот на траење е во минато време",
     "%1$s shared »%2$s« with you" : "%1$s сподели »%2$s« со вас",
     "%1$s shared »%2$s« with you." : "%1$s сподели »%2$s« со вас.",
     "Click the button below to open it." : "Кликнете на копчето подолу за да ја отворите.",
@@ -132,23 +130,15 @@ OC.L10N.register(
     "The username is already being used" : "Корисничкото име е веќе во употреба",
     "User disabled" : "Оневозможен корисник",
     "a safe home for all your data" : "безбеден дом за сите ваши податоци",
-    "File is currently busy, please try again later" : "Датотеката моментално е зафатена, обидете се повторно",
     "Can't read file" : "Неможе да се прочита датотеката",
     "Application is not enabled" : "Апликацијата не е овозможена",
     "Authentication error" : "Грешка во автентикација",
     "Token expired. Please reload page." : "Жетонот е истечен. Ве молам превчитајте ја страницата.",
-    "Cannot write into \"config\" directory" : "Не може да зе запишува во \"config\" директориумот",
-    "Cannot write into \"apps\" directory" : "Не може да зе запишува во \"apps\" директориумот",
     "Setting locale to %s failed" : "Неуспешно поставување на локацијата %s ",
-    "Please ask your server administrator to install the module." : "Замолете го сервер администраторот да го инсталира додатокот.",
     "PHP module %s not installed." : "PHP модулот %s не е инсталиран.",
     "PHP setting \"%s\" is not set to \"%s\"." : "PHP поставката \"%s\" не е поставена до \"%s\".",
     "Please ask your server administrator to restart the web server." : "Замолете го сервер администраторот да го рестартира веб серверот.",
     "PostgreSQL >= 9 required" : "Потребно е PostgreSQL >= 9 ",
-    "Please upgrade your database version" : "Ве молиме надградете ја верзијата на базата со податоци",
-    "Storage unauthorized. %s" : "Неавторизирано складиште. %s",
-    "Storage incomplete configuration. %s" : "Конфигурацијата на складиштето не е комплетна. %s",
-    "Storage connection error. %s" : "Грешка во конекција до складиштето. %s",
     "Storage is temporarily not available" : "Складиштето моментално не е достапно",
     "Create" : "Креирај",
     "Change" : "Измени",
@@ -165,7 +155,6 @@ OC.L10N.register(
     "Verifying" : "Потврдување",
     "Verifying …" : "Потврдување …",
     "Verify" : "Потврди",
-    "Sharing %s failed, because you can not share with yourself" : "Споделувањето на %s е неуспешно, бидејќи неможете да го споделите сами со себе",
     "Sharing %1$s failed, because this item is already shared with %2$s" : "Споделувањето на %1$s е неуспешно, бидејќи истото веќе е споделено со %2$s",
     "Not allowed to create a federated share with the same user" : "Не е овозможено да креирате федерално споделување со ист корисник",
     "Sharing %1$s failed, could not find %2$s, maybe the server is currently unreachable." : "Споделувањето на %1$s е неуспешно, неможе да се пронајде %2$s, можеби серверот моментално не е достапен.",

lib/l10n/mk.json

@@ -1,5 +1,5 @@
 { "translations": {
-    "Cannot write into \"config\" directory!" : "Не може да зе запишува во \"config\" директориумот!",
+    "Cannot write into \"config\" directory!" : "Не можам да впишувам во \"config\" директориумот!",
     "See %s" : "Види %s",
     "Sample configuration detected" : "Детектирана е едноставна конфигурација",
     "%1$s and %2$s" : "%1$s и %2$s",
@@ -46,7 +46,6 @@
     "Empty file" : "Празна датотека",
     "File name is too long" : "Името на датотеката е премногу долго",
     "Empty filename is not allowed" : "Датотеки без име не се дозболени",
-    "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Апликацијата \"%s\" неможе да се инсталира бидејќи не е компатибилна со верзијата на серверот.",
     "__language_name__" : "Македонски",
     "This is an automatically sent email, please do not reply." : "Ова е автоматски испратена порака, не одговарајте на истата.",
     "Help" : "Помош",
@@ -72,7 +71,6 @@
     "Open »%s«" : "Отвори »%s«",
     "%1$s via %2$s" : "%1$s преку %2$s",
     "You are not allowed to share %s" : "Не сте овластени да ја споделите %s",
-    "Expiration date is in the past" : "Рокот на траење е во минато време",
     "%1$s shared »%2$s« with you" : "%1$s сподели »%2$s« со вас",
     "%1$s shared »%2$s« with you." : "%1$s сподели »%2$s« со вас.",
     "Click the button below to open it." : "Кликнете на копчето подолу за да ја отворите.",
@@ -130,23 +128,15 @@
     "The username is already being used" : "Корисничкото име е веќе во употреба",
     "User disabled" : "Оневозможен корисник",
     "a safe home for all your data" : "безбеден дом за сите ваши податоци",
-    "File is currently busy, please try again later" : "Датотеката моментално е зафатена, обидете се повторно",
     "Can't read file" : "Неможе да се прочита датотеката",
     "Application is not enabled" : "Апликацијата не е овозможена",
     "Authentication error" : "Грешка во автентикација",
     "Token expired. Please reload page." : "Жетонот е истечен. Ве молам превчитајте ја страницата.",
-    "Cannot write into \"config\" directory" : "Не може да зе запишува во \"config\" директориумот",
-    "Cannot write into \"apps\" directory" : "Не може да зе запишува во \"apps\" директориумот",
     "Setting locale to %s failed" : "Неуспешно поставување на локацијата %s ",
-    "Please ask your server administrator to install the module." : "Замолете го сервер администраторот да го инсталира додатокот.",
     "PHP module %s not installed." : "PHP модулот %s не е инсталиран.",
     "PHP setting \"%s\" is not set to \"%s\"." : "PHP поставката \"%s\" не е поставена до \"%s\".",
     "Please ask your server administrator to restart the web server." : "Замолете го сервер администраторот да го рестартира веб серверот.",
     "PostgreSQL >= 9 required" : "Потребно е PostgreSQL >= 9 ",
-    "Please upgrade your database version" : "Ве молиме надградете ја верзијата на базата со податоци",
-    "Storage unauthorized. %s" : "Неавторизирано складиште. %s",
-    "Storage incomplete configuration. %s" : "Конфигурацијата на складиштето не е комплетна. %s",
-    "Storage connection error. %s" : "Грешка во конекција до складиштето. %s",
     "Storage is temporarily not available" : "Складиштето моментално не е достапно",
     "Create" : "Креирај",
     "Change" : "Измени",
@@ -163,7 +153,6 @@
     "Verifying" : "Потврдување",
     "Verifying …" : "Потврдување …",
     "Verify" : "Потврди",
-    "Sharing %s failed, because you can not share with yourself" : "Споделувањето на %s е неуспешно, бидејќи неможете да го споделите сами со себе",
     "Sharing %1$s failed, because this item is already shared with %2$s" : "Споделувањето на %1$s е неуспешно, бидејќи истото веќе е споделено со %2$s",
     "Not allowed to create a federated share with the same user" : "Не е овозможено да креирате федерално споделување со ист корисник",
     "Sharing %1$s failed, could not find %2$s, maybe the server is currently unreachable." : "Споделувањето на %1$s е неуспешно, неможе да се пронајде %2$s, можеби серверот моментално не е достапен.",

lib/private/Files/Cache/Updater.php

@@ -224,15 +224,12 @@ class Updater implements IUpdater {
 	private function updateStorageMTimeOnly($internalPath) {
 		$fileId = $this->cache->getId($internalPath);
 		if ($fileId !== -1) {
-			$mtime = $this->storage->filemtime($internalPath);
-			if ($mtime !== false) {
-				$this->cache->update(
-					$fileId, [
-						'mtime' => null, // this magic tells it to not overwrite mtime
-						'storage_mtime' => $mtime
-					]
-				);
-			}
+			$this->cache->update(
+				$fileId, [
+					'mtime' => null, // this magic tells it to not overwrite mtime
+					'storage_mtime' => $this->storage->filemtime($internalPath)
+				]
+			);
 		}
 	}
 

lib/private/Updater/ChangesCheck.php

@@ -56,8 +56,8 @@ class ChangesCheck {
 		$version = $this->normalizeVersion($version);
 		$changesInfo = $this->mapper->getChanges($version);
 		$changesData = json_decode($changesInfo->getData(), true);
-		if (empty($changesData)) {
-			throw new DoesNotExistException('Unable to decode changes info');
+		if(empty($changesData)) {
+			throw new DoesNotExistException();
 		}
 		return $changesData;
 	}

lib/private/legacy/helper.php

@@ -42,6 +42,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
+
+use OCP\IUser;
 use Symfony\Component\Process\ExecutableFinder;
 
 /**
@@ -503,19 +505,14 @@ class OC_Helper {
 				|| $storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')
 			) {
 				/** @var \OC\Files\Storage\Home $storage */
-				$userInstance = $storage->getUser();
-				$user = ($userInstance === null) ? null : $userInstance->getUID();
+				$user = $storage->getUser();
 			} else {
-				$user = \OC::$server->getUserSession()->getUser()->getUID();
-			}
-			if ($user) {
-				$quota = OC_Util::getUserQuota($user);
-			} else {
-				$quota = \OCP\Files\FileInfo::SPACE_UNLIMITED;
+				$user = \OC::$server->getUserSession()->getUser();
 			}
+			$quota = OC_Util::getUserQuota($user);
 			if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
 				// always get free space / total space from root + mount points
-				return self::getGlobalStorageInfo();
+				return self::getGlobalStorageInfo($quota);
 			}
 		}
 
@@ -561,11 +558,10 @@ class OC_Helper {
 	/**
 	 * Get storage info including all mount points and quota
 	 *
+	 * @param int $quota
 	 * @return array
 	 */
-	private static function getGlobalStorageInfo() {
-		$quota = OC_Util::getUserQuota(\OCP\User::getUser());
-
+	private static function getGlobalStorageInfo($quota) {
 		$rootInfo = \OC\Files\Filesystem::getFileInfo('', 'ext');
 		$used = $rootInfo['size'];
 		if ($used < 0) {

lib/private/legacy/util.php

@@ -251,8 +251,7 @@ class OC_Util {
 			) {
 				/** @var \OC\Files\Storage\Home $storage */
 				if (is_object($storage->getUser())) {
-					$user = $storage->getUser()->getUID();
-					$quota = OC_Util::getUserQuota($user);
+					$quota = OC_Util::getUserQuota($storage->getUser());
 					if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
 						return new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => $quota, 'root' => 'files'));
 					}
@@ -375,11 +374,10 @@ class OC_Util {
 	/**
 	 * Get the quota of a user
 	 *
-	 * @param string $userId
+	 * @param IUser|null $user
 	 * @return float Quota bytes
 	 */
-	public static function getUserQuota($userId) {
-		$user = \OC::$server->getUserManager()->get($userId);
+	public static function getUserQuota(?IUser $user) {
 		if (is_null($user)) {
 			return \OCP\Files\FileInfo::SPACE_UNLIMITED;
 		}

tests/Core/Controller/AvatarControllerTest.php

@@ -193,8 +193,6 @@ class AvatarControllerTest extends \Test\TestCase {
 		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
 		$this->assertArrayHasKey('Content-Type', $response->getHeaders());
 		$this->assertEquals('image type', $response->getHeaders()['Content-Type']);
-		$this->assertArrayHasKey('X-NC-IsCustomAvatar', $response->getHeaders());
-		$this->assertEquals('1', $response->getHeaders()['X-NC-IsCustomAvatar']);
 
 		$this->assertEquals('my etag', $response->getETag());
 	}
@@ -208,11 +206,9 @@ class AvatarControllerTest extends \Test\TestCase {
 
 		$response = $this->avatarController->getAvatar('userId', 32);
 
-		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+		$this->assertEquals(Http::STATUS_CREATED, $response->getStatus());
 		$this->assertArrayHasKey('Content-Type', $response->getHeaders());
 		$this->assertEquals('image type', $response->getHeaders()['Content-Type']);
-		$this->assertArrayHasKey('X-NC-IsCustomAvatar', $response->getHeaders());
-		$this->assertEquals('0', $response->getHeaders()['X-NC-IsCustomAvatar']);
 
 		$this->assertEquals('my etag', $response->getETag());
 	}

tests/lib/Updater/ChangesCheckTest.php

@@ -380,21 +380,4 @@ class ChangesCheckTest extends TestCase {
 		$this->assertTrue(isset($data['whatsNew']['en']['regular']));
 		$this->assertTrue(isset($data['changelogURL']));
 	}
-
-	public function testGetChangesForVersionEmptyData() {
-		$entry = $this->createMock(ChangesResult::class);
-		$entry->expects($this->once())
-			->method('__call')
-			->with('getData')
-			->willReturn('');
-
-		$this->mapper->expects($this->once())
-			->method('getChanges')
-			->with('13.0.7')
-			->willReturn($entry);
-
-		$this->expectException(DoesNotExistException::class);
-		/** @noinspection PhpUnhandledExceptionInspection */
-		$this->checker->getChangesForVersion('13.0.7');
-	}
 }