Merge branch 'master' into imaginary-performance

Author: enoch85

.htaccess

@@ -90,6 +90,7 @@
   RewriteRule ^remote/(.*) remote.php [QSA,L]
   RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
   RewriteRule ^\.well-known/(?!acme-challenge|pki-validation) /index.php [QSA,L]
+  RewriteRule ^ocm-provider/?$ /index.php [QSA,L]
   RewriteRule ^(?:\.(?!well-known)|autotest|occ|issue|indie|db_|console).* - [R=404,L]
 </IfModule>
 

3rdparty

@@ -2,6 +2,6 @@ OC.L10N.register(
     "admin_audit",
     {
     "Auditing / Logging" : "Auditoria / Registro",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece recursos de registro para Nextcloud, como registros de acesso a arquivos ou outras ações confidenciais."
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece recursos de registro para Nextcloud, como registros de acesso a arquivos ou outras ações sensíveis."
 },
 "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");

apps/admin_audit/l10n/pt_BR.js

@@ -1,5 +1,5 @@
 { "translations": {
     "Auditing / Logging" : "Auditoria / Registro",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece recursos de registro para Nextcloud, como registros de acesso a arquivos ou outras ações confidenciais."
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece recursos de registro para Nextcloud, como registros de acesso a arquivos ou outras ações sensíveis."
 },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }

apps/admin_audit/l10n/pt_BR.json

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Delete comment" : "حذف التعليق",
     "Cancel edit" : "إلغاء التعديل",
     "Post comment" : "أضف تعليق",
+    "\"@\" for mentions, \":\" for emoji, \"/\" for smart picker" : "\"@\" للإشارات, \":\" للإيموجي, \"/\" للاقط الذكي",
     "No comments yet, start the conversation!" : "لا يوجد تعليقات, ابدأ النقاش الآن!",
     "No more messages" : "لامزيد من الرسائل",
     "Retry" : "أعد المحاولة",

apps/comments/l10n/ar.js

@@ -14,6 +14,7 @@
     "Delete comment" : "حذف التعليق",
     "Cancel edit" : "إلغاء التعديل",
     "Post comment" : "أضف تعليق",
+    "\"@\" for mentions, \":\" for emoji, \"/\" for smart picker" : "\"@\" للإشارات, \":\" للإيموجي, \"/\" للاقط الذكي",
     "No comments yet, start the conversation!" : "لا يوجد تعليقات, ابدأ النقاش الآن!",
     "No more messages" : "لامزيد من الرسائل",
     "Retry" : "أعد المحاولة",

apps/comments/l10n/ar.json

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Delete comment" : "Kommentar löschen",
     "Cancel edit" : "Bearbeiten abbrechen",
     "Post comment" : "Kommentar veröffentlichen",
+    "\"@\" for mentions, \":\" for emoji, \"/\" for smart picker" : "\"@\" für Erwähnungen, \":\" für Emoji, \"/\" für Smart Picker",
     "No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginnen Sie die Diskussion!",
     "No more messages" : "Keine weiteren Nachrichten",
     "Retry" : "Wiederholen",

apps/comments/l10n/de_DE.js

@@ -14,6 +14,7 @@
     "Delete comment" : "Kommentar löschen",
     "Cancel edit" : "Bearbeiten abbrechen",
     "Post comment" : "Kommentar veröffentlichen",
+    "\"@\" for mentions, \":\" for emoji, \"/\" for smart picker" : "\"@\" für Erwähnungen, \":\" für Emoji, \"/\" für Smart Picker",
     "No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginnen Sie die Diskussion!",
     "No more messages" : "Keine weiteren Nachrichten",
     "Retry" : "Wiederholen",

apps/comments/l10n/de_DE.json

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Delete comment" : "Ta bort kommentar",
     "Cancel edit" : "Avbryt redigering",
     "Post comment" : "Publicera kommentar",
+    "\"@\" for mentions, \":\" for emoji, \"/\" for smart picker" : "\"@\" för omnämnanden, \":\" för emoji, \"/\" för smart picker",
     "No comments yet, start the conversation!" : "Inga kommentarer ännu.",
     "No more messages" : "Inga fler meddelanden",
     "Retry" : "Försök igen",

apps/comments/l10n/sv.js

@@ -14,6 +14,7 @@
     "Delete comment" : "Ta bort kommentar",
     "Cancel edit" : "Avbryt redigering",
     "Post comment" : "Publicera kommentar",
+    "\"@\" for mentions, \":\" for emoji, \"/\" for smart picker" : "\"@\" för omnämnanden, \":\" för emoji, \"/\" för smart picker",
     "No comments yet, start the conversation!" : "Inga kommentarer ännu.",
     "No more messages" : "Inga fler meddelanden",
     "Retry" : "Försök igen",