summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--l10n/ar.js18
-rw-r--r--l10n/ar.json18
-rw-r--r--l10n/bg.js18
-rw-r--r--l10n/bg.json18
-rw-r--r--l10n/ca.js18
-rw-r--r--l10n/ca.json18
-rw-r--r--l10n/cs.js18
-rw-r--r--l10n/cs.json18
-rw-r--r--l10n/de.js18
-rw-r--r--l10n/de.json18
-rw-r--r--l10n/de_DE.js18
-rw-r--r--l10n/de_DE.json18
-rw-r--r--l10n/en_GB.js18
-rw-r--r--l10n/en_GB.json18
-rw-r--r--l10n/es.js18
-rw-r--r--l10n/es.json18
-rw-r--r--l10n/es_EC.js18
-rw-r--r--l10n/es_EC.json18
-rw-r--r--l10n/eu.js8
-rw-r--r--l10n/eu.json8
-rw-r--r--l10n/fa.js18
-rw-r--r--l10n/fa.json18
-rw-r--r--l10n/fi.js2
-rw-r--r--l10n/fi.json2
-rw-r--r--l10n/fr.js18
-rw-r--r--l10n/fr.json18
-rw-r--r--l10n/gl.js18
-rw-r--r--l10n/gl.json18
-rw-r--r--l10n/hu.js18
-rw-r--r--l10n/hu.json18
-rw-r--r--l10n/ja.js18
-rw-r--r--l10n/ja.json18
-rw-r--r--l10n/ka.js18
-rw-r--r--l10n/ka.json18
-rw-r--r--l10n/ko.js18
-rw-r--r--l10n/ko.json18
-rw-r--r--l10n/nb.js18
-rw-r--r--l10n/nb.json18
-rw-r--r--l10n/pl.js18
-rw-r--r--l10n/pl.json18
-rw-r--r--l10n/pt_BR.js21
-rw-r--r--l10n/pt_BR.json21
-rw-r--r--l10n/ro.js4
-rw-r--r--l10n/ro.json4
-rw-r--r--l10n/ru.js18
-rw-r--r--l10n/ru.json18
-rw-r--r--l10n/sk.js36
-rw-r--r--l10n/sk.json36
-rw-r--r--l10n/sl.js16
-rw-r--r--l10n/sl.json16
-rw-r--r--l10n/sr.js21
-rw-r--r--l10n/sr.json21
-rw-r--r--l10n/tr.js63
-rw-r--r--l10n/tr.json63
-rw-r--r--l10n/zh_CN.js18
-rw-r--r--l10n/zh_CN.json18
-rw-r--r--l10n/zh_HK.js18
-rw-r--r--l10n/zh_HK.json18
-rw-r--r--l10n/zh_TW.js21
-rw-r--r--l10n/zh_TW.json21
-rw-r--r--lib/Chat/SystemMessage/Listener.php6
-rw-r--r--lib/Controller/PageController.php3
-rw-r--r--lib/Federation/BackendNotifier.php2
-rw-r--r--lib/Federation/CloudFederationProviderTalk.php5
-rw-r--r--lib/Federation/FederationManager.php21
-rw-r--r--lib/Middleware/InjectionMiddleware.php3
-rw-r--r--lib/Model/InvitationMapper.php10
-rw-r--r--lib/Service/BotService.php6
-rw-r--r--src/services/participantsService.js17
-rw-r--r--tests/integration/features/bootstrap/FeatureContext.php3
-rw-r--r--tests/integration/features/federation/invite.feature64
-rw-r--r--tests/php/Chat/SystemMessage/ListenerTest.php4
-rw-r--r--tests/php/Federation/FederationTest.php3
73 files changed, 763 insertions, 524 deletions
diff --git a/l10n/ar.js b/l10n/ar.js
index fd273d60d..86d34325a 100644
--- a/l10n/ar.js
+++ b/l10n/ar.js
@@ -1680,15 +1680,6 @@ OC.L10N.register(
"In conversation" : "في المحادثة ...",
"Search in conversation: {conversation}" : "البحث في المحادثة: {conversation}",
"Error while sharing file" : "خطأ اثناء مشاركة ملف",
- "An error occurred while creating breakout rooms" : "حدث خطأ أثناء إنشاء الغرف الجانبية",
- "An error occurred while re-ordering the attendees" : "حدث خطأٌ أثناء إعادة ترتيب الحاضرين",
- "An error occurred while deleting breakout rooms" : "حدث خطأ أثناء حذف الغرف الجانبية",
- "An error occurred while starting breakout rooms" : "حدث خطأ أثناء بدء الغرف الجانبية",
- "An error occurred while stopping breakout rooms" : "حدث خطأ أثناء إيقاف الغرف الجانبية",
- "An error occurred while sending a message to the breakout rooms" : "حدث خطأ أثناء إرسال رسالة إلى الغرف الجانبية",
- "An error occurred while requesting assistance" : "حدث خطأٌ أثناء طلب المساعدة",
- "An error occurred while resetting the request for assistance" : "حدث خطأٌ أثناء إعادة تعيين طلب المساعدة",
- "An error occurred while joining breakout room" : "حدث خطأٌ أثناء الانضمام إلى غرفة جانبية",
"Error while clearing conversation history" : "خطأ أثناء مسح محفوظات المحادثة",
"Call recording is starting." : "بدء تسجيل المكالمة.",
"Call recording stopped while starting." : "تسجيل المكالمة توقف بمجرد البدء فيه",
@@ -1708,6 +1699,15 @@ OC.L10N.register(
"An error occurred while submitting your vote" : "حدث خطأ أثناء تقديم تصويتك",
"An error occurred while ending the poll" : "حدث خطأ أثناء إنهاء الاستطلاع",
"Poll \"{name}\" was created by {user}. Click to vote" : "الاستفتاء \"{name}\" أنشأه {user}. أنقُر للتصويت",
+ "An error occurred while creating breakout rooms" : "حدث خطأ أثناء إنشاء الغرف الجانبية",
+ "An error occurred while re-ordering the attendees" : "حدث خطأٌ أثناء إعادة ترتيب الحاضرين",
+ "An error occurred while deleting breakout rooms" : "حدث خطأ أثناء حذف الغرف الجانبية",
+ "An error occurred while starting breakout rooms" : "حدث خطأ أثناء بدء الغرف الجانبية",
+ "An error occurred while stopping breakout rooms" : "حدث خطأ أثناء إيقاف الغرف الجانبية",
+ "An error occurred while sending a message to the breakout rooms" : "حدث خطأ أثناء إرسال رسالة إلى الغرف الجانبية",
+ "An error occurred while requesting assistance" : "حدث خطأٌ أثناء طلب المساعدة",
+ "An error occurred while resetting the request for assistance" : "حدث خطأٌ أثناء إعادة تعيين طلب المساعدة",
+ "An error occurred while joining breakout room" : "حدث خطأٌ أثناء الانضمام إلى غرفة جانبية",
"An error occurred while accepting an invitation" : "حدث خطأ أثناء قبول الدعوة",
"An error occurred while rejecting an invitation" : "حدث خطأ أثناء رفض الدعوة",
"{guest} (guest)" : "{guest} (ضيف)",
diff --git a/l10n/ar.json b/l10n/ar.json
index 9b3808fb3..8a825c5f8 100644
--- a/l10n/ar.json
+++ b/l10n/ar.json
@@ -1678,15 +1678,6 @@
"In conversation" : "في المحادثة ...",
"Search in conversation: {conversation}" : "البحث في المحادثة: {conversation}",
"Error while sharing file" : "خطأ اثناء مشاركة ملف",
- "An error occurred while creating breakout rooms" : "حدث خطأ أثناء إنشاء الغرف الجانبية",
- "An error occurred while re-ordering the attendees" : "حدث خطأٌ أثناء إعادة ترتيب الحاضرين",
- "An error occurred while deleting breakout rooms" : "حدث خطأ أثناء حذف الغرف الجانبية",
- "An error occurred while starting breakout rooms" : "حدث خطأ أثناء بدء الغرف الجانبية",
- "An error occurred while stopping breakout rooms" : "حدث خطأ أثناء إيقاف الغرف الجانبية",
- "An error occurred while sending a message to the breakout rooms" : "حدث خطأ أثناء إرسال رسالة إلى الغرف الجانبية",
- "An error occurred while requesting assistance" : "حدث خطأٌ أثناء طلب المساعدة",
- "An error occurred while resetting the request for assistance" : "حدث خطأٌ أثناء إعادة تعيين طلب المساعدة",
- "An error occurred while joining breakout room" : "حدث خطأٌ أثناء الانضمام إلى غرفة جانبية",
"Error while clearing conversation history" : "خطأ أثناء مسح محفوظات المحادثة",
"Call recording is starting." : "بدء تسجيل المكالمة.",
"Call recording stopped while starting." : "تسجيل المكالمة توقف بمجرد البدء فيه",
@@ -1706,6 +1697,15 @@
"An error occurred while submitting your vote" : "حدث خطأ أثناء تقديم تصويتك",
"An error occurred while ending the poll" : "حدث خطأ أثناء إنهاء الاستطلاع",
"Poll \"{name}\" was created by {user}. Click to vote" : "الاستفتاء \"{name}\" أنشأه {user}. أنقُر للتصويت",
+ "An error occurred while creating breakout rooms" : "حدث خطأ أثناء إنشاء الغرف الجانبية",
+ "An error occurred while re-ordering the attendees" : "حدث خطأٌ أثناء إعادة ترتيب الحاضرين",
+ "An error occurred while deleting breakout rooms" : "حدث خطأ أثناء حذف الغرف الجانبية",
+ "An error occurred while starting breakout rooms" : "حدث خطأ أثناء بدء الغرف الجانبية",
+ "An error occurred while stopping breakout rooms" : "حدث خطأ أثناء إيقاف الغرف الجانبية",
+ "An error occurred while sending a message to the breakout rooms" : "حدث خطأ أثناء إرسال رسالة إلى الغرف الجانبية",
+ "An error occurred while requesting assistance" : "حدث خطأٌ أثناء طلب المساعدة",
+ "An error occurred while resetting the request for assistance" : "حدث خطأٌ أثناء إعادة تعيين طلب المساعدة",
+ "An error occurred while joining breakout room" : "حدث خطأٌ أثناء الانضمام إلى غرفة جانبية",
"An error occurred while accepting an invitation" : "حدث خطأ أثناء قبول الدعوة",
"An error occurred while rejecting an invitation" : "حدث خطأ أثناء رفض الدعوة",
"{guest} (guest)" : "{guest} (ضيف)",
diff --git a/l10n/bg.js b/l10n/bg.js
index 4af93ff2a..cb8916d1a 100644
--- a/l10n/bg.js
+++ b/l10n/bg.js
@@ -1324,15 +1324,6 @@ OC.L10N.register(
"The recording failed. Please contact your administrator." : "Записът е неуспешен. Моля, свържете се с вашия администратор.",
"Share to conversation" : "Споделяне в разговора",
"Error while sharing file" : "Грешка при споделяне на файл",
- "An error occurred while creating breakout rooms" : "Възникна грешка при създаването на стаи за отделно събрание",
- "An error occurred while re-ordering the attendees" : "Възникна грешка при пренареждане на участниците",
- "An error occurred while deleting breakout rooms" : "Възникна грешка при изтриването на стаи за отделно събрание",
- "An error occurred while starting breakout rooms" : "Възникна грешка при стартирането на стаи за отделно събрание",
- "An error occurred while stopping breakout rooms" : "Възникна грешка при спирането на стаи за отделно събрание",
- "An error occurred while sending a message to the breakout rooms" : "Възникна грешка при изпращането на съобщение до стаи за отделно събрание",
- "An error occurred while requesting assistance" : "Възникна грешка при заявка за съдействие",
- "An error occurred while resetting the request for assistance" : "Възникнала е грешка при възстановяване на заявката за съдействие",
- "An error occurred while joining breakout room" : "Възникна грешка при присъединяването към стаята за отделно събрание",
"Error while clearing conversation history" : "Грешка при изчистване на историята на разговорите",
"Call recording is starting." : "Записването на обаждането започва.",
"Call recording stopped while starting." : "Записването на разговора спря при стартирането му.",
@@ -1351,6 +1342,15 @@ OC.L10N.register(
"Leave this page" : "Напускане на тази страница",
"An error occurred while submitting your vote" : "Възникна грешка при изпращането на вашето гласуване",
"An error occurred while ending the poll" : "Възникна грешка при приключване на анкетата",
+ "An error occurred while creating breakout rooms" : "Възникна грешка при създаването на стаи за отделно събрание",
+ "An error occurred while re-ordering the attendees" : "Възникна грешка при пренареждане на участниците",
+ "An er