diff --git a/translations/ring_client_windows.ts b/translations/ring_client_windows.ts
index 10e8338bddb084fedc5dbcaca39599ce7aa4c468..a3fe5927479f76b6ad7c2556d98d75ccebaefa2b 100644
--- a/translations/ring_client_windows.ts
+++ b/translations/ring_client_windows.ts
@@ -28,12 +28,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"></translation>
</message>
@@ -125,35 +125,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -178,15 +159,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"></translation>
@@ -2283,17 +2299,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_ar.ts b/translations/ring_client_windows_ar.ts
index 92a3da3c9966bd890e7fc2200fa15cee0c21731d..78bd364fe44f778803d228b0a2386c6ccf3d4cf8 100644
--- a/translations/ring_client_windows_ar.ts
+++ b/translations/ring_client_windows_ar.ts
@@ -4,7 +4,7 @@
<message>
<location filename="../src/mainview/components/AboutPopUp.qml" line="245"/>
<source>Close</source>
- <translation type="unfinished"/>
+ <translation>إغلاق</translation>
</message>
</context>
<context>
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,22 +157,27 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
<message>
<location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="40"/>
<source>Start video call</source>
- <translation type="unfinished"/>
+ <translation>بدء مكالمة Ùيديو</translation>
</message>
<message>
<location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="49"/>
@@ -201,7 +187,7 @@
<message>
<location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="59"/>
<source>Clear conversation</source>
- <translation type="unfinished"/>
+ <translation>Ù…Ø³Ø Ø§Ù„Ù…Øادثة</translation>
</message>
<message>
<location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="68"/>
@@ -249,7 +235,7 @@
<message>
<location filename="../src/wizardview/components/CreateAccountPage.qml" line="170"/>
<source>Invalid username</source>
- <translation type="unfinished"/>
+ <translation>اسم مستخدم غير صالØ</translation>
</message>
<message>
<location filename="../src/wizardview/components/CreateAccountPage.qml" line="170"/>
@@ -259,7 +245,7 @@
<message>
<location filename="../src/wizardview/components/CreateAccountPage.qml" line="172"/>
<source>Username already taken</source>
- <translation type="unfinished"/>
+ <translation>اسم المستخدم مستخدم بالÙعل</translation>
</message>
<message>
<location filename="../src/wizardview/components/CreateAccountPage.qml" line="172"/>
@@ -373,7 +359,7 @@ Jami will now quit.</source>
<message>
<location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="87"/>
<source>Import from backup</source>
- <translation type="unfinished"/>
+ <translation>استيراد من النسخ الاØتياطي</translation>
</message>
<message>
<location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="158"/>
@@ -489,7 +475,7 @@ Jami will now quit.</source>
<message>
<location filename="../src/constant/JamiStrings.qml" line="51"/>
<source>Delete account</source>
- <translation type="unfinished"/>
+ <translation>Øذ٠الØساب</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="53"/>
@@ -664,7 +650,7 @@ Jami will now quit.</source>
<message>
<location filename="../src/constant/JamiStrings.qml" line="126"/>
<source>Enable local peer discovery</source>
- <translation type="unfinished"/>
+ <translation>تمكين اكتشا٠النظراء المØلي</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="137"/>
@@ -719,7 +705,7 @@ Jami will now quit.</source>
<message>
<location filename="../src/constant/JamiStrings.qml" line="221"/>
<source>Create a rendezvous point</source>
- <translation type="unfinished"/>
+ <translation>إنشاء نقطة اجتماع</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="224"/>
@@ -729,7 +715,7 @@ Jami will now quit.</source>
<message>
<location filename="../src/constant/JamiStrings.qml" line="226"/>
<source>Choose a name for your rendezvous point</source>
- <translation type="unfinished"/>
+ <translation>اختر اسماً لنقطة الاجتماع</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="278"/>
@@ -739,7 +725,7 @@ Jami will now quit.</source>
<message>
<location filename="../src/constant/JamiStrings.qml" line="298"/>
<source>Network error</source>
- <translation type="unfinished"/>
+ <translation>خطأ ÙÙŠ الشبكة</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="299"/>
@@ -1064,7 +1050,7 @@ Jami will now quit.</source>
<message>
<location filename="../src/constant/JamiStrings.qml" line="157"/>
<source>Enable hardware acceleration</source>
- <translation type="unfinished"/>
+ <translation>تمكين تسريع الأجهزة</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="158"/>
@@ -1099,7 +1085,7 @@ Jami will now quit.</source>
<message>
<location filename="../src/constant/JamiStrings.qml" line="169"/>
<source>Never show me this again</source>
- <translation type="unfinished"/>
+ <translation>لا تظهر لي هذا مرة أخرى</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="170"/>
@@ -1181,7 +1167,7 @@ Jami will now quit.</source>
<message>
<location filename="../src/constant/JamiStrings.qml" line="198"/>
<source>Stop recording</source>
- <translation type="unfinished"/>
+ <translation>إيقا٠التسجيل</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="199"/>
@@ -1201,7 +1187,7 @@ Jami will now quit.</source>
<message>
<location filename="../src/constant/JamiStrings.qml" line="202"/>
<source>Share screen</source>
- <translation type="unfinished"/>
+ <translation>مشاركة الشاشة</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="203"/>
@@ -1246,7 +1232,7 @@ Jami will now quit.</source>
<message>
<location filename="../src/constant/JamiStrings.qml" line="213"/>
<source>Connect</source>
- <translation type="unfinished"/>
+ <translation>إتصال</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="215"/>
@@ -1578,7 +1564,7 @@ Jami will now quit.</source>
<message>
<location filename="../src/constant/JamiStrings.qml" line="329"/>
<source>Close</source>
- <translation type="unfinished"/>
+ <translation>إغلاق</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="330"/>
@@ -1714,7 +1700,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/constant/JamiStrings.qml" line="391"/>
<source>Add a SIP account</source>
- <translation type="unfinished"/>
+ <translation>إضاÙØ© Øساب SIP</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="392"/>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation>إنهاء المكالمة</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -1944,7 +1960,7 @@ Please try again later.</source>
<message>
<location filename="../src/settingsview/components/LinkedDevices.qml" line="109"/>
<source>Linked Devices</source>
- <translation type="unfinished"/>
+ <translation>الأجهزة المرتبطة</translation>
</message>
</context>
<context>
@@ -2012,7 +2028,7 @@ Please try again later.</source>
<message>
<location filename="../src/settingsview/components/NameRegistrationDialog.qml" line="90"/>
<source>Network error</source>
- <translation type="unfinished"/>
+ <translation>خطأ ÙÙŠ الشبكة</translation>
</message>
</context>
<context>
@@ -2174,7 +2190,7 @@ Please try again later.</source>
<message>
<location filename="../src/settingsview/components/RecordingSettings.qml" line="82"/>
<source>Always record calls</source>
- <translation type="unfinished"/>
+ <translation>تسجيل المكالمات دائمًا</translation>
</message>
<message>
<location filename="../src/settingsview/components/RecordingSettings.qml" line="112"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>عام</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2342,7 +2358,7 @@ Please try again later.</source>
<message>
<location filename="../src/settingsview/components/UserIdentity.qml" line="50"/>
<source>Identity</source>
- <translation type="unfinished"/>
+ <translation>الهوية</translation>
</message>
</context>
<context>
diff --git a/translations/ring_client_windows_bg.ts b/translations/ring_client_windows_bg.ts
index 0b78a77ff842bd5dd4b2329e03ce505754af07da..5638488b4ee844d10c17fcd20c5b1284bcd1e0aa 100644
--- a/translations/ring_client_windows_bg.ts
+++ b/translations/ring_client_windows_bg.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation>ЗатварÑне</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Общи</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ca.ts b/translations/ring_client_windows_ca.ts
index 37baddcf39fa32b64fe530d5d7400d264197d76d..06225f93a72a774374d3542c62b49fc0d8c5b64a 100644
--- a/translations/ring_client_windows_ca.ts
+++ b/translations/ring_client_windows_ca.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Copiï'l i comparteixi'l amb els seus amics!</translation>
<translation>Penjar</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Intentant reconnectar al dimoni Jami (dring)…</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>No s'ha pogut reconnectar al dimoni Jami (dring).
@@ -2284,17 +2300,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_cs_CZ.ts b/translations/ring_client_windows_cs_CZ.ts
index a44cbe2625a791faa68d48eeb539e82a0cdfb48b..f0cf59a25233217791998774455e9e20c5829a24 100644
--- a/translations/ring_client_windows_cs_CZ.ts
+++ b/translations/ring_client_windows_cs_CZ.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>Zvukové soubory</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>VÅ¡echny soubory</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>Já</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation>vám volá</translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Přidat do konference</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>Přesměrovat tento hovor</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>Hledat kontakty</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Přidat do konference</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>Přesměrovat tento hovor</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1750,12 +1736,42 @@ ZkopÃrujte je a sdÃlejte je se svými přáteli!</translation>
<translation>Zavěsit</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>PokouÅ¡Ãm se znovu pÅ™ipojit k démonu Jami (dring)…</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Nelze se znovu připojit k démonu Jami (dring).
@@ -2287,17 +2303,17 @@ Zkuste to, prosÃm, pozdÄ›ji znovu.</translation>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Nastavenà úÄtu</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Obecné</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>Zásuvný modul</translation>
</message>
diff --git a/translations/ring_client_windows_da.ts b/translations/ring_client_windows_da.ts
index 047fb929e95ae82ebc8e3650ba08245ef893d1ac..b5bbc89f3ed542791d184b9a8cf9ea617c957199 100644
--- a/translations/ring_client_windows_da.ts
+++ b/translations/ring_client_windows_da.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>Tilføj filer</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>Alle filer</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>mig</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Tilføj til konference</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>Overfør denne samtale</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>Søg efter kontakter</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Tilføj til konference</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>Overfør denne samtale</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1372,7 +1358,7 @@ Jami will now quit.</source>
<message>
<location filename="../src/constant/JamiStrings.qml" line="254"/>
<source>Register a username</source>
- <translation type="unfinished"/>
+ <translation>Registrér et brugernavn</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="255"/>
@@ -1748,12 +1734,42 @@ Kopier og del det med dine venner!</translation>
<translation>Læg på</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Forsøger at genoprette forbindelse til Jami-servicen (dring)...</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Kunne ikke genoprette forbindelsen til Jami-servicen (dring). Jami lukker nu.</translation>
@@ -2282,17 +2298,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Generelt</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_da_DK.ts b/translations/ring_client_windows_da_DK.ts
index 848fcc65d1073973eaa48346c24f79d70591b71f..2e6937371b591d20617801524c5f2c32ef1fd373 100644
--- a/translations/ring_client_windows_da_DK.ts
+++ b/translations/ring_client_windows_da_DK.ts
@@ -28,12 +28,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"></translation>
</message>
@@ -125,35 +125,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -178,15 +159,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"></translation>
@@ -2283,17 +2299,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation type="unfinished">Generelt</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_de.ts b/translations/ring_client_windows_de.ts
index ae77bbcbdb043e143bf42742ed747ddb968d743b..bfa12b1ccdf166e9699f2619703070a8da551955 100644
--- a/translations/ring_client_windows_de.ts
+++ b/translations/ring_client_windows_de.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>Audiodateien</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>Alle Dateien</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Zur Konferenz hinzufügen</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Zur Konferenz hinzufügen</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Kopieren und teilen Sie diesen mit Ihren Freunden!</translation>
<translation>Auflegen</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Neuer Verbindungsversuch zum Jami-Daemon (dring)...</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Neuverbindung zum Jami-Daemon (dring) fehlgeschlagen.
@@ -2284,17 +2300,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Kontoeinstellungen</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>Plugin</translation>
</message>
diff --git a/translations/ring_client_windows_de_DE.ts b/translations/ring_client_windows_de_DE.ts
index d1f10df4adffb9134934e0f60e54d4dc1caa14d6..3abeedac2013940eaab16a5ec5460b7d0e54fd46 100644
--- a/translations/ring_client_windows_de_DE.ts
+++ b/translations/ring_client_windows_de_DE.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>Audio-Dateien</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>Alle Dateien</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>ich</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation>ruft Sie an</translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Zur Konferenz hinzufügen</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>Diesen Anruf übergeben</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>Kontakt suchen</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Zur Konferenz hinzufügen</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>Diesen Anruf übergeben</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1750,12 +1736,42 @@ Kopieren Sie ihn und teilen Sie ihn mit Ihren Freunden!</translation>
<translation>Auflegen</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Versuche wieder mit dem Jami-Hintergrundprozess zu verbinden (dring)</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Verbindung mit Jami-Hintergrundprozess (dring) konnte nicht wiederhergestellt werden.
@@ -2286,17 +2302,17 @@ Versuchen Sie es später erneut.</translation>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Konto-Einstellungen</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>Plugin</translation>
</message>
diff --git a/translations/ring_client_windows_el.ts b/translations/ring_client_windows_el.ts
index 8cbd84b2f8a4944152161a0faa3188580468aaeb..dfe8ceb906e180b00261dccca25f30e2b8582ce1 100644
--- a/translations/ring_client_windows_el.ts
+++ b/translations/ring_client_windows_el.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Γενικά</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_en_GB.ts b/translations/ring_client_windows_en_GB.ts
index af447ba013924ee9b37ab8b1fc02430242ecfa9a..156be4cc0d0050e1e51b1433d27d9c074149e350 100644
--- a/translations/ring_client_windows_en_GB.ts
+++ b/translations/ring_client_windows_en_GB.ts
@@ -28,12 +28,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"></translation>
</message>
@@ -125,35 +125,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -178,15 +159,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"></translation>
@@ -2283,17 +2299,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_eo.ts b/translations/ring_client_windows_eo.ts
index ba6e9be99efefdf7d69690ed98a087d91029339c..b990379d57ddcf5bc5084b3d4437086ecc989e29 100644
--- a/translations/ring_client_windows_eo.ts
+++ b/translations/ring_client_windows_eo.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation>Finigi vokon</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Äœeneralaj</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_es.ts b/translations/ring_client_windows_es.ts
index 6679c5ec5f439ba91b426fa68a44fb39f5c84743..e600252905caf8995073c97ddb582ee615ba8bce 100644
--- a/translations/ring_client_windows_es.ts
+++ b/translations/ring_client_windows_es.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>Ficheros de audio</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>Todos los archivos</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>yo</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation>te está llamando</translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Agregar a la conferencia</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>Transferir esta llamada</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>Buscar contactos</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Agregar a la conferencia</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>Transferir esta llamada</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1750,12 +1736,42 @@ Copy and share it with your friends!</source>
<translation>Cortar</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Tratando de conectarse de nuevo al demonio Jami (dring)...</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>No se pudo volver a conectar con el demonio Jami (dring).
@@ -2287,17 +2303,17 @@ Por favor inténtalo más tarde.</translation>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Configuración de la cuenta</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>Complemento</translation>
</message>
diff --git a/translations/ring_client_windows_es_AR.ts b/translations/ring_client_windows_es_AR.ts
index 4f02cf96d880adc7992fd600f328db3a3c45fa87..4f1247795e86f8bc2797dd079d6db69196bfb5c5 100644
--- a/translations/ring_client_windows_es_AR.ts
+++ b/translations/ring_client_windows_es_AR.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>Archivos de audio</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>Todos los archivos</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>yo</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation>te está llamando</translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Agregar a conferencia</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>Transferir esta llamada</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>Buscar contactos</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Agregar a conferencia</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>Transferir esta llamada</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1750,12 +1736,42 @@ Copy and share it with your friends!</source>
<translation>Colgar</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Intentando reconectar con el demonio Jami (dring) ...</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>No se pudo volver a conectar con el demonio Jami (dring).
@@ -2287,17 +2303,17 @@ Por favor intentalo más tarde.</translation>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Configuración de la cuenta</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>Complemento</translation>
</message>
diff --git a/translations/ring_client_windows_es_MX.ts b/translations/ring_client_windows_es_MX.ts
index bad15537dff35f2dc6d26069f1b7f093820f0454..953a830286d714df44d61ea61f5dfab001b8efbb 100644
--- a/translations/ring_client_windows_es_MX.ts
+++ b/translations/ring_client_windows_es_MX.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_et.ts b/translations/ring_client_windows_et.ts
index 37d1ee7d2cbbd5f0d362d25342babb33c034d1e6..1fa939ac9db624de66724494495a9b21954f2837 100644
--- a/translations/ring_client_windows_et.ts
+++ b/translations/ring_client_windows_et.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_et_EE.ts b/translations/ring_client_windows_et_EE.ts
index 3ab58d51408d2771501c278dcd8e7ee677f8384c..6503ba194f7d3d50e699911ab8e014a301d83cf0 100644
--- a/translations/ring_client_windows_et_EE.ts
+++ b/translations/ring_client_windows_et_EE.ts
@@ -28,12 +28,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"></translation>
</message>
@@ -125,35 +125,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -178,15 +159,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"></translation>
@@ -2283,17 +2299,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_eu.ts b/translations/ring_client_windows_eu.ts
index 436d9ebf9f1ea14f8449f5e32d15af5753cc977d..aca14bfa183a8300d289a30ca984ce095809fde4 100644
--- a/translations/ring_client_windows_eu.ts
+++ b/translations/ring_client_windows_eu.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation>Eseki</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Orokorra</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_fa_IR.ts b/translations/ring_client_windows_fa_IR.ts
index 9d5b563c403c6fa8407258381a55ba67c884c487..394b7679c524615ac6306059cdd362552f71dcfb 100644
--- a/translations/ring_client_windows_fa_IR.ts
+++ b/translations/ring_client_windows_fa_IR.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>اÙزودن به نشست</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>اÙزودن به نشست</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Copy and share it with your friends!</source>
<translation>به صØبت تلÙÙ†ÛŒ خاتمه دادن</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>تلاش برای اتصال مجدد به دیمن Jami (dring)...</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>عدم توانایی در اتصال مجدد به دیمن Jami (dring).
@@ -2284,17 +2300,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>عمومی</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>اÙزونه</translation>
</message>
diff --git a/translations/ring_client_windows_fi.ts b/translations/ring_client_windows_fi.ts
index 5002d58fab5e799b7e9e14bdff8756f028e5ab7b..121c4278bf32b5a066f79852d6bcd8f000dc2407 100644
--- a/translations/ring_client_windows_fi.ts
+++ b/translations/ring_client_windows_fi.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>Äänitiedostot</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>Kaikki tiedostot</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>minä</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation>soittaa sinulle</translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Lisää kokoukseen</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>Siirrä tämä puhelu</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>Hae yhteystietoja</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Lisää kokoukseen</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>Siirrä tämä puhelu</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1125,17 +1111,17 @@ Jami sulkeutuu nyt.</translation>
<message>
<location filename="../src/constant/JamiStrings.qml" line="178"/>
<source>is recording</source>
- <translation type="unfinished"/>
+ <translation>tallentaa</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="179"/>
<source>are recording</source>
- <translation type="unfinished"/>
+ <translation>tallentavat</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="180"/>
<source>Peer stopped recording</source>
- <translation type="unfinished"/>
+ <translation>Lopetti tallennuksen</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="183"/>
@@ -1750,12 +1736,42 @@ Kopioi ja jaa se ystäviesi kanssa!</translation>
<translation>Katkaistu</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Yritetään muodostaa yhteys Jami-taustapalveluun (dring)...</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Ei voinut muodostaa yhteyttä uudelleen Jami-taustapalveluun (dring).
@@ -2287,17 +2303,17 @@ Yritä myöhemmin uudelleen.</translation>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Tilin asetukset</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Yleiset</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>Laajennus</translation>
</message>
diff --git a/translations/ring_client_windows_fr.ts b/translations/ring_client_windows_fr.ts
index 835f2fee9e39a483862f8527241cb699ba58eb98..71f50f2607ed7ada5893c5993ceb7fa52e62f4af 100644
--- a/translations/ring_client_windows_fr.ts
+++ b/translations/ring_client_windows_fr.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>Fichiers audio</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>Tous les fichiers</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>moi</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation>vous appelle</translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Ajouter à la conférence</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>Transférer cet appel</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>Recherche des contacts</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Ajouter à la conférence</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>Transférer cet appel</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -239,7 +225,7 @@
<message>
<location filename="../src/wizardview/components/CreateAccountPage.qml" line="155"/>
<source>Choose your username</source>
- <translation>Choisissez un nom d'utilisateur</translation>
+ <translation>Choisissez votre nom d'utilisateur</translation>
</message>
<message>
<location filename="../src/wizardview/components/CreateAccountPage.qml" line="155"/>
@@ -259,7 +245,7 @@
<message>
<location filename="../src/wizardview/components/CreateAccountPage.qml" line="172"/>
<source>Username already taken</source>
- <translation>Ce nom d'utilisateur est déjà utilisé</translation>
+ <translation>Nom d'utilisateur déjà utilisé</translation>
</message>
<message>
<location filename="../src/wizardview/components/CreateAccountPage.qml" line="172"/>
@@ -319,13 +305,13 @@
<location filename="../src/DaemonReconnectWindow.qml" line="100"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
- <translation>Impossible de se reconnecter au daemon Jami (dring).
+ <translation>Impossible de se reconnecter au service Jami (dring).
Le programme va maintenant se terminer.</translation>
</message>
<message>
<location filename="../src/DaemonReconnectWindow.qml" line="101"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
- <translation>Redémarrage de Jami en cours …</translation>
+ <translation>Tentative de reconnexion au service Jami (dring) …</translation>
</message>
<message>
<location filename="../src/DaemonReconnectWindow.qml" line="156"/>
@@ -402,7 +388,7 @@ Le programme va maintenant se terminer.</translation>
<message>
<location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="139"/>
<source>Generating account…</source>
- <translation>Création du compte en cours... </translation>
+ <translation>Création du compte...</translation>
</message>
<message>
<location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="179"/>
@@ -496,8 +482,7 @@ Veuillez entrer votre mot de passe.</translation>
<message>
<location filename="../src/constant/JamiStrings.qml" line="53"/>
<source>Authentication failed</source>
- <translation>Échec de l'authentification
-</translation>
+ <translation>Échec de l'authentification</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="54"/>
@@ -582,7 +567,7 @@ Veuillez entrer votre mot de passe.</translation>
<message>
<location filename="../src/constant/JamiStrings.qml" line="75"/>
<source>Enable SDES key exchange</source>
- <translation>Activer SDES (échange de clés)</translation>
+ <translation>Activer l'échange de clés SDES</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="76"/>
@@ -682,7 +667,7 @@ Veuillez entrer votre mot de passe.</translation>
<message>
<location filename="../src/constant/JamiStrings.qml" line="156"/>
<source>Select video frame rate (frames per second)</source>
- <translation>Choisir le nombre d'image vidéo par seconde</translation>
+ <translation>Choisir la fréquence d'image vidéo (images par seconde)</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="185"/>
@@ -893,7 +878,7 @@ Notez que le mot de passe ne peut être récupéré.</translation>
<message>
<location filename="../src/constant/JamiStrings.qml" line="101"/>
<source>TURN username</source>
- <translation>Utilisateur TURN</translation>
+ <translation>Nom d'utilisateur TURN</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="102"/>
@@ -1013,27 +998,27 @@ Notez que le mot de passe ne peut être récupéré.</translation>
<message>
<location filename="../src/constant/JamiStrings.qml" line="142"/>
<source>Select audio input device</source>
- <translation>Périphérique de sortie audio </translation>
+ <translation>Sélection du périphérique d'entrée audio</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="143"/>
<source>Output device</source>
- <translation>Périphérique de sortie :</translation>
+ <translation>Périphérique de sortie</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="144"/>
<source>Select audio output device</source>
- <translation>Périphérique de sortie audio</translation>
+ <translation>Sélection du périphérique de sortie audio</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="145"/>
<source>Ringtone device</source>
- <translation>Périphérique pour la sonnerie :</translation>
+ <translation>Périphérique pour la sonnerie</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="146"/>
<source>Select ringtone output device</source>
- <translation>Périphérique de sortie pour la sonnerie</translation>
+ <translation>Sélection du périphérique de sortie pour la sonnerie</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="147"/>
@@ -1048,7 +1033,7 @@ Notez que le mot de passe ne peut être récupéré.</translation>
<message>
<location filename="../src/constant/JamiStrings.qml" line="151"/>
<source>Select video device</source>
- <translation>Périphérique vidéo</translation>
+ <translation>Sélection du périphérique vidéo</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="152"/>
@@ -1128,17 +1113,17 @@ Notez que le mot de passe ne peut être récupéré.</translation>
<message>
<location filename="../src/constant/JamiStrings.qml" line="178"/>
<source>is recording</source>
- <translation type="unfinished"/>
+ <translation>est en cours d'enregistrement</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="179"/>
<source>are recording</source>
- <translation type="unfinished"/>
+ <translation>sont en cours d'enregistrement</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="180"/>
<source>Peer stopped recording</source>
- <translation type="unfinished"/>
+ <translation>Le correspondant a arrêté l'enregistrement</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="183"/>
@@ -1752,12 +1737,42 @@ Copy and share it with your friends!</source>
<translation>Raccrocher</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Redémarrage de Jami en cours …</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Impossible de se reconnecter au daemon Jami (dring).
@@ -2288,17 +2303,17 @@ Veuillez réessayer plus tard</translation>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Paramètres Compte Jami</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Général</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>Module d'extension</translation>
</message>
diff --git a/translations/ring_client_windows_fr_BE.ts b/translations/ring_client_windows_fr_BE.ts
index 4b5379d7266948f3a73a774a9154bda810ba8ed3..61a4e0695d88736743e9744be6bdf84c1564cd61 100644
--- a/translations/ring_client_windows_fr_BE.ts
+++ b/translations/ring_client_windows_fr_BE.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Général</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_fr_CA.ts b/translations/ring_client_windows_fr_CA.ts
index 8a9b7b4a97e4bae59a99240c227d1d6d09ee7456..c0f41e7c528677fff4f7734d694c2bbb18d8fb03 100644
--- a/translations/ring_client_windows_fr_CA.ts
+++ b/translations/ring_client_windows_fr_CA.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation>Raccrocher</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Paramètres du compte</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Général</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_fr_CH.ts b/translations/ring_client_windows_fr_CH.ts
index ddde94c8df0b33276459dc6e88f2f9ec3b397bf7..c838d47d0a3cb8881108622589a74b8aedb3792f 100644
--- a/translations/ring_client_windows_fr_CH.ts
+++ b/translations/ring_client_windows_fr_CH.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Général</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_fr_FR.ts b/translations/ring_client_windows_fr_FR.ts
index d49ebfe23bd69338e9bd22b231e4ef273e0ad584..b86211f0baadb4b26a4bf60469f2c1c846d57290 100644
--- a/translations/ring_client_windows_fr_FR.ts
+++ b/translations/ring_client_windows_fr_FR.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation>Raccrocher</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Général</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_gl.ts b/translations/ring_client_windows_gl.ts
index af1d8f6e7293f4d2c8811c690082cc7738d4efdf..634a155fecf3fdfd74d3cbdafaed6cadd09ec2d1 100644
--- a/translations/ring_client_windows_gl.ts
+++ b/translations/ring_client_windows_gl.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>eu</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1748,12 +1734,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Intentando reconectar co demoño Jami (dring)...</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Non se puido reconectar co demoño Jami (dring).
@@ -2283,17 +2299,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Xeral</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>Plugin</translation>
</message>
diff --git a/translations/ring_client_windows_he.ts b/translations/ring_client_windows_he.ts
index 7dcba86ec830a63246e8f43e72dcd7d6df97cf64..4704b04c864570069f99acab03d9f49ec35e612b 100644
--- a/translations/ring_client_windows_he.ts
+++ b/translations/ring_client_windows_he.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>קובצי שמע</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>כל הקבצי×</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation>× ×ª×§</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>כלליות</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_hi_IN.ts b/translations/ring_client_windows_hi_IN.ts
index d17e87f3488400c46de84b0270dc7ecda5a0b042..137539ab6ba8524d98efb6af0bd25110e241ec56 100644
--- a/translations/ring_client_windows_hi_IN.ts
+++ b/translations/ring_client_windows_hi_IN.ts
@@ -28,12 +28,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"></translation>
</message>
@@ -125,35 +125,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -178,15 +159,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"></translation>
@@ -2283,17 +2299,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_hr.ts b/translations/ring_client_windows_hr.ts
index 6d906f2ee397e5ec816c1a0b013eebdff7395bc7..7f09c48f707fa29733d403f39457599b4c1356fa 100644
--- a/translations/ring_client_windows_hr.ts
+++ b/translations/ring_client_windows_hr.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Opće</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_hu.ts b/translations/ring_client_windows_hu.ts
index 867ba4af2c3c9008215fdb440ebde3bdb10c3d79..48a79b7b6ea8650bdd69de8929e1d85cdd4c6875 100644
--- a/translations/ring_client_windows_hu.ts
+++ b/translations/ring_client_windows_hu.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>Hangfájlok</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>Minden fájl</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>én</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation>hÃv</translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Hozzáadás a konferenciához</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>HÃvás átadása</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>Keresés a kapcsolatok között</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Hozzáadás a konferenciához</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>HÃvás átadása</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1125,17 +1111,17 @@ A Jami most kilép.</translation>
<message>
<location filename="../src/constant/JamiStrings.qml" line="178"/>
<source>is recording</source>
- <translation type="unfinished"/>
+ <translation>felvételt készÃt</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="179"/>
<source>are recording</source>
- <translation type="unfinished"/>
+ <translation>felvételt készÃt</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="180"/>
<source>Peer stopped recording</source>
- <translation type="unfinished"/>
+ <translation>Egyenrangú leállÃtotta a felvételt</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="183"/>
@@ -1749,12 +1735,42 @@ Másolja ki, és ossza meg barátaival!</translation>
<translation>HÃvás befejezése</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Újrakapcsolódás a Jami rendszerfolyamathoz (dring)…</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Nem sikerült újrakapcsolódni a Jami rendszerfolyamathoz (dring).
@@ -2285,17 +2301,17 @@ Kérjük, hogy próbálja újra később.</translation>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Fiók beállÃtások</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Ãltalános</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>Beépülő modul</translation>
</message>
diff --git a/translations/ring_client_windows_id.ts b/translations/ring_client_windows_id.ts
index 61a30dd33fa18f420a598e33617a579f551daaec..409cf06f0394de2177eacd00fd87bf425a675653 100644
--- a/translations/ring_client_windows_id.ts
+++ b/translations/ring_client_windows_id.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_it.ts b/translations/ring_client_windows_it.ts
index 98b41f8e57abd1c502db0b41cc4e97c781f41f23..e328fccbbe2549ad50423d98bb27cd38abcd1fa3 100644
--- a/translations/ring_client_windows_it.ts
+++ b/translations/ring_client_windows_it.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Copia e condividi con i tuoi amici!</translation>
<translation>Riattacare</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Cercando di riconnettersi al demone Jami (dring) ...</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Impossibile riconnettersi al demone Jami (dring).
@@ -2284,17 +2300,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Generali</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_it_IT.ts b/translations/ring_client_windows_it_IT.ts
index 1f017f57e3666d10c61541a50fd77de0518eebcf..54f13616ef477482f85fc554de9f3bffcc912a53 100644
--- a/translations/ring_client_windows_it_IT.ts
+++ b/translations/ring_client_windows_it_IT.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>File audio</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>Tutti i file</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>io</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation>ti sta chiamando</translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Aggiungi alla conferenza</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>Trasferisci questa chiamata</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>Cerca contatti</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Aggiungi alla conferenza</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>Trasferisci questa chiamata</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1125,17 +1111,17 @@ Jami ora verrà terminato.</translation>
<message>
<location filename="../src/constant/JamiStrings.qml" line="178"/>
<source>is recording</source>
- <translation type="unfinished"/>
+ <translation>sta registrando</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="179"/>
<source>are recording</source>
- <translation type="unfinished"/>
+ <translation>stanno registrando</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="180"/>
<source>Peer stopped recording</source>
- <translation type="unfinished"/>
+ <translation>Il peer ha interrotto la registrazione</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="183"/>
@@ -1750,12 +1736,42 @@ Copia e condividi con i tuoi amici!</translation>
<translation>Aggancia</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Sto cercando di riconnettersi al demone Jami (dring) ...</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Impossibile riconnettersi al demone Jami (dring).
@@ -2287,17 +2303,17 @@ Per favore riprova più tardi.</translation>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Impostazioni dell 'account</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Generale</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>Plugin</translation>
</message>
diff --git a/translations/ring_client_windows_ja.ts b/translations/ring_client_windows_ja.ts
index 7c36b41c3c2a799360ed26e42c163eceabe9a65f..928fd3609fb67874ef50b6bc5a95075d4645617e 100644
--- a/translations/ring_client_windows_ja.ts
+++ b/translations/ring_client_windows_ja.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>グループ通話ã«è¿½åŠ </translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>グループ通話ã«è¿½åŠ </translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1748,12 +1734,42 @@ Copy and share it with your friends!</source>
<translation>å—話</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2282,17 +2298,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>全般</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ko_KR.ts b/translations/ring_client_windows_ko_KR.ts
index 9a47293f563be6aa2f9dc211288fabcdeddaa455..773c012313a486471286d7e60a4c3d543c0d603b 100644
--- a/translations/ring_client_windows_ko_KR.ts
+++ b/translations/ring_client_windows_ko_KR.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation>통화종료</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>ì¼ë°˜</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_lt.ts b/translations/ring_client_windows_lt.ts
index f595121fa86d6104e05cc9c9365924284d8cc6ec..22dd9236ab6a22cf2387cbe19cdb78e89679ff70 100644
--- a/translations/ring_client_windows_lt.ts
+++ b/translations/ring_client_windows_lt.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Pridėti į konferenciją</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Pridėti į konferenciją</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Nukopijuokite ir dalinkitÄ—s juo su draugais!</translation>
<translation>Padėti ragelį</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Bandoma iš naujo prisijungti prie Jami tarnybos (dring)…</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Nepavyko iš naujo prisijungti prie Jami tarnybos (dring).
@@ -2284,17 +2300,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Paskyros nustatymai</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Bendra</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ms.ts b/translations/ring_client_windows_ms.ts
index 3d253f5ef747e65533c79e839160db2a1958aa07..0b88f968cf13fffe575daf074575341ef53b1eb5 100644
--- a/translations/ring_client_windows_ms.ts
+++ b/translations/ring_client_windows_ms.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Utama</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_nb.ts b/translations/ring_client_windows_nb.ts
index 28a905811e31fa4c6af8f115c8ca06f467f8b21c..99b21275122858872921c946019acd6b2ef92173 100644
--- a/translations/ring_client_windows_nb.ts
+++ b/translations/ring_client_windows_nb.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>Lydfiler</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>Alle filer</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>meg</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation>ringer deg</translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Legg til konferanse</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>Overfør denne samtalen</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>Søk kontakter</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Legg til konferanse</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>Overfør denne samtalen</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1750,12 +1736,42 @@ Kopier og del det med dine venner!</translation>
<translation>Legg på</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Forsøker å koble til Jami-bakgrunnsprosessen (dring) på nytt...</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Klarte ikke koble opp forbindelsen igjen til Jami-bakgrunnsprosessen (dring).
@@ -2287,17 +2303,17 @@ Vennligst forsøk igjen senere.</translation>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Kontoinnstillinger</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Generell</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>Utvidelse</translation>
</message>
diff --git a/translations/ring_client_windows_nb_NO.ts b/translations/ring_client_windows_nb_NO.ts
index a66dc5a1c722de283fbe4254ab7cc17cfe1d93c1..38882f02aae5fcaef42967abb82b53b995f10cb8 100644
--- a/translations/ring_client_windows_nb_NO.ts
+++ b/translations/ring_client_windows_nb_NO.ts
@@ -28,12 +28,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"></translation>
</message>
@@ -125,35 +125,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -178,15 +159,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"></translation>
@@ -2283,17 +2299,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_nl.ts b/translations/ring_client_windows_nl.ts
index f896962faf842f7b105b60f2cbcd6b066ab905e5..1a026596160ff4c4b115946211335e49f68b7e90 100644
--- a/translations/ring_client_windows_nl.ts
+++ b/translations/ring_client_windows_nl.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Toevoegen aan groepsgesprek</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Toevoegen aan groepsgesprek</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Deel deze met uw vrienden!</translation>
<translation>Ophangen</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Opnieuw verbinding maken met de Jami-daemon (dring)…</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Kon niet opnieuw verbinding maken met de Jami-daemon (dring).
@@ -2284,17 +2300,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Accountinstellingen</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Algemeen</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_nl_BE.ts b/translations/ring_client_windows_nl_BE.ts
index 34b3f55248647a2f5edbf19c207e8e87bbd1c110..fb7dd485e77dd6488439175d4a36c34456130e7d 100644
--- a/translations/ring_client_windows_nl_BE.ts
+++ b/translations/ring_client_windows_nl_BE.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Toevoegen aan groepsgesprek</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Toevoegen aan groepsgesprek</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Deel hem met uw vrienden!</translation>
<translation>Ophangen</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Bezig met herverbinden met de Jami-daemon (dring)…</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Kon niet herverbinden met de Jami-daemon (dring).
@@ -2284,17 +2300,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Accountinstellingen</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Algemeen</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_nl_NL.ts b/translations/ring_client_windows_nl_NL.ts
index 5393728024bc232a5d38d7b92a02e3e403535ffd..b326f9b5490a73e2e84c42fad3d0e9e8531ccce5 100644
--- a/translations/ring_client_windows_nl_NL.ts
+++ b/translations/ring_client_windows_nl_NL.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Algemeen</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_oc.ts b/translations/ring_client_windows_oc.ts
index 23db51ad77a3e3d5dc9f94509c96e64df285af43..ce65761862dbdb59ba2d722a4892dc19ba38db9f 100644
--- a/translations/ring_client_windows_oc.ts
+++ b/translations/ring_client_windows_oc.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1748,12 +1734,42 @@ Copiatz-lo e partejatz-lo a vòstres amics !</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2282,17 +2298,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>Extension</translation>
</message>
diff --git a/translations/ring_client_windows_pa.ts b/translations/ring_client_windows_pa.ts
index 6d737e0bc3b470d9edcb34f86c86b88bfccb336c..ee3cab8506f764dcd76dcabf826f4b555cfa926a 100644
--- a/translations/ring_client_windows_pa.ts
+++ b/translations/ring_client_windows_pa.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>ਸਧਾਰਨ</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_pl.ts b/translations/ring_client_windows_pl.ts
index 29313ccdde37a8751b7eaec52ba30f8e11ed5504..f14304a65df323cc78bea1e14690417e9892acb8 100644
--- a/translations/ring_client_windows_pl.ts
+++ b/translations/ring_client_windows_pl.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>Pliki dźwiękowe</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>Wszystkie pliki</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>ja</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation>dzwoni do ciebie</translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Dodaj do rozmowy</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>Przełącz rozmowę</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>Szukaj kontaktów</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Dodaj do rozmowy</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>Przełącz rozmowę</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1750,12 +1736,42 @@ Skopiuj i podziel się nią z przyjaciółmi!</translation>
<translation>Odłoż słuchawkę</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Próba połączenia z daemonem Jami (dring)...</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Nie udało się ponownie połączyć z daemonem Jami (dring).
@@ -2287,17 +2303,17 @@ Spróbuj ponownie później.</translation>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Ustawienia Konta</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Generalne</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>Wtyczka</translation>
</message>
diff --git a/translations/ring_client_windows_pl_PL.ts b/translations/ring_client_windows_pl_PL.ts
index a14bd8175dabe16ed730cf9bc93b49cb985004ed..8e7fe37a0004067eac3b281043a664f79cafc3be 100644
--- a/translations/ring_client_windows_pl_PL.ts
+++ b/translations/ring_client_windows_pl_PL.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>Pliki dźwiękowe</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>Wszystkie pliki</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>ja</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation>dzwoni do ciebie</translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Dodaj do rozmowy</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>Przełącz tą rozmowę</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>Wyszukaj kontakt</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Dodaj do rozmowy</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>Przełącz tą rozmowę</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Skopiuj i podziel się nią z przyjaciółmi!</translation>
<translation>Odłożyć słuchawkę</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Próba połączenia z daemonem Jami (dring)...</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Nie udało się ponownie połączyć z daemonem Jami (dring).
@@ -2284,17 +2300,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Ustawienia Konta</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Generalne</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_pt.ts b/translations/ring_client_windows_pt.ts
index 94072b485e1c86516fdacdd8b439876c13e9e4f6..b7ce611d93bdd16807b0abdf441f782bedf2fd22 100644
--- a/translations/ring_client_windows_pt.ts
+++ b/translations/ring_client_windows_pt.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Adicionar à conferência</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Adicionar à conferência</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Copie e o partilhe-o com os seus amigos!</translation>
<translation>Desligar</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>A tentar reconectar ao processo Jami (dring)…</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Não foi possÃvel reconectar ao processo Jami (drink) .%s
@@ -2284,17 +2300,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Configurações da Conta</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_pt_BR.ts b/translations/ring_client_windows_pt_BR.ts
index 92e4a3f66e162af1fc50d412c19c5bcee9abc2fb..1b14c696eb1f7c3ffe3450a466ca026699f36380 100644
--- a/translations/ring_client_windows_pt_BR.ts
+++ b/translations/ring_client_windows_pt_BR.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>Arquivos de Ãudio</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>Todos os arquivos</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>eu</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation>está chamando você</translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Adicionar a conferência</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>Transferir esta chamada</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>Buscar contatos</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Adicionar a conferência</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>Transferir esta chamada</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1750,12 +1736,42 @@ Copie-o e compartilhe com seus amigos!</translation>
<translation>Desligar</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Tentando reconectar ao processo do Jami (dring)…</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Não foi possÃvel reconectar ao processo do Jami (drink) .%s
@@ -2287,17 +2303,17 @@ Por favor, tente novamente mais tarde.</translation>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Configurações da Conta</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>Plugin</translation>
</message>
diff --git a/translations/ring_client_windows_pt_PT.ts b/translations/ring_client_windows_pt_PT.ts
index 9adc17946dc24f40f7ed266cb7c5eaf54c56da2f..2975ab41f3fee48724c05fc6ef145f684b6443e1 100644
--- a/translations/ring_client_windows_pt_PT.ts
+++ b/translations/ring_client_windows_pt_PT.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Adicionar à conferência</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Adicionar à conferência</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Copie e o partilhe-o com os seus amigos!</translation>
<translation>Desligar</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>A tentar reconectar ao processo Jami (dring)…</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Não foi possÃvel reconectar ao processo Jami (drink) .%s
@@ -2284,17 +2300,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Configurações da Conta</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ro.ts b/translations/ring_client_windows_ro.ts
index 0ca8a32ddf07a2e10ef05d9fc03bd00cd9f65415..ae73d76a21c8e1473cd28dd21e63bf274fe43580 100644
--- a/translations/ring_client_windows_ro.ts
+++ b/translations/ring_client_windows_ro.ts
@@ -28,12 +28,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"></translation>
</message>
@@ -125,35 +125,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -178,15 +159,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"></translation>
@@ -2283,17 +2299,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation type="unfinished">General</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_ro_RO.ts b/translations/ring_client_windows_ro_RO.ts
index cb6976acfe1e583aa55a004c4932b8909d7389b8..496092a649b006a0b590fad74c073bb416f6a0b7 100644
--- a/translations/ring_client_windows_ro_RO.ts
+++ b/translations/ring_client_windows_ro_RO.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>Fișiere Audio</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>Toate fișierele</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>eu</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation>te sună</translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Adaugă la conferință</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>Redirecționează acest apel</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>Caută contacte</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Adaugă la conferință</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>Redirecționează acest apel</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1125,17 +1111,17 @@ Jami se va închide acum.</translation>
<message>
<location filename="../src/constant/JamiStrings.qml" line="178"/>
<source>is recording</source>
- <translation type="unfinished"/>
+ <translation>e înregistrată</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="179"/>
<source>are recording</source>
- <translation type="unfinished"/>
+ <translation>sînt înregistrate</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="180"/>
<source>Peer stopped recording</source>
- <translation type="unfinished"/>
+ <translation>Interlocutorul a oprit înregistrarea</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="183"/>
@@ -1750,12 +1736,42 @@ Copiază-l și distribuie-l prietenilor!</translation>
<translation>ÃŽnchide</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Reconectare la procesul de sistem Jami (dring)...</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Imposibilă reconectarea la procesul de sistem Jami (dring).
@@ -2287,17 +2303,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Reglările Contului</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Generale</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>Extensie</translation>
</message>
diff --git a/translations/ring_client_windows_ru.ts b/translations/ring_client_windows_ru.ts
index e16f72f99ac08db85daa64ce8884a687404879ef..779bef6d3c109befff319cf66423b548d9b34131 100644
--- a/translations/ring_client_windows_ru.ts
+++ b/translations/ring_client_windows_ru.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>Ðудио файлы</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>Ð’Ñе файлы</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>мне</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation>звонит вам</translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Добавить к конференции</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>Передать Ñтот звонок</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>Ðайти контакты</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Добавить к конференции</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>Передать Ñтот звонок</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1750,12 +1736,42 @@ Copy and share it with your friends!</source>
<translation>ПовеÑить трубку</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Пробуем переподключитьÑÑ Ðº демону Jami (dring)…</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Ðе удалоÑÑŒ переподключитьÑÑ Ðº демону Jami (dring).
@@ -2287,17 +2303,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>ÐаÑтройки аккаунта</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Общие</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>Дополнение</translation>
</message>
diff --git a/translations/ring_client_windows_ru_RU.ts b/translations/ring_client_windows_ru_RU.ts
index 342e1b05d56a43a83e948a3698688975eacea28f..e26d74859210630602e131e7d1b6be2b36bc5daa 100644
--- a/translations/ring_client_windows_ru_RU.ts
+++ b/translations/ring_client_windows_ru_RU.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>Ðудио Файлы</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>Ð’Ñе файлы</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>Ñ</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Добавить в чат</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Добавить в чат</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Copy and share it with your friends!</source>
<translation>Разъединить</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Пробуем переподключитьÑÑ Ðº демону Jami (dring)…</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Ðе удалоÑÑŒ переподключитьÑÑ Ðº демону Jami (dring).
@@ -2286,17 +2302,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>ОÑновные</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>ДополнениÑ</translation>
</message>
diff --git a/translations/ring_client_windows_sk_SK.ts b/translations/ring_client_windows_sk_SK.ts
index 28889d5370f0f26cad260c5ee036eb57745f89d8..3db33a1ebe5d7a9c109de2e419054a6295fe1f2e 100644
--- a/translations/ring_client_windows_sk_SK.ts
+++ b/translations/ring_client_windows_sk_SK.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Pridať ku konferencii</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Pridať ku konferencii</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ SkopÃrujte ho a zdieľajte s priateľmi!</translation>
<translation>Zložiť</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Prebieha pokus o znovupripojenie k daemonovi Jami (dring)...</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Nepodarilo sa znovupripojenie k daemonovi Jami (dring).
@@ -2284,17 +2300,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Všeobecné</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_sl.ts b/translations/ring_client_windows_sl.ts
index eef03ceb974b7c5e82fef2bfb15b46d3d020599c..cc456694b7225ad94cd30e9aa87b280ac473b9aa 100644
--- a/translations/ring_client_windows_sl.ts
+++ b/translations/ring_client_windows_sl.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>ZvoÄne datoteke</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>Vse datoteke</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>jaz</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation>vas kliÄe</translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Dodaj v konferenco</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>Preveži ta klic</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>Iskanje stika</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Dodaj v konferenco</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>Preveži ta klic</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1750,12 +1736,42 @@ Kopirajte ga in delite s prijatelji!</translation>
<translation>Odloži</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Poskus ponovnega povezovanja z Jami pritajenim demonom (dring)...</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Nisem se mogel znova povezati z Jami pritajenim demonom (dring).
@@ -2287,17 +2303,17 @@ Poskusite znova kasneje.</translation>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Nastavitve raÄuna</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Splošno</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>VtiÄnik</translation>
</message>
diff --git a/translations/ring_client_windows_sq_AL.ts b/translations/ring_client_windows_sq_AL.ts
index e4723b68b09a15e75071f3531d36ce0fb43352b8..109f1598a8712b5c3b7874ad7f75e14da298c8b8 100644
--- a/translations/ring_client_windows_sq_AL.ts
+++ b/translations/ring_client_windows_sq_AL.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>Kartela Audio</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>Krejt kartelat</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>unë</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation>po ju thërret</translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Shtoje te konferenca</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>Shpërngule këtë thirrje</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>Kërko te kontaktet</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Shtoje te konferenca</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>Shpërngule këtë thirrje</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1125,17 +1111,17 @@ Jami tani do të dalë.</translation>
<message>
<location filename="../src/constant/JamiStrings.qml" line="178"/>
<source>is recording</source>
- <translation type="unfinished"/>
+ <translation>po regjistron</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="179"/>
<source>are recording</source>
- <translation type="unfinished"/>
+ <translation>po regjistrojnë</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="180"/>
<source>Peer stopped recording</source>
- <translation type="unfinished"/>
+ <translation>Ana tjetër ndali regjistrimin</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="183"/>
@@ -1750,12 +1736,42 @@ Kopjojeni dhe jepuani shokëve!</translation>
<translation>Mbylle</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Po provohet rilidhja me demonin Jami (dring)…</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>S’u rilidh dot me demonin Jami (dring).
@@ -2287,17 +2303,17 @@ Ju lutemi, riprovoni më vonë.</translation>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Rregullime Llogarie</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Të përgjithshme</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>Shtojcë</translation>
</message>
diff --git a/translations/ring_client_windows_sr@latin.ts b/translations/ring_client_windows_sr@latin.ts
index 3a48f326cb1c41123202c4926fcfcb5597192bad..e70dcfc99c152e3b0bc61ed4d0e3a8e2525b38e2 100644
--- a/translations/ring_client_windows_sr@latin.ts
+++ b/translations/ring_client_windows_sr@latin.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_sv.ts b/translations/ring_client_windows_sv.ts
index 44fb4c6a205c3ad1c532a8e4a032792a50ea1593..32900d9e467382d3758c82cd5805331ab61d119c 100644
--- a/translations/ring_client_windows_sv.ts
+++ b/translations/ring_client_windows_sv.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>Ljudfiler</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>Alla filer</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>jag</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation>ringer dig</translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Lägg till i konferens</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>Överför samtal</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>Sök kontakter</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Lägg till i konferens</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>Överför samtal</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Kopiera och dela det med dina vänner!</translation>
<translation>Lägg på</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Försöker återansluta till Jami-tjänsten (dring)...</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Kunde inte återansluta till Jami-tjänsten (dring).
@@ -2284,17 +2300,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Kontoinställningar</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Allmänt</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>Insticksmodul</translation>
</message>
diff --git a/translations/ring_client_windows_ta.ts b/translations/ring_client_windows_ta.ts
index a358d10470e291b06df02ba06c4a81ec11c8623b..cee9037b9b55373cb5303bb3f40c8cee20bc73e0 100644
--- a/translations/ring_client_windows_ta.ts
+++ b/translations/ring_client_windows_ta.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>பொதà¯</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_tr.ts b/translations/ring_client_windows_tr.ts
index 95c3c607b9de3636175573dacc7c4cfa19deb689..64a3391a4192249d583e71f9759622b2d85da521 100644
--- a/translations/ring_client_windows_tr.ts
+++ b/translations/ring_client_windows_tr.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Konferansa ekle</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Konferansa ekle</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1750,13 +1736,43 @@ Kopyalayın ve arkadaşlarınızla paylaşın!</translation>
<translation>Kapat</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Jami uygulamasına yeniden bağlanmayı deniyor
(dring)…</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Jami uygulamasına bağlanılamadı (dring).
@@ -2286,17 +2302,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>Hesap Ayarları</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Genel</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_tr_TR.ts b/translations/ring_client_windows_tr_TR.ts
index 57af54eefe9c035db5e03514b433c867b2d3118e..95eda34e6e360d91f713f9e608027bdd5881e5c6 100644
--- a/translations/ring_client_windows_tr_TR.ts
+++ b/translations/ring_client_windows_tr_TR.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_uk.ts b/translations/ring_client_windows_uk.ts
index 37144126ecea2e9b4114d89504179d858f06fd1e..d6dfc87e01ffc635794429aae7cbc0061a8113c2 100644
--- a/translations/ring_client_windows_uk.ts
+++ b/translations/ring_client_windows_uk.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>Додати до конференції</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>Додати до конференції</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Copy and share it with your friends!</source>
<translation>Ð’Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ð¸ÐºÐ»Ð¸ÐºÑƒ</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>Спроба з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· ÑервіÑом Джамі (dring)…</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>Ðе вдалоÑÑ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾ з'єднатиÑÑ Ð· ÑервіÑом Джамі (dring).
@@ -2284,17 +2300,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>Головні</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_uk_UA.ts b/translations/ring_client_windows_uk_UA.ts
index b985ea0b77c6662e0fa877c2e2fc300db5cb1e43..c001057eb120b5802090a148298d7ff66f452c5c 100644
--- a/translations/ring_client_windows_uk_UA.ts
+++ b/translations/ring_client_windows_uk_UA.ts
@@ -28,12 +28,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"></translation>
</message>
@@ -125,35 +125,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -178,15 +159,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1749,12 +1735,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"></translation>
@@ -2283,17 +2299,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_vi.ts b/translations/ring_client_windows_vi.ts
index e8e7b2315a13df9d30e4f7d021e36d6e56f74a65..7a3e560ec86b27009a47e767f6de4dc2c80c7684 100644
--- a/translations/ring_client_windows_vi.ts
+++ b/translations/ring_client_windows_vi.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_zh.ts b/translations/ring_client_windows_zh.ts
index 56a6036f11b7d73e516f18f164506cacef23fe31..90227d1b2729ad7ef48f3398010cb2468aabf08c 100644
--- a/translations/ring_client_windows_zh.ts
+++ b/translations/ring_client_windows_zh.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation type="unfinished"/>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1747,12 +1733,42 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
- <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
+ <source>Trying to reconnect to the Jami daemon (dring)…</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation type="unfinished"/>
@@ -2281,17 +2297,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>通用</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_zh_CN.ts b/translations/ring_client_windows_zh_CN.ts
index eff1f1205931bffd4db04229406fcea9b3779634..9bb180a3bb80410311af08cf6920ab76778554ba 100644
--- a/translations/ring_client_windows_zh_CN.ts
+++ b/translations/ring_client_windows_zh_CN.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>音频文件</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>所有文件</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>我</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation>æ£åœ¨å‘¼å«æ‚¨</translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>æ·»åŠ è‡³ä¼šè®®</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>转接呼å«</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>æœç´¢è”系人</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>æ·»åŠ è‡³ä¼šè®®</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>转接呼å«</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1125,17 +1111,17 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/constant/JamiStrings.qml" line="178"/>
<source>is recording</source>
- <translation type="unfinished"/>
+ <translation>æ£åœ¨å½•åˆ¶</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="179"/>
<source>are recording</source>
- <translation type="unfinished"/>
+ <translation>æ£åœ¨å½•åˆ¶</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="180"/>
<source>Peer stopped recording</source>
- <translation type="unfinished"/>
+ <translation>对ç‰ç«¯å·²åœæ¢å½•åˆ¶</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="183"/>
@@ -1750,12 +1736,42 @@ Copy and share it with your friends!</source>
<translation>挂æ–</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>æ£åœ¨é‡è¯•è¿žæŽ¥ Jami 守护进程（dring）…</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>æ— æ³•è¿žæŽ¥è‡³ Jami 守护进程（dring）。
@@ -2287,17 +2303,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>账户设置</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>通用</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>æ’件</translation>
</message>
diff --git a/translations/ring_client_windows_zh_TW.ts b/translations/ring_client_windows_zh_TW.ts
index ac709d9e0de5f299e3a90b1bb87bf60232754376..9b83ca7fb401ac99beee147068487b1c76ef0b43 100644
--- a/translations/ring_client_windows_zh_TW.ts
+++ b/translations/ring_client_windows_zh_TW.ts
@@ -26,12 +26,12 @@
<context>
<name>AdvancedCallSettings</name>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>Audio Files</source>
<translation>音訊檔案</translation>
</message>
<message>
- <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
+ <location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="86"/>
<source>All files</source>
<translation>所有檔案</translation>
</message>
@@ -123,35 +123,16 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="282"/>
- <location filename="../src/calladapter.cpp" line="359"/>
+ <location filename="../src/calladapter.cpp" line="277"/>
<source>me</source>
<translation>我</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="322"/>
+ <location filename="../src/calladapter.cpp" line="341"/>
<source>is calling you</source>
<translation>æ£åœ¨èˆ‡æ‚¨é€šè©±</translation>
</message>
</context>
-<context>
- <name>CallAdvancedOptions</name>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Add to conference</source>
- <translation>åŠ å…¥æœƒè°</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="87"/>
- <source>Transfer this call</source>
- <translation>轉é€æ¤é€šè©±</translation>
- </message>
- <message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="105"/>
- <source>Search contacts</source>
- <translation>æœå°‹è¯çµ¡äºº</translation>
- </message>
-</context>
<context>
<name>CallOverlay</name>
<message>
@@ -176,15 +157,20 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="91"/>
<source>Add to conference</source>
<translation>åŠ å…¥æœƒè°</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="87"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="93"/>
<source>Transfer this call</source>
<translation>轉é€æ¤é€šè©±</translation>
</message>
+ <message>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="95"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ConversationSmartListContextMenu</name>
@@ -1125,17 +1111,17 @@ Jami 將會çµæŸã€‚</translation>
<message>
<location filename="../src/constant/JamiStrings.qml" line="178"/>
<source>is recording</source>
- <translation type="unfinished"/>
+ <translation>æ£åœ¨éŒ„製</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="179"/>
<source>are recording</source>
- <translation type="unfinished"/>
+ <translation>æ£åœ¨éŒ„製</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="180"/>
<source>Peer stopped recording</source>
- <translation type="unfinished"/>
+ <translation>å°æ–¹åœæ¢éŒ„製</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="183"/>
@@ -1750,12 +1736,42 @@ Copy and share it with your friends!</source>
<translation>掛斷</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>local muted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Conference moderation</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Default moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="421"/>
+ <source>Enable local moderators</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="422"/>
+ <source>Add default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="423"/>
+ <source>Remove default moderator</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="426"/>
<source>Trying to reconnect to the Jami daemon (dring)…</source>
<translation>æ£åœ¨å˜—試é‡æ–°é€£ç·šåˆ° Jami å¹•å¾Œç¨‹å¼ (dring)……</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <location filename="../src/constant/JamiStrings.qml" line="427"/>
<source>Could not re-connect to the Jami daemon (dring).
Jami will now quit.</source>
<translation>無法é‡æ–°é€£ç·šåˆ° Jami å¹•å¾Œç¨‹å¼ (dring)。
@@ -2287,17 +2303,17 @@ Please try again later.</source>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="149"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="151"/>
<source>Account Settings</source>
<translation>帳號è¨å®š</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="151"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="153"/>
<source>General</source>
<translation>一般</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="157"/>
<source>Plugin</source>
<translation>外掛程å¼</translation>
</message>